Project "Tuxbox-GIT: apps":
The branch, master has been updated
via 1f09dc36e1958d3484fd857a03854007c4147520 (commit)
from fa967f9f085f85ee99a7280b31d104d6d2987f5b (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 1f09dc36e1958d3484fd857a03854007c4147520
Author: svenhoefer <[email protected]>
Date: Tue May 12 18:59:33 2015 +0200
yWeb: allow style_set function w/o parameter to install correct style
Signed-off-by: GetAway <[email protected]>
diff --git a/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Tools.sh
b/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Tools.sh
index 7b64d30..3b6ace2 100755
--- a/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Tools.sh
+++ b/tuxbox/neutrino/daemons/nhttpd/web/scripts/Y_Tools.sh
@@ -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
-----------------------------------------------------------------------
Summary of changes:
.../neutrino/daemons/nhttpd/web/scripts/Y_Tools.sh | 15 +++++++++++----
1 files changed, 11 insertions(+), 4 deletions(-)
--
Tuxbox-GIT: apps
------------------------------------------------------------------------------
One dashboard for servers and applications across Physical-Virtual-Cloud
Widest out-of-the-box monitoring support with 50+ applications
Performance metrics, stats and reports that give you Actionable Insights
Deep dive visibility with transaction tracing using APM Insight.
http://ad.doubleclick.net/ddm/clk/290420510;117567292;y
_______________________________________________
Tuxbox-cvs-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tuxbox-cvs-commits
