tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

2012-04-03 Dario Rodriguez <dario.rodriguez@artica.es> 

* godmode/menu.php,
	godmode/tag/tag.php,
	godmode/tag/edit_tag.php: Moved tag menu inside Manage modules.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@5885 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
darode 2012-04-03 13:57:25 +00:00
parent 8608d4ad03
commit 54c9564e3e
4 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pandora_console/ChangeLog
View File

@ -1,3 +1,9 @@
2012-04-03 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/menu.php,
godmode/tag/tag.php,
godmode/tag/edit_tag.php: Moved tag menu inside Manage modules.
2012-04-03 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_menu.php: Deleted extension icon on menus.

11
pandora_console/godmode/menu.php
View File

@ -76,7 +76,11 @@ if (check_acl ($config['id_user'], 0, "PM")) {
enterprise_hook ('components_submenu');
$sub["godmode/modules/manage_network_templates"]["text"] = __('Module templates');
enterprise_hook ('inventory_submenu');
// Tag
$sub["godmode/tag/tag"]["text"] = __('Manage tags');
$sub["godmode/tag/tag"]["subsecs"] = "godmode/tag/edit_tag";
$menu["gmodules"]["sub"] = $sub;
}
@ -175,11 +179,6 @@ if (check_acl ($config['id_user'], 0, "PM")) {
$menu["glog"]["sec2"] = "godmode/admin_access_logs";
$menu["glog"]["id"] = "god-audit";
// Tag
$menu["gtag"]["text"] = __('Manage tags');
$menu["gtag"]["sec2"] = "godmode/tag/tag";
$menu["gtag"]["id"] = "god-tag";
// Setup
$menu["gsetup"]["text"] = __('Setup');
$menu["gsetup"]["sec2"] = "godmode/setup/setup";

6
pandora_console/godmode/tag/edit_tag.php
View File

@ -39,13 +39,13 @@ $tab = (string) get_parameter ("tab", "list");
$buttons = array(
'list' => array(
'active' => false,
'text' => '<a href="index.php?sec=gtag&sec2=godmode/tag/tag&tab=list">' .
'text' => '<a href="index.php?sec=gmodules&sec2=godmode/tag/tag&tab=list">' .
html_print_image ("images/god6.png", true, array ("title" => __('List tags'))) .'</a>'));
$buttons[$tab]['active'] = true;
// Header
ui_print_page_header (__('Tags configuration'), "images/tag_red.png", false, "", true, $buttons);
ui_print_page_header (__('Tags configuration'), "images/setup.png", false, "", true, $buttons);
// Two actions can performed in this page: update and create tags
// Update tag: update an existing tag
@ -118,7 +118,7 @@ else {
}
// Create/Update tag form
echo '<form method="post" action="index.php?sec=gtag&sec2=godmode/tag/edit_tag&action=' . $action . '&id_tag=' . $id_tag . '" enctype="multipart/form-data">';
echo '<form method="post" action="index.php?sec=gmodules&sec2=godmode/tag/edit_tag&action=' . $action . '&id_tag=' . $id_tag . '" enctype="multipart/form-data">';
echo '<div align=left style="width: 98%" class="pandora_form">';

12
pandora_console/godmode/tag/tag.php
View File

@ -65,7 +65,7 @@ $buttons = array(
$buttons[$tab]['active'] = true;
// Header
ui_print_page_header (__('Tags configuration'), "images/tag_red.png", false, "", true, $buttons);
ui_print_page_header (__('Tags configuration'), "images/setup.png", false, "", true, $buttons);
// Two actions can performed in this page: search and delete tags
@ -104,14 +104,14 @@ echo "<tr>";
echo "<td>";
echo '<b>' . __("Name") . "/" . __("Description") . '</b>';
echo "<td align=center>";
echo '<form method=post action="index.php?sec=gtag&sec2=godmode/tag/tag&delete_tag=0">';
echo '<form method=post action="index.php?sec=gmodules&sec2=godmode/tag/tag&delete_tag=0">';
html_print_input_hidden ("search_tag", "1");
html_print_input_text ('tag_name', $tag_name, '', 30, 255, false);
echo "&nbsp;&nbsp;&nbsp;";
html_print_submit_button (__('Filter'), 'filter_button', false, 'class="sub search"');
echo "</form>";
echo "<td align=right>";
echo '<form method="post" action="index.php?sec=gtag&sec2=godmode/tag/edit_tag&action=new">';
echo '<form method="post" action="index.php?sec=gmodules&sec2=godmode/tag/edit_tag&action=new">';
html_print_input_hidden ("create_tag", "1", true);
html_print_submit_button (__('Create tag'), 'create_button', false, 'class="sub next"');
echo "</form>";
@ -152,7 +152,7 @@ if (!empty($result)){
$data = array ();
$data[0] = "<a href='index.php?sec=gtag&sec2=godmode/tag/edit_tag&action=update&id_tag=".$tag["id_tag"] . "'>" . $tag["name"] . "</a>";
$data[0] = "<a href='index.php?sec=gmodules&sec2=godmode/tag/edit_tag&action=update&id_tag=".$tag["id_tag"] . "'>" . $tag["name"] . "</a>";
$data[1] = ui_print_truncate_text($tag["description"], 25, false);
$data[2] = '<a href="' . $tag["url"] . '">' . $tag["url"] . '</a>';
$data[3] = ' <a class="tag_details"
@ -162,8 +162,8 @@ if (!empty($result)){
$data[3] .= tags_get_modules_count($tag["id_tag"]);
$data[4] = "<a href='index.php?sec=gtag&sec2=godmode/tag/edit_tag&action=update&id_tag=".$tag["id_tag"] . "'>" . html_print_image("images/config.png", true, array("title" => "Edit")) . "</a>&nbsp;&nbsp;";
$data[4] .= '<a href="index.php?sec=gtag&sec2=godmode/tag/tag&delete_tag='.$tag["id_tag"] . '"onclick="if (! confirm (\''.__('Are you sure?').'\')) return false">' . html_print_image("images/cross.png", true, array("title" => "Delete")) . '</a>';
$data[4] = "<a href='index.php?sec=gmodules&sec2=godmode/tag/edit_tag&action=update&id_tag=".$tag["id_tag"] . "'>" . html_print_image("images/config.png", true, array("title" => "Edit")) . "</a>&nbsp;&nbsp;";
$data[4] .= '<a href="index.php?sec=gmodules&sec2=godmode/tag/tag&delete_tag='.$tag["id_tag"] . '"onclick="if (! confirm (\''.__('Are you sure?').'\')) return false">' . html_print_image("images/cross.png", true, array("title" => "Delete")) . '</a>';
array_push ($table->data, $data);
}