diff --git a/src/nhttpd/web/Y_Blocks.txt b/src/nhttpd/web/Y_Blocks.txt index 1314d137c..4d8624a17 100644 --- a/src/nhttpd/web/Y_Blocks.txt +++ b/src/nhttpd/web/Y_Blocks.txt @@ -30,6 +30,7 @@ start-block~yWeb_save_settings {=ini-set:/var/tuxbox/config/Y-Web.conf;wol_desc_3;{=wol_desc_3=}~cache=} {=ini-set:/var/tuxbox/config/Y-Web.conf;fb;{=fb=}~cache=} {=ini-set:/var/tuxbox/config/Y-Web.conf;start_page;{=start_page=}~cache=} +{=ini-set:/var/tuxbox/config/Y-Web.conf;style;{=style=}~cache=} {=ini-set:/var/tuxbox/config/Y-Web.conf;yweb_box_name;{=yweb_box_name=}~cache=} {=ini-set:/var/tuxbox/config/Y-Web.conf;yweb_box_color;{=yweb_box_color=}~save=} end-block~yWeb_save_settings @@ -271,6 +272,7 @@ start-block~head yWeb + end-block~head @@ -283,6 +285,7 @@ start-block~headCache yWeb + end-block~headCache @@ -294,6 +297,7 @@ start-block~head_no_charset yWeb + end-block~head_no_charset @@ -305,6 +309,7 @@ start-block~frame_head + yWeb end-block~frame_head @@ -317,6 +322,7 @@ start-block~frame_iso_head + yWeb end-block~frame_iso_head diff --git a/src/nhttpd/web/Y_Dist.css b/src/nhttpd/web/Y_Dist.css new file mode 100644 index 000000000..0ccf32fc7 --- /dev/null +++ b/src/nhttpd/web/Y_Dist.css @@ -0,0 +1,6 @@ +/* + Original yWeb Style - Do not modify. + + When you're a distributor, use your own styles/Y_Dist-.css file. + When you're a user, use Y_User.css. +*/ diff --git a/src/nhttpd/web/Y_Main.css b/src/nhttpd/web/Y_Main.css index 91e9ecb4e..89c0c3f88 100644 --- a/src/nhttpd/web/Y_Main.css +++ b/src/nhttpd/web/Y_Main.css @@ -306,6 +306,10 @@ tr { -webkit-border-radius: 5px; -moz-border-radius: 5px; } +.work_box .work_box { + margin: 0; + padding: 0; +} .work_box_head { margin: 0; padding: 0; diff --git a/src/nhttpd/web/Y_Settings_Menue.yhtm b/src/nhttpd/web/Y_Settings_Menue.yhtm index 7a27aa57c..041b56271 100644 --- a/src/nhttpd/web/Y_Settings_Menue.yhtm +++ b/src/nhttpd/web/Y_Settings_Menue.yhtm @@ -44,7 +44,6 @@ function init(){ {=var-set:m_link_text={=L:set.menue.timer_settings=}=} {=include-block:Y_Blocks.txt;management_link=} -
Neutrino
diff --git a/src/nhttpd/web/Y_Settings_Skin.yhtm b/src/nhttpd/web/Y_Settings_Skin.yhtm deleted file mode 100644 index 0847f99d1..000000000 --- a/src/nhttpd/web/Y_Settings_Skin.yhtm +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - -
-
Skin {=var-set:help_url=Neutrino:yWeb:Settings#Skins=}{=include-block:Y_Blocks.txt;wiki_help=}
-
-
- - - - - - - -
Skin 
-
- -
-
- - \ No newline at end of file diff --git a/src/nhttpd/web/Y_Settings_yWeb.yhtm b/src/nhttpd/web/Y_Settings_yWeb.yhtm index bf3a914ab..a94e35081 100644 --- a/src/nhttpd/web/Y_Settings_yWeb.yhtm +++ b/src/nhttpd/web/Y_Settings_yWeb.yhtm @@ -5,8 +5,25 @@ // + {=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=} @@ -104,11 +128,22 @@ function do_init(){ {=L:set.yweb.start_page=} - + + + + + + Styles + + +
@@ -118,7 +153,6 @@ function do_init(){ - {=include-block:Y_Blocks.txt;management_check_bottom=} diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt index 5e6c70d5c..9cb9129a2 100644 --- a/src/nhttpd/web/Y_Version.txt +++ b/src/nhttpd/web/Y_Version.txt @@ -1,4 +1,4 @@ -version=2.9.0.7 -date=25.02.2015 +version=2.9.0.8 +date=01.03.2015 type=Release info=Port CST diff --git a/src/nhttpd/web/Y_blank.htm b/src/nhttpd/web/Y_blank.htm index 24aba0065..8eac065ed 100644 --- a/src/nhttpd/web/Y_blank.htm +++ b/src/nhttpd/web/Y_blank.htm @@ -5,6 +5,7 @@ yWeb + diff --git a/src/nhttpd/web/scripts/Y_Tools.sh b/src/nhttpd/web/scripts/Y_Tools.sh index 5cc259520..e6bb897f5 100755 --- a/src/nhttpd/web/scripts/Y_Tools.sh +++ b/src/nhttpd/web/scripts/Y_Tools.sh @@ -7,48 +7,40 @@ . ./_Y_Globals.sh . ./_Y_Library.sh # =========================================================== -# Settings : Skins +# Settings : Styles # =========================================================== # ----------------------------------------------------------- -# Skin List [Function inactive] +# Style List # ----------------------------------------------------------- -skin_get() +style_get() { check_Y_Web_conf - active_skin=`config_get_value_direct $y_config_Y_Web 'skin'` + active_style=`config_get_value_direct $y_config_Y_Web 'style'` html_option_list="" - skin_list=`find $y_path_httpd -name 'Y_Main-*'` - for f in $skin_list + style_list=`find $y_path_httpd/styles -name 'Y_Dist-*'` + for f in $style_list do - skin=`echo "$f"|sed -e s/^.*Y_Main-//g|sed -e s/.css//g` - if [ "$skin" = "$active_skin" ] + style=$(echo "$f" | sed -e s/^.*Y_Dist-//g | sed -e s/.css//g) + sname=${style//_/ } # replace '_' with ' ' + if [ "$style" = "$active_style" ] then - selec="selected" + sel="selected='selected'" else - selec="" + sel="" fi - opt="" + opt="" html_option_list="$html_option_list $opt" done echo "$html_option_list" } # ----------------------------------------------------------- -# Set Skin: override css $1=Skin-Name [Function inactive] +# Set Style: override Y_Main.css $1=Style-Name # ----------------------------------------------------------- -skin_set() +style_set() { cd $y_path_httpd - cp Y_Main-$1.css Y_Main.css - if [ -e global-$1.css ] - then - cp global-$1.css global.css - else - cp global-Standard.css global.css - fi - config_set_value_direct $y_config_Y_Web 'skin' $1 - - msg="Skin changed - Now browsers Refresh/actualization explain" - y_format_message_html + cp styles/Y_Dist-$1.css Y_Dist.css + #config_set_value_direct $y_config_Y_Web 'style' $1 } # ----------------------------------------------------------- # Image Backup - build form @@ -366,6 +358,7 @@ do_installer() then echo '' echo '' + echo '' echo '' echo "" echo '' @@ -375,6 +368,7 @@ do_installer() else echo '' echo '' + echo '' echo '' echo '' echo '' @@ -531,8 +525,8 @@ restart_neutrino() #debug # echo "call:$*" >> "/tmp/debug.txt" case "$1" in - skin_set) skin_set $2 ;; - skin_get) skin_get ;; + style_set) style_set $2 ;; + style_get) style_get ;; image_upload) image_upload ;; image_backup) image_backup_mtd $2; echo "/tmp/flash_mtd$2.img" ;; image_flash) shift 1; flash_mtd $* ;; diff --git a/src/nhttpd/web/scripts/_Y_Library.sh b/src/nhttpd/web/scripts/_Y_Library.sh index 6991d6ee8..7df5c5c12 100755 --- a/src/nhttpd/web/scripts/_Y_Library.sh +++ b/src/nhttpd/web/scripts/_Y_Library.sh @@ -74,6 +74,7 @@ y_format_message_html() { tmp="" tmp="$tmp " + tmp="$tmp " tmp="$tmp " tmp="$tmp
Results
" tmp="$tmp 
\n$msg\n
" @@ -85,6 +86,7 @@ y_format_message_html2() { tmp="" tmp="$tmp " + tmp="$tmp " tmp="$tmp " tmp="$tmp
Results
" tmp="$tmp $msg
" @@ -94,6 +96,7 @@ y_format_message_html_plain() { tmp="" tmp="$tmp " + tmp="$tmp " tmp="$tmp " tmp="$tmp $msg" echo "$tmp" diff --git a/src/nhttpd/web/styles/Y_Dist-Original_yWeb.css b/src/nhttpd/web/styles/Y_Dist-Original_yWeb.css new file mode 100644 index 000000000..c24b0c767 --- /dev/null +++ b/src/nhttpd/web/styles/Y_Dist-Original_yWeb.css @@ -0,0 +1,6 @@ +/* + Original yWeb Style - Do not modify. + + When you're a distributor, use your own styles/Y_Dist-.css file. + When you're a user, use Y_User.css. +*/