From 6033fafd7efae9185362fb0e22e1fe429a951405 Mon Sep 17 00:00:00 2001 From: Andreas Brachold Date: Sun, 27 Jul 2008 15:18:27 +0000 Subject: * Redesign SVDRP Communation to support more as one video disk recorder (Change database schema to version 30) --- skins/blue/vdrlist.tmpl | 1 + skins/blue_flat/vdrlist.tmpl | 1 + skins/deltab/clist.tmpl | 14 ++-- skins/deltab/now.tmpl | 2 +- skins/deltab/search.tmpl | 2 +- skins/deltab/style.css | 11 +++- skins/deltab/tlist.tmpl | 1 - skins/deltab/tooltip.js | 9 ++- skins/deltab/ulist.tmpl | 2 + skins/deltab/vdrlist.tmpl | 81 +++++++++++++++++++++++ skins/deltab/widgets/littlemenu.tmpl | 19 ++++-- skins/deltab/widgets/remote.tmpl | 47 ++++++++++++-- skins/lcars/vdrlist.tmpl | 1 + skins/lcars_flat/vdrlist.tmpl | 1 + skins/snow/vdrlist.tmpl | 1 + skins/snow_flat/style.css | 22 +++---- skins/snow_flat/vdrlist.tmpl | 1 + skins/stone/clist.tmpl | 48 ++++++++++---- skins/stone/now.tmpl | 2 +- skins/stone/search.tmpl | 2 +- skins/stone/skin.cfg | 3 + skins/stone/skin.cfg.default | 4 +- skins/stone/style.css | 2 + skins/stone/tlist.tmpl | 2 +- skins/stone/tooltip.js | 9 ++- skins/stone/vdrlist.tmpl | 118 ++++++++++++++++++++++++++++++++++ skins/stone/widgets/littlemenu.tmpl | 15 ++--- skins/stone/widgets/remote.tmpl | 47 ++++++++++++-- skins/stone_flat/clist.tmpl | 14 ++-- skins/stone_flat/now.tmpl | 2 +- skins/stone_flat/search.tmpl | 2 +- skins/stone_flat/style.css | 26 ++++---- skins/stone_flat/tlist.tmpl | 2 +- skins/stone_flat/vdrlist.tmpl | 98 ++++++++++++++++++++++++++++ skins/xstyle/bloecke/event_links.tmpl | 2 +- skins/xstyle/clist.tmpl | 14 ++-- skins/xstyle/mainmenu.inc | 63 ++++++++++-------- skins/xstyle/vdrlist.tmpl | 45 +++++++++++++ skins/xstyle/widgets/remote.tmpl | 47 ++++++++++++-- 39 files changed, 661 insertions(+), 122 deletions(-) create mode 120000 skins/blue/vdrlist.tmpl create mode 120000 skins/blue_flat/vdrlist.tmpl create mode 100644 skins/deltab/vdrlist.tmpl create mode 120000 skins/lcars/vdrlist.tmpl create mode 120000 skins/lcars_flat/vdrlist.tmpl create mode 120000 skins/snow/vdrlist.tmpl create mode 120000 skins/snow_flat/vdrlist.tmpl create mode 100644 skins/stone/vdrlist.tmpl create mode 100644 skins/stone_flat/vdrlist.tmpl create mode 100644 skins/xstyle/vdrlist.tmpl diff --git a/skins/blue/vdrlist.tmpl b/skins/blue/vdrlist.tmpl new file mode 120000 index 0000000..b800e1f --- /dev/null +++ b/skins/blue/vdrlist.tmpl @@ -0,0 +1 @@ +../stone/vdrlist.tmpl \ No newline at end of file diff --git a/skins/blue_flat/vdrlist.tmpl b/skins/blue_flat/vdrlist.tmpl new file mode 120000 index 0000000..064ef23 --- /dev/null +++ b/skins/blue_flat/vdrlist.tmpl @@ -0,0 +1 @@ +../stone_flat/vdrlist.tmpl \ No newline at end of file diff --git a/skins/deltab/clist.tmpl b/skins/deltab/clist.tmpl index 9001a4e..53f772e 100644 --- a/skins/deltab/clist.tmpl +++ b/skins/deltab/clist.tmpl @@ -31,7 +31,7 @@ - + " /> @@ -41,7 +41,7 @@ - : \'\' ?','?cmd=cdelete&data=')"> + : \'\' ?','?cmd=cdelete&data=')"> " /> @@ -51,7 +51,7 @@ > - + @@ -109,7 +109,7 @@ + POS=zeile.15;CGRP=zeile.16;HOST=zeile.17; -%?> @@ -117,7 +117,11 @@ -

+ +

:

+ + +

diff --git a/skins/deltab/now.tmpl b/skins/deltab/now.tmpl index 5f3b697..1352aed 100644 --- a/skins/deltab/now.tmpl +++ b/skins/deltab/now.tmpl @@ -38,7 +38,7 @@ " /> "> - ">.  + "> diff --git a/skins/deltab/tooltip.js b/skins/deltab/tooltip.js index ea83b17..28e64ff 100644 --- a/skins/deltab/tooltip.js +++ b/skins/deltab/tooltip.js @@ -202,7 +202,7 @@ function ttp_make_tlist_visable(title, tlist, x, y){ var content = ""; var values = eval('(' + oAnswer.responseText + ')'); if(values && values.data && typeof(values.data) == 'object'){ - for (var i = 1; i < values.data.length; i++) { + for (var i = 0; i < values.data.length; i++) { var x = values.data[i]; var len = 23; @@ -210,7 +210,12 @@ function ttp_make_tlist_visable(title, tlist, x, y){ content += ''; } //var d = new Date(x[9] * 1000); - content += x[4]; //Day + var d = new Date(x[4] * 1000); + if(0) { + content += d.getDate() + "/" + (d.getMonth()+1) + "/" + (d.getYear() + 1900); //Day + } else { + content += d.getDate() + "." + (d.getMonth()+1) + "." + (d.getYear() + 1900); //Day + } content += " - "; content += x[5]; //Start content += "-"; diff --git a/skins/deltab/ulist.tmpl b/skins/deltab/ulist.tmpl index 2abe308..6bed1f0 100644 --- a/skins/deltab/ulist.tmpl +++ b/skins/deltab/ulist.tmpl @@ -38,6 +38,7 @@ + + diff --git a/skins/deltab/vdrlist.tmpl b/skins/deltab/vdrlist.tmpl new file mode 100644 index 0000000..2e6710c --- /dev/null +++ b/skins/deltab/vdrlist.tmpl @@ -0,0 +1,81 @@ + +
+ + + + + " /> + + + + ','','vdrdelete','')"> + " /> + + + + + + + + + + + + + + + + + + + + + + + + + + > +
+ + + + + +

+ 1 %?> + +
diff --git a/skins/deltab/search.tmpl b/skins/deltab/search.tmpl index 15442e9..bd28ef6 100644 --- a/skins/deltab/search.tmpl +++ b/skins/deltab/search.tmpl @@ -28,7 +28,7 @@  "> - ">.  + "> diff --git a/skins/deltab/style.css b/skins/deltab/style.css index fc8945a..81eb59a 100644 --- a/skins/deltab/style.css +++ b/skins/deltab/style.css @@ -20,7 +20,7 @@ background-color:#FFF; font-size:12px; } -h1,h2 { +h1,h2,h3 { color:#4080ff; border-bottom-color:#4080ff; font-weight:700; @@ -38,6 +38,11 @@ font-size:14px; margin-bottom:10px; } +h3 { +font-size:12px; +margin-bottom:10px; +} + table.schema { border:1px dotted #4080ff; border-right:0; @@ -174,12 +179,12 @@ font-size:12px; } .subtitle { -font-size:10px; +font-size:11px; } .description { padding-left:5px; -font-size:8px; +font-size:10px; } a:active,a:link,a:visited { diff --git a/skins/deltab/tlist.tmpl b/skins/deltab/tlist.tmpl index 81047f1..a343151 100644 --- a/skins/deltab/tlist.tmpl +++ b/skins/deltab/tlist.tmpl @@ -80,7 +80,6 @@ " IF allow('ttoggle') %?> " style="vertical-align:bottom;"> - ">.  "> + + + " href="?cmd=vdredit&data="> + + "> + + + + + "> + + +
+ + + ";END %?> + + + +
+ + + + + + + diff --git a/skins/deltab/widgets/littlemenu.tmpl b/skins/deltab/widgets/littlemenu.tmpl index ff6db64..e335dfa 100644 --- a/skins/deltab/widgets/littlemenu.tmpl +++ b/skins/deltab/widgets/littlemenu.tmpl @@ -1,16 +1,23 @@ + + +

+ 1 %?> + + + ";END %?> + + +
+ + + + + + + + + + diff --git a/skins/stone/widgets/littlemenu.tmpl b/skins/stone/widgets/littlemenu.tmpl index f06d52d..5f80b5c 100644 --- a/skins/stone/widgets/littlemenu.tmpl +++ b/skins/stone/widgets/littlemenu.tmpl @@ -6,16 +6,15 @@ @@ -47,7 +47,7 @@ > - + @@ -141,8 +141,14 @@ - - + + + + : + + + + diff --git a/skins/xstyle/mainmenu.inc b/skins/xstyle/mainmenu.inc index 0a4cd35..c0d737c 100644 --- a/skins/xstyle/mainmenu.inc +++ b/skins/xstyle/mainmenu.inc @@ -6,6 +6,8 @@ webfxMenuImagePath = "images/" webfxMenuUseHover = true; webfxMenuHideTime = 500; webfxMenuShowTime = 200; +WebFXMenu.prototype.width = 175; + var myBar = new WebFXMenuBar; @@ -16,13 +18,13 @@ var myBar = new WebFXMenuBar; runnowGrp.add(new WebFXMenuItem('', "?cmd=now&data=&__cgrp=")); - runnow.add(new WebFXMenuItem("",null,null,runnowGrp)); + runnow.add(new WebFXMenuItem("",null,null,runnowGrp)); var runnextGrp = new WebFXMenu; runnextGrp.add(new WebFXMenuItem('', "?cmd=next&data=&__cgrp=")); - runnow.add(new WebFXMenuItem("",null,null,runnextGrp)); + runnow.add(new WebFXMenuItem("",null,null,runnextGrp)); runnow.add(new WebFXMenuSeparator()); @@ -60,20 +62,24 @@ var myBar = new WebFXMenuBar; program.add(new WebFXMenuItem("", "?cmd=t10")); program.add(new WebFXMenuItem("", "?cmd=search")); program.add(new WebFXMenuSeparator()); - - var programGrp = new WebFXMenu; - - - - global.cfgMaxChannelMenuEntrys %?> - programGrp.add(new WebFXMenuItem('', '?cmd=program&data=')); + + + global.cfgMaxChannelMenuEntrys %?> + + + program.add(new WebFXMenuItem('',null,null,programGrp)); + + + + var programGrp = new WebFXMenu; - program.add(new WebFXMenuItem('',null,null,programGrp)); + programGrp.add(new WebFXMenuItem('', '?cmd=program&data=')); + program.add(new WebFXMenuItem('',null,null,programGrp)); program.add(new WebFXMenuSeparator()); - program.add(new WebFXMenuItem("","?cmd=erestart")); + program.add(new WebFXMenuItem("","?cmd=erestart")); myBar.add(new WebFXMenuButton("",null,null,program)); @@ -81,35 +87,36 @@ var myBar = new WebFXMenuBar; // ----- var control = new WebFXMenu; - control.add(new WebFXMenuItem("", "?cmd=alist")); - control.add(new WebFXMenuItem("", "?cmd=tlist")); - control.add(new WebFXMenuItem("","?cmd=movetimerlist")); + control.add(new WebFXMenuItem("", "?cmd=alist")); + control.add(new WebFXMenuItem("", "?cmd=tlist")); + control.add(new WebFXMenuItem("","?cmd=movetimerlist")); myBar.add(new WebFXMenuButton("",null,null,control)); var media = new WebFXMenu; - media.add(new WebFXMenuItem("", "?cmd=rlist")); - media.add(new WebFXMenuItem("", "?cmd=mlist")); - media.add(new WebFXMenuItem("","?cmd=mllist")); + media.add(new WebFXMenuItem("", "?cmd=rlist")); + media.add(new WebFXMenuItem("", "?cmd=mlist")); + media.add(new WebFXMenuItem("","?cmd=mllist")); myBar.add(new WebFXMenuButton("",null,null,media)); var tools = new WebFXMenu; - tools.add(new WebFXMenuItem("", "?cmd=remote")); - tools.add(new WebFXMenuItem("", "?cmd=vtxpage")); - tools.add(new WebFXMenuItem("", "?cmd=cmdlist")); - tools.add(new WebFXMenuItem("","?cmd=report")); + tools.add(new WebFXMenuItem("", "?cmd=remote")); + tools.add(new WebFXMenuItem("", "?cmd=vtxpage")); + tools.add(new WebFXMenuItem("", "?cmd=cmdlist")); + tools.add(new WebFXMenuItem("","?cmd=report")); myBar.add(new WebFXMenuButton("",null,null,tools)); // ----- var admin = new WebFXMenu; - admin.add(new WebFXMenuItem("", "?cmd=cl")); - admin.add(new WebFXMenuItem("","?cmd=ul")); - admin.add(new WebFXMenuItem("","?cmd=uprefs")); - admin.add(new WebFXMenuItem("","?cmd=rel")); - admin.add(new WebFXMenuItem("","?cmd=logout")); - admin.add(new WebFXMenuItem("","?cmd=restart")); + admin.add(new WebFXMenuItem("","?cmd=vl")); + admin.add(new WebFXMenuItem("", "?cmd=cl")); + admin.add(new WebFXMenuItem("","?cmd=ul")); + admin.add(new WebFXMenuItem("","?cmd=uprefs")); + admin.add(new WebFXMenuItem("","?cmd=rel")); + admin.add(new WebFXMenuItem("","?cmd=logout")); + admin.add(new WebFXMenuItem("","?cmd=restart")); myBar.add(new WebFXMenuButton("",null,null,admin)); @@ -119,7 +126,7 @@ var myBar = new WebFXMenuBar; var prefs = new WebFXMenu; - prefs.add(new WebFXMenuItem("", "?cmd=configedit&data=")); + prefs.add(new WebFXMenuItem("", "?cmd=configedit&data=")); myBar.add(new WebFXMenuButton("",null,null,prefs)); diff --git a/skins/xstyle/vdrlist.tmpl b/skins/xstyle/vdrlist.tmpl new file mode 100644 index 0000000..4fbb418 --- /dev/null +++ b/skins/xstyle/vdrlist.tmpl @@ -0,0 +1,45 @@ + +

+ + +

+ + + + + + + + + + + + + + + bgcolor='#F5F5F5'> + + + + + + + + + + + + + +
+ " href="?cmd=vdredit&data="> +   + " + href="#" onclick="sure(document.vdrlist, ': ','?cmd=vdrdelete&data=')"> + + +
diff --git a/skins/xstyle/widgets/remote.tmpl b/skins/xstyle/widgets/remote.tmpl index 4acb00f..942481d 100644 --- a/skins/xstyle/widgets/remote.tmpl +++ b/skins/xstyle/widgets/remote.tmpl @@ -10,9 +10,10 @@ var interval = 5 var last = 0; function post(url) { + var vdr = ( document.remoteform.vdr.options ? document.remoteform.vdr.options[document.remoteform.vdr.options.selectedIndex].value : document.remoteform.vdr.value ); // Hmm, brutal und gemein, das Laden der URL als Bild funktioniert... var img = new Image(); - img.src = url; + img.src = url + '&__vdr=' + vdr; } function switch_channel(url) { @@ -27,8 +28,9 @@ function switch_channel(url) { function grab() { if(document.remoteform.grabinterval.value > 0) { - Now = new Date(); - document.livepicture.src = '?cmd=gdisplay&random=' + Now.getTime(); + Now = new Date(); + var vdr = ( document.remoteform.vdr.options ? document.remoteform.vdr.options[document.remoteform.vdr.options.selectedIndex].value : document.remoteform.vdr.value ); + document.livepicture.src = '?cmd=gdisplay&__vdr='+vdr+'&random=' + Now.getTime(); } last = Date.UTC(); } @@ -57,8 +59,8 @@ aktiv = window.setInterval("grab()", inter); - @@ -117,6 +119,41 @@ aktiv = window.setInterval("grab()", inter); + 1 %?> + + + + + + + + + + +
- + + "> 
+ +
+ +
+ +
-- cgit v1.2.3