mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-12 07:53:37 +02:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3299911086
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-03-16 (Mon, 16 Mar 2015)

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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2015-03-16 17:38:02 +01:00
parent fafe2570bb
commit ee5b9181ae
2 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/nhttpd/web/Y_Version.txt
View File

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

15
src/nhttpd/web/scripts/Y_Tools.sh
View File

@@ -51,16 +51,23 @@ style_get()
# ----------------------------------------------------------- # -----------------------------------------------------------
style_set() 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_directory=$(config_get_value_direct $y_config_nhttpd 'WebsiteMain.directory')
y_path_override_directory=$(config_get_value_direct $y_config_nhttpd 'WebsiteMain.override_directory') y_path_override_directory=$(config_get_value_direct $y_config_nhttpd 'WebsiteMain.override_directory')
cd $y_path_directory cd $y_path_directory
if [ -e $y_path_override_directory/styles/Y_Dist-$1.css ]; then if [ -e $y_path_override_directory/styles/Y_Dist-$style.css ]; then
cp $y_path_override_directory/styles/Y_Dist-$1.css Y_Dist.css 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 else
cp $y_path_directory/styles/Y_Dist-$1.css Y_Dist.css config_set_value_direct $y_config_Y_Web 'style'
fi fi
#config_set_value_direct $y_config_Y_Web 'style' $1
} }
# ----------------------------------------------------------- # -----------------------------------------------------------
# Image Backup - build form # Image Backup - build form