2013-04-16 Miguel de Dios <miguel.dedios@artica.es>

* godmode/setup/setup.php: updated the method to fill the header
	with the new header.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7991 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
This commit is contained in:
mdtrooper 2013-04-16 10:01:37 +00:00
parent e844c73c08
commit 67e41f24a3
2 changed files with 34 additions and 27 deletions

View File

@ -1,3 +1,8 @@
2013-04-16 Miguel de Dios <miguel.dedios@artica.es>
* godmode/setup/setup.php: updated the method to fill the header
with the new header.
2013-04-16 Sergio Martin <sergio.martin@artica.es> 2013-04-16 Sergio Martin <sergio.martin@artica.es>
* include/functions_ui.php * include/functions_ui.php

View File

@ -69,35 +69,36 @@ $buttons = array();
// Draws header // Draws header
$buttons['general'] = array('active' => false, $buttons['general'] = array('active' => false,
'text' => '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=general">' . 'text' => '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=general">' .
html_print_image("images/gm_setup.png", true, array ("title" => __('General'))) . '</a>'); html_print_image("images/gm_setup.png", true, array ("title" => __('General'))) . '</a>');
if (enterprise_installed()) { if (enterprise_installed()) {
$buttons = setup_enterprise_add_Tabs($buttons); $buttons = setup_enterprise_add_Tabs($buttons);
} }
$buttons['auth'] = array('active' => false, $buttons['auth'] = array('active' => false,
'text' => '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=auth">' . 'text' => '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=auth">' .
html_print_image("images/key.png", true, array ("title" => __('Authentication'))) . '</a>'); html_print_image("images/key.png", true, array ("title" => __('Authentication'))) . '</a>');
$buttons['perf'] = array('active' => false, $buttons['perf'] = array('active' => false,
'text' => '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=perf">' . 'text' => '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=perf">' .
html_print_image("images/performance.png", true, array ("title" => __('Performance'))) . '</a>'); html_print_image("images/performance.png", true, array ("title" => __('Performance'))) . '</a>');
$buttons['vis'] = array('active' => false, $buttons['vis'] = array('active' => false,
'text' => '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=vis">' . 'text' => '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=vis">' .
html_print_image("images/chart.png", true, array ("title" => __('Visual styles'))) . '</a>'); html_print_image("images/chart.png", true, array ("title" => __('Visual styles'))) . '</a>');
if (check_acl ($config['id_user'], 0, "AW")) { if (check_acl ($config['id_user'], 0, "AW")) {
if ($config['activate_netflow']) { if ($config['activate_netflow']) {
$buttons['net'] = array('active' => false, $buttons['net'] = array('active' => false,
'text' => '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=net">' . 'text' => '<a href="index.php?sec=gsetup&sec2=godmode/setup/setup&amp;section=net">' .
html_print_image("images/op_netflow.png", true, array ("title" => __('Netflow'))) . '</a>'); html_print_image("images/op_netflow.png", true, array ("title" => __('Netflow'))) . '</a>');
} }
} }
$help_header = '';
if (enterprise_installed()) { if (enterprise_installed()) {
$subpage = setup_enterprise_add_subsection_main($section, $buttons); $subpage = setup_enterprise_add_subsection_main($section, $buttons, $help_header);
} }
switch ($section) { switch ($section) {
@ -111,7 +112,8 @@ switch ($section) {
break; break;
case 'perf': case 'perf':
$buttons['perf']['active'] = true; $buttons['perf']['active'] = true;
$subpage = ' &raquo ' . __('Performance') . ' ' . ui_print_help_icon ('performance', true); $subpage = ' &raquo ' . __('Performance');
$help_header = 'performance';
break; break;
case 'vis': case 'vis':
$buttons['vis']['active'] = true; $buttons['vis']['active'] = true;
@ -124,7 +126,7 @@ switch ($section) {
} }
// Header // Header
ui_print_page_header (__('Configuration') . $subpage, "", false, "", true, $buttons); ui_print_page_header (__('Configuration') . $subpage, "", false, $help_header, true, $buttons);
if (isset($config['error_config_update_config'])) { if (isset($config['error_config_update_config'])) {
if ($config['error_config_update_config']['correct'] == false) { if ($config['error_config_update_config']['correct'] == false) {
@ -139,23 +141,23 @@ if (isset($config['error_config_update_config'])) {
switch ($section) { switch ($section) {
case "general": case "general":
require_once($config['homedir'] . "/godmode/setup/setup_general.php"); require_once($config['homedir'] . "/godmode/setup/setup_general.php");
break; break;
case "auth": case "auth":
require_once($config['homedir'] . "/godmode/setup/setup_auth.php"); require_once($config['homedir'] . "/godmode/setup/setup_auth.php");
break; break;
case "perf": case "perf":
require_once($config['homedir'] . "/godmode/setup/performance.php"); require_once($config['homedir'] . "/godmode/setup/performance.php");
break; break;
case "net": case "net":
require_once($config['homedir'] . "/godmode/setup/setup_netflow.php"); require_once($config['homedir'] . "/godmode/setup/setup_netflow.php");
break; break;
case "vis": case "vis":
require_once($config['homedir'] . "/godmode/setup/setup_visuals.php"); require_once($config['homedir'] . "/godmode/setup/setup_visuals.php");
break; break;
default: default:
enterprise_hook('setup_enterprise_select_tab', array($section)); enterprise_hook('setup_enterprise_select_tab', array($section));
break; break;
} }
?> ?>