diff --git a/data/y-web/Makefile.am b/data/y-web/Makefile.am
index 19a3978ab..eb5958a13 100644
--- a/data/y-web/Makefile.am
+++ b/data/y-web/Makefile.am
@@ -3,7 +3,6 @@ SUBDIRS = images scripts languages styles
installdir = $(PRIVATE_HTTPDDIR)
install_DATA = channels.js \
- channels.txt \
extentions.txt \
favicon.ico \
index.html \
@@ -31,20 +30,11 @@ install_DATA = channels.js \
Y_Ext_Update.js \
Y_Ext_Update_refresh.yhtm \
Y_Ext_Update.yhtm \
- Y_Flash.js \
Y_Info_Help.yhtm \
Y_Info_Menue.yhtm \
Y_Info_Updates.yhtm \
- Y_Live_DoubleView.yhtm \
Y_Live_EPG_Info.yhtm \
Y_Live_EPG.yhtm \
- Y_Live.js \
- Y_Live_Menue.yhtm \
- Y_Live_Msg.yhtm \
- Y_Live_Record.yhtm \
- Y_Live_Transcode.yhtm \
- Y_LiveViewFull.yhtm \
- Y_Live.yhtm \
Y_Main.css \
Y_Menue.yhtm \
Y_neutrino_Blocks.txt \
@@ -55,17 +45,14 @@ install_DATA = channels.js \
Y_Settings_buttons.yhtm \
Y_Settings_glcd.yhtm \
Y_Settings_lcd.yhtm \
- Y_Settings_Live.yhtm \
Y_Settings_Menue.yhtm \
Y_Settings_mount_liste.yhtm \
Y_Settings_mount.yhtm \
Y_Settings_neutrino_forms.yhtm \
Y_Settings_nhttpd.yhtm \
Y_Settings_personalize.yhtm \
- Y_Settings_Timer.yhtm \
Y_Settings_umount_liste.yhtm \
Y_Settings_video_audio.yhtm \
- Y_Settings_VNC.yhtm \
Y_Settings_wol.yhtm \
Y_Settings_xmltv.yhtm \
Y_Settings_yWeb.yhtm \
@@ -73,28 +60,19 @@ install_DATA = channels.js \
Y_StreamInfo.yhtm \
Y_Timer_Edit.yhtm \
Y_Timer_List.yhtm \
- Y_Tools_Bootlogo.yhtm \
Y_Tools_Boxcontrol.yhtm \
Y_Tools_Check_Install.yhtm \
Y_Tools_Cmd.yhtm \
- Y_Tools_Flash_Menue.yhtm \
- Y_Tools_Flash_Upload.yhtm \
Y_Tools_Glcd_Screenshot.yhtm \
Y_Tools_Info_Menue.yhtm \
Y_Tools_Installer.yhtm \
- Y_Tools_lcshot.yhtm \
Y_Tools_Menue.yhtm \
Y_Tools_Rcsim.yhtm \
Y_Tools_Screenshot.yhtm \
- 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
diff --git a/data/y-web/Y_Baselib.js b/data/y-web/Y_Baselib.js
index dcd498964..e974904a8 100644
--- a/data/y-web/Y_Baselib.js
+++ b/data/y-web/Y_Baselib.js
@@ -1,7 +1,6 @@
/* yWeb Baselib by yjogol
- $Date$
- $Revision$
*/
+
var baselib_version="2.0.0";
var tmp = document.documentMode, e, isIE;
// Try to force this property to be a string.
@@ -21,16 +20,19 @@ function $yN(_obj_name)
{
return $(document.getElementsByName(_obj_name));
}
+
function id(obj_id)
{
return document.getElementById(obj_id);
}
+
function obj_update(obj_id, html)
{
var obj = id(obj_id);
if(obj)
obj.innerHTML = html;
}
+
function yClientHeight()
{
if(window.innerHeight)
@@ -40,6 +42,7 @@ function yClientHeight()
else if (document.body)
return document.body.clientHeight;
}
+
function yClientWidth()
{
if(window.innerWidth)
@@ -49,6 +52,7 @@ function yClientWidth()
else if (document.body)
return document.body.clientWidth;
}
+
function obj_create(_typ, _class)
{
var __obj = document.createElement(_typ);
@@ -58,12 +62,14 @@ function obj_create(_typ, _class)
__obj.setAttributeNode(__class);
return __obj;
}
+
function obj_createAt(_parent, _typ, _class)
{
var __obj = obj_create(_typ, _class);
_parent.appendChild(__obj);
return __obj;
}
+
function obj_get_radio_value(_obj_name)
{
var _obj = document.getElementsByName(_obj_name);
@@ -75,6 +81,7 @@ function obj_get_radio_value(_obj_name)
}
return "";
}
+
function obj_set_radio_value(_obj_name, _value)
{
var _obj = document.getElementsByName(_obj_name);
@@ -84,6 +91,7 @@ function obj_set_radio_value(_obj_name, _value)
_obj[i].checked = (_obj[i].value == _value);
}
}
+
function obj_clear_all_childs(_obj)
{
while(_obj.childNodes.length > 0)
@@ -93,6 +101,7 @@ function obj_clear_all_childs(_obj)
_obj.removeChild(aChild);
}
}
+
/*DHTML-Table*/
function y_add_row_to_table(_table, _class)
{
@@ -103,6 +112,7 @@ function y_add_row_to_table(_table, _class)
_table.appendChild(__row);
return __row;
}
+
function y_add_plain_cell_to_row(_row, _name)
{
var __cell=document.createElement("td");
@@ -110,6 +120,7 @@ function y_add_plain_cell_to_row(_row, _name)
_row.appendChild(__cell);
return __cell;
}
+
function y_add_text_cell_to_row(_row, _name, _value)
{
var __cell=y_add_plain_cell_to_row(_row, _name);
@@ -117,12 +128,14 @@ function y_add_text_cell_to_row(_row, _name, _value)
__cell.appendChild(__text);
return __cell;
}
+
function y_add_html_cell_to_row(_row, _name, _value)
{
var __cell=y_add_plain_cell_to_row(_row, _name);
__cell.innerHTML = _value;
return __cell;
}
+
function y_add_li_to_ul(_ul, _class, _value){
var __li=document.createElement("li");
var __class = document.createAttribute("class");
@@ -132,6 +145,7 @@ function y_add_li_to_ul(_ul, _class, _value){
__li.innerHTML=_value;
return __li;
}
+
function getXMLNodeItemValue(node, itemname)
{
@@ -141,6 +155,7 @@ function getXMLNodeItemValue(node, itemname)
return item[0].firstChild.nodeValue;
return "";
}
+
function setInnerHTML(_id, _html)
{
var item = document.getElementById(_id);
@@ -154,6 +169,7 @@ function obj_addAttributeNode(_obj, _attr, _value)
__attr.nodeValue = _value;
_obj.setAttributeNode(__attr);
}
+
/*XMLHttpRequest AJAX*/
var g_req;
function loadXMLDoc(_url, _processReqChange)
@@ -182,6 +198,7 @@ function loadXMLDoc(_url, _processReqChange)
else
alert("No Browser-support for XMLHttpRequest");
}
+
function loadSyncURL2(_url)
{
var myAjax = new Ajax.Request(
@@ -192,6 +209,7 @@ function loadSyncURL2(_url)
});
return myAjax.responseText;
}
+
function loadSyncURL(_url)
{
var _req;
@@ -219,6 +237,7 @@ function loadSyncURL(_url)
else
return "";
}
+
function loadSyncURLxml(_url)
{
var _req;
@@ -246,26 +265,31 @@ function loadSyncURLxml(_url)
else
return "";
}
+
/*visibility*/
function obj_disable(_obj_name, _disable)
{
var __obj = document.getElementById(_obj_name);
__obj.disabled = _disable;
}
+
function obj_enable(_obj_name, _disable)
{
obj_disable(_obj_name, !_disable);
}
+
function show_obj(_obj_name, _show)
{
var __obj = document.getElementById(_obj_name);
__obj.style.visibility= (_show) ? "visible" : "hidden";
}
+
function display_obj(_obj_name, _display)
{
var __obj = document.getElementById(_obj_name);
__obj.style.display = (_display) ? "block" : "none";
}
+
function show_waitbox(_show)
{
show_obj("wait", _show);
@@ -276,14 +300,17 @@ function l_trim(_str)
{
return _str.replace(/\s*((\S+\s*)*)/, "$1");
}
+
function r_trim(_str)
{
return _str.replace(/((\s*\S+)*)\s*/, "$1");
}
+
function trim(_str)
{
return l_trim(r_trim(_str));
}
+
function split_one(_str, _delimiter)
{
var __p = _str.indexOf(_delimiter);
@@ -291,28 +318,33 @@ function split_one(_str, _delimiter)
var __right = _str.substring(__p+_delimiter.length);
return new Array(__left, __right);
}
+
function split_left(_str, _delimiter)
{
var res = split_one(_str, _delimiter);
return res[0];
}
+
function split_right(_str, _delimiter)
{
var res = split_one(_str, _delimiter);
return res[1];
}
+
function de_qout(_str)
{
_str = _str.replace(/\"/g,""");
_str = _str.replace(/'/g,""");
return _str;
}
+
function epg_de_qout(_str)
{
_str = de_qout(_str);
_str = _str.replace(/\x8A/g,"
");
return _str;
}
+
function split_version(vstring,v){
var l=vstring.split(".");
v.set('major', (l.length>0)?l[0]:"0");
@@ -320,18 +352,21 @@ function split_version(vstring,v){
v.set('patch', (l.length>2)?l[2]:"0");
v.set('pre', (l.length>3)?l[3]:"0");
}
+
function version_less(l, r) /* l<= r?*/{
return (l.get('major') < r.get('major'))||
((l.get('major') == r.get('major')) && (l.get('minor') < r.get('minor'))) ||
((l.get('major') == r.get('major')) && (l.get('minor') == r.get('minor')) && (l.get('patch') < r.get('patch'))) ||
((l.get('major') == r.get('major')) && (l.get('minor') == r.get('minor')) && (l.get('patch') == r.get('patch')) && (l.get('pre') < r.get('pre')));
}
+
function version_le(l, r) /* l<= r?*/{
return (l.get('major') < r.get('major'))||
((l.get('major') == r.get('major')) && (l.get('minor') < r.get('minor'))) ||
((l.get('major') == r.get('major')) && (l.get('minor') == r.get('minor')) && (l.get('patch') < r.get('patch'))) ||
((l.get('major') == r.get('major')) && (l.get('minor') == r.get('minor')) && (l.get('patch') == r.get('patch')) && (l.get('pre') <= r.get('pre')));
}
+
function version_str_less(l, r) /* l<= r?*/{
var lh=$H();
split_version(l,lh);
@@ -339,6 +374,7 @@ function version_str_less(l, r) /* l<= r?*/{
split_version(r,rh);
return version_less(lh,rh);
}
+
function str_to_hash(str){
var h=new Hash();
var items=str.split(",");
@@ -349,6 +385,7 @@ function str_to_hash(str){
});
return h;
}
+
function hash_to_str(h){
var str="";
h.each(function(e){
@@ -357,6 +394,7 @@ function hash_to_str(h){
});
return str;
}
+
/*etc*/
function format_time(_t)
{
@@ -377,103 +415,88 @@ function bt_get_value(_bt_name)
else
return "";
}
+
function bt_set_value(_bt_name, _text)
{
var __button = document.getElementById(_bt_name);
__button.firstChild.nodeValue = _text;
}
-/*dbox*/
-/*expermental*/
+
function reload_neutrino_conf() {
loadSyncURL("/control/reloadsetup");
}
-function dbox_rcsim(_key){
+
+function stb_rcsim(_key){
loadSyncURL("/control/rcem?" + _key);
}
-function dbox_reload_neutrino(){
- var sc=dbox_exec_tools("restart_neutrino");
+
+function stb_reload_neutrino(){
+ var sc=stb_exec_tools("restart_neutrino");
}
-function dbox_exec_command(_cmd)
+
+function stb_exec_command(_cmd)
{
- alert("Function dbox_exec_command is deactivated for security reasons");
+ alert("Function stb_exec_command is deactivated for security reasons");
var __cmd = _cmd.replace(/ /g, "&");
-// return loadSyncURL("/control/exec?Y_Tools&exec_cmd&"+__cmd);
+ //return loadSyncURL("/control/exec?Y_Tools&exec_cmd&"+__cmd);
}
-function dbox_exec_tools(_cmd)
+
+function stb_exec_tools(_cmd)
{
var __cmd = _cmd.replace(/ /g, "&");
return loadSyncURL("/control/exec?Y_Tools&"+__cmd);
}
-function dbox_message(_msg)
+
+function stb_message(_msg)
{
return loadSyncURL("/control/message?nmsg="+_msg);
}
-function dbox_popup(_msg)
+
+function stb_popup(_msg)
{
return loadSyncURL("/control/message?popup="+_msg);
}
-function dbox_set_timer_rec(_channel_id, _start, _stop)
+
+function stb_set_timer_rec(_channel_id, _start, _stop)
{
var _url = "/control/timer?action=new&type=5&alarm="+_start+"&stop="+_stop+"&announce="+_start+"&channel_id="+_channel_id+"&rs=1";
return loadSyncURL(_url);
}
-function dbox_set_timer_zap(_channel_id, _start)
+
+function stb_set_timer_zap(_channel_id, _start)
{
var _url = "/control/timer?action=new&type=3&alarm="+_start+"&channel_id="+_channel_id;
return loadSyncURL(_url);
}
-function dbox_zapto(_channel_id)
+
+function stb_zapto(_channel_id)
{
var _url = "/control/zapto?"+_channel_id;
return loadSyncURL(_url);
}
-function dbox_spts_status()
-{
- return (trim(loadSyncURL("/control/system?getAViAExtPlayBack")) == "1");
-}
-function dbox_spts_set(_on)
-{
- return loadSyncURL("/control/system?setAViAExtPlayBack=" + (_on ? "spts" : "pes") );
-}
-function dbox_getmode()
+
+function stb_getmode()
{
return trim( loadSyncURL("/control/getmode") );
}
-function dbox_setmode(_mode)
+
+function stb_setmode(_mode)
{
return loadSyncURL("/control/setmode?" + _mode);
}
-/*live*/
-function live_kill_streams()
-{
- dbox_exec_command("killall streamts");
- dbox_exec_command("killall streampes");
-}
-function live_switchto(_mode)
-{
- //live_kill_streams();
- var _actual_spts = dbox_spts_status();
- if(_mode == "tv" && !_actual_spts)
- dbox_spts_set(true);
- else if(_mode == "radio" && _actual_spts)
- dbox_spts_set(false);
- var _actual_mode = dbox_getmode();
- if(_actual_mode != _mode)
- dbox_setmode(_mode);
-}
function live_lock()
{
- loadSyncURL("/control/lcd?lock=1&clear=1&rect=10,10,110,50,1,0&xpos=20&ypos=27&size=22&font=2&text=%20%20%20%20yWeb%0A%20%20LiveView&update=1");
loadSyncURL("/control/rc?lock");
loadSyncURL("/control/zapto?stopplayback");
}
+
function live_unlock()
{
- loadSyncURL("/control/lcd?lock=0");
loadSyncURL("/control/rc?unlock");
loadSyncURL("/control/zapto?startplayback");
}
+
function yhttpd_cache_clear(category)
{
if(category == "")
diff --git a/data/y-web/Y_Blocks.txt b/data/y-web/Y_Blocks.txt
index 438f7d29e..c58081d3c 100644
--- a/data/y-web/Y_Blocks.txt
+++ b/data/y-web/Y_Blocks.txt
@@ -6,181 +6,147 @@ start-block~timer