Merge branch 'ent-8651-fallos-menores-de-usabilidad-en-setup' into 'develop'
Fix console setup visual issues See merge request artica/pandorafms!4756
This commit is contained in:
commit
ecd2f7e35e
|
@ -323,6 +323,8 @@ switch ($section) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Put header inside div for special sizing.(No right margin).
|
||||||
|
echo '<div id="header_configuration" style="width: calc(100% + 3em);">';
|
||||||
// Header.
|
// Header.
|
||||||
ui_print_page_header(
|
ui_print_page_header(
|
||||||
__('Configuration').$subpage,
|
__('Configuration').$subpage,
|
||||||
|
@ -330,8 +332,15 @@ ui_print_page_header(
|
||||||
false,
|
false,
|
||||||
$help_header,
|
$help_header,
|
||||||
true,
|
true,
|
||||||
$buttons
|
$buttons,
|
||||||
|
false,
|
||||||
|
'',
|
||||||
|
GENERIC_SIZE_TEXT,
|
||||||
|
'',
|
||||||
|
'',
|
||||||
|
true
|
||||||
);
|
);
|
||||||
|
echo '</div>';
|
||||||
|
|
||||||
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) {
|
||||||
|
|
|
@ -120,9 +120,17 @@ $table_remote->data['ehorus_test'] = $row;
|
||||||
echo '<div class="center pdd_b_20px">';
|
echo '<div class="center pdd_b_20px">';
|
||||||
echo '<a target="_blank" rel="noopener noreferrer" href="http://ehorus.com">';
|
echo '<a target="_blank" rel="noopener noreferrer" href="http://ehorus.com">';
|
||||||
if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
|
if ($config['style'] === 'pandora_black' && !is_metaconsole()) {
|
||||||
html_print_image('include/ehorus/images/ehorus-logo.png');
|
html_print_image(
|
||||||
|
'include/ehorus/images/ehorus-logo.png',
|
||||||
|
false,
|
||||||
|
['class' => 'w400px']
|
||||||
|
);
|
||||||
} else {
|
} else {
|
||||||
html_print_image('include/ehorus/images/ehorus-logo-grey.png');
|
html_print_image(
|
||||||
|
'include/ehorus/images/ehorus-logo-grey.png',
|
||||||
|
false,
|
||||||
|
['class' => 'w400px']
|
||||||
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
echo '</a>';
|
echo '</a>';
|
||||||
|
|
|
@ -574,7 +574,11 @@ $table_remote->data['integria_test'] = $row;
|
||||||
// Print.
|
// Print.
|
||||||
echo '<div class="center pdd_b_20px">';
|
echo '<div class="center pdd_b_20px">';
|
||||||
echo '<a target="_blank" rel="noopener noreferrer" href="http://integriaims.com">';
|
echo '<a target="_blank" rel="noopener noreferrer" href="http://integriaims.com">';
|
||||||
html_print_image('images/integria_logo.svg');
|
html_print_image(
|
||||||
|
'images/integria_logo.svg',
|
||||||
|
false,
|
||||||
|
['class' => 'w400px' ]
|
||||||
|
);
|
||||||
echo '</a>';
|
echo '</a>';
|
||||||
echo '<br />';
|
echo '<br />';
|
||||||
echo '<div clsas="integria_title">';
|
echo '<div clsas="integria_title">';
|
||||||
|
|
|
@ -4577,19 +4577,19 @@ function ui_print_standard_header(
|
||||||
/**
|
/**
|
||||||
* Return a standard page header (Pandora FMS 3.1 version)
|
* Return a standard page header (Pandora FMS 3.1 version)
|
||||||
*
|
*
|
||||||
* @param string $title Title.
|
* @param string $title Title.
|
||||||
* @param string $icon Icon path.
|
* @param string $icon Icon path.
|
||||||
* @param boolean $return Return (false will print using a echo).
|
* @param boolean $return Return (false will print using a echo).
|
||||||
* @param boolean $help Help (Help ID to print the Help link).
|
* @param boolean $help Help (Help ID to print the Help link).
|
||||||
* @param boolean $godmode Godmode (false = operation mode).
|
* @param boolean $godmode Godmode (false = operation mode).
|
||||||
* @param string $options Options (HTML code for make tabs or just a brief
|
* @param string $options Options (HTML code for make tabs or just a brief
|
||||||
* info string.
|
* info string.
|
||||||
* @param mixed $modal Modal.
|
* @param mixed $modal Modal.
|
||||||
* @param mixed $message Message.
|
* @param mixed $message Message.
|
||||||
* @param mixed $numChars NumChars.
|
* @param mixed $numChars NumChars.
|
||||||
* @param mixed $alias Alias.
|
* @param mixed $alias Alias.
|
||||||
* @param mixed $breadcrumbs Breadcrumbs.
|
* @param mixed $breadcrumbs Breadcrumbs.
|
||||||
*
|
* @param boolean $hide_left_small Hide title id screen is small.
|
||||||
* @return string Header HTML
|
* @return string Header HTML
|
||||||
*/
|
*/
|
||||||
function ui_print_page_header(
|
function ui_print_page_header(
|
||||||
|
@ -4603,7 +4603,8 @@ function ui_print_page_header(
|
||||||
$message='',
|
$message='',
|
||||||
$numChars=GENERIC_SIZE_TEXT,
|
$numChars=GENERIC_SIZE_TEXT,
|
||||||
$alias='',
|
$alias='',
|
||||||
$breadcrumbs=''
|
$breadcrumbs='',
|
||||||
|
$hide_left_small=false
|
||||||
) {
|
) {
|
||||||
$title = io_safe_input_html($title);
|
$title = io_safe_input_html($title);
|
||||||
if (($icon == '') && ($godmode == true)) {
|
if (($icon == '') && ($godmode == true)) {
|
||||||
|
@ -4632,7 +4633,6 @@ function ui_print_page_header(
|
||||||
}
|
}
|
||||||
|
|
||||||
$buffer .= '<div id="menu_tab_left">';
|
$buffer .= '<div id="menu_tab_left">';
|
||||||
|
|
||||||
$buffer .= '<ul class="mn"><li class="'.$type.'">';
|
$buffer .= '<ul class="mn"><li class="'.$type.'">';
|
||||||
|
|
||||||
if (strpos($title, 'Monitoring » Services »') != -1) {
|
if (strpos($title, 'Monitoring » Services »') != -1) {
|
||||||
|
@ -4728,6 +4728,31 @@ function ui_print_page_header(
|
||||||
|
|
||||||
$buffer .= '</div>';
|
$buffer .= '</div>';
|
||||||
|
|
||||||
|
if ($hide_left_small) {
|
||||||
|
$buffer .= '<script>
|
||||||
|
$(window).resize(function () {
|
||||||
|
hideLeftHeader()
|
||||||
|
});
|
||||||
|
|
||||||
|
$(document).ready(function () {
|
||||||
|
hideLeftHeader();
|
||||||
|
});
|
||||||
|
|
||||||
|
function hideLeftHeader() {
|
||||||
|
var right_width = 0;
|
||||||
|
$("#menu_tab").find("li").each(function(index) {
|
||||||
|
right_width += parseInt($(this).outerWidth(), 10);
|
||||||
|
});
|
||||||
|
|
||||||
|
if($("#menu_tab").outerWidth() < right_width) {
|
||||||
|
$("#menu_tab_left").children().hide()
|
||||||
|
} else {
|
||||||
|
$("#menu_tab_left").children().show();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
</script>';
|
||||||
|
}
|
||||||
|
|
||||||
if (!$return) {
|
if (!$return) {
|
||||||
echo $buffer;
|
echo $buffer;
|
||||||
}
|
}
|
||||||
|
|
|
@ -1520,10 +1520,6 @@ div.title_line {
|
||||||
}
|
}
|
||||||
/* End - Breadcrum */
|
/* End - Breadcrum */
|
||||||
|
|
||||||
#menu_tab {
|
|
||||||
margin-right: 10px;
|
|
||||||
}
|
|
||||||
|
|
||||||
#menu_tab .mn,
|
#menu_tab .mn,
|
||||||
#menu_tab ul,
|
#menu_tab ul,
|
||||||
#menu_tab .mn ul {
|
#menu_tab .mn ul {
|
||||||
|
|
Loading…
Reference in New Issue