tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-27 15:54:29 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '78-revisar-todas-las-pestanas' into 'develop'

Browse Source 
fixed errors in tab menu

See merge request !198
This commit is contained in:
daniel 2017-02-23 09:32:30 +01:00
commit 4554db3767
5 changed files with 17 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pandora_console/godmode/reporting/reporting_builder.php
View File

@ -343,7 +343,7 @@ switch ($action) {
switch ($activeTab) {
case 'main':
$buttons['list_reports']['active'] = true;
$subsection = ' » '.__('Custom reporting');
$subsection = __('Custom reporting');
break;
default:
$subsection = reporting_enterprise_add_subsection_main($activeTab, $buttons);
@ -365,7 +365,7 @@ switch ($action) {
}
// Page header for normal console
else
ui_print_page_header (__('Reporting').' » '.__('Custom reporting'), "images/op_reporting.png", false, "", false, $buttons,false,'',50);
ui_print_page_header (__('Custom reporting'), "images/op_reporting.png", false, "", false, $buttons,false,'',60);
if ($action == 'delete_report') {
@ -1886,7 +1886,7 @@ switch ($action) {
switch ($activeTab) {
case 'main':
$buttons['list_reports']['active'] = true;
$subsection = ' » ' . __('Custom reporting');
$subsection = __('Custom reporting');
break;
default:
$subsection = reporting_enterprise_add_subsection_main($activeTab, $buttons);
@ -1908,7 +1908,7 @@ switch ($action) {
}
// Page header for normal console
else
ui_print_page_header (__('Reporting') . $subsection, "images/op_reporting.png", false, "", false, $buttons,false,'',50);
ui_print_page_header ($subsection, "images/op_reporting.png", false, "", false, $buttons,false,'',60);
reporting_enterprise_select_main_tab($action);
@ -1952,7 +1952,7 @@ $buttons['view'] = array('active' => false,
$buttons[$activeTab]['active'] = true;
if ($idReport != 0) {
$textReportName = " » " . $reportName;
$textReportName = $reportName;
}
else {
$temp = $buttons['main'];
@ -1978,9 +1978,9 @@ if ($enterpriseEnable and defined('METACONSOLE')) {
ui_meta_print_header(__('Reporting'). $textReportName, "", $buttons);
}
else {
ui_print_page_header(__('Reporting') . $textReportName,
ui_print_page_header($textReportName,
"images/op_reporting.png", false,
"reporting_" . $activeTab . "_tab", false, $buttons,false,'',50);
"reporting_" . $activeTab . "_tab", false, $buttons,false,'',60);
}
if ($resultOperationDB !== null) {

2
pandora_console/include/constants.php
View File

@ -152,7 +152,7 @@ define('COL_GRAPH13', '#E83128');
/* The styles */
/* Size of text in characters for truncate */
define('GENERIC_SIZE_TEXT', 25);
define('GENERIC_SIZE_TEXT', 50);

8
pandora_console/include/functions_ui.php
View File

@ -2429,24 +2429,24 @@ function ui_print_page_header ($title, $icon = "", $return = false,
$buffer = '<div id="'.$type2.'" style=""><div id="menu_tab_left">';
$buffer .= '<ul class="mn"><li class="' . $type . '">&nbsp;' . '&nbsp; ';
$buffer .= '<ul class="mn"><li class="' . $type . '">';
if(strpos($title, "Monitoring » Services »") != -1){
$title = str_replace("Monitoring » Services » Service Map » ",'',$title);
}
$buffer .= '<span style="margin-right:10px;">';
$buffer .= '<span>';
if (empty($alias)) $buffer .= ui_print_truncate_text($title, $numChars);
else $buffer .= ui_print_truncate_text($alias, $numChars);
if ($modal && !enterprise_installed()){
$buffer .= "
<div id='".$message."' class='publienterprise' title='Community version' style='float: right;margin-top: -2px !important; margin-left: 2px !important;'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>
<div id='".$message."' class='publienterprise' title='Community version' style='float: right;margin-top: -2px !important;'><img data-title='Enterprise version' class='img_help forced_title' data-use_title_for_force_title='1' src='images/alert_enterprise.png'></div>
";
}
if ($help != "")
$buffer .= "<div class='head_help' style='float: right; margin-top: -2px !important; margin-left: 2px !important;'>" .
$buffer .= "<div class='head_help' style='float: right; margin-top: -2px !important;'>" .
ui_print_help_icon ($help, true, '', 'images/help_w.png') . "</div>";
$buffer .= '</span></li></ul></div>';

8
pandora_console/include/styles/pandora.css
View File

@ -1252,7 +1252,6 @@ div.title_line {
text-decoration: none;
}
#menu_tab_left li.view a {
padding: 2px 10px 2px 10px;
color: #fff;
font-weight: bold;
font-weight: 100;
@ -1263,7 +1262,7 @@ div.title_line {
#menu_tab_left li.view {
background: #82b92e;
max-width: 60%;
min-width: 20%;
min-width: 30%;
padding: 5px 5px 0px;
text-align: center;
-moz-border-top-right-radius: 3px;
@ -1289,13 +1288,12 @@ div.title_line {
#menu_tab_left li a, #menu_tab_left li span {
text-transform: uppercase;
padding: 0px 0px 0px 5px;
color: #fff;
font-size: 9.5pt;
font-size: 100%;
line-height: 20px;
letter-spacing:0px;
font-family: verdana, sans-serif;
font-weight: normal;
font-weight: bold;
}
span.users {

7
pandora_console/operation/reporting/reporting_viewer.php
View File

@ -124,11 +124,8 @@ if ($config['metaconsole'] == 1 and defined('METACONSOLE')) {
ui_meta_print_header(__('Reporting'), "", $options);
}
else {
ui_print_page_header (
__('Reporting') .
" &raquo; " .
reporting_get_name($id_report),
"images/op_reporting.png", false, "", false, $options,false,'',50);
ui_print_page_header (reporting_get_name($id_report), "images/op_reporting.png",
false, "", false, $options,false,'',50);
}
//------------------- END HEADER ---------------------------------------