diff options
Diffstat (limited to 'html')
| -rw-r--r-- | html/display.tmpl | 2 | ||||
| -rw-r--r-- | html/javascript/global.js | 7 | ||||
| -rw-r--r-- | html/mlist.tmpl | 4 | ||||
| -rw-r--r-- | html/tlist.tmpl | 6 | ||||
| -rw-r--r-- | html/widgets/remote.tmpl | 4 | ||||
| -rw-r--r-- | html/widgets/start.tmpl | 3 |
6 files changed, 10 insertions, 16 deletions
diff --git a/html/display.tmpl b/html/display.tmpl index fca8970..fb04878 100644 --- a/html/display.tmpl +++ b/html/display.tmpl @@ -70,7 +70,7 @@ <td> <?% date.format(data.first.$c,"%A, %x",locale) %?> <?% date.format(data.first.$c,"%H:%M",locale) %?> - <?% IF data.first.11 && data.first.11 != data.first.$c %?> (<?% gettext("VPS") %?> <?% date.format(data.first.11,"%H:%M",locale) %?>) <?% END %?> + <?% IF data.first.11 && data.first.11 != data.first.$c %?> (<?% gettext("PDC") %?> <?% date.format(data.first.11,"%H:%M",locale) %?>) <?% END %?> </td> <?% ELSIF field == gettext('Stop') %?> <td> diff --git a/html/javascript/global.js b/html/javascript/global.js index 7a0e82f..a05b873 100644 --- a/html/javascript/global.js +++ b/html/javascript/global.js @@ -113,7 +113,7 @@ function reverse(form) { } } -function Play(warnmsg,form,proxy) { +function Play(warnmsg,form) { // test on checked Boxes ok = new Array; x = 0; @@ -126,10 +126,7 @@ function Play(warnmsg,form,proxy) { } } if(x > 0) { - var url = ""; - if(proxy != "") - url = proxy; - url = url + '?cmd=mplaylist&data=' + ok.join('_') + '&binary=1'; + var url = '?cmd=mplaylist&data=' + ok.join('_'); location.href = url; } else { alert(warnmsg); diff --git a/html/mlist.tmpl b/html/mlist.tmpl index cf6b389..0608359 100644 --- a/html/mlist.tmpl +++ b/html/mlist.tmpl @@ -37,7 +37,7 @@ <b> <?% IF allow('mplay') %?> -<a href="#" onClick="Play('<?% gettext("Nothing selected!") %?>',document.musicform,'<?% param.proxy %?>')"> +<a href="#" onClick="Play('<?% gettext("Nothing selected!") %?>',document.musicform)"> [<?% gettext("Play selected songs") %?>] </a> <?% END %?> @@ -67,7 +67,7 @@ </tr> <tr> <td colspan=<?% zeile.size %?>> - <img class="cover" src="?cmd=mcoverimage&data=<?% zeile.0 %?>&__binary=1" alt="<?% zeile.2 %?>" align="right" /> + <img class="cover" src="?cmd=mcoverimage&data=<?% zeile.0 %?>" alt="<?% zeile.2 %?>" align="right" /> <?% albummark = "Album"+loop.count %?> <h1>Album: <?% zeile.2 %?> <font size=2><a href="#" onClick="selSwitch(document.musicform, '<?% albummark %?>')">[<?% gettext("Selection") %?> album]</a></font></h1> <h3> diff --git a/html/tlist.tmpl b/html/tlist.tmpl index 18823b4..0c119ff 100644 --- a/html/tlist.tmpl +++ b/html/tlist.tmpl @@ -52,7 +52,7 @@ </tr> <?% FOREACH zeile = data %?> <?% aktiv= ( zeile.1 ? zeile.1 mod 2 : 0 ); - vps= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 ); + pdc= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 ); day = date.format(zeile.9, "%A, %x", locale); IF aktiv; rest = rest - zeile.13; END; %?> @@ -88,13 +88,13 @@ <?% an = gettext('On') %?> <?% IF allow('ttoggle') %?> <a name='<?% zeile.0 %?>' href="javascript:tostatus('?cmd=ttoggle&data=<?% zeile.0 %?>', <?% zeile.0 %?>)" title="<?% gettext("Toggle timer") %?> <?% aktiv ? aus : an %?>"><div class="<?% myclass %?>">[<?% aktiv ? an : aus %?>]</div></a> - <?% vps ? '(VPS)' : '' %?> + <?% IF pdc;'(';gettext('PDC');')';END %?> <?% IF zeile.12 && allow('aedit') %?> <a href="?cmd=aedit&data=<?% zeile.12 %?>" title="<?% gettext("Edit autotimer") %?>"><div class="<?% myclass %?>">(AT)</div></a><br> <?% END %?> <?% IF rest <= 0 %?><a href="javascript:alert('<?% gettext("Not enough space to record this timer!") %?>')">(!)</a><br/><?% END %?> <?% ELSE %?> - [<?% aktiv ? aus : an %?>]<?% vps ? ' (VPS)' : '' %?> + [<?% aktiv ? aus : an %?>]<?% IF pdc;' (';gettext('PDC');')';END %?> <?% END %?> <?% level = getModule('SHARE').getEventLevel(zeile.11) %?> diff --git a/html/widgets/remote.tmpl b/html/widgets/remote.tmpl index 4a9dadc..6c8e68f 100644 --- a/html/widgets/remote.tmpl +++ b/html/widgets/remote.tmpl @@ -22,7 +22,7 @@ function switch_channel(url) { function grab() { if(document.remoteform.grabinterval.value > 0) { Now = new Date(); - document.livepicture.src = '?cmd=gdisplay&binary=1&laber=' + Now.getTime(); + document.livepicture.src = '?cmd=gdisplay&random=' + Now.getTime(); } last = Date.UTC(); } @@ -53,7 +53,7 @@ aktiv = window.setInterval("grab()", inter); <tr> <?% IF monitor %?> <td rowspan="12"> - <img src="?cmd=gdisplay&binary=1&laber=<?% date.now %?>" width="<?% param.width %?>" height="<?% param.height %?>" name="livepicture"> + <img src="?cmd=gdisplay&random=<?% date.now %?>" width="<?% param.width %?>" height="<?% param.height %?>" name="livepicture"> </td> <?% END %?> <td colspan="3"><nobr> diff --git a/html/widgets/start.tmpl b/html/widgets/start.tmpl index cb168f2..90947ac 100644 --- a/html/widgets/start.tmpl +++ b/html/widgets/start.tmpl @@ -20,9 +20,6 @@ <base target="Daten"> </head> <body> -<script language="javascript" type="text/javascript"> - var proxy = '<?% proxy %?>'; -</SCRIPT> <?% INCLUDE 'skin.cfg' %?> <?%# INCLUDE 'help.tmpl' %?> |