From ad178b396d577a489ebe80aa496b96c2155336ec Mon Sep 17 00:00:00 2001 From: Kirill Krasnov Date: Mon, 20 Sep 2010 16:35:56 +0300 Subject: [PATCH] Fix 12352: change config-value css_include_file for user define file which can overwrite values from default file default.css --- config_defaults_inc.php | 4 ++-- core/html_api.php | 3 ++- docbook/Admin_Guide/en-US/Configuration.xml | 3 ++- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/config_defaults_inc.php b/config_defaults_inc.php index ca109c3..395d219 100644 --- a/config_defaults_inc.php +++ b/config_defaults_inc.php @@ -3101,10 +3101,10 @@ $g_bottom_include_page = '%absolute_path%'; $g_top_include_page = '%absolute_path%'; /** - * CSS file + * CSS file for user overwrite * @global string $g_css_include_file */ -$g_css_include_file = 'default.css'; +$g_css_include_file = ''; /** * RTL CSS file diff --git a/core/html_api.php b/core/html_api.php index 7784df0..6e6c7e8 100644 --- a/core/html_api.php +++ b/core/html_api.php @@ -353,7 +353,7 @@ function require_css( $p_stylesheet_path ) { */ function html_css() { global $g_stylesheets_included; - html_css_link( config_get( 'css_include_file' ) ); + html_css_link('default.css'); html_css_link( 'jquery-ui.css' ); # Add right-to-left css if needed if ( lang_get( 'directionality' ) == 'rtl' ) { @@ -362,6 +362,7 @@ function html_css() { foreach ( $g_stylesheets_included as $t_stylesheet_path ) { html_css_link ( $t_stylesheet_path ); } + html_css_link( config_get( 'css_include_file' ) ); } /** diff --git a/docbook/Admin_Guide/en-US/Configuration.xml b/docbook/Admin_Guide/en-US/Configuration.xml index 84d2eec..900f1d5 100644 --- a/docbook/Admin_Guide/en-US/Configuration.xml +++ b/docbook/Admin_Guide/en-US/Configuration.xml @@ -1628,7 +1628,8 @@ $g_css_include_file - Set this to point to the CSS file of your choice. + Set this to point to the user CSS file of your choice which + can overwrite default values in default.css. -- 1.7.2.3.msysgit.0