diff --git a/src/nhttpd/web/Y_Blocks.txt b/src/nhttpd/web/Y_Blocks.txt index 62c461e05..c5f78a2cf 100644 --- a/src/nhttpd/web/Y_Blocks.txt +++ b/src/nhttpd/web/Y_Blocks.txt @@ -210,6 +210,11 @@ start-block~management_check_bottom =} end-block~management_check_bottom +# ------- Managemant Link +start-block~management_link +{=var-get:m_link_text=} +end-block~management_link + # ------- Snip: Wait Message Layer-div hidden start-block~snip_wait
diff --git a/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm b/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm index 601953b9a..c75361b24 100644 --- a/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm +++ b/src/nhttpd/web/Y_Boxcontrol_Menue.yhtm @@ -36,8 +36,8 @@ function volumen_set(_volumen){ } function set_mute_button(){ var status = loadSyncURL("/control/volume?status"); - $('btMute').update( (status==1)? "  ": "  "); - return status; + $('btMute').update( (status==1) ? "" : ""); + return status; } function toggle_mute(){ var status = loadSyncURL("/control/volume?status"); @@ -64,7 +64,7 @@ function init(){ 'href': e.get('file') }).update("-"+e.get('menuitem')) ); - $('secmenu').insert({'bottom':el}); + $('secmenu_boxcontrol').insert({'bottom':el}); }); } @@ -79,31 +79,45 @@ function init(){

{=L:main.boxcontrol=}

-
@@ -119,15 +133,31 @@ function init(){
- -   - - - -    - -   -   + + + + + + + + + + + + + + + + + + + + + + + + +
@@ -137,7 +167,9 @@ function init(){
diff --git a/src/nhttpd/web/Y_Ext_Menue.yhtm b/src/nhttpd/web/Y_Ext_Menue.yhtm index 547164c50..7981d982d 100644 --- a/src/nhttpd/web/Y_Ext_Menue.yhtm +++ b/src/nhttpd/web/Y_Ext_Menue.yhtm @@ -14,13 +14,10 @@ function build_menu(){ var item=""+e.get('menuitem')+""; y_add_li_to_ul(id("ext_normal"),"ext",item); }); - var ext_normal=ext.select_type("m"); - ext_normal.each(function(e){ - {=if-empty:{=var-get:management=}~ - var item=""+e.get('menuitem')+""; - ~ - var item=""+e.get('menuitem')+""; - =} + + var ext_management=ext.select_type("m"); + ext_management.each(function(e){ + var item=''+e.get("menuitem")+''; y_add_li_to_ul(id("ext_management"),"ext",item); }); } @@ -44,15 +41,21 @@ function build_menu(){
{=L:administration=}
diff --git a/src/nhttpd/web/Y_Info_Menue.yhtm b/src/nhttpd/web/Y_Info_Menue.yhtm index 227ad2af5..c549d5ffc 100644 --- a/src/nhttpd/web/Y_Info_Menue.yhtm +++ b/src/nhttpd/web/Y_Info_Menue.yhtm @@ -13,7 +13,7 @@ function init(){ 'href': e.get('file') }).update("-"+e.get('menuitem')) ); - $('secmenu').insert({'bottom':el}); + $('secmenu_info').insert({'bottom':el}); }); } @@ -24,14 +24,18 @@ function init(){

{=L:main.info=}

-
diff --git a/src/nhttpd/web/Y_Live_Menue.yhtm b/src/nhttpd/web/Y_Live_Menue.yhtm index 5efd33a80..a92bb0d90 100644 --- a/src/nhttpd/web/Y_Live_Menue.yhtm +++ b/src/nhttpd/web/Y_Live_Menue.yhtm @@ -30,7 +30,17 @@ function init(){ 'href': e.get('file') }).update("-"+e.get('menuitem')) ); - $('secmenu_live').insert({'bottom':el}); + $('secmenu_live').insert({'bottom':el}); + }); + var menu=ext.select_menu('epg'); + menu.each(function(e){ + var el=new Element('li').update( + new Element('a', {'target':'work', + 'title': e.get('desc'), + 'href': e.get('file') + }).update("-"+e.get('menuitem')) + ); + $('secmenu_epg').insert({'bottom':el}); }); var menu=ext.select_menu('timer'); menu.each(function(e){ @@ -40,7 +50,7 @@ function init(){ 'href': e.get('file') }).update("-"+e.get('menuitem')) ); - $('secmenu_timer').insert({'bottom':el}); + $('secmenu_timer').insert({'bottom':el}); }); } //]]> @@ -55,33 +65,38 @@ function init(){
+
{=L:live.epg=}
+
+ +
{=L:live.timer=}
diff --git a/src/nhttpd/web/Y_Main.css b/src/nhttpd/web/Y_Main.css index b71b30e24..df5072da4 100644 --- a/src/nhttpd/web/Y_Main.css +++ b/src/nhttpd/web/Y_Main.css @@ -25,7 +25,7 @@ button[ytype]{ background-color: transparent; background-repeat: no-repeat; padding-left: 20px; - padding-right:0px; + padding-right: 5px; vertical-align: middle; text-align:left; } @@ -227,12 +227,6 @@ tr { padding-left: 20px; color: #555555; } -.y_menu_sec li.disabled { - height: auto; - margin-bottom: 0.1em; - color: #808080; - text-decoration:line-through; -} .y_menu_sec li a { text-decoration: none; font-size: 10pt; @@ -240,8 +234,6 @@ tr { .y_menu_sec li.plain a { color: #555555 } -.y_menu_sec li.disabled a { -} .y_menu_sec li a:hover { color: #FF6600; } @@ -252,6 +244,22 @@ tr { font-size: 10pt; font-weight: bold; } +.y_menu_sec li a.disabled, +.y_menu_sec li a.restricted { + color: #808080; + text-decoration:line-through; +} +.y_menu_sec ul li:first-child { + margin-top: 5px; +} +.y_menu_popup_link { + float: right; + margin-right: 15px; +} + +.control_icon a img { + margin: 0 2px; +} /*work*/ .work_box { diff --git a/src/nhttpd/web/Y_Menue.yhtm b/src/nhttpd/web/Y_Menue.yhtm index 48a2fa2e6..b2965a68d 100644 --- a/src/nhttpd/web/Y_Menue.yhtm +++ b/src/nhttpd/web/Y_Menue.yhtm @@ -117,10 +117,12 @@ function vlc() { -   -   -   - + + + + + +   diff --git a/src/nhttpd/web/Y_Settings_Menue.yhtm b/src/nhttpd/web/Y_Settings_Menue.yhtm index 31aa65324..239aa3a89 100644 --- a/src/nhttpd/web/Y_Settings_Menue.yhtm +++ b/src/nhttpd/web/Y_Settings_Menue.yhtm @@ -46,100 +46,123 @@ function init(){
{=L:general=}
Neutrino
- {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ + {=if-not-equal:{=global-var-get:boxtype=}~coolstream~
{=L:plugins=}
- ~=} + ~=} diff --git a/src/nhttpd/web/Y_Tools_Check_Install.yhtm b/src/nhttpd/web/Y_Tools_Check_Install.yhtm index e032adc7d..768f771e3 100644 --- a/src/nhttpd/web/Y_Tools_Check_Install.yhtm +++ b/src/nhttpd/web/Y_Tools_Check_Install.yhtm @@ -94,37 +94,37 @@ function do_check(){ sLog_addRow(sLog_body, "green", "Programs: dboxshot is installed at: {=var-get:dboxshot=}. Remote & OSD is enabled.", "ok"); =} - {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ - {=var-set:fcp={=if-file-exists:/sbin/fcp~/sbin/fcp~{=if-file-exists:/var/bin/fcp~/var/bin/fcp~{=if-file-exists:/bin/fcp~/bin/fcp~false=}=}=}=} - {=if-equal:{=var-get:fcp=}~false~ - sLog_addRow(sLog_body, "red", "Programs: fcp is not installed. Image flashing is disabled. "+y_url("Help-Tools-Image"), "failed"); - ~ - sLog_addRow(sLog_body, "green", "Programs: fcp is installed at: {=var-get:fcp=}. Image flashing is enabled.", "ok"); - =} - ~=} +{=if-not-equal:{=global-var-get:boxtype=}~coolstream~ + {=var-set:fcp={=if-file-exists:/sbin/fcp~/sbin/fcp~{=if-file-exists:/var/bin/fcp~/var/bin/fcp~{=if-file-exists:/bin/fcp~/bin/fcp~false=}=}=}=} + {=if-equal:{=var-get:fcp=}~false~ + sLog_addRow(sLog_body, "red", "Programs: fcp is not installed. Image flashing is disabled. "+y_url("Help-Tools-Image"), "failed"); + ~ + sLog_addRow(sLog_body, "green", "Programs: fcp is installed at: {=var-get:fcp=}. Image flashing is enabled.", "ok"); + =} +~=} - {=var-set:ether-wake={=if-equal:{=global-var-get:boxtype=}~coolstream~{=if-file-exists:/bin/ether-wake~/bin/ether-wake~{=if-file-exists:/var/bin/ether-wake~/var/bin/ether-wake~=}=}~{=if-file-exists:/bin/ether-wake~/bin/ether-wake~{=if-file-exists:/var/bin/ether-wake~/var/bin/ether-wake~=}=}=}=} + {=var-set:ether-wake={=if-file-exists:/bin/ether-wake~/bin/ether-wake~{=if-file-exists:/var/bin/ether-wake~/var/bin/ether-wake~false=}=}=} {=if-equal:{=var-get:ether-wake=}~false~ sLog_addRow(sLog_body, "red", "Programs: ether-wake is not installed. Wake on LAN is disabled. "+y_url("Help-Tools-Wake_on_LAN"), "failed"); ~ sLog_addRow(sLog_body, "green", "Programs: ether-wake is installed at: {=var-get:ether-wake=}. Wake on LAN is enabled.", "ok"); =} - {=if-not-equal:{=global-var-get:boxtype=}~coolstream~ - /*automount*/ - {=var-set:automount={=if-file-exists:/sbin/automount~/sbin/automount~{=if-file-exists:/var/bin/automount~/var/bin/automount~false=}=}=} - {=if-equal:{=var-get:automount=}~false~ - sLog_addRow(sLog_body, "red", "Programs: automount is not installed. AutoMount is disabled. "+y_url("Help-Tools-AutoMount"), "failed"); - ~ - sLog_addRow(sLog_body, "green", "Programs: automount is installed at: {=var-get:automount=}. AutoMount is enabled.", "ok"); - =} - /* udp */ - {=var-set:udpstreamts={=if-file-exists:/sbin/udpstreamts~/sbin/udpstreamts~{=if-file-exists:/var/bin/udpstreamts~/var/bin/udpstreamts~false=}=}=} - {=if-equal:{=var-get:udpstreamts=}~false~ - sLog_addRow(sLog_body, "red", "Programs: udpstreamts is not installed. udp-streaming is disabled. "+y_url("Help-Live_Timer-UDP_Streaming"), "failed"); - ~ - sLog_addRow(sLog_body, "green", "Programs: udpstreamts is installed at: {=var-get:udpstreamts=}. udp-streaming is enabled.", "ok"); - =} - ~=} +{=if-not-equal:{=global-var-get:boxtype=}~coolstream~ + /*automount*/ + {=var-set:automount={=if-file-exists:/sbin/automount~/sbin/automount~{=if-file-exists:/var/bin/automount~/var/bin/automount~false=}=}=} + {=if-equal:{=var-get:automount=}~false~ + sLog_addRow(sLog_body, "red", "Programs: automount is not installed. AutoMount is disabled. "+y_url("Help-Tools-AutoMount"), "failed"); + ~ + sLog_addRow(sLog_body, "green", "Programs: automount is installed at: {=var-get:automount=}. AutoMount is enabled.", "ok"); + =} + /* udp */ + {=var-set:udpstreamts={=if-file-exists:/sbin/udpstreamts~/sbin/udpstreamts~{=if-file-exists:/var/bin/udpstreamts~/var/bin/udpstreamts~false=}=}=} + {=if-equal:{=var-get:udpstreamts=}~false~ + sLog_addRow(sLog_body, "red", "Programs: udpstreamts is not installed. udp-streaming is disabled. "+y_url("Help-Live_Timer-UDP_Streaming"), "failed"); + ~ + sLog_addRow(sLog_body, "green", "Programs: udpstreamts is installed at: {=var-get:udpstreamts=}. udp-streaming is enabled.", "ok"); + =} +~=} do_stop(); } diff --git a/src/nhttpd/web/Y_Tools_Menue.yhtm b/src/nhttpd/web/Y_Tools_Menue.yhtm index 04acc2d10..6cf1ac3e5 100644 --- a/src/nhttpd/web/Y_Tools_Menue.yhtm +++ b/src/nhttpd/web/Y_Tools_Menue.yhtm @@ -15,7 +15,7 @@ function init(){ 'href': e.get('file') }).update("-"+e.get('menuitem')) ); - $('secmenu_tools').insert({'bottom':el}); + $('secmenu_tools').insert({'bottom':el}); }); var menu=ext.select_menu('expert'); menu.each(function(e){ @@ -25,13 +25,23 @@ function init(){ 'href': e.get('file') }).update("-"+e.get('menuitem')) ); - $('secmenu_expert').insert({'bottom':el}); + $('secmenu_expert').insert({'bottom':el}); + }); + var menu=ext.select_menu('yweb'); + menu.each(function(e){ + var el=new Element('li').update( + new Element('a', {'target':'work', + 'title': e.get('desc'), + 'href': e.get('file') + }).update("-"+e.get('menuitem')) + ); + $('secmenu_yweb').insert({'bottom':el}); }); } -{=var-set:automount={=if-file-exists:/sbin/automount~true~{=if-file-exists:/var/bin/automount~true~=}=}=} {=var-set:management={=if-equal:{=func:get_request_data client_addr=}~{=ini-get:/var/tuxbox/config/Y-Web.conf;management_ip;{=func:get_request_data client_addr=}=}~1~=}{=if-equal:{=func:get_request_data client_addr=}~{=ini-get:/var/tuxbox/config/Y-Web.conf;management_ip2=}~1~=}=} +{=var-set:automount={=if-file-exists:/sbin/automount~true~{=if-file-exists:/var/bin/automount~true~=}=}=} {=var-set:ether-wake={=if-equal:{=global-var-get:boxtype=}~coolstream~{=if-file-exists:/bin/ether-wake~/bin/ether-wake~{=if-file-exists:/var/bin/ether-wake~/var/bin/ether-wake~=}=}~{=if-file-exists:/bin/ether-wake~/bin/ether-wake~{=if-file-exists:/var/bin/ether-wake~/var/bin/ether-wake~=}=}=}=}
@@ -40,46 +50,77 @@ function init(){
{=L:main.tools=}
{=L:tools.expert=}
+
+
yWeb
+
+
diff --git a/src/nhttpd/web/Y_Version.txt b/src/nhttpd/web/Y_Version.txt index 30716673e..894eae6c5 100644 --- a/src/nhttpd/web/Y_Version.txt +++ b/src/nhttpd/web/Y_Version.txt @@ -1,4 +1,4 @@ -version=2.8.0.20 -date=23.07.2012 +version=2.8.0.21 +date=24.07.2012 type=Release info=Port Coolstream diff --git a/src/nhttpd/web/languages/Deutsch b/src/nhttpd/web/languages/Deutsch index cb6471e44..1958127c3 100644 --- a/src/nhttpd/web/languages/Deutsch +++ b/src/nhttpd/web/languages/Deutsch @@ -217,7 +217,6 @@ set.sync_with_neutrino=Zur Synchronisation mit Neutrino ========Settings General & Menue set.menue.webserver=Webserver -set.menue.boot_logo=Boot Logo set.menue.timer_settings=Timer Einstellungen set.menue.zapit=Zapit set.menue.backup_restore=Sichern und Wiederherstellen @@ -422,6 +421,7 @@ tools.path=Verzeichnis tools.command=Kommando tools.cmd.enter_command=Auszuführendes Kommando eingeben tools.cmd.execute_command=Kommando ausführen +tools.boot_logo=Boot Logo =========== LIVE Menue live.heading=Live/Timer diff --git a/src/nhttpd/web/languages/English b/src/nhttpd/web/languages/English index 2dc94fcb8..85c0c6657 100644 --- a/src/nhttpd/web/languages/English +++ b/src/nhttpd/web/languages/English @@ -220,7 +220,6 @@ set.sync_with_neutrino=Synchronization with Neutrino =======Settings General & Menue set.menue.webserver=Webserver -set.menue.boot_logo=Boot Logo set.menue.timer_settings=Timer Settings set.menue.zapit=Zapit set.menue.backup_restore=Backup & Restore @@ -425,6 +424,7 @@ tools.path=Path tools.command=Command tools.cmd.enter_command=enter command to execute tools.cmd.execute_command=execute shell command +tools.boot_logo=Boot Logo =========== LIVE Menue live.heading=Live/Timer diff --git a/src/nhttpd/web/languages/Portuguese b/src/nhttpd/web/languages/Portuguese index 6495cb1ca..a455b84f1 100644 --- a/src/nhttpd/web/languages/Portuguese +++ b/src/nhttpd/web/languages/Portuguese @@ -223,7 +223,6 @@ set.sync_with_neutrino=Sincronização com Neutrino =======Definições General & Menu set.menue.webserver=Webserver -set.menue.boot_logo=Boot Logo set.menue.timer_settings=Definições do Programador set.menue.zapit=Zapit set.menue.backup_restore=Backup & Restore @@ -409,6 +408,7 @@ tools.path=Path tools.command=Comando_Shell tools.cmd.enter_command=escrever comando para executar tools.cmd.execute_command=execute comando shell +tools.boot_logo=Boot Logo =========== Menu LIVE live.heading=Live/Timer