- yWeb: allow style_set function w/o parameter to install correct style

This commit is contained in:
svenhoefer
2015-03-16 17:38:02 +01:00
parent 14999c7015
commit 3299911086
2 changed files with 13 additions and 6 deletions

View File

@@ -1,4 +1,4 @@
version=2.9.0.12
date=04.03.2015
version=2.9.0.13
date=16.03.2015
type=Release
info=Port CST

View File

@@ -51,16 +51,23 @@ style_get()
# -----------------------------------------------------------
style_set()
{
# This function should be called one time after installing a new image
# to get sure, the right skin is installed too
style=${1:-$(config_get_value_direct $y_config_Y_Web 'style')}
test -n "$style" || return
y_path_directory=$(config_get_value_direct $y_config_nhttpd 'WebsiteMain.directory')
y_path_override_directory=$(config_get_value_direct $y_config_nhttpd 'WebsiteMain.override_directory')
cd $y_path_directory
if [ -e $y_path_override_directory/styles/Y_Dist-$1.css ]; then
cp $y_path_override_directory/styles/Y_Dist-$1.css Y_Dist.css
if [ -e $y_path_override_directory/styles/Y_Dist-$style.css ]; then
cp $y_path_override_directory/styles/Y_Dist-$style.css Y_Dist.css
elif [ -e $y_path_directory/styles/Y_Dist-$style.css ]; then
cp $y_path_directory/styles/Y_Dist-$style.css Y_Dist.css
else
cp $y_path_directory/styles/Y_Dist-$1.css Y_Dist.css
config_set_value_direct $y_config_Y_Web 'style'
fi
#config_set_value_direct $y_config_Y_Web 'style' $1
}
# -----------------------------------------------------------
# Image Backup - build form