Starting to fix the themes. TICKET: #435

This commit is contained in:
mdtrooper 2015-08-19 13:16:33 +02:00
parent 441422cf98
commit 7da9cd812a
8 changed files with 2983 additions and 3431 deletions

View File

@ -115,18 +115,22 @@ $table_styles->style[0] = 'font-weight: bold;';
$table_styles->data = array ();
$table_styles->data[$row][0] = __('Style template');
$table_styles->data[$row][1] = html_print_select (themes_get_css (), 'style', $config["style"].'.css', '', '', '', true);
$table_styles->data[$row][1] = html_print_select(themes_get_css(),
'style', $config["style"].'.css', '', '', '', true);
$row++;
$table_styles->data[$row][0] = __('Status icon set');
$iconsets["default"] = __('Colors');
$iconsets["faces"] = __('Faces');
$iconsets["color_text"] = __('Colors and text');
$table_styles->data[$row][1] = html_print_select ($iconsets, 'status_images_set', $config["status_images_set"], '', '', '', true);
$table_styles->data[$row][1] .= " " . html_print_button(__("View"), 'status_set_preview', false, '', '', true);
$table_styles->data[$row][1] = html_print_select($iconsets,
'status_images_set', $config["status_images_set"], '', '', '', true);
$table_styles->data[$row][1] .= " " .
html_print_button(__("View"), 'status_set_preview', false, '', '', true);
$row++;
$table_styles->data[$row][0] = __('Login background') . ui_print_help_tip(__('You can place your custom images into the folder images/backgrounds/'), true);
$table_styles->data[$row][0] = __('Login background') .
ui_print_help_tip(__('You can place your custom images into the folder images/backgrounds/'), true);
$backgrounds_list_jpg = list_files("images/backgrounds", "jpg", 1, 0);
$backgrounds_list_gif = list_files("images/backgrounds", "gif", 1, 0);
$backgrounds_list_png = list_files("images/backgrounds", "png", 1, 0);
@ -136,7 +140,8 @@ asort($backgrounds_list);
$table_styles->data[$row][1] = html_print_select ($backgrounds_list,
'login_background', $config["login_background"], '', __('Default'),
'', true);
$table_styles->data[$row][1] .= " " . html_print_button(__("View"), 'login_background_preview', false, '', 'class="sub camera"', true);
$table_styles->data[$row][1] .= " " .
html_print_button(__("View"), 'login_background_preview', false, '', 'class="sub camera"', true);
$row++;
$table_styles->data[$row][0] = __('Custom logo') . ui_print_help_icon("custom_logo", true);
@ -193,11 +198,13 @@ $listIcons = gis_get_array_list_icons();
$arraySelectIcon = array();
foreach ($listIcons as $index => $value)
$arraySelectIcon[$index] = $index;
$table_gis->data[$row][0] = __('Default icon in GIS') . ui_print_help_tip(__('Agent icon for GIS Maps. If set to "none", group icon will be used'), true);
$table_gis->data[$row][0] = __('Default icon in GIS') .
ui_print_help_tip(__('Agent icon for GIS Maps. If set to "none", group icon will be used'), true);
$table_gis->data[$row][1] = html_print_select($arraySelectIcon,
"gis_default_icon", $config["gis_default_icon"], "", __('None'),
'', true);
$table_gis->data[$row][1] .= " " . html_print_button(__("View"), 'gis_icon_preview', false, '', '', true);
$table_gis->data[$row][1] .= " " .
html_print_button(__("View"), 'gis_icon_preview', false, '', '', true);
$row++;
echo "<fieldset>";
@ -217,7 +224,8 @@ $table_font->data = array ();
$table_font->data[$row][0] = __('Font path');
$fonts = load_fonts();
$table_font->data[$row][1] = html_print_select($fonts, 'fontpath', io_safe_output($config["fontpath"]), '', '', 0, true);
$table_font->data[$row][1] = html_print_select($fonts, 'fontpath',
io_safe_output($config["fontpath"]), '', '', 0, true);
$row++;
@ -244,14 +252,20 @@ $table_font->data[$row][1] = html_print_select($font_size_array, 'font_size',
$config["font_size"], '', '', 0, true);
$row++;
$table_font->data[$row][0] = __('Agent size text') . ui_print_help_tip(__('When the agent name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true);
$table_font->data[$row][1] = __('Small:') . html_print_input_text ('agent_size_text_small', $config["agent_size_text_small"], '', 3, 3, true);
$table_font->data[$row][1] .= ' ' . __('Normal:') . html_print_input_text ('agent_size_text_medium', $config["agent_size_text_medium"], '', 3, 3, true);
$table_font->data[$row][0] = __('Agent size text') .
ui_print_help_tip(__('When the agent name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true);
$table_font->data[$row][1] = __('Small:') .
html_print_input_text ('agent_size_text_small', $config["agent_size_text_small"], '', 3, 3, true);
$table_font->data[$row][1] .= ' ' . __('Normal:') .
html_print_input_text ('agent_size_text_medium', $config["agent_size_text_medium"], '', 3, 3, true);
$row++;
$table_font->data[$row][0] = __('Module size text') . ui_print_help_tip(__('When the module name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true);
$table_font->data[$row][1] = __('Small:') . html_print_input_text ('module_size_text_small', $config["module_size_text_small"], '', 3, 3, true);
$table_font->data[$row][1] .= ' ' . __('Normal:') . html_print_input_text ('module_size_text_medium', $config["module_size_text_medium"], '', 3, 3, true);
$table_font->data[$row][0] = __('Module size text') .
ui_print_help_tip(__('When the module name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true);
$table_font->data[$row][1] = __('Small:') .
html_print_input_text ('module_size_text_small', $config["module_size_text_small"], '', 3, 3, true);
$table_font->data[$row][1] .= ' ' . __('Normal:') .
html_print_input_text ('module_size_text_medium', $config["module_size_text_medium"], '', 3, 3, true);
$row++;
$table_font->data[$row][0] = __('Description size text') . ui_print_help_tip(__('When the description name have a lot of characters, in some places in Pandora Console it is necesary truncate to N characters.'), true);

View File

@ -35,22 +35,22 @@ function themes_get_css ($path = false) {
$theme_dir = 'include/styles/';
if ($path)
$files = list_files ($theme_dir, "pandora", 0, 0);
else
$files = list_files ($theme_dir, "pandora", 1, 0);
$files = list_files($theme_dir, "pandora", 0, 0);
else
$files = list_files($theme_dir, "pandora", 1, 0);
$retval = array ();
foreach ($files as $file) {
//Skip '..' and '.' entries and files not ended in '.css'
if ($path && ($file == '.' || $file == '..' || strtolower(substr ($file, strlen ($file) - 4)) !== '.css'))
continue;
$data = implode ('', file ($theme_dir.'/'.$file));
if (preg_match ('|Exclude css from visual styles|', $data)) {
$data = implode('', file ($theme_dir . '/' . $file));
if (preg_match('|Exclude css from visual styles|', $data)) {
continue;
}
preg_match ('|Name:(.*)$|mi', $data, $name);
if (isset ($name[1]))
$retval[$file] = trim ($name[1]);
if (isset($name[1]))
$retval[$file] = trim($name[1]);
else
$retval[$file] = $file;
}

View File

@ -46,10 +46,9 @@
li:hover ul { display: block; }
.submenu_text{
.submenu_text {
padding: 11px;
margin-left: 0px;
color: #fff;
width: 100%;
}

8
pandora_console/include/styles/pandora.css Executable file → Normal file
View File

@ -2266,6 +2266,10 @@ ul.operation li a:hover {
background-color: #585858 !important;
}
.submenu_text {
color: #fff;
}
li.links a:hover {
#font-weight: bold;
}
@ -2282,6 +2286,10 @@ li.links a:hover {
background-color: #333 !important;
}
.operation .selected {
background-color: #585858 !important;
}
.menu li, .menu .li.not_selected {
border-radius: 0px 0px 0px 0px;
display: block;

File diff suppressed because it is too large Load Diff

View File

@ -1,110 +0,0 @@
/*
Author: The Pandora FMS team
Name: Black Metal theme
Description: A theme with a variable width layout
// Pandora FMS - the Free monitoring system
// ========================================
// Copyright (c) 2009 Artica Soluciones Tecnologicas, info@artica.es
// Copyright (c) 2009 Esteban Sanchez, <estebans@artica.es>
//
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; version 2
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
// Pandora FMS - the Flexible Monitoring System
// =============================================
// Copyright (c) 2004-2009 Artica Soluciones Tecnológicas S.L
// This program is free software; you can redistribute it and/or
// modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; version 2
// This program is distributed in the hope that it will be useful,
// but WITHOUT ANY WARRANTY; without even the implied warranty of
// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
// You should have received a copy of the GNU General Public License
// along with this program; if not, write to the Free Software
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
*/
@import url(pandora.css);
div#pandora_logo_header {
/* Put here your company logo */
background: url(../../images/MiniLogoArtica.jpg);
width: 83px;
height: 31px;
}
h1, h2, h3, h4 {
color: #000;
}
div#page {
border-bottom: solid 5px #000;
border-top: solid 5px #000;
}
div#head {
font-size: 8pt;
background: url(../../images/black_header.png);
background-color: #000;
background-repeat: repeat-x;
background-position: 0% 0%;
border-bottom: solid 2px #000;
}
th, .bg {
background-color: #555;
}
#menu_tab_frame, #menu_tab_frame_view {
border-bottom:1px solid #000;
}
#menu_tab li a, #menu_tab a {
border-left: 2px solid #000;
}
.databox_color {
border-left: 0px;
}
#head_r {
padding-top: 5px;
}
span#logo_text1, span#logo_text2 {
font: bolder 2.5em Arial, Sans-serif;
text-align: right;
}
ol.steps li.current {
border-left: 5px solid #000;
}
tr.rowPair {
background-color: #fff;
}
tr.rowOdd {
background-color: #BDC2C7;
}
tr.rowPair:hover {
background-color: #DEDEDE;
}
tr.rowOdd:hover {
background-color: #7D8287;
}

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff