From da5f54ffd8e6bd0dd118acb5ff1a4b684f16f667 Mon Sep 17 00:00:00 2001 From: juanmanuelr Date: Thu, 26 Apr 2012 13:57:30 +0000 Subject: [PATCH] 2012-04-26 Juan Manuel Ramon * include/styles/pandora_forms.css include/functions_themes.php: Removed bad Css files from visual styles. Merged from branches. git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6195 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f --- pandora_console/ChangeLog | 8 ++++++++ pandora_console/include/functions_themes.php | 6 +++++- pandora_console/include/styles/pandora_forms.css | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) diff --git a/pandora_console/ChangeLog b/pandora_console/ChangeLog index b1cca0d1a5..dcc0b252ac 100644 --- a/pandora_console/ChangeLog +++ b/pandora_console/ChangeLog @@ -1,3 +1,11 @@ +2012-04-26 Juan Manuel Ramon + + * include/styles/pandora_forms.css + include/functions_themes.php: Removed bad Css files from visual + styles. + + Merged from branches. + 2012-04-26 Vanessa Gil * operation/events/events_list.php: The column to validate events diff --git a/pandora_console/include/functions_themes.php b/pandora_console/include/functions_themes.php index 1dc6bca38f..abdb0f4d28 100644 --- a/pandora_console/include/functions_themes.php +++ b/pandora_console/include/functions_themes.php @@ -23,7 +23,8 @@ * Get a list of CSS themes installed. * * @param bool List all css files of an specific path without filter "pandora*" pattern - * + * Note: If you want to exclude a Css file from the resulting list put "Exclude css from visual styles" in the file header + * * @return array An indexed array with the file name in the index and the theme * name (if available) as the value. */ @@ -44,6 +45,9 @@ function themes_get_css ($path = false) { 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)) { + continue; + } preg_match ('|Name:(.*)$|mi', $data, $name); if (isset ($name[1])) $retval[$file] = trim ($name[1]); diff --git a/pandora_console/include/styles/pandora_forms.css b/pandora_console/include/styles/pandora_forms.css index 741bd6b2af..caccb8b9ac 100644 --- a/pandora_console/include/styles/pandora_forms.css +++ b/pandora_console/include/styles/pandora_forms.css @@ -1,7 +1,7 @@ /* Author: The Pandora FMS team -Name: Forms +Exclude css from visual styles Description: Forms based on fieldset and labels to improve accesibility // Pandora FMS - the Flexible Monitoring System