mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

- yweb: remork submenus for a better readability

Browse Source 
* add a new block for management-links to be more generic
  * some marginal design-fixes
This commit is contained in:
svenhoefer
2012-07-24 21:23:46 +02:00
parent 757ef788a8
commit 8456bcd80d
14 changed files with 372 additions and 239 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/nhttpd/web/Y_Blocks.txt
View File

@@ -210,6 +210,11 @@ start-block~management_check_bottom
=}
end-block~management_check_bottom
# ------- Managemant Link
start-block~management_link
<a {=if-empty:{=var-get:management=}~class="restricted" title="{=L:restriced_by_management_ip=}" href="javascript:void(0);"~title="{=var-get:m_link_desc=}" href="{=var-get:m_link_href=}" target="work"=}>{=var-get:m_link_text=}</a>
end-block~management_link
# ------- Snip: Wait Message Layer-div hidden
start-block~snip_wait
<div class="y_wait_box" id="wait">

106
src/nhttpd/web/Y_Boxcontrol_Menue.yhtm
View File

@@ -36,8 +36,8 @@ function volumen_set(_volumen){
}
function set_mute_button(){
var status = loadSyncURL("/control/volume?status");
$('btMute').update( (status==1)? "&nbsp;<img src=\"/images/volumeunmute.png\">&nbsp;": "&nbsp;<img src=\"/images/volumemute.png\">&nbsp;");
return status;
$('btMute').update( (status==1) ? "<img src=\"/images/volumeunmute.png\">" : "<img src=\"/images/volumemute.png\">");
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(){
<div class="y_menu_sec_box_head"><h2>{=L:main.boxcontrol=}</h2></div>
<div class="y_menu_sec_box_body">
<div class="y_menu_sec">
<ul id="secmenu">
<li><a target="work" title="{=L:bc.menue.bouquets_desc=}" href="Y_Boxcontrol_Bouquets.yhtm">{=L:bc.menue.bouquets=}</a></li>
<li><a target="work" title="{=L:bc.menue.control_desc=}" href="Y_Tools_Boxcontrol.yhtm">{=L:bc.menue.control=}</a></li>
<li><a target="work" title="{=L:bc.menue.messages_desc=}" href="Y_Boxcontrol_Messages.yhtm">{=L:bc.menue.messages=}</a></li>
<li><a target="work" title="{=L:bc.menue.remote_desc=}" href="Y_Tools_Rcsim.yhtm">{=L:bc.menue.remote=}</a></li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
{=if-equal:{=var-get:lcshot=}~true~
<li><a target="work" title="{=L:bc.menue.lcd_screenshot_desc=}" href="Y_Tools_lcshot.yhtm">{=L:bc.menue.lcd_screenshot=}</a></li>
~
<li class="disabled" title="{=L:bc.menue.lcd_screenshot_desc_ni=}">{=L:bc.menue.lcd_screenshot=}</li>
=}
~=}
{=if-equal:{=global-var-get:boxtype=}~coolstream~
<li><a target="work" title="{=L:bc.menue.tv_screenshot_desc=}" href="Y_Tools_tvshot.yhtm">{=L:bc.menue.tv_screenshot=}</a></li>
<ul id="secmenu_boxcontrol">
<li>
<a target="work" title="{=L:bc.menue.bouquets_desc=}" href="Y_Boxcontrol_Bouquets.yhtm">{=L:bc.menue.bouquets=}</a>
</li>
<li>
<a target="work" title="{=L:bc.menue.control_desc=}" href="Y_Tools_Boxcontrol.yhtm">{=L:bc.menue.control=}</a>
</li>
<li>
<a target="work" title="{=L:bc.menue.messages_desc=}" href="Y_Boxcontrol_Messages.yhtm">{=L:bc.menue.messages=}</a>
</li>
<li>
<a target="work" title="{=L:bc.menue.remote_desc=}" href="Y_Tools_Rcsim.yhtm">{=L:bc.menue.remote=}</a>
</li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li>
{=if-equal:{=var-get:lcshot=}~true~
<a target="work" title="{=L:bc.menue.lcd_screenshot_desc=}" href="Y_Tools_lcshot.yhtm">{=L:bc.menue.lcd_screenshot=}</a>
~
<a href="javascript:void(0)" class="disabled" title="{=L:bc.menue.lcd_screenshot_desc_ni=}">{=L:bc.menue.lcd_screenshot=}</a>
=}
</li>
~=}
{=if-equal:{=var-get:fbshot=}~true~
<li><a target="work" title="{=L:bc.menue.osd_screenshot_desc=}" href="Y_Tools_fbshot.yhtm">{=L:bc.menue.osd_screenshot=}</a></li>
~
<li class="disabled" title="{=L:bc.menue.osd_screenshot_desc_ni=}">{=L:bc.menue.osd_screenshot=}</li>
=}
{=if-equal:{=var-get:dboxshot=}~true~
<li><a target="work" title="{=L:bc.menue.remote_osd_desc=}" href="Y_Tools_remote_osd.yhtm">{=L:bc.menue.remote_osd=}</a></li>
~
<li class="disabled" title="{=L:bc.menue.remote_osd_desc_ni=}">{=L:bc.menue.remote_osd=}</li>
=}
<li>
<a target="work" title="{=L:bc.menue.tv_screenshot_desc=}" href="Y_Tools_tvshot.yhtm">{=L:bc.menue.tv_screenshot=}</a>
</li>
<li>
{=if-equal:{=var-get:fbshot=}~true~
<a target="work" title="{=L:bc.menue.osd_screenshot_desc=}" href="Y_Tools_fbshot.yhtm">{=L:bc.menue.osd_screenshot=}</a>
~
<a href="javascript:void(0)" class="disabled" title="{=L:bc.menue.osd_screenshot_desc_ni=}">{=L:bc.menue.osd_screenshot=}</a>
=}
</li>
<li>
{=if-equal:{=var-get:dboxshot=}~true~
<a target="work" title="{=L:bc.menue.remote_osd_desc=}" href="Y_Tools_remote_osd.yhtm">{=L:bc.menue.remote_osd=}</a>
~
<a href="javascript:void(0)" class="disabled" title="{=L:bc.menue.remote_osd_desc_ni=}">{=L:bc.menue.remote_osd=}</a>
=}
</li>
</ul>
</div>
</div>
@@ -119,15 +133,31 @@ function init(){
</tr>
</table>
<br/>
<span title="{=L:bc.menue.decrease_volume=}">
<a href="javascript:volumen_set(g_volumen-10);"><img src="/images/volumedown.png">&nbsp;</a></span>
<span title="{=L:bc.menue.increase_volume=}">
<a href="javascript:volumen_set(g_volumen+10);"><img src="/images/volumeup.png"></a></span>
<span title="{=L:bc.menue.mute_volume=}">
<a id="btMute" href="javascript:toggle_mute();">&nbsp;<img src="/images/volumemute.png">&nbsp;</a></span>
<!-- <br/><br/>-->
<span title="{=L:bc.menue.switch_to_tv=}"><a href="javascript:set_mode('tv');"><img src="/images/live.gif">&nbsp;</a></span>
<span title="{=L:bc.menue.switch_to_radio=}"><a href="javascript:set_mode('radio');">&nbsp;<img src="/images/radio.png"></a></span>
<span class="control_icon" title="{=L:bc.menue.decrease_volume=}">
<a href="javascript:volumen_set(g_volumen-10);">
<img src="/images/volumedown.png">
</a>
</span>
<span class="control_icon" title="{=L:bc.menue.increase_volume=}">
<a href="javascript:volumen_set(g_volumen+10);">
<img src="/images/volumeup.png">
</a>
</span>
<span class="control_icon" title="{=L:bc.menue.mute_volume=}">
<a id="btMute" href="javascript:toggle_mute();">
<img src="/images/volumemute.png">
</a>
</span>
<span class="control_icon" title="{=L:bc.menue.switch_to_tv=}">
<a href="javascript:set_mode('tv');">
<img src="/images/live.gif">
</a>
</span>
<span class="control_icon" title="{=L:bc.menue.switch_to_radio=}">
<a href="javascript:set_mode('radio');">
<img src="/images/radio.png">
</a>
</span>
</center>
</div>
</div>
@@ -137,7 +167,9 @@ function init(){
<div class="y_menu_sec_box_body">
<div class="y_menu_sec">
<ul>
<li><a target="_top" title="{=L:bc.menue.webinf_slavebox=}" href="http://{=ini-get:/var/tuxbox/config/Y-Web.conf;slavebox=}/">{=ini-get:/var/tuxbox/config/Y-Web.conf;slavebox=}</a></li>
<li>
<a target="_top" title="{=L:bc.menue.webinf_slavebox=}" href="http://{=ini-get:/var/tuxbox/config/Y-Web.conf;slavebox=}/">{=ini-get:/var/tuxbox/config/Y-Web.conf;slavebox=}</a>
</li>
</ul>
</div>
</div>

35
src/nhttpd/web/Y_Ext_Menue.yhtm
View File

@@ -14,13 +14,10 @@ function build_menu(){
var item="<a target=\"work\" title=\""+e.get('desc')+"\" href=\""+e.get('file')+"\">"+e.get('menuitem')+"</a>";
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="<span class=\"disabled\" title=\""+e.get('desc')+" (restricted by ManagementIP)\">"+e.get('menuitem')+"</span>";
~
var item="<a target=\"work\" title=\""+e.get('desc')+"\" href=\""+e.get('file')+"\">"+e.get('menuitem')+"</a>";
=}
var ext_management=ext.select_type("m");
ext_management.each(function(e){
var item='<a {=if-empty:{=var-get:management=}~class="restricted" title="{=L:restriced_by_management_ip=}" href="javascript:void(0);"~title="'+e.get("desc")+'" href="'+e.get("file")+'" target="work"=}>'+e.get("menuitem")+'</a>';
y_add_li_to_ul(id("ext_management"),"ext",item);
});
}
@@ -44,15 +41,21 @@ function build_menu(){
<div class="y_menu_sec_section">{=L:administration=}</div>
<div class="y_menu_sec">
<ul>
{=if-empty:{=var-get:management=}~
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:main.settings=}</li>
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:ext.installer_updater=}</li>
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:uninstaller=}</li>
~
<li><a target="work" title="" href="Y_Ext_Settings.yhtm">{=L:main.settings=}</a></li>
<li><a target="work" title="" href="Y_Ext_Update.yhtm">{=L:ext.installer_updater=}</a></li>
<li><a target="work" title="" href="Y_Ext_Uninstall.yhtm">{=L:uninstaller=}</a></li>
=}
<li>
{=var-set:m_link_href=Y_Ext_Settings.yhtm=}
{=var-set:m_link_text={=L:main.settings=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<li>
{=var-set:m_link_href=Y_Ext_Update.yhtm=}
{=var-set:m_link_text={=L:ext.installer_updater=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<li>
{=var-set:m_link_href=Y_Ext_Uninstall.yhtm=}
{=var-set:m_link_text={=L:uninstaller=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
</ul>
</div>
</div>

22
src/nhttpd/web/Y_Info_Menue.yhtm
View File

@@ -13,7 +13,7 @@ function init(){
'href': e.get('file')
}).update("-"+e.get('menuitem'))
);
$('secmenu').insert({'bottom':el});
$('secmenu_info').insert({'bottom':el});
});
}
</script>
@@ -24,14 +24,18 @@ function init(){
<div class="y_menu_sec_box_head"><h2>{=L:main.info=}</h2></div>
<div class="y_menu_sec_box_body">
<div class="y_menu_sec">
<ul id="secmenu">
<li><a target="work" href="Y_About.yhtm">{=L:info.About=}</a></li>
<li><a target="work" href="Y_Info_Help.yhtm">{=L:info.help=}</a></li>
{=if-empty:{=var-get:management=}~
<li class="disabled" >{=L:info.check_for_updates=}</li>
~
<li><a target="work" href="Y_Info_Updates.yhtm">{=L:info.check_for_updates=}</a></li>
=}
<ul id="secmenu_info">
<li>
<a target="work" href="Y_About.yhtm">{=L:info.About=}</a>
</li>
<li>
<a target="work" href="Y_Info_Help.yhtm">{=L:info.help=}</a>
</li>
<li>
{=var-set:m_link_href=Y_Info_Updates.yhtm=}
{=var-set:m_link_text={=L:info.check_for_updates=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
</ul>
</div>

51
src/nhttpd/web/Y_Live_Menue.yhtm
View File

@@ -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(){
<div class="y_menu_sec">
<ul id="secmenu_live">
<li>
<table class="y_invisible_table" cellspacing="0" cellpadding="0" style="width:100%; padding-right:15px;margin:0"><tr>
<td><a target="work" href="Y_LiveViewFull.yhtm?mode=tv&amp;typ=live">{=L:live.tv=}</a></td>
<td align="right"><a title="{=L:live.tv_popup_desc=}LiveTV (popup)" href="javascript:go_live_popup_tv()"><img src="/images/popup.png"/></a></td>
</tr></table>
<a target="work" href="Y_LiveViewFull.yhtm?mode=tv&amp;typ=live">{=L:live.tv=}</a>
<a class="y_menu_popup_link" title="{=L:live.tv_popup_desc=}" href="javascript:go_live_popup_tv()"><img src="/images/popup.png"/></a>
</li>
<li>
<table class="y_invisible_table" cellspacing="0" cellpadding="0" style="width:100%; padding-right:15px;margin:0"><tr>
<td><a target="work" href="Y_LiveViewFull.yhtm?mode=radio&amp;typ=live">{=L:live.radio=}</a></td>
<td align="right"><a title="{=L:live.radio_popup_desc=}" href="javascript:go_live_popup_radio()"><img src="/images/popup.png"/></a></td>
</tr></table>
<a target="work" href="Y_LiveViewFull.yhtm?mode=radio&amp;typ=live">{=L:live.radio=}</a>
<a class="y_menu_popup_link" title="{=L:live.radio_popup_desc=}" href="javascript:go_live_popup_radio()"><img src="/images/popup.png"/></a>
</li>
<!-- <li><a target="work" title="use LiveView with 2 boxes" href="Y_Live_DoubleView.yhtm">{=L:live.double_view=}</a></li> -->
</ul>
</div>
<div class="y_menu_sec_section">{=L:live.epg=}</div>
<div class="y_menu_sec">
<ul id="secmenu_epg">
<li>
<a target="work" href="Y_Boxcontrol_Bouquets.yhtm">{=L:live.epg=}</a>
</li>
<li>
<a target="work" href="Y_EPG_Plus.yhtm">{=L:live.epg_plus=}</a>
<a class="y_menu_popup_link" title="{=L:live.epg_plus_popup_desc=}" href="javascript:epg_plus_popup()"><img src="/images/popup.png"/></a>
</li>
</ul>
</div>
<div class="y_menu_sec_section">{=L:live.timer=}</div>
<div class="y_menu_sec">
<ul id="secmenu_timer">
<li><a target="work" href="Y_Timer_List.yhtm">{=L:live.timer=}</a></li>
<li><a target="work" href="Y_Boxcontrol_Bouquets.yhtm">{=L:live.epg=}</a></li>
<li>
<table class="y_invisible_table" cellspacing="0" cellpadding="0" style="width:100%; padding-right:15px;margin:0"><tr>
<td><a target="work" href="Y_EPG_Plus.yhtm">{=L:live.epg_plus=}</a></td>
<td align="right"><a title="{=L:live.epg_plus_popup_desc=}" href="javascript:epg_plus_popup()"><img src="/images/popup.png"/></a></td>
</tr></table>
<a target="work" href="Y_Timer_List.yhtm">{=L:live.timer=}</a>
</li>
<li>
<a target="work" href="Y_Tools_Timer_Sync.yhtm">{=L:live.timer_sync=}</a>
</li>
<li><a target="work" href="Y_Tools_Timer_Sync.yhtm">{=L:live.timer_sync=}</a></li>
<!--<li><a target="work" title="recorder" href="Y_Blank.yhtm">Recorder</a></li>-->
</ul>
</div>
</div>

26
src/nhttpd/web/Y_Main.css
View File

@@ -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 {

10
src/nhttpd/web/Y_Menue.yhtm
View File

@@ -117,10 +117,12 @@ function vlc() {
</ul>
</td>
<td>
<a target="base" href="Y_Dyn_Pages.yhtm?page=frame_live_directtv" title={=L:main.live_tv_desc=}><img src="/images/live.gif"></a>&nbsp;
<a target="base" href="Y_Dyn_Pages.yhtm?page=frame_live&dostart=live_tv_popup" title="{=L:main.live_tv_popup_desc=}"><img src="/images/live_popup.gif"></a>&nbsp;
<a target="base" href="Y_Tools_remote_osd.yhtm?full=1" title="{=L:main.remote_full_desc=}"><img src="/images/fb.png"></a>&nbsp;
<a href="javascript:vlc()" title="{=L:main.stream_to_vlc_client_desc=}"><img src="/images/vlc.gif"></a>
<span class="control_icon">
<a target="base" href="Y_Dyn_Pages.yhtm?page=frame_live_directtv" title={=L:main.live_tv_desc=}><img src="/images/live.gif"></a>
<a target="base" href="Y_Dyn_Pages.yhtm?page=frame_live&dostart=live_tv_popup" title="{=L:main.live_tv_popup_desc=}"><img src="/images/live_popup.gif"></a>
<a target="base" href="Y_Tools_remote_osd.yhtm?full=1" title="{=L:main.remote_full_desc=}"><img src="/images/fb.png"></a>
<a href="javascript:vlc()" title="{=L:main.stream_to_vlc_client_desc=}"><img src="/images/vlc.gif"></a>
</span>
</td>
<td align="right">
<span id="state" style="color : red;font-family: Courier New, Courier, monospace;">&nbsp;</span>

185
src/nhttpd/web/Y_Settings_Menue.yhtm
View File

@@ -46,100 +46,123 @@ function init(){
<div class="y_menu_sec_section">{=L:general=}</div>
<div class="y_menu_sec">
<ul id="secmenu_general">
{=if-empty:{=var-get:management=}~
<li class="disabled" title="{=L:restriced_by_management_ip=}">yWeb</li>
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.webserver=}</li>
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.zapit=}</li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.boot_logo=}</li>
~=}
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.backup_restore=}</a></li>
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.timer_settings=}</a></li>
~
<li><a target="work" href="Y_Settings_yWeb.yhtm">yWeb</a></li>
<li><a target="work" href="Y_Settings_nhttpd.yhtm">{=L:set.menue.webserver=}</a></li>
<li><a target="work" href="Y_Settings_zapit.yhtm">{=L:set.menue.zapit=}</a></li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li><a target="work" href="Y_Tools_Bootlogo.yhtm">{=L:set.menue.boot_logo=}</a></li>
~=}
<li><a target="work" href="Y_Settings_Backup.yhtm">{=L:set.menue.backup_restore=}</a></li>
<li><a target="work" href="Y_Settings_Timer.yhtm">{=L:set.menue.timer_settings=}</a></li>
=}
<li>
{=var-set:m_link_href=Y_Settings_yWeb.yhtm=}
{=var-set:m_link_text=yWeb=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<li>
{=var-set:m_link_href=Y_Settings_nhttpd.yhtm=}
{=var-set:m_link_text={=L:set.menue.webserver=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<li>
{=var-set:m_link_href=Y_Settings_zapit.yhtm=}
{=var-set:m_link_text={=L:set.menue.zapit=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<li>
{=var-set:m_link_href=Y_Settings_Backup.yhtm=}
{=var-set:m_link_text={=L:set.menue.backup_restore=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<li>
{=var-set:m_link_href=Y_Settings_Timer.yhtm=}
{=var-set:m_link_text={=L:set.menue.timer_settings=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<!--<li><a title="change layout skin" target="work" href="Y_Settings_Skin.yhtm">Skins</a></li>-->
</ul>
</div>
<div class="y_menu_sec_section">Neutrino</div>
<div class="y_menu_sec">
<ul id="secmenu_neutrino">
{=if-empty:{=var-get:management=}~
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.bouquet_editor=}</a></li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.video_audio=}</a></li>
~=}
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.parental=}</a></li>
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.recording=}</a></li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.direct_recording=}</a></li>
=}
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.audio_player=}</a></li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.esound_server=}</a></li>
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.movieplayer=}</a></li>
~=}
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.pictureviewer=}</a></li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.lcd_display=}</a></li>
~=}
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.key_settings=}</a></li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.boot_options=}</a></li>
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.others=}</a></li>
~=}
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:set.menue.peronalization=}</li>
~
<li><a target="work" href="Y_Boxcontrol_Bouquet_Editor_Main.yhtm">{=L:set.menue.bouquet_editor=}</a></li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li><a target="work" href="Y_Settings_video_audio.yhtm">{=L:set.menue.video_audio=}</a></li>
~=}
<li><a target="work" href="Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_parental">{=L:set.menue.parental=}</a></li>
<li><a target="work" href="Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_record">{=L:set.menue.recording=}</a></li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li><a target="work" href="Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_direct_recording">{=L:set.menue.direct_recording=}</a></li>
=}
<li><a target="work" href="Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_audioplayer">{=L:set.menue.audio_player=}</a></li>
<li><a target="work" href="Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_movieplayer">{=L:set.menue.movieplayer=}</a></li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li><a target="work" href="Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_esound">{=L:set.menue.esound_server=}</a></li>
~=}
<li><a target="work" href="Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_pictureviewer">{=L:set.menue.pictureviewer=}</a></li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li><a target="work" href="Y_Settings_lcd.yhtm">{=L:set.menue.lcd_display=}</a></li>
~=}
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li><a target="work" href="Y_Settings_buttons.yhtm">{=L:set.menue.key_settings=}</a></li>
~=}
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li><a target="work" href="Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_bootoptions">{=L:set.menue.boot_options=}</a></li>
<li><a target="work" href="Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_diverse">{=L:set.menue.others=}</a></li>
~=}
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li><a target="work" href="Y_Settings_personalize.yhtm">{=L:set.menue.peronalization=}</a></li>
~=}
=}
<li>
{=var-set:m_link_href=Y_Boxcontrol_Bouquet_Editor_Main.yhtm=}
{=var-set:m_link_text={=L:set.menue.bouquet_editor=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<li>
{=var-set:m_link_href=Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_parental=}
{=var-set:m_link_text={=L:set.menue.parental=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<li>
{=var-set:m_link_href=Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_record=}
{=var-set:m_link_text={=L:set.menue.recording=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<li>
{=var-set:m_link_href=Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_movieplayer=}
{=var-set:m_link_text={=L:set.menue.movieplayer=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<li>
{=var-set:m_link_href=Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_audioplayer=}
{=var-set:m_link_text={=L:set.menue.audio_player=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<li>
{=var-set:m_link_href=Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_pictureviewer=}
{=var-set:m_link_text={=L:set.menue.pictureviewer=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li>
{=var-set:m_link_href=Y_Settings_video_audio.yhtm=}
{=var-set:m_link_text={=L:set.menue.video_audio=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<li>
{=var-set:m_link_href=Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_esound=}
{=var-set:m_link_text={=L:set.menue.esound_server=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<li>
{=var-set:m_link_href=Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_direct_recording=}
{=var-set:m_link_text={=L:set.menue.direct_recording=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<li>
{=var-set:m_link_href=Y_Settings_lcd.yhtm=}
{=var-set:m_link_text={=L:set.menue.lcd_display=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<li>
{=var-set:m_link_href=Y_Settings_buttons.yhtm=}
{=var-set:m_link_text={=L:set.menue.key_settings=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<li>
{=var-set:m_link_href=Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_bootoptions=}
{=var-set:m_link_text={=L:set.menue.boot_options=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<li>
{=var-set:m_link_href=Y_Settings_neutrino_forms.yhtm?form=neutrino_form-data_diverse=}
{=var-set:m_link_text={=L:set.menue.others=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<li>
{=var-set:m_link_href=Y_Settings_personalize.yhtm=}
{=var-set:m_link_text={=L:set.menue.peronalization=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
~=}
</ul>
</div>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<div class="y_menu_sec_section">{=L:plugins=}</div>
<div class="y_menu_sec">
<ul id="secmenu_plugins">
{=if-empty:{=var-get:management=}~
<li class="disabled" title="{=L:restriced_by_management_ip=}">VNC</li>
~
<li><a target="work" href="Y_Settings_VNC.yhtm">VNC</a></li>
=}
<li>
{=var-set:m_link_href=Y_Settings_VNC.yhtm=}
{=var-set:m_link_text=VNC=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
</ul>
</div>
~=}
~=}
</div>
</div>

50
src/nhttpd/web/Y_Tools_Check_Install.yhtm
View File

@@ -94,37 +94,37 @@ function do_check(){
sLog_addRow(sLog_body, "green", "Programs: dboxshot is installed at: {=var-get:dboxshot=}. Remote &amp; 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();
}

111
src/nhttpd/web/Y_Tools_Menue.yhtm
View File

@@ -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});
});
}
</script>
</head>
{=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~=}=}=}=}
<body onload="init()">
<div class="y_menu_sec_box">
@@ -40,46 +50,77 @@ function init(){
<div class="y_menu_sec_section">{=L:main.tools=}</div>
<div class="y_menu_sec">
<ul id="secmenu_tools">
{=if-empty:{=var-get:management=}~
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li class="disabled" title="{=L:tools.not_installed=}">{=L:tools.automount=}</li>
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:tools.mounts=}</li>
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:tools.wake_on_lan=}</li>
~=}
~
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
{=if-not-equal:{=global-var-get:boxtype=}~coolstreamm~
<li>
{=if-empty:{=var-get:automount=}~
<li class="disabled" title="{=L:tools.not_installed=}">{=L:tools.automount=}</li>
<a href="javascript:void(0)" class="disabled" title="{=L:tools.not_installed=}">{=L:tools.automount=}</a>
~
<li><a target="work" title="{=L:tools.automount_desc=}" href="Y_Settings_automount_liste.yhtm">{=L:tools.automount=}</a></li>
{=var-set:m_link_href=Y_Settings_automount_liste.yhtm=}
{=var-set:m_link_desc==}
{=var-set:m_link_text={=L:tools.automount=}=}
{=include-block:Y_Blocks.txt;management_link=}
=}
<li><a target="work" title="{=L:tools.mounts_desc=}" href="Y_Settings_mount_liste.yhtm">{=L:tools.mounts=}</a></li>
~=}
{=if-empty:{=var-get:ether-wake=}~
<li class="disabled" title="{=L:tools.not_installed=}" >{=L:tools.wake_on_lan=}</li>
~
<li><a target="work" href="Y_Settings_wol.yhtm">{=L:tools.wake_on_lan=}</a></li>
=}
=}
<li><a target="work" href="Y_Tools_Check_Install.yhtm">{=L:tools.check_install=}</a></li>
</li>
<li>
{=var-set:m_link_href=Y_Settings_mount_liste.yhtm=}
{=var-set:m_link_desc={=L:tools.mounts_desc=}=}
{=var-set:m_link_text={=L:tools.mounts=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
~=}
<li>
{=if-empty:{=var-get:ether-wake=}~
<a href="javascript:void(0)" class="disabled" title="{=L:tools.not_installed=}">{=L:tools.wake_on_lan=}</a>
~
{=var-set:m_link_href=Y_Settings_wol.yhtm=}
{=var-set:m_link_desc==}
{=var-set:m_link_text={=L:tools.wake_on_lan=}=}
{=include-block:Y_Blocks.txt;management_link=}
=}
</li>
</ul>
</div>
<div class="y_menu_sec_section">{=L:tools.expert=}</div>
<div class="y_menu_sec">
<ul id="secmenu_expert">
<li><a target="work" title="get box infos" href="Y_Tools_Info_Menue.yhtm">{=L:main.info=}</a></li>
{=if-empty:{=var-get:management=}~
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:tools.image=}</li>
<li class="disabled" title="{=L:restriced_by_management_ip=}">{=L:tools.command_shell=}</li>
<li class="disabled" title="{=L:restriced_by_management_ip=}">yInstaller</li>
~
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li><a target="work" title="{=L:tools.image_desc=}" href="Y_Tools_Flash_Menue.yhtm">{=L:tools.image=}</a></li>
~=}
<li><a target="work" href="Y_Tools_Cmd.yhtm">{=L:tools.command_shell=}</a>&nbsp;
<a title="command shell (popup)" href="javascript:cmd_popup()"><img src="/images/popup.png"/></a></li>
<li><a target="work" href="Y_Tools_Installer.yhtm">yInstaller</a></li>
=}
<li>
<a target="work" title="get box infos" href="Y_Tools_Info_Menue.yhtm">{=L:main.info=}</a>
</li>
{=if-not-equal:{=global-var-get:boxtype=}~coolstream~
<li>
{=var-set:m_link_href=Y_Tools_Bootlogo.yhtm=}
{=var-set:m_link_desc==}
{=var-set:m_link_text={=L:tools.boot_logo=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
<li>
{=var-set:m_link_href=Y_Tools_Flash_Menue.yhtm=}
{=var-set:m_link_desc==}
{=var-set:m_link_text={=L:tools.image=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
~=}
<li>
{=var-set:m_link_href=Y_Tools_Cmd.yhtm=}
{=var-set:m_link_desc==}
{=var-set:m_link_text={=L:tools.command_shell=}=}
{=include-block:Y_Blocks.txt;management_link=}
<a class="y_menu_popup_link" title="{=L:tools.command_shell=} (popup)" href="javascript:cmd_popup()"><img src="/images/popup.png"/></a>
</li>
</ul>
</div>
<div class="y_menu_sec_section">yWeb</div>
<div class="y_menu_sec">
<ul id="secmenu_yweb">
<li>
<a target="work" href="Y_Tools_Check_Install.yhtm">{=L:tools.check_install=}</a>
</li>
<li>
{=var-set:m_link_href=Y_Tools_Installer.yhtm=}
{=var-set:m_link_desc==}
{=var-set:m_link_text=yInstaller=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
</ul>
</div>
</div>

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

@@ -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

2
src/nhttpd/web/languages/Deutsch
View File

@@ -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

2
src/nhttpd/web/languages/English
View File

@@ -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 &amp; 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

2
src/nhttpd/web/languages/Portuguese
View File

@@ -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 &amp; 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