Merge remote-tracking branch 'test/cst-next'

This commit is contained in:
Stefan Seyfried
2015-03-07 20:09:44 +01:00
161 changed files with 707 additions and 703 deletions

View File

@@ -415,7 +415,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
(channel->getServiceType() == ST_NVOD_REFERENCE_SERVICE) ? " (NVOD)" : "",
channel->getChannelID(),
channel->getChannelID() & 0xFFFFFFFFFFFFULL,
((NeutrinoAPI->ChannelListEvents[channel->getChannelID()]) ? "<img src=\"/images/elist.gif\" alt=\"Program preview\" style=\"border: 0px\" />" : ""));
((NeutrinoAPI->ChannelListEvents[channel->getChannelID()]) ? "<img src=\"/images/elist.png\" alt=\"Program preview\" style=\"border: 0px\" />" : ""));
if (channel->getChannelID() == current_channel)
yresult += string_printf("\n&nbsp;&nbsp;<a href=\"javascript:do_streaminfo()\"><img src=\"/images/streaminfo.png\" alt=\"Streaminfo\" style=\"border: 0px\" /></a>");

View File

@@ -367,7 +367,7 @@ std::string CNeutrinoYParser::func_get_bouquets_with_epg(CyhookHandler *hh, std:
channel->name,
(channel->service_type == ST_NVOD_REFERENCE_SERVICE) ? " (NVOD)" : "",
channel->channel_id,
((NeutrinoAPI->ChannelListEvents[channel->channel_id]) ? "<img src=\"/images/elist.gif\" alt=\"Programmvorschau\" style=\"border: 0px\" />" : ""));
((NeutrinoAPI->ChannelListEvents[channel->channel_id]) ? "<img src=\"/images/elist.png\" alt=\"Programmvorschau\" style=\"border: 0px\" />" : ""));
if (channel->channel_id == current_channel)
yresult += string_printf("\n&nbsp;&nbsp;<a href=\"javascript:do_streaminfo()\"><img src=\"/images/streaminfo.png\" alt=\"Streaminfo\" style=\"border: 0px\" /></a>");

View File

@@ -1,4 +1,4 @@
SUBDIRS = images scripts languages
SUBDIRS = images scripts languages styles
installdir = $(DATADIR)/neutrino/httpd
@@ -20,6 +20,7 @@ install_DATA = channels.js \
Y_Boxcontrol_Channellist.yhtm \
Y_Boxcontrol_Menue.yhtm \
Y_Boxcontrol_Messages.yhtm \
Y_Dist.css \
Y_Dyn_Pages.yhtm \
Y_EPG.js \
Y_EPG_Plus.yhtm \
@@ -59,7 +60,6 @@ install_DATA = channels.js \
Y_Settings_neutrino_forms.yhtm \
Y_Settings_nhttpd.yhtm \
Y_Settings_personalize.yhtm \
Y_Settings_Skin.yhtm \
Y_Settings_Timer.yhtm \
Y_Settings_umount_liste.yhtm \
Y_Settings_video_audio.yhtm \
@@ -85,9 +85,17 @@ install_DATA = channels.js \
Y_Tools_Timer_Sync.js \
Y_Tools_Timer_Sync.yhtm \
Y_Tools_tvshot.yhtm \
Y_User.css \
Y_Version.txt \
Y_VLC.js \
Y_Wait.yhtm \
ywidget.css \
ywidget.js \
Y_yweb.js
# file manager
install_DATA += accordion.js \
effects.js \
Y_Filemgr.yhtm \
Y_Filemgr_Edit.yhtm \
Y_Filemgr_blocks.txt

View File

@@ -10,13 +10,13 @@
<div class="work_box_body">
<table border="0" cellpadding="2" cellspacing="4">
<tr>
<td width="144" valign="bottom"><img border="0" src="images/yjogol.gif" alt="yjogol"/></td>
<td valign="bottom" style="font-size:18pt;">yWeb</td>
<td valign="bottom" width="144"></td>
<td valign="bottom"><img border="0" src="images/tux-yweb.png" alt="yWeb by yjogol"/></td>
</tr><tr>
<td valign="top">&nbsp;</td>
<td valign="top">
{=ini-get:{=var-get:vf=};version=} - {=ini-get:{=var-get:vf=};date=} - {=ini-get:{=var-get:vf=};type=}<br/><br/>
{=ini-get:{=var-get:vf=};info=}<br/><br/><br/>
v{=ini-get:{=var-get:vf=};version=} - {=ini-get:{=var-get:vf=};date=} - {=ini-get:{=var-get:vf=};type=} - {=ini-get:{=var-get:vf=};info=}
<br/><br/>
</td>
</tr>
<tr>

View File

@@ -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,8 @@ start-block~head
<meta http-equiv="expires" content="0" />
<title>yWeb</title>
<link rel="stylesheet" type="text/css" href="/Y_Main.css" />
<link rel="stylesheet" type="text/css" href="/Y_Dist.css" />
<link rel="stylesheet" type="text/css" href="/Y_User.css" />
end-block~head
# ------- Lay-HEAD
@@ -282,6 +285,8 @@ start-block~headCache
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<title>yWeb</title>
<link rel="stylesheet" type="text/css" href="/Y_Main.css" />
<link rel="stylesheet" type="text/css" href="/Y_Dist.css" />
<link rel="stylesheet" type="text/css" href="/Y_User.css" />
end-block~headCache
# ------- Lay-HEAD without charset
@@ -292,6 +297,8 @@ start-block~head_no_charset
<head>
<title>yWeb</title>
<link rel="stylesheet" type="text/css" href="/Y_Main.css" />
<link rel="stylesheet" type="text/css" href="/Y_Dist.css" />
<link rel="stylesheet" type="text/css" href="/Y_User.css" />
end-block~head_no_charset
# ------- Lay-Frame HEAD
@@ -302,6 +309,8 @@ start-block~frame_head
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
<link rel="stylesheet" type="text/css" href="/Y_Main.css" />
<link rel="stylesheet" type="text/css" href="/Y_Dist.css" />
<link rel="stylesheet" type="text/css" href="/Y_User.css" />
<title>yWeb</title>
end-block~frame_head
@@ -313,6 +322,8 @@ start-block~frame_iso_head
<head>
<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1" />
<link rel="stylesheet" type="text/css" href="/Y_Main.css" />
<link rel="stylesheet" type="text/css" href="/Y_Dist.css" />
<link rel="stylesheet" type="text/css" href="/Y_User.css" />
<title>yWeb</title>
end-block~frame_iso_head
@@ -402,7 +413,7 @@ end-block~frame_main
start-block~page_frame_rest
{=include-block:Y_Blocks.txt;head=}
</head>
<body style="background : white;">
<body>
</body>
</html>
end-block~page_frame_rest
@@ -582,69 +593,69 @@ end-block~rc_cst_v1
# ------- Remote CST V2 (NEO)
start-block~rc_cst_v2
<img src="images/rc_cst_v2.jpg" usemap="#rc" alt="remote" />
<img src="images/rc_cst_v2.png" usemap="#rc" alt="remote" />
<map name="rc" id="rc">
<area shape="rect" href="javascript:rcsim('KEY_POWER')" coords="217, 28, 240, 50" />
<area shape="rect" href="javascript:rcsim('KEY_MUTE')" coords="328, 29, 348, 50" />
<area shape="rect" href="javascript:rcsim('KEY_1')" coords="223, 161, 250, 187" />
<area shape="rect" href="javascript:rcsim('KEY_2')" coords="270, 161, 297, 187" />
<area shape="rect" href="javascript:rcsim('KEY_3')" coords="313, 161, 341, 187" />
<area shape="rect" href="javascript:rcsim('KEY_4')" coords="223, 196, 250, 221" />
<area shape="rect" href="javascript:rcsim('KEY_5')" coords="269, 196, 296, 221" />
<area shape="rect" href="javascript:rcsim('KEY_6')" coords="313, 196, 341, 221" />
<area shape="rect" href="javascript:rcsim('KEY_7')" coords="223, 233, 250, 258" />
<area shape="rect" href="javascript:rcsim('KEY_8')" coords="269, 233, 296, 258" />
<area shape="rect" href="javascript:rcsim('KEY_9')" coords="313, 233, 341, 258" />
<area shape="rect" href="javascript:rcsim('KEY_0')" coords="269, 270, 296, 297" />
<area shape="rect" href="javascript:rcsim('KEY_INFO')" coords="329, 398, 352, 422" />
<area shape="rect" href="javascript:rcsim('KEY_SETUP')" coords="212, 520, 234, 543" />
<area shape="rect" href="javascript:rcsim('KEY_EPG')" coords="212, 398, 236, 422" />
<area shape="rect" href="javascript:rcsim('KEY_FAVORITES')" coords="313, 270, 341, 297" />
<area shape="rect" href="javascript:rcsim('KEY_HOME')" coords="328, 518, 352, 542" />
<area shape="rect" href="javascript:rcsim('KEY_UP')" coords="265, 422, 300, 450" />
<area shape="rect" href="javascript:rcsim('KEY_LEFT')" coords="232, 450, 265, 490" />
<area shape="rect" href="javascript:rcsim('KEY_OK')" coords="270, 456, 295, 485" />
<area shape="rect" href="javascript:rcsim('KEY_RIGHT')" coords="300, 454, 336, 490" />
<area shape="rect" href="javascript:rcsim('KEY_DOWN')" coords="265, 488, 300, 520" />
<area shape="rect" href="javascript:rcsim('KEY_VOLUMEUP')" coords="213, 317, 254, 350" />
<area shape="rect" href="javascript:rcsim('KEY_VOLUMEDOWN')" coords="213, 350, 254, 385" />
<area shape="rect" href="javascript:rcsim('KEY_PAGEUP')" coords="313, 317, 353, 350" />
<area shape="rect" href="javascript:rcsim('KEY_PAGEDOWN')" coords="313, 350, 350, 385" />
<area shape="rect" href="javascript:rcsim('KEY_TV')" coords="216, 59, 237, 80" />
<area shape="rect" href="javascript:rcsim('KEY_TEXT')" coords="223, 270, 250, 297" />
<area shape="rect" href="javascript:rcsim('KEY_RADIO')" coords="216, 59, 237, 80" />
<area shape="rect" href="javascript:rcsim('KEY_RED')" coords="206, 560, 240, 580" />
<area shape="rect" href="javascript:rcsim('KEY_GREEN')" coords="247, 560, 280, 580" />
<area shape="rect" href="javascript:rcsim('KEY_YELLOW')" coords="286, 560, 320, 580" />
<area shape="rect" href="javascript:rcsim('KEY_BLUE')" coords="327, 560, 360, 580" />
<area shape="rect" href="javascript:rcsim('KEY_SAT')" coords="215, 94, 236, 113" />
<area shape="rect" href="javascript:rcsim('KEY_HELP')" coords="329, 93, 350, 114" />
<area shape="rect" href="javascript:rcsim('KEY_NEXT')" coords="254, 59, 275, 80" />
<area shape="rect" href="javascript:rcsim('KEY_PREVIOUS')" coords="291, 59, 312, 80" />
<area shape="rect" href="javascript:rcsim('KEY_TIME')" coords="330, 628, 353, 650" />
<area shape="rect" href="javascript:rcsim('KEY_AUDIO')" coords="291, 93, 312, 113" />
<area shape="rect" href="javascript:rcsim('KEY_REWIND')" coords="211, 593, 235, 614" />
<area shape="rect" href="javascript:rcsim('KEY_FORWARD')" coords="290, 593, 315, 614" />
<area shape="rect" href="javascript:rcsim('KEY_PAUSE')" coords="253, 628, 276, 651" />
<area shape="rect" href="javascript:rcsim('KEY_RECORD')" coords="212, 628, 237, 651" />
<area shape="rect" href="javascript:rcsim('KEY_STOP')" coords="330, 593, 353, 614" />
<area shape="rect" href="javascript:rcsim('KEY_PLAY')" coords="252, 593, 275, 614" />
<area shape="rect" href="javascript:rcsim('KEY_WWW')" coords="216, 128, 237, 150" />
<area shape="rect" href="javascript:rcsim('KEY_GAMES')" coords="290, 628, 315, 651" />
<area shape="rect" href="javascript:rcsim('KEY_POWER')" coords="22, 28, 45, 50" />
<area shape="rect" href="javascript:rcsim('KEY_MUTE')" coords="133, 29, 153, 50" />
<area shape="rect" href="javascript:rcsim('KEY_1')" coords="28, 161, 55, 187" />
<area shape="rect" href="javascript:rcsim('KEY_2')" coords="75, 161, 102, 187" />
<area shape="rect" href="javascript:rcsim('KEY_3')" coords="118, 161, 146, 187" />
<area shape="rect" href="javascript:rcsim('KEY_4')" coords="28, 196, 55, 221" />
<area shape="rect" href="javascript:rcsim('KEY_5')" coords="74, 196, 101, 221" />
<area shape="rect" href="javascript:rcsim('KEY_6')" coords="118, 196, 146, 221" />
<area shape="rect" href="javascript:rcsim('KEY_7')" coords="28, 233, 55, 258" />
<area shape="rect" href="javascript:rcsim('KEY_8')" coords="74, 233, 101, 258" />
<area shape="rect" href="javascript:rcsim('KEY_9')" coords="118, 233, 146, 258" />
<area shape="rect" href="javascript:rcsim('KEY_0')" coords="74, 270, 101, 297" />
<area shape="rect" href="javascript:rcsim('KEY_INFO')" coords="134, 398, 157, 422" />
<area shape="rect" href="javascript:rcsim('KEY_SETUP')" coords="17, 520, 39, 543" />
<area shape="rect" href="javascript:rcsim('KEY_EPG')" coords="17, 398, 41, 422" />
<area shape="rect" href="javascript:rcsim('KEY_FAVORITES')" coords="118, 270, 146, 297" />
<area shape="rect" href="javascript:rcsim('KEY_HOME')" coords="133, 518, 157, 542" />
<area shape="rect" href="javascript:rcsim('KEY_UP')" coords="70, 422, 105, 450" />
<area shape="rect" href="javascript:rcsim('KEY_LEFT')" coords="37, 450, 70, 490" />
<area shape="rect" href="javascript:rcsim('KEY_OK')" coords="75, 456, 100, 485" />
<area shape="rect" href="javascript:rcsim('KEY_RIGHT')" coords="105, 454, 141, 490" />
<area shape="rect" href="javascript:rcsim('KEY_DOWN')" coords="70, 488, 105, 520" />
<area shape="rect" href="javascript:rcsim('KEY_VOLUMEUP')" coords="18, 317, 59, 350" />
<area shape="rect" href="javascript:rcsim('KEY_VOLUMEDOWN')" coords="18, 350, 59, 385" />
<area shape="rect" href="javascript:rcsim('KEY_PAGEUP')" coords="118, 317, 158, 350" />
<area shape="rect" href="javascript:rcsim('KEY_PAGEDOWN')" coords="118, 350, 155, 385" />
<area shape="rect" href="javascript:rcsim('KEY_TV')" coords="21, 59, 42, 80" />
<area shape="rect" href="javascript:rcsim('KEY_TEXT')" coords="28, 270, 55, 297" />
<area shape="rect" href="javascript:rcsim('KEY_RADIO')" coords="21, 59, 42, 80" />
<area shape="rect" href="javascript:rcsim('KEY_RED')" coords="11, 560, 45, 580" />
<area shape="rect" href="javascript:rcsim('KEY_GREEN')" coords="52, 560, 85, 580" />
<area shape="rect" href="javascript:rcsim('KEY_YELLOW')" coords="91, 560, 125, 580" />
<area shape="rect" href="javascript:rcsim('KEY_BLUE')" coords="132, 560, 165, 580" />
<area shape="rect" href="javascript:rcsim('KEY_SAT')" coords="20, 94, 41, 113" />
<area shape="rect" href="javascript:rcsim('KEY_HELP')" coords="134, 93, 155, 114" />
<area shape="rect" href="javascript:rcsim('KEY_NEXT')" coords="59, 59, 80, 80" />
<area shape="rect" href="javascript:rcsim('KEY_PREVIOUS')" coords="96, 59, 117, 80" />
<area shape="rect" href="javascript:rcsim('KEY_TIME')" coords="135, 628, 158, 650" />
<area shape="rect" href="javascript:rcsim('KEY_AUDIO')" coords="96, 93, 117, 113" />
<area shape="rect" href="javascript:rcsim('KEY_REWIND')" coords="16, 593, 40, 614" />
<area shape="rect" href="javascript:rcsim('KEY_FORWARD')" coords="95, 593, 120, 614" />
<area shape="rect" href="javascript:rcsim('KEY_PAUSE')" coords="58, 628, 81, 651" />
<area shape="rect" href="javascript:rcsim('KEY_RECORD')" coords="17, 628, 42, 651" />
<area shape="rect" href="javascript:rcsim('KEY_STOP')" coords="135, 593, 158, 614" />
<area shape="rect" href="javascript:rcsim('KEY_PLAY')" coords="57, 593, 80, 614" />
<area shape="rect" href="javascript:rcsim('KEY_WWW')" coords="21, 128, 42, 150" />
<area shape="rect" href="javascript:rcsim('KEY_GAMES')" coords="95, 628, 120, 651" />
</map>
end-block~rc_cst_v2
# ------ Remote CST V3 (ZEE, NEO2)
start-block~rc_cst_v3
{=var-set:rcu=rc_cst_v3=}
<img src="images/rc_cst_v3.jpg" usemap="#rc" alt="remote" />
<img src="images/rc_cst_v3.png" usemap="#rc" alt="remote" />
{=include-block:Y_Blocks.txt;map_rc_cst_v3_v4=}
end-block~rc_cst_v3
# ------ Remote CST V4 (NEO TWIN)
start-block~rc_cst_v4
{=var-set:rcu=rc_cst_v4=}
<img src="images/rc_cst_v4.jpg" usemap="#rc" alt="remote" />
<img src="images/rc_cst_v4.png" usemap="#rc" alt="remote" />
{=include-block:Y_Blocks.txt;map_rc_cst_v3_v4=}
end-block~rc_cst_v4
@@ -727,7 +738,7 @@ end-block~map_rc_cst_v3_v4
# ------- Remote CST V5 (TANK)
start-block~rc_cst_v5
<img src="images/rc_cst_v5.jpg" usemap="#rc" alt="remote" />
<img src="images/rc_cst_v5.png" usemap="#rc" alt="remote" />
<map name="rc" id="rc">
<area shape="circle" href="javascript:rcsim('KEY_POWER')" coords="50,42,14" alt="standby" title="{=L:rc.key_power=}" />
@@ -790,7 +801,7 @@ end-block~rc_cst_v5
# ------- Remote CST V6 (TRINITY)
start-block~rc_cst_v6
<img src="images/rc_cst_v6.jpg" usemap="#rc" alt="remote" />
<img src="images/rc_cst_v6.png" usemap="#rc" alt="remote" />
<map name="rc" id="rc">
<area shape="circle" coords="94,50,16" alt="standby" href="javascript:rcsim('KEY_POWER')" title="{=L:rc.key_power=}" />
<area shape="circle" coords="150,68,13" alt="mute" href="javascript:rcsim('KEY_MUTE')" title="{=L:rc.key_mute=}" />
@@ -856,7 +867,7 @@ end-block~rc_cst_v6
# ------- Remote d-Box Nokia old
start-block~rc_dbox_nokia_old
<img src="images/rc_dbox_nokia_old.jpg" usemap="#rc" alt="remote" />
<img src="images/rc_dbox_nokia_old.png" usemap="#rc" alt="remote" />
<map name="rc" id="rc">
<area shape="rect" href="javascript:rcsim('KEY_SETUP')" coords="7,95,45,109" />
<area shape="circle" href="javascript:rcsim('KEY_7')" coords="60,102,10" />
@@ -889,7 +900,7 @@ end-block~rc_dbox_nokia_old
# ------- Remote d-Box Philips/Sagem
start-block~rc_dbox_philips
<img src="images/rc_dbox_philips.jpg" usemap="#rc" alt="remote" />
<img src="images/rc_dbox_philips.png" usemap="#rc" alt="remote" />
<map name="rc" id="rc">
<area shape="poly" href="javascript:rcsim('KEY_RIGHT')" coords="100,117,100,180,67,146,100,116" />
<area shape="poly" href="javascript:rcsim('KEY_DOWN')" coords="36,181,101,180,66,146" />

View File

@@ -1,7 +1,7 @@
{=include-block:Y_Blocks.txt;head_no_charset=}
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252"/>
</head>
<body>
<body class="iframe">
<table class="bouquetlist" width="100%">
<tr class="blist"><td><a href="Y_Boxcontrol_Channellist.yhtm#akt" target="content">{=L:bc.channels=}</a></td></tr>
<tr><td><hr/></td></tr>

View File

@@ -16,7 +16,7 @@ function do_streaminfo() {
//]]>
</script>
</head>
<body>
<body class="iframe">
<table class="bouquetitemlist">
{=func:get_bouquets_with_epg {=bouquet=}=}
</table>

View File

@@ -174,7 +174,7 @@ function get_data(){
<table class="y_text_boxcontrol_table" cellspacing="0" cellpadding="0" title="{=L:bc.menue.volumen_display=}">
<tr>
<td id="audiobar_left" width="100%"><img src="/images/blank.gif" height="1" width="0" alt="."/></td>
<td id="audiobar_right" width="0%" bgcolor="white"><img src="/images/blank.gif" height="1" width="0" alt="."/></td>
<td id="audiobar_right" width="0%"><img src="/images/blank.gif" height="1" width="0" alt="."/></td>
</tr>
</table>
<br/>
@@ -195,7 +195,7 @@ function get_data(){
</span>
<span class="control_icon" title="{=L:bc.menue.switch_to_tv=}">
<a href="javascript:set_mode('tv');">
<img src="/images/live.gif">
<img src="/images/live.png">
</a>
</span>
<span class="control_icon" title="{=L:bc.menue.switch_to_radio=}">
@@ -214,7 +214,7 @@ function get_data(){
<table class="y_text_boxcontrol_table_progress" cellspacing="0" cellpadding="0" title="{=L:bc.menue.sig_display=}">
<tr>
<td id="sigbar_left" width="100%"><img src="/images/blank.gif" height="1" width="0" alt="." /></td>
<td id="sigbar_right" width="0%" bgcolor="white"><img src="/images/blank.gif" height="1" width="0" alt="." /></td>
<td id="sigbar_right" width="0%"><img src="/images/blank.gif" height="1" width="0" alt="." /></td>
</tr>
</table>
</center>
@@ -223,7 +223,7 @@ function get_data(){
<table class="y_text_boxcontrol_table_progress" cellspacing="0" cellpadding="0" title="{=L:bc.menue.snr_display=}">
<tr>
<td id="snrbar_left" width="100%"><img src="/images/blank.gif" height="1" width="0" alt="." /></td>
<td id="snrbar_right" width="0%" bgcolor="white"><img src="/images/blank.gif" height="1" width="0" alt="." /></td>
<td id="snrbar_right" width="0%"><img src="/images/blank.gif" height="1" width="0" alt="." /></td>
</tr>
</table>
</center>

View File

@@ -0,0 +1,6 @@
/*
Tuxbox yWeb Style - Do not modify.
When you're a distributor, use your own styles/Y_Dist-<name>.css file.
When you're a user, use Y_User.css.
*/

View File

@@ -1,5 +1,4 @@
{=include-block:Y_Blocks.txt;head=}
<link rel="stylesheet" type="text/css" href="/Y_Ext_Filemgr.css"/>
<script type="text/javascript" src="/Y_Baselib.js"></script>
<script type="text/javascript" src="/prototype.js"></script>
<script type="text/javascript" src="/effects.js"></script>
@@ -77,7 +76,7 @@ CyExplorer.prototype = {
else
fnamestr = "<a href='javascript:do_prop(\""+editlink+"\")'>"+fp.get('fname')+"</a>";
/* if(editlink != "")
fdate = "<a href='' edit='"+editlink+"' ycontextmenu=\"imgmenu\"><img src=\"/images/properties.gif\"></a>"+fp.get('date');
fdate = "<a href='' edit='"+editlink+"' ycontextmenu=\"imgmenu\"><img src=\"/images/properties.png\"></a>"+fp.get('date');
*/
var file_cell = new Element( 'td',{name: 'file'}).update(fnamestr);
mycurrent_row.insert(file_cell);
@@ -482,7 +481,7 @@ function prop_plugin_img(fullfname)
function prop_plugin_ts(fullfname)
{
$('ext_title').update("Stream File");
var html="<a href='/tmp/vlc.m3u?"+Math.random()+"' target='_blank'><img src='/images/vlc.gif'>start vlc</a>";
var html="<a href='/tmp/vlc.m3u?"+Math.random()+"' target='_blank'><img src='/images/vlc.png'>start vlc</a>";
$('ext_content').update(html);
$('ext_diag').show();
}
@@ -553,7 +552,7 @@ function do_download(){
}
function do_edit(){
if($F('ftype') != "d")
window.open("/Y_Ext_Filemgr_Edit.yhtm?file="+explorer.build_fname(),"edit", "width=800,height=600,resizable=yes");
window.open("/Y_Filemgr_Edit.yhtm?file="+explorer.build_fname(),"edit", "width=800,height=600,resizable=yes");
else
alert("you can not edit a directory");
}
@@ -576,8 +575,8 @@ function ni() {
<table class="toolbar" cellspacing="1" cellpadding="1">
<tr>
<td title="go to top dir"><a href='javascript:do_dirview("/")'><img src="/images/home.png"/></a></td>
<td title="go one dir up"><a href='javascript:do_go_up_dir()'><img src="/images/dir_up.gif"/></a></td>
<td title="refresh"><a href='javascript:refresh_dirview()'><img src="/images/reload.gif"/></a></td>
<td title="go one dir up"><a href='javascript:do_go_up_dir()'><img src="/images/dir_up.png"/></a></td>
<td title="refresh"><a href='javascript:refresh_dirview()'><img src="/images/reload.png"/></a></td>
<td title="add folder here"><a href='javascript:add_folder_dialog()'><img src="/images/folder_add.png"/></a></td>
<td title="upload"><a href='javascript:upload_dialog()'><img src="/images/upload.png"/></a></td>
<td title="paste item"><a href="javascript:do_paste()"><img src="/images/paste.gif"/></a></td>
@@ -693,7 +692,7 @@ function ni() {
<tr><td align="right">
<input type="hidden" name="dummy" value="/"/>
<input type="hidden" name="path" value="/"/>
<input type="hidden" name="tmpl" value="/Y_Ext_Filemgr.yhtm"/>
<input type="hidden" name="tmpl" value="/Y_Filemgr.yhtm"/>
<input type="hidden" name="execute" value=""/>
<input type="button" value="upload" name="su" onclick="do_upload()"/>

View File

@@ -1,5 +1,4 @@
{=include-block:Y_Blocks.txt;head=}
<link rel="stylesheet" type="text/css" href="/Y_Ext_Filemgr.css"/>
<script type="text/javascript" src="/Y_Baselib.js"></script>
<script type="text/javascript" src="/prototype.js"></script>
<script type="text/javascript">
@@ -52,13 +51,13 @@ function ni(){
<td title="cut text"><a href="javascript:ni()"><img src="/images/cut.gif"/></a></td>
<td title="paste item"><a href="javascript:ni()"><img src="/images/paste.gif"/></a></td>
-->
<td title="reload"><a href='javascript:do_reload()'><img src="/images/reload.gif"/></a></td>
<td title="reload"><a href='javascript:do_reload()'><img src="/images/reload.png"/></a></td>
<td title="close without save"><a href='javascript:window.close()'><img src="/images/cross.png"/></a></td>
</tr>
</table>
<form name="f" accept-charset="UTF-8" action="/y/cgi?execute=include-block:Y_Ext_Filemgr_blocks.txt;edit_save_settings;nix" method="POST">
<form name="f" accept-charset="UTF-8" action="/y/cgi?execute=include-block:Y_Filemgr_blocks.txt;edit_save_settings;nix" method="POST">
<textarea id="txt" name="editfile" cols="100" rows="31" wrap="off" title="Editor" style="width:100%;background : white; font : 'Courier New',medium monospace; color : #333333;">{=include:{=file=}=}</textarea>
<input type="hidden" name="tmpl" value="Y_Ext_Filemgr_Edit.yhtm"/>
<input type="hidden" name="tmpl" value="Y_Filemgr_Edit.yhtm"/>
<input type="hidden" name="file" value="{=file=}"/>
</form>
</div>

View File

@@ -90,7 +90,7 @@ function view_transcode_mode(){
<button id="epg" class="y_live_button" type="button" title="{=L:live.view_epg=}" onclick="view_epg()" disabled="disabled">
<img src="/images/epg.png"/></button>
<button id="epg_reload" class="y_live_button" type="button" title="{=L:live.reload=}" onclick="view_epg_reload()">
<img src="/images/reload.gif"/></button>
<img src="/images/reload.png"/></button>
</td></tr>
<tr id="subsRow" style="display:none">
<td>

View File

@@ -101,12 +101,12 @@ function _show_epg()
//]]>
</script>
</head>
<body onload="show_epg()">
<body onload="show_epg()" class="iframe">
{=var-set:wait_text={=L:get_epg=}=}{=include-block:Y_Blocks.txt;snip_show_wait=}
<table id="epglist" class="y_invisible_table" cellpadding="4" cellspacing="0" width="100%">
<thead align="left">
<tr>
<th colspan="2"><img id="logo" src="{=ini-get:/var/tuxbox/config/nhttpd.conf;Tuxbox.LogosURL=}/{=logoid=}.jpg" style="visibility:hidden"/>&nbsp;</th>
<th colspan="2"><img id="logo" src="{=ini-get:/var/tuxbox/config/nhttpd.conf;Tuxbox.LogosURL=}/{=logoid=}.png" style="visibility:hidden; max-width: 50px;"/>&nbsp;</th>
<th>{=L:date=}</th><th>{=L:from=}</th><th>{=L:to=}</th><th>{=L:program=}</th>
</tr>
</thead>

View File

@@ -11,7 +11,7 @@ function show_info(_desc, _info1, _info2){
</script>
</head>
<a href="javascript:window.history.back()"><u>{=L:back=}</u></a>
<body>
<body class="iframe">
<div class="y_epg_info">
<div id="description">&nbsp;</div>
<div id="info1">&nbsp;</div>

View File

@@ -43,7 +43,7 @@ button[ytype]{
button[ytype="save"]{background-image:url(/images/save.png);}
button[ytype="saveall"]{background-image:url(/images/saveall.png);}
button[ytype="cancel"]{background-image:url(/images/cross.png);}
button[ytype="refresh"],button[ytype="reboot"]{background-image:url(/images/reload.gif);}
button[ytype="refresh"],button[ytype="reboot"]{background-image:url(/images/reload.png);}
button[ytype="record"]{background-image:url(/images/record.png);}
button[ytype="zap"]{background-image:url(/images/zap.png);}
button[ytype="timeup"]{background-image:url(/images/time_up.png);}
@@ -53,7 +53,7 @@ button[ytype="snapshot"]{background-image:url(/images/snapshot.png);}
button[ytype="clearshot"]{background-image:url(/images/remove.png);}
button[ytype="switchrc"]{background-image:url(/images/fb.png);}
button[ytype="go"]{background-image:url(/images/accept.png);}
button[ytype="download"]{background-image:url(/images/wget.gif);}
button[ytype="download"]{background-image:url(/images/wget.png);}
button[ytype="clear"]{background-image:url(/images/remove.png);}
button[ytype="add"]{background-image:url(/images/new.png);}
button[ytype="delete"]{background-image:url(/images/remove.png);}
@@ -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;
@@ -552,7 +556,7 @@ tr {
.y_text_boxcontrol_table {
width:114px;
height: 23px;
background: url('/images/audiobar.gif') no-repeat 1px 1px;
background: url('/images/audiobar.png') no-repeat 1px 1px;
padding: 1px;
margin-top: 10px;
border: #FF8e42 solid 1px;
@@ -581,6 +585,12 @@ tr {
margin-top: 5px;
margin-bottom: -1px;
}
#audiobar_right,
#sigbar_right,
#snrbar_right {
background-color: #ffffff;
}
.y_epg_info {
border: 1px solid #CCCCCC;
background-color: white;
@@ -954,3 +964,61 @@ img#shot {
img#shot:hover {
cursor: pointer;
}
/* Filemgr */
.diag {
border: 1px solid #bbbbbb;
border-collapse: collapse;
background-color: #eeeeee;
margin-left: 10px;
margin-top: 10px;
}
.toolbar td {
border: 1px solid #cccccc;
width: 20px;
height: 20px;
text-align: center;
}
.toolbar img {
border:0;
}
.toolbar td:hover {
background-color: #dddddd;
}
.button {
border: 1px solid #cccccc;
width: 40px;
height: 20px;
text-align: center;
}
.button:hover {
background-color: #dddddd;
}
.mform {
empty-cells:show;
}
.filelist a {
text-decoration:underline;
}
.box {
border: 1px solid #cccccc;
empty-cells:show;
}
.epginfo2 {
font-size: 8pt;
}
.detail_title {
border: 1px solid #cccccc;
font-weight: bold;
background-color: #ffffff;
}
.detail_title_active {
border: 1px solid #cccccc;
font-weight: bold;
background-color: #eeeeee;
}
.detail_img {
max-width: 300px;
max-height:300px;
}

View File

@@ -75,7 +75,7 @@ function vlc() {
</script>
<style>
#prim{
background: url(/images/tux-yweb.gif) no-repeat left top;
background: url(/images/tux-yweb.png) no-repeat left top;
height:38px;
}
</style>
@@ -101,18 +101,20 @@ function vlc() {
title="{=L:main.tools_desc=}">{=L:main.tools=}</a></li>
<li><a target="base" href="Y_Dyn_Pages.yhtm?page=frame_settings"
title="{=L:main.settings_desc=}">{=L:main.settings=}</a></li>
<!-- unused
<li><a target="base" href="Y_Dyn_Pages.yhtm?page=frame_ext"
title="{=L:main.extensions_desc=}">{=L:main.extensions=}</a></li>
-->
<li><a target="base" href="Y_Dyn_Pages.yhtm?page=frame_info"
title="{=L:main.info_desc=}">{=L:main.info=}</a></li>
</ul>
</td>
<td>
<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_Dyn_Pages.yhtm?page=frame_live_directtv" title={=L:main.live_tv_desc=}><img src="/images/live.png"></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.png"></a>
<a target="base" href="Y_Tools_Screenshot.yhtm?osd=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>
<a href="javascript:vlc()" title="{=L:main.stream_to_vlc_client_desc=}"><img src="/images/vlc.png"></a>
</span>
</td>
<td align="right">

View File

@@ -44,7 +44,6 @@ function init(){
{=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>

View File

@@ -1,36 +0,0 @@
<html>
<head>
<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">
<link rel="stylesheet" type="text/css" href="/Y_Main.css">
<script language="JavaScript" type="text/javascript">
function do_it()
{
_url="/control/exec?Y_Plugins&skin_set&"+
document.f.skin.value;
parent.frames[1].location.href=_url;
}
</script>
</head>
<body>
<br>
<div class="y_head">Skin {=var-set:help_url=Neutrino:yWeb:Settings#Skins=}{=include-block:Y_Blocks.txt;wiki_help=}</div>
<div class="y_work_box">
<form name="f" action="">
<table border="0">
<tr>
<td>Skin</td>
<td><select size="1" name="skin">
{=script:Y_Plugins skin_get=}
</select></td>
<td>&nbsp;</td>
</tr>
</table>
<br>
<input type="button" value="Setzen" name="B1" title="submit values" onClick='do_it()'>
</form>
</div>
</body>
</html>

View File

@@ -5,8 +5,25 @@
//<![CDATA[
function do_submit(){
show_waitbox(true);
do_reload = false;
style_new = document.f.style.value;
if (style_old != style_new)
{
do_reload = true;
loadSyncURL("/control/exec?Y_Tools&style_set&" + style_new);
}
yhttpd_cache_clear("");
document.f.submit();
if (do_reload == true)
{
alert("Style changed. Maybe you'll have to reload this site.");
/* ugly mess */
top.top_main.prim_menu.location.reload();
top.top_main.base.sec_menu.location.reload();
//FIXME top.top_main.base.work.location.reload();
top.top_left.location.reload();
top.top_right.location.reload();
}
}
function do_init(){
val = "{=ini-get:/var/tuxbox/config/Y-Web.conf;fb;0~open=}";
@@ -34,9 +51,16 @@ function do_init(){
case "control": sel=1; break;
}
document.f.start_page.selectedIndex = sel;
style_old = "{=ini-get:/var/tuxbox/config/Y-Web.conf;style~cache=}";
}
//]]>
</script>
<style type="text/css">
input[type="text"],
select {
width: 220px;
}
</style>
</head>
<body onload="do_init()">
{=var-set:wait_text={=L:save_values=}=}{=include-block:Y_Blocks.txt;snip_wait=}
@@ -104,11 +128,21 @@ function do_init(){
</tr>
<tr>
<td>{=L:set.yweb.start_page=}</td>
<td colspan="3"> <select name="start_page" title="{=L:start_page=}">
<option value="bouquets" selected="selected">{=L:bc.menue.bouquets=}</option>
<option value="control">{=L:bc.menue.control=}</option>
<option value="none">{=L:empty=}</option>
</select></td>
<td colspan="3">
<select name="start_page" title="{=L:start_page=}">
<option value="bouquets" selected="selected">{=L:bc.menue.bouquets=}</option>
<option value="control">{=L:bc.menue.control=}</option>
<option value="none">{=L:empty=}</option>
</select>
</td>
</tr>
<tr>
<td>Styles</td>
<td>
<select name="style" title="Style">
{=script:Y_Tools style_get=}
</select>
</td>
</tr>
</table>
<br/>
@@ -118,7 +152,6 @@ function do_init(){
</form>
</div>
</div>
</body>
</html>
{=include-block:Y_Blocks.txt;management_check_bottom=}

View File

@@ -47,7 +47,7 @@
</td>
<td>
<a href="javascript:location.reload()">
<img src="/images/reload.gif" alt="Aktualisieren"/></a>
<img src="/images/reload.png" alt="Aktualisieren"/></a>
</td>
</tr>
</table>

View File

@@ -23,7 +23,6 @@ function init(){
<div class="y_menu_sec_section">{=L:main.tools=}</div>
<div class="y_menu_sec">
<ul id="secmenu_tools">
{=if-not-equal:{=global-var-get:boxtype=}~coolstreamm~
<li>
{=if-empty:{=var-get:automount=}~
<a href="javascript:void(0)" class="disabled" title="{=L:tools.not_installed=}">{=L:tools.automount=}</a>
@@ -40,7 +39,12 @@ function init(){
{=var-set:m_link_text={=L:tools.mounts=}=}
{=include-block:Y_Blocks.txt;management_link=}
</li>
~=}
<li>
{=var-set:m_link_href=Y_Filemgr.yhtm=}
{=var-set:m_link_desc={=L:tools.filemgr_desc=}=}
{=var-set:m_link_text={=L:tools.filemgr=}=}
{=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>

View File

@@ -110,7 +110,7 @@ function do_switchrc_txt(){
</div>
</div>
<table cellpadding="0">
<table cellpadding="0" class="screenshot">
<tr>
<td id="remote" {=if-empty:{=noremote=}~~style="display: none"=}>
{=include-block:Y_Blocks.txt;remote=}

10
src/nhttpd/web/Y_User.css Normal file
View File

@@ -0,0 +1,10 @@
/* Y_User.css - User style sheet for yWeb */
/*
body {
background-color: #eee;
}
body.iframe {
background-color: #fff;
}
*/

View File

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

View File

@@ -4,8 +4,10 @@
<head>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<title>yWeb</title>
<link rel="stylesheet" type="text/css" href="/Y_Main.css" />
<link rel="stylesheet" type="text/css" href="/Y_Dist.css" />
<link rel="stylesheet" type="text/css" href="/Y_User.css" />
</head>
<body>
</body>
</html>

View File

@@ -1,44 +0,0 @@
# ===========================================================
# yWeb SDK: Extention Unnstaller Include
# Extention Name: filemgr
# by yjogol
# -----------------------------------------------------------
# $Date: 2007-12-29 17:08:16 $
# $Revision: 1.3 $
# ===========================================================
yI_updatename="yWeb-Extension filemgr (02.02.2008)"
yI_Ext_Tag="filemgr"
yI_Ext_Version="1-0-0"
yI_uninstall_log="$y_path_tmp/uninstall_filemgr.log"
yI_uninstaller="filemgr_uninstall.inc"
uninstall()
{
rm $y_ywebover_dir/Y_Ext_Filemgr.yhtm
rm $y_ywebover_dir/Y_Ext_Filemgr.css
rm $y_ywebover_dir/Y_Ext_Filemgr_Edit.yhtm
rm $y_ywebover_dir/Y_Ext_Filemgr_blocks.txt
# rm $y_ywebover_dir/accordion.js
# rm $y_ywebover_dir/effects.js
rm $y_ywebover_dir/scripts/Y_NAS*
rm $y_ywebover_dir/images/chmod.png
rm $y_ywebover_dir/images/copy.gif
rm $y_ywebover_dir/images/cut.png
# rm $y_ywebover_dir/images/delete.gif
rm $y_ywebover_dir/images/dir_up.gif
rm $y_ywebover_dir/images/download.png
rm $y_ywebover_dir/images/folder_add.png
rm $y_ywebover_dir/images/ftype_file.png
rm $y_ywebover_dir/images/ftype_folder.png
rm $y_ywebover_dir/images/ftype_link.png
rm $y_ywebover_dir/images/home.png
rm $y_ywebover_dir/images/package.png
rm $y_ywebover_dir/images/page_edit.png
rm $y_ywebover_dir/images/paste.gif
rm $y_ywebover_dir/images/picture.png
rm $y_ywebover_dir/images/rename.gif
rm $y_ywebover_dir/images/text.png
rm $y_ywebover_dir/images/upload.png
rm $y_ywebover_dir/images/work.gif
}

View File

@@ -1,56 +0,0 @@
.diag {
border: 1px solid #bbbbbb;
border-collapse: collapse;
background-color: #eeeeee;
margin-left: 10px;
margin-top: 10px;
}
.toolbar td {
border: 1px solid #cccccc;
width: 20px;
height: 20px;
text-align: center;
}
.toolbar img {
border:0;
}
.toolbar td:hover {
background-color: #dddddd;
}
.button {
border: 1px solid #cccccc;
width: 40px;
height: 20px;
text-align: center;
}
.button:hover {
background-color: #dddddd;
}
.mform {
empty-cells:show;
}
.filelist a{
text-decoration:underline;
}
.box {
border: 1px solid #cccccc;
empty-cells:show;
}
.epginfo2{
font-size: 8pt;
}
.detail_title{
border: 1px solid #cccccc;
font-weight: bold;
background-color: #ffffff;
}
.detail_title_active{
border: 1px solid #cccccc;
font-weight: bold;
background-color: #eeeeee;
}
.detail_img {
max-width: 300px;
max-height:300px;
}

Binary file not shown.

Before

Width:  |  Height:  |  Size: 609 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 345 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 620 B

View File

@@ -1,20 +0,0 @@
# ===========================================================
# yWeb SDK: Extention Installer Include
# Extention Name: filemgr
# by yjogol
# -----------------------------------------------------------
# $Date: 2007-12-29 10:11:37 $
# $Revision: 1.2 $
# ===========================================================
yI_updatename="yWeb-Extension filemgr (02.02.2008)"
yI_Ext_Tag="filemgr"
yI_Ext_Version="1-0-0"
yI_install_log="$y_path_tmp/install_filemgr.log"
yI_uninstaller="filemgr_uninstall.sh"
install()
{
cp -r /tmp/files/httpd/* $y_ywebover_dir
chmod 755 $y_ywebover_dir/scripts/*.sh
}

View File

@@ -1,143 +0,0 @@
# ===========================================================
# yWeb Extension: Install an Extension
# by yjogol
# -----------------------------------------------------------
# $Date: 2007-12-29 10:11:37 $
# $Revision: 1.3 $
# -----------------------------------------------------------
# Script starts in /tmp
# ===========================================================
# -----------------------------------------------------------
# Installer Configs
# -----------------------------------------------------------
yI_Version="$Revision: 1.3 $"
# -----------------------------------------------------------
# Dirs
# -----------------------------------------------------------
y_path_usrbin="/var/bin"
y_path_config="/var/tuxbox/config"
y_path_tmp="/tmp"
y_ywebover_dir="/var/httpd"
y_ext_conf_dir="$y_path_config/ext"
# -----------------------------------------------------------
# Files
# -----------------------------------------------------------
y_config_Y_Web="$y_path_config/Y-Web.conf"
y_config_nhttpd="$y_path_config/nhttpd.conf"
y_config_neutrino="$y_path_config/neutrino.conf"
y_upload_file="$y_path_tmp/upload.tmp"
# ===========================================================
# config-Dateien - lesen / schreiben
# (Zeilenformat: VarName=VarValue)
# ===========================================================
cfg=""
# -----------------------------------------------------------
# config-Datei lesen/cachen (Inhalt in $cfg)
# $1=config-Filename
# -----------------------------------------------------------
config_open()
{
cfg=""
cfg=`cat $1`
}
# -----------------------------------------------------------
# config-Datei schreiben (Inhalt in $cfg)
# $1=config-Filename
# -----------------------------------------------------------
config_write()
{
echo "$cfg" >$1
}
# -----------------------------------------------------------
# Variablenwert zurueckgeben (vorher open)
# $1=VarName
# -----------------------------------------------------------
config_get_value()
{
cmd="sed -n /^$1=/p"
tmp=`echo "$cfg" | $cmd`
cmd="sed -e s/^$1=//1"
tmp=`echo "$tmp" | $cmd`
echo $tmp
}
# -----------------------------------------------------------
# Variablenwert zurueckgeben (ohne open)
# $1=config-Filename
# $2=VarName
# -----------------------------------------------------------
config_get_value_direct()
{
config_open $1
config_get_value $2
}
# -----------------------------------------------------------
# Variablenwert setzen (vorher open)
# $1=VarName)
# $2=VarValue
# -----------------------------------------------------------
config_set_value()
{
tmp=`echo "$cfg" | sed -n "/^$1=.*/p"`
if [ "$tmp" = "" ]
then
cfg=`echo -e "$cfg\n$1=$2"`
else
cmd="sed -e s/^$1=.*/$1=$2/g"
cfg=`echo "$cfg" | $cmd`
fi
}
# -----------------------------------------------------------
# Variablenwert zurueckgeben (ohne open)
# $1=config-Filename
# $2=VarName)
# $3=VarValue
# -----------------------------------------------------------
config_set_value_direct()
{
config_open $1
config_set_value $2 $3
config_write $1
}
# ===========================================================
# Initialization
# ===========================================================
. ./install.inc
hp=`config_get_value_direct "$y_config_nhttpd" "WebsiteMain.override_directory"`
if [ "$hp" != "" ]; then
y_ywebover_dir=`echo "$hp"`
fi
mkdir -p $y_ywebover_dir
chmod -R oug+rw $y_ywebover_dir
# -----------------------------------------------------------
# prepare log
# -----------------------------------------------------------
date +%y%m%d_%H%M%S >"$yI_install_log"
echo "" >>yI_install_log
echo "installing $yI_updatename [$yI_Ext_Tag/$yI_Ext_Version]" >>"yI_install_log"
echo "installdir: $y_ywebover_dir"
# -----------------------------------------------------------
# Install (from install.inc)
# -----------------------------------------------------------
install
# -----------------------------------------------------------
# finishing
# -----------------------------------------------------------
mkdir -p $y_ext_conf_dir
chmod oug+rw $y_ext_conf_dir
chmod 755 ./uninstall*
cp ./uninstall.sh "$y_ext_conf_dir/"
cp ./*uninstall.inc "$y_ext_conf_dir/"
# -----------------------------------------------------------
# Clean Up
# -----------------------------------------------------------
cd /tmp
rm -r /tmp/files

View File

@@ -1,136 +0,0 @@
# ===========================================================
# yWeb Extension: Unnstall an Extension
# by yjogol
# -----------------------------------------------------------
# $Date: 2007-12-29 17:08:16 $
# $Revision: 1.4 $
# -----------------------------------------------------------
# Script starts in /tmp
# ===========================================================
# -----------------------------------------------------------
# Installer Configs
# -----------------------------------------------------------
yI_Version="$Revision: 1.4 $"
# -----------------------------------------------------------
# Dirs
# -----------------------------------------------------------
y_path_usrbin="/var/bin"
y_path_config="/var/tuxbox/config"
y_path_tmp="/tmp"
y_ywebover_dir="/var/httpd"
y_ext_conf_dir="$y_path_config/ext"
# -----------------------------------------------------------
# Files
# -----------------------------------------------------------
y_config_Y_Web="$y_path_config/Y-Web.conf"
y_config_nhttpd="$y_path_config/nhttpd.conf"
y_config_neutrino="$y_path_config/neutrino.conf"
y_upload_file="$y_path_tmp/upload.tmp"
# ===========================================================
# config-Dateien - lesen / schreiben
# (Zeilenformat: VarName=VarValue)
# ===========================================================
cfg=""
# -----------------------------------------------------------
# config-Datei lesen/cachen (Inhalt in $cfg)
# $1=config-Filename
# -----------------------------------------------------------
config_open()
{
cfg=""
cfg=`cat $1`
}
# -----------------------------------------------------------
# config-Datei schreiben (Inhalt in $cfg)
# $1=config-Filename
# -----------------------------------------------------------
config_write()
{
echo "$cfg" >$1
}
# -----------------------------------------------------------
# Variablenwert zurueckgeben (vorher open)
# $1=VarName
# -----------------------------------------------------------
config_get_value()
{
cmd="sed -n /^$1=/p"
tmp=`echo "$cfg" | $cmd`
cmd="sed -e s/^$1=//1"
tmp=`echo "$tmp" | $cmd`
echo $tmp
}
# -----------------------------------------------------------
# Variablenwert zurueckgeben (ohne open)
# $1=config-Filename
# $2=VarName
# -----------------------------------------------------------
config_get_value_direct()
{
config_open $1
config_get_value $2
}
# -----------------------------------------------------------
# Variablenwert setzen (vorher open)
# $1=VarName)
# $2=VarValue
# -----------------------------------------------------------
config_set_value()
{
tmp=`echo "$cfg" | sed -n "/^$1=.*/p"`
if [ "$tmp" = "" ]
then
cfg=`echo -e "$cfg\n$1=$2"`
else
cmd="sed -e s/^$1=.*/$1=$2/g"
cfg=`echo "$cfg" | $cmd`
fi
}
# -----------------------------------------------------------
# Variablenwert zurueckgeben (ohne open)
# $1=config-Filename
# $2=VarName)
# $3=VarValue
# -----------------------------------------------------------
config_set_value_direct()
{
config_open $1
config_set_value $2 $3
config_write $1
}
# ===========================================================
# Initialization
# ===========================================================
. $y_ext_conf_dir/$1
hp=`config_get_value_direct "$y_config_nhttpd" "WebsiteMain.override_directory"`
if [ "$hp" != "" ]; then
y_ywebover_dir=`echo "$hp"`
fi
mkdir -p $y_ywebover_dir
# -----------------------------------------------------------
# prepare log
# -----------------------------------------------------------
date +%y%m%d_%H%M%S >"$yI_uninstall_log"
echo "" >>"$yI_uninstall_log"
echo "uninstalling $yI_updatename [$yI_Ext_Tag/$yI_Ext_Version]" >>"$yI_uninstall_log"
#echo "installdir: $y_ywebover_dir"
# -----------------------------------------------------------
# Uninstall (from uninstal_<tag>.inc)
# -----------------------------------------------------------
uninstall
# -----------------------------------------------------------
# finishing
# -----------------------------------------------------------
rm $y_ext_conf_dir/$1
# -----------------------------------------------------------
# Clean Up
# -----------------------------------------------------------

View File

@@ -14,7 +14,8 @@ disc1="/dev/ide/host0/bus0/target0/lun0/disc"
y_format_message_html()
{
tmp="<html><head><meta http-equiv='Content-Type' content='text/html; charset=windows-1252'>"
tmp="$tmp <link rel='stylesheet' type='text/css' href='/Y_Main.css'></head>"
tmp="$tmp <link rel='stylesheet' type='text/css' href='/Y_Main.css'>"
tmp="$tmp <link rel='stylesheet' type='text/css' href='/Y_User.css'></head>"
tmp="$tmp <body><div class='work_box'><div class='work_box_head'><div class='work_box_head_h2'>Results</div></div><div class='work_box_body' style='overflow:auto'>"
tmp="$tmp <pre>\n$msg\n</pre></div></div></body></html>"

View File

@@ -1,19 +1,11 @@
Same pictures used are form the Tuxbox Community:
Published under GPL v2
- rc_dbox_nokia_old.jpg : Jonny Spitzner <jonnyspitzner@gmx.de>
- rc_dbox_philips.jpg : Jonny Spitzner <jonnyspitzner@gmx.de>
- tux.gif : from wiki.tuxbox.org
From Johannes Golombek yjogol@online.de:
Published under GPL v2
- y.png
- audiobar.gif
- audiobar.png
- blank.gif
- help_white.gif
From old (before yWeb):
Published under GPL v2
- elist.gif
- elist.png
- streaminfo.png
All others are from Mark James (www.famfamfam.com)

View File

@@ -1,26 +1,18 @@
installdir = $(DATADIR)/neutrino/httpd/images
install_DATA = accept.png \
addfolder.gif \
alert.gif \
arrowdown.gif \
arrowdown.png \
arrowleft.png \
arrowright.png \
arrowup.gif \
arrowup.png \
audiobar.gif \
audiobar.png \
blank.gif \
check_green.gif \
chmod.gif \
comment.gif \
check_green.png \
comment.png \
cross.png \
delete.gif \
download.gif \
elist.gif \
elist.png \
epg.png \
excl_yellow.gif \
exlink.gif \
ext_add.png \
ext_delete.png \
@@ -39,43 +31,30 @@ install_DATA = accept.png \
ftype_link.gif \
fullscreen.png \
help.gif \
help_white.gif \
hidden.gif \
hidden.png \
home-dir.gif \
hourglas.gif \
info.png \
inlink.gif \
live.gif \
livelock.png \
live.png \
live_popup.gif \
live_popup.png \
livelock.png \
liveunlock.png \
lock.gif \
lock.png \
modify.png \
new.gif \
new.png \
ok.gif \
pause.png \
play.png \
popup.png \
properties.gif \
properties.png \
radio.png \
rc_cst_v1.jpg \
rc_cst_v2.jpg \
rc_cst_v3.jpg \
rc_cst_v4.jpg \
rc_cst_v5.jpg \
rc_cst_v6.jpg \
rc_dbox_nokia_old.jpg \
rc_dbox_philips.jpg \
record.gif \
rc_cst_v2.png \
rc_cst_v3.png \
rc_cst_v4.png \
rc_cst_v5.png \
rc_cst_v6.png \
rc_dbox_nokia_old.png \
rc_dbox_philips.png \
record.png \
reload.gif \
remotescreen.gif \
reload.png \
remove.png \
rename.gif \
saveall.png \
@@ -89,23 +68,35 @@ install_DATA = accept.png \
timer.gif \
time_up.png \
transcode.png \
tux.gif \
tux-yweb.gif \
tux-yweb.png \
udp_switch_off.png \
udp_switch_on.png \
unlock.gif \
unlock.png \
upload.gif \
visible.gif \
visible.png \
vlc.gif \
vlc.png \
volumedown.png \
volumemute.png \
volumeunmute.png \
volumeup.png \
wait.gif \
wget.gif \
x_red.gif \
yjogol.gif \
y.png \
wget.png \
x_red.png \
zap.png
# file manager
install_DATA += chmod.png \
copy.gif \
cut.png \
dir_up.png \
download.png \
film.png \
folder_add.png \
ftype_file.png \
ftype_folder.png \
ftype_link.png \
home.png \
package.png \
page_edit.png \
paste.gif \
picture.png \
text.png \
upload.png \
work.gif

Binary file not shown.

Before

Width:  |  Height:  |  Size: 224 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 195 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 192 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 634 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 476 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 357 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 455 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 346 B

View File

Before

Width:  |  Height:  |  Size: 785 B

After

Width:  |  Height:  |  Size: 785 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 85 B

View File

Before

Width:  |  Height:  |  Size: 263 B

After

Width:  |  Height:  |  Size: 263 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 655 B

After

Width:  |  Height:  |  Size: 565 B

View File

Before

Width:  |  Height:  |  Size: 648 B

After

Width:  |  Height:  |  Size: 648 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 220 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 653 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 337 B

View File

Before

Width:  |  Height:  |  Size: 523 B

After

Width:  |  Height:  |  Size: 523 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 336 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 240 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 596 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 521 B

After

Width:  |  Height:  |  Size: 362 B

View File

Before

Width:  |  Height:  |  Size: 653 B

After

Width:  |  Height:  |  Size: 653 B

View File

Before

Width:  |  Height:  |  Size: 668 B

After

Width:  |  Height:  |  Size: 668 B

View File

Before

Width:  |  Height:  |  Size: 635 B

After

Width:  |  Height:  |  Size: 635 B

View File

Before

Width:  |  Height:  |  Size: 537 B

After

Width:  |  Height:  |  Size: 537 B

View File

Before

Width:  |  Height:  |  Size: 830 B

After

Width:  |  Height:  |  Size: 830 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 93 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 653 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 352 B

View File

Before

Width:  |  Height:  |  Size: 806 B

After

Width:  |  Height:  |  Size: 806 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 819 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 644 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 696 B

After

Width:  |  Height:  |  Size: 602 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 642 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 809 B

After

Width:  |  Height:  |  Size: 692 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 459 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 815 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 703 B

After

Width:  |  Height:  |  Size: 483 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 173 B

View File

Before

Width:  |  Height:  |  Size: 853 B

After

Width:  |  Height:  |  Size: 853 B

View File

Before

Width:  |  Height:  |  Size: 807 B

After

Width:  |  Height:  |  Size: 807 B

View File

Before

Width:  |  Height:  |  Size: 286 B

After

Width:  |  Height:  |  Size: 286 B

View File

Before

Width:  |  Height:  |  Size: 606 B

After

Width:  |  Height:  |  Size: 606 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 214 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 678 B

After

Width:  |  Height:  |  Size: 553 B

Binary file not shown.

Before

Width:  |  Height:  |  Size: 84 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 61 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 76 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 77 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 76 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 68 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 62 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 152 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 13 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 65 KiB

Some files were not shown because too many files have changed in this diff Show More