r2771 - in vdr/vdr-xxv-skins/trunk: debian xxv-db-skins
xxv-db-skins/blue xxv-db-skins/blue/images
xxv-db-skins/deltab xxv-db-skins/deltab/images
xxv-db-skins/lcars xxv-db-skins/lcars/images
xxv-db-skins/snow xxv-db-skins/snow/images xxv-db-skins/stone
xxv-db-skins/stone/images xxv-db-skins/stone/widgets
Tobias Grimm
tiber-guest at costa.debian.org
Thu May 11 20:11:59 UTC 2006
Author: tiber-guest
Date: 2006-05-11 20:11:55 +0000 (Thu, 11 May 2006)
New Revision: 2771
Added:
vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/asearch.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/images/audio.gif
vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/images/audio.png
vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/images/topten.gif
vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/images/topten.png
vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/print.css
vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/topten.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/asearch.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/images/audio.gif
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/images/audio.png
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/images/topten.gif
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/images/topten.png
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/print.css
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/topten.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/asearch.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/images/audio.gif
vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/images/audio.png
vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/images/topten.gif
vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/images/topten.png
vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/print.css
vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/topten.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/asearch.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/images/audio.gif
vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/images/audio.png
vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/images/topten.gif
vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/images/topten.png
vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/print.css
vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/topten.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/asearch.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/images/audio.gif
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/images/audio.png
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/images/topten.gif
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/images/topten.png
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/print.css
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/topten.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/date.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/url.tmpl
Modified:
vdr/vdr-xxv-skins/trunk/debian/TODO.debian
vdr/vdr-xxv-skins/trunk/debian/changelog
vdr/vdr-xxv-skins/trunk/xxv-db-skins/HISTORY
vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/style.css
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/alist.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/clist.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/display.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/global.js
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/mlist.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/now.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/program.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/rdisplay.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/rlist.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/schema.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/search.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/style.css
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/tlist.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/ulist.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/style.css
vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/style.css
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/alist.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/bayes.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/clist.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/display.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/filesys.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/global.js
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/help.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/images/movie.gif
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/images/movie.png
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/memory.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/mlist.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/network.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/now.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/program.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/rdisplay.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/rlist.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/schema.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/search.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/style.css
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/tlist.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/ulist.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/vitals.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/footer.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/littlemenu.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/start.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/string.tmpl
vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/wait.tmpl
Log:
Updated deltab skins to version 0.71
Modified: vdr/vdr-xxv-skins/trunk/debian/TODO.debian
===================================================================
--- vdr/vdr-xxv-skins/trunk/debian/TODO.debian 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/debian/TODO.debian 2006-05-11 20:11:55 UTC (rev 2771)
@@ -3,3 +3,4 @@
* install *.cfg to /etc/ ?
* suggest xxv restart in postinst?
+* the watch file seems to be useless for a Debian native package
\ No newline at end of file
Modified: vdr/vdr-xxv-skins/trunk/debian/changelog
===================================================================
--- vdr/vdr-xxv-skins/trunk/debian/changelog 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/debian/changelog 2006-05-11 20:11:55 UTC (rev 2771)
@@ -1,3 +1,9 @@
+vdr-xxv-skins (1.1.0) unstable; urgency=low
+
+ * Updated deltab skins to version 0.71
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Thu, 11 May 2006 22:10:19 +0200
+
vdr-xxv-skins (1.0.0) unstable; urgency=low
* Added xstyle skin
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/HISTORY
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/HISTORY 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/HISTORY 2006-05-11 20:11:55 UTC (rev 2771)
@@ -1,6 +1,27 @@
-0.60 Fixes
+* topten: angelegt
+* search: Advanced Search mode
+* vitals/network/memory/filesys: Ausgabe der Charts als GIF - Siehe Bugreport[154]
+* now/next/program/search/display: Ausgabe der VPS Startzeit, wenn verfügbar bzw. von der normalen Zeit abweicht.
+* mlist: Genreauswahl aktualisiert
+* rlist: Nicht mehr Anzeige des letzten Previewbilder, sondern eines Bild aus der Mitte bei verfügbaren mehreren Bildern
+* mlist Ersten Jahreszahl nicht mehr hardcodiert
+* schema Tooltips mit Zeilenumbrüchen
+* global.js ungenutzte Variablen entfernt
+* widget url.tmpl von xstyle übernommen
+* rlist: Kennzeichung von Audioaufnahmen
+* rsearch: Kennzeichung von Audioaufnahmen
+* widget/wait.tmpl: Titelzeile auf 80 Zeichen begrenzt.
+* alist/clist/rlist: Startsortierung asc/desc anpasst
+* asearch hinzugefügt
+* widget date.tmpl von xstyle übernommen
+* MUSIC: im Javascript MUSIC::PROXY in URL eingefügt siehe cmd=mplaylist ... &binary=1
+* now/next Ausgabe mit CHANNELSGROUPS - FEATUREREQUSEST[145]
+* CSS für Ausdruck ohne Navigationselememte hinzugefügt
+* rdisplay : Anzeige des Kanal auf dem die Aufnahme getätigt wurde.
-* widget - Feldbeschreibungen werden abgekürzt, und als optional als Tooltip angezeigt
+0.60 Fixes:
+
+* widget - Feldbeschreibungen werden abgekürzt, und optional als Tooltip angezeigt
* all - validierung
* blue(remote) - Pixmap für Cursor aktualisiert
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/asearch.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/asearch.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/asearch.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link alist.tmpl
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/asearch.tmpl
___________________________________________________________________
Name: svn:special
+ *
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/images/audio.gif
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/images/audio.gif 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/images/audio.gif 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link ../../stone/images/audio.gif
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/images/audio.gif
___________________________________________________________________
Name: svn:special
+ *
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/images/audio.png
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/images/audio.png 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/images/audio.png 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link ../../stone/images/audio.png
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/images/audio.png
___________________________________________________________________
Name: svn:special
+ *
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/images/topten.gif
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/images/topten.gif 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/images/topten.gif 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link ../../stone/images/topten.gif
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/images/topten.gif
___________________________________________________________________
Name: svn:special
+ *
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/images/topten.png
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/images/topten.png 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/images/topten.png 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link ../../stone/images/topten.png
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/images/topten.png
___________________________________________________________________
Name: svn:special
+ *
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/print.css
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/print.css 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/print.css 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1,43 @@
+body.frame {
+ padding: 0px 0px 0px 0px;
+ margin: 0px 0px 0px 0px;
+}
+
+.push{
+ display:none;
+}
+
+#logo {
+ display:none;
+}
+
+#logo a img {
+ display:none;
+}
+
+#header {
+ display:none;
+}
+
+#headerNav {
+ display:none;
+}
+
+/* Sidebar */
+
+#sidebar {
+ display:none;
+}
+
+#sidebar input {
+ display:none;
+}
+
+#sidebar select {
+ display:none;
+}
+
+#shutter {
+ display:none;
+}
+
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/style.css
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/style.css 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/style.css 2006-05-11 20:11:55 UTC (rev 2771)
@@ -106,6 +106,11 @@
border: 0px;
}
+td.push{
+ vertical-align:middle;
+ text-align: right;
+ white-space: nowrap;
+}
tr.two{
background-color:#002f4c;
@@ -605,5 +610,3 @@
.channel{
font-size:8px;
}
-
-z
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/topten.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/topten.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/topten.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link ../stone/topten.tmpl
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/blue/topten.tmpl
___________________________________________________________________
Name: svn:special
+ *
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/alist.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/alist.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/alist.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -68,7 +68,7 @@
<?% directory | html %?><br />
<?% END %?>
</td>
- <td<?% IF state != "";" class='";state;"'";END %?>>
+ <td class="push <?% IF state != "";" ";state;;END %?>">
<?% PROCESS RowButtons %?>
</td>
<?% END %?>
@@ -131,7 +131,7 @@
<td style="padding:0px;" width="20"><a href="?cmd=<?% cmd %?><?% datas %?>&__sortby=<?% row %?>&__desc=0" ><img src="images/home.<?% global.imagetyp %?>" alt="" /></a></td>
<td style="padding:0px;" width="160">
<?% "<b>" IF cgi.param('__sortby') == row %?>
- <a href="?cmd=<?% cmd %?><?% datas %?>&__sortby=<?% row %?>&__desc=<?% IF cgi.param('__sortby') == row && cgi.param('__desc') == 1 %?>0<?% ELSE %?>1<?% END %?>" >
+ <a href="?cmd=<?% cmd %?><?% datas %?>&__sortby=<?% row %?>&__desc=<?% IF cgi.param('__sortby') == row && cgi.param('__desc') == 0 %?>1<?% ELSE %?>0<?% END %?>" >
<?% label %?>
</a>
<?% "</b>" IF cgi.param('__sortby') == row %?>
@@ -145,6 +145,13 @@
<?% PROCESS SortItem row="Dir" label=gettext('Group all recordings on a directory',20) %?>
</table>
<?% END %?>
+ <p class="section"><?% gettext("Search text",20) %?></p>
+ <form action="">
+ <p>
+ <input type="hidden" name="cmd" value="asearch" />
+ <input type="text" name="data" size="18" value="" />
+ </p>
+ </form>
</div>
<?% global.sidebar = 1 %?>
<?% END %?>
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/asearch.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/asearch.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/asearch.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link alist.tmpl
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/asearch.tmpl
___________________________________________________________________
Name: svn:special
+ *
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/clist.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/clist.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/clist.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -20,7 +20,7 @@
<td width="20"><a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=0" ><img src="images/home.<?% global.imagetyp %?>" alt="" /></a></td>
<td width="160">
<?% "<strong>" IF sortby == row %?>
- <a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=<?% IF sortby == row && orderby == 1 %?>0<?% ELSE %?>1<?% END %?>" >
+ <a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=<?% IF sortby == row && orderby == 0 %?>1<?% ELSE %?>0<?% END %?>" >
<?% label %?>
</a>
<?% "</strong>" IF sortby == row %?>
@@ -51,7 +51,7 @@
<tr<?% ' class="two"' IF loop.count mod 2 == 0 %?>>
<td>
<?% IF enableform %?>
- <input type="checkbox" value="<?% POS %?>" name="<?% name | html %?>" />
+ <input class="push" type="checkbox" value="<?% POS %?>" name="<?% name | html %?>" />
<?% END %?>
</td>
<td>
@@ -87,7 +87,7 @@
<td>
<?% CA | truncate (10) | html %?>
</td>
- <td align="right">
+ <td class="push">
<?% PROCESS RowButtons %?>
</td>
</tr>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/display.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/display.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/display.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -3,16 +3,20 @@
<!-- First: <?% FOREACH x = data.first %?><?% loop.count - 1 %?>:<?% x %?>|<?% END %?> -->
<!-- Last: <?% FOREACH x = data.last %?><?% loop.count - 1 %?>:<?% x %?>|<?% END %?> -->
<?% END %?>
-<?% id = data.last.0 %?>
-<?% title = data.last.1 %?>
-<?% subtitle = data.last.2 %?>
-<?% start = data.last.3.match('(.*) (.*) (.*)') %?>
-<?% stop = data.last.4.match('(.*) (.*) (.*)') %?>
-<?% day = start.0 %?>
-<?% channel = data.last.5 %?>
-<?% description = data.last.6 %?>
-<?% bild = data.last.7 %?>
-<?% duration = data.last.8 %?>
+<?%- id = data.last.0;
+ title = data.last.1;
+ subtitle = data.last.2;
+ start = data.last.3.match('(.*) (.*) (.*)');
+ stop = data.last.4.match('(.*) (.*) (.*)');
+ day = start.0;
+ channel = data.last.5;
+ description = data.last.6;
+ bild = data.last.7;
+ duration = data.last.8;
+ video = data.last.9;
+ audio = data.last.10;
+ vps = data.last.11;
+-%?>
<?% ######################################################################## %?>
<div id="body">
<?% BLOCK dur %?>
@@ -39,6 +43,7 @@
<?% END %?>
<?% day %?>
<?% start.2 %?> <?% start.1 %?> - <?% stop.1 %?>
+ <?% IF vps && vps != start.1 %?> (<?% gettext("VPS") %?>:<?% vps %?>) <?% END %?>
<?% PROCESS dur %?>
</div>
<?% IF description != "" || bild != "" %?>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/global.js
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/global.js 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/global.js 2006-05-11 20:11:55 UTC (rev 2771)
@@ -104,10 +104,18 @@
}
}
-function Play(warn,form) {
+function PlayMusic(ids,proxy) {
+ var url = "";
+ if(proxy.length > 0)
+ url = proxy;
+ url = url + '?cmd=mplaylist&data=' + ids + '&binary=1';
+ location.href = url;
+}
+
+function Play(warnmsg,form,proxy) {
// test on checked Boxes
+ x = 0;
ok = new Array;
- x = 0;
for(var i=0;i<form.length;++i) {
var id;
if(form.elements[i].type == 'checkbox' && form.elements[i].checked) {
@@ -117,8 +125,8 @@
}
}
if(x > 0) {
- location.href = '?cmd=mplay&data=' + ok.join('_');
+ PlayMusic(ok.join('_'));
} else {
- alert(warn);
+ alert(warnmsg);
}
}
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/images/audio.gif
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/images/audio.gif 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/images/audio.gif 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link ../../stone/images/audio.gif
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/images/audio.gif
___________________________________________________________________
Name: svn:special
+ *
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/images/audio.png
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/images/audio.png 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/images/audio.png 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link ../../stone/images/audio.png
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/images/audio.png
___________________________________________________________________
Name: svn:special
+ *
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/images/topten.gif
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/images/topten.gif 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/images/topten.gif 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link ../../stone/images/topten.gif
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/images/topten.gif
___________________________________________________________________
Name: svn:special
+ *
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/images/topten.png
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/images/topten.png 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/images/topten.png 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link ../../stone/images/topten.png
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/images/topten.png
___________________________________________________________________
Name: svn:special
+ *
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/mlist.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/mlist.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/mlist.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -1,5 +1,6 @@
<!--mlist-->
<div id="body">
+<?% USE date %?>
<?% ######################################################################## %?>
<?% total = 0 %?>
<?% BLOCK summe %?>
@@ -32,7 +33,7 @@
<?% BLOCK item %?>
<td>
<?% IF allow('mplay') %?>
- <input type="checkbox" value="<?% id %?>" />
+ <input class="push" type="checkbox" value="<?% id %?>" />
<?% END %?>
<font class="title">
<?% IF artist.length > 0 %?>
@@ -52,10 +53,10 @@
</td>
<td style="white-space: nowrap">
<?% IF allow('mplay') %?>
- <a title="<?% gettext("Play selected songs") %?>" href="?cmd=mplay&data=<?% id %?>">
- <img align="right" valign="bottom" src="images/play.<?% global.imagetyp %?>" alt="" title="<?% gettext("Play selected songs") %?>" />
+ <a title="<?% gettext("Play selected songs") %?>" href="javascript:PlayMusic('<?% id %?>','<?% param.proxy %?>')">
+ <img class="push" src="images/play.<?% global.imagetyp %?>" alt="" title="<?% gettext("Play selected songs") %?>" />
</a>
- <a title="<?% gettext("Play selected songs") %?>" href="?cmd=mplay&data=<?% id %?>">
+ <a title="<?% gettext("Play selected songs") %?>" href="javascript:PlayMusic('<?% id %?>','<?% param.proxy %?>')">
<?% END %?>
<?% playtime %?>
<?% IF track != "" %?> (<?% track %?>)<?% END %?>
@@ -66,7 +67,7 @@
<?% END %?>
<?% ######################################################################## %?>
<?% BLOCK titleline %?>
- <?%- files = param.getCover(album);
+ <?%- files = param.getCover(album,artist);
IF files.size > 0 && files.first.length > 0;
cover = files.first;
ELSE;
@@ -145,7 +146,7 @@
<p>
<?% gettext("Genres",20) %?>:<br /><select name="genres" onchange="di('?cmd=ml&data=','genre:' + this.form.genres.options[this.form.genres.options.selectedIndex].value)">
<?% FOREACH ch = param.genres %?>
- <option value="<?% url( ch.0 ) %?>"<?% ' selected="selected"' IF cgi.param('data').split(':').first == 'genre' && cgi.param('data').split(':').last == ch.0 %?>><?% ch.0 | html %?></option>
+ <option value="<?% url( ch.1 ) %?>"<?% ' selected="selected"' IF cgi.param('data').split(':').first == 'genre' && cgi.param('data').split(':').last == ch.1 %?>><?% ch.0 | html %?></option>
<?% END %?>
</select>
<?% gettext("Artists",20) %?>:<br /><select name="artists" onchange="di('?cmd=ml&data=','artist:' + this.form.artists.options[this.form.artists.options.selectedIndex].value)">
@@ -161,7 +162,7 @@
<?% gettext("Year",20) %?>:<br />
<select name='years' onchange="di('?cmd=ml&data=','year:' + this.form.years.options[this.form.years.options.selectedIndex].value)">
<option value=""> </option>
- <?% ch = 2005; WHILE ch >= 1970; %?>
+ <?% ch = date.format(date.now, '%Y', 'en_GB'); WHILE ch >= 1970; %?>
<option value="<?% url( ch ) %?>"<?% ' selected="selected"' IF cgi.param('data').split(':').first == 'year' && cgi.param('data').split(':').last == ch %?>><?% ch | html %?></option>
<?% ch = ch - 1; END %?>
</select>
@@ -191,10 +192,10 @@
<a href="javascript:selAll(document.mlist,0)"><?% gettext("Unselect all",20) %?></a><br />
<a href="javascript:reverse(document.mlist)"><img src="images/invers.<?% global.imagetyp %?>" alt="" /></a>
<a href="javascript:reverse(document.mlist)"><?% gettext("Reverse select",20) %?></a><br />
- <a href="javascript:Play('<?% gettext("You have nothing selected!") %?>',document.mlist)">
+ <a href="javascript:Play('<?% gettext("You have nothing selected!") %?>',document.mlist,'<?% param.proxy %?>')">
<img src="images/play.<?% global.imagetyp %?>" alt="" title="<?% gettext("Play selected songs") %?>" />
</a>
- <a href="javascript:Play('<?% gettext("You have nothing selected!") %?>',document.mlist)">
+ <a href="javascript:Play('<?% gettext("You have nothing selected!") %?>',document.mlist,'<?% param.proxy %?>')">
<?% gettext("Play selected songs",20) %?>
</a>
</p>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/now.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/now.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/now.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -3,7 +3,7 @@
<div id="body">
<?% ######################################################################## %?>
<?% BLOCK dur %?>
- <?% height=6;d = d div 1 ; IF d >= 0 and d <= 100 %?>
+ <?% height=6;d = d div 1 ; IF d > 0 and d <= 100 %?>
<?% IF d >= 1 %?>
<?% d = d / 2 %?>
<img class="progressleft" src="images/blank.gif" width="<?% 50 - d | format('%d') %?>" height="<?% height %?>" alt="<?% 50 - d | format('%d') %?>%" /><img class="progressright" src="images/blank.gif" width="<?% d | format('%d') %?>" height="<?% height %?>" alt="" />
@@ -17,7 +17,7 @@
<td>
<?% IF allow('switch') %?>
<a href="javascript:post('switch','<?% channel %?>')">
- <img src="images/watch.<?% global.imagetyp %?>" alt="" title="<?% gettext("Switch") %?>" />
+ <img class="push" src="images/watch.<?% global.imagetyp %?>" alt="" title="<?% gettext("Switch") %?>" />
</a>
<?% END %?>
<a style="vertical-align:bottom;" href="?cmd=program&data=<?% channel %?>" title="<?% gettext("Program guide for") %?> <?% sender | html %?>">
@@ -40,8 +40,9 @@
</td>
<td>
<?% start %?> - <?% stop %?>
+ <?% IF vps && vps != start %?> (<?% gettext("VPS") %?>:<?% vps %?>) <?% END %?>
</td>
- <td>
+ <td class="push">
<a href="?cmd=search&data=<?% url( title ) %?>">
<img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
</a>
@@ -90,7 +91,7 @@
<?% FOREACH zeile = data %?>
<?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
<tr<?% " class='two'" IF loop.count mod 2 == 0 %?>>
- <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;duration=zeile.8;desc=zeile.9 %?>
+ <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;desc=zeile.8;duration=zeile.9;vps=zeile.10 %?>
<?% IF old.defined && group != old %?>
</tr>
</table>
@@ -114,25 +115,35 @@
<!-- ###### Seite ###### -->
<div id="sidebar">
<p class="section"><?% gettext("What is running at",20) %?></p>
+ <form action="">
<p>
- <a href="?cmd=now"><img src="images/forward.<?% global.imagetyp %?>" alt="" title="<?% gettext("Running now") %?>" /></a>
- <a href="?cmd=now"><?% gettext("Running now",20) %?></a><br />
- <a href="?cmd=next"><img src="images/forward.<?% global.imagetyp %?>" alt="" title="<?% gettext("Next") %?>" /></a>
- <a href="?cmd=next"><?% gettext("Next",20) %?></a><br />
- <a href="?cmd=sch<?% IF param.zeit && cgi.param('cmd') != 'next' && now != 1;"&data=";param.zeit;END;%?>">
+ <select name="cgroups" onchange="di('?cmd=<?% cgi.param('cmd') %?>&data=<?% cgi.param('data') %?>&__cgrp=',this.form.cgroups.options[this.form.cgroups.options.selectedIndex].value)">
+ <?% FOREACH cgrp = param.cgroups %?>
+ <option value="<?% cgrp.last %?>"<?% ' selected="selected"' IF param.channelgroup == cgrp.last %?>><?% cgrp.first %?></option>
+ <?% END %?>
+ </select>
+ </p>
+ </form>
+ <p>
+ <a href="?cmd=now&__cgrp=<?% cgi.param('__cgrp') %?>"><img src="images/forward.<?% global.imagetyp %?>" alt="" title="<?% gettext("Running now") %?>" /></a>
+ <a href="?cmd=now&__cgrp=<?% cgi.param('__cgrp') %?>"><?% gettext("Running now",20) %?></a><br />
+ <a href="?cmd=next&__cgrp=<?% cgi.param('__cgrp') %?>"><img src="images/forward.<?% global.imagetyp %?>" alt="" title="<?% gettext("Next") %?>" /></a>
+ <a href="?cmd=next&__cgrp=<?% cgi.param('__cgrp') %?>"><?% gettext("Next",20) %?></a><br />
+ <a href="?cmd=sch<?% IF param.zeit && cgi.param('cmd') != 'next' && now != 1;"&data=";param.zeit;END;%?>&__cgrp=<?% cgi.param('__cgrp') %?>">
<img alt="" src="images/forward.<?% global.imagetyp %?>" title="<?% gettext("Schema") %?>" /></a>
- <a href="?cmd=sch<?% IF param.zeit && cgi.param('cmd') != 'next' && now != 1;"&data=";param.zeit;END;%?>">
+ <a href="?cmd=sch<?% IF param.zeit && cgi.param('cmd') != 'next' && now != 1;"&data=";param.zeit;END;%?>&__cgrp=<?% cgi.param('__cgrp') %?>">
<?% gettext("Schema",20) %?><?% IF param.zeit && cgi.param('cmd') != 'next' && now != 1;" ";day;END;%?></a>
</p>
<form action="">
<p>
<input type="hidden" name="cmd" value="now" />
<input type="text" name="data" value="<?% IF time.defined %?><?% time %?><?% ELSE %?>20:15<?% END %?>" size="18" />
+ <input type="hidden" name="__cgrp" value="<?% cgi.param('__cgrp') %?>" />
</p>
</form>
<form action="">
<p>
- <select size="5" name='data' onchange="di('?cmd=now&data=',this.form.data.options[this.form.data.options.selectedIndex].value)">
+ <select size="5" name='data' onchange="di('?cmd=now&__cgrp=<?% cgi.param('__cgrp') %?>&data=',this.form.data.options[this.form.data.options.selectedIndex].value)">
<?% today = [] %?>
<?% tomor = [] %?>
<?% FOREACH zeit = param.periods.split(','); %?>
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/print.css
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/print.css 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/print.css 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1,48 @@
+#frame {
+ padding: 0px 0px 0px 0px;
+ margin: 0px 0px 0px 0px;
+}
+
+.push{
+ display:none;
+}
+
+#logo {
+ display:none;
+}
+
+#logo a img {
+ display:none;
+}
+
+#header {
+ display:none;
+}
+
+#headerNav {
+ display:none;
+}
+
+
+/* Sidebar */
+
+#sidebar {
+ display:none;
+}
+
+#sidebar p {
+ display:none;
+}
+
+#sidebar p.section {
+ display:none;
+}
+
+#sidebar input {
+ display:none;
+}
+
+#sidebar select {
+ display:none;
+}
+
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/program.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/program.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/program.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -26,8 +26,9 @@
</td>
<td>
<?% start %?> - <?% stop %?>
+ <?% IF vps && vps != start %?> (<?% gettext("VPS") %?>:<?% vps %?>) <?% END %?>
</td>
- <td>
+ <td class="push">
<a href="?cmd=search&data=<?% url( title ) %?>">
<img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
</a>
@@ -64,7 +65,7 @@
<?% FOREACH zeile = data %?>
<?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
- <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;desc=zeile.6 %?>
+ <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;desc=zeile.6;video=zeile.7;audio=zeile.8;vps=zeile.9 %?>
<?% day = date.format(zeile.5, "%A, %x") | html %?>
<?% IF old.defined && day != old %?>
<tr>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/rdisplay.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/rdisplay.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/rdisplay.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -13,6 +13,36 @@
<?% END %?>
<?% END %?>
<?% ######################################################################## %?>
+<?% BLOCK image %?>
+ <?%- IF data.Type == 'RADIO';
+ mylist = [ "images/audio", global.imagetyp ];
+ files = [ mylist.join('.') ];
+ ELSIF param.previews.size <= 0;
+ mylist = [ "images/movie", global.imagetyp ];
+ files = mylist.join('.');
+ ELSE;
+ files = param.previews;
+ END;
+ -%?>
+ <?% IF files.size %?>
+ <table summary="">
+ <tr>
+ <td>
+ <?% FOREACH bild = files %?>
+ <img class="recorddetails" src="<?% bild %?>" alt="" />
+ <?% IF (loop.count) mod 4 == 0 && loop.count != loop.size %?>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <?% END %?>
+ <?% END %?>
+ </td>
+ </tr>
+ </table>
+ <?% END %?>
+<?% END %?>
+<?% ######################################################################## %?>
<?% BLOCK marks; # (c) xpix %?>
<?% width = 600 #data.Duration > 7200 ? 600 : 500 %?>
<table class="my" width="<?% width %?>px" align="center" summary="">
@@ -89,23 +119,7 @@
<table summary="">
<tr>
<td valign="top" align="center">
- <?% IF param.previews.size %?>
- <table summary="">
- <tr>
- <td>
- <?% FOREACH bild = param.previews %?>
- <img class="recorddetails" src="<?% bild %?>" alt="" />
- <?% IF (loop.count) mod 4 == 0 && loop.count != loop.size %?>
- </td>
- </tr>
- <tr>
- <td>
- <?% END %?>
- <?% END %?>
- </td>
- </tr>
- </table>
- <?% END %?>
+ <?% PROCESS image %?>
</td>
</tr>
<tr>
@@ -119,6 +133,9 @@
<?% ELSE %?>
<?% gettext("at") %?> <?% data.StartTime %?>
<?% END %?>
+ <?% IF data.Channel %?>
+ <br /><?% gettext('Channel') %?> : <?% data.Channel %?>
+ <?% END %?>
</td>
<td align="right" >
<?% IF allow( 'rconvert' ) && param.reccmds.size > 0 %?>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/rlist.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/rlist.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/rlist.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -35,11 +35,47 @@
<?% END %?>
<?% END %?>
<?% ######################################################################## %?>
+<?% total = 0 %?>
+<?% BLOCK printsumme %?>
+ <tr>
+ <?% IF enableform %?>
+ <td></th>
+ <?% END %?>
+ <?% IF param.previewcommand != 'n' %?>
+ <td></td>
+ <?% END %?>
+ <td></td>
+ <td class="description" style="padding: 0;">
+ <?% IF total > 0 %?>
+ <?% gettext("total time") %?> :
+ <?%
+ sec = total mod 60;
+ min = total div 60 mod 60;
+ hour = total div 3600;
+ %?>
+ <?% IF hour > 0 %?><?% hour FILTER format('%02d') %?>:<?% END %?><?% min FILTER format('%02d') %?>:<?% sec FILTER format('%02d')%?>
+ <?% END %?>
+ </td>
+ <td></td>
+ </tr>
+
+<?% END %?>
+<?% ######################################################################## %?>
<?% BLOCK image %?>
<?%- files = param.getPreview(eventid);
- IF files.size > 0 && files.last.length > 0;
- preview = files.last;
- ELSE;
+ IF type == 'RADIO';
+ mylist = [ "images/audio", global.imagetyp ];
+ preview = mylist.join('.') ;
+ ELSIF files.size > 0;
+#
+# USE date;
+# img = date.format(date.now, '%S') mod files.size;
+# preview = files.$img;
+#
+ img = (files.size div 2);
+ preview = files.$img;
+ END;
+ IF preview.length <= 0;
mylist = [ "images/movie", global.imagetyp ];
preview = mylist.join('.') ;
END;
@@ -158,11 +194,14 @@
<?% FOREACH zeile = data %?>
<?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
<tr<?% " class='two'" IF loop.count mod 2 == 0 %?>>
- <?% id=zeile.0;eventid=zeile.1;title=zeile.2.split('~').last;subtitle=zeile.3;duration=zeile.4;start=zeile.5;new=zeile.6;folder=zeile.7;fulltitle=zeile.8 %?>
- <?% foldertitle=fulltitle.split('~').last %?>
+ <?%- id=zeile.0;eventid=zeile.1;title=zeile.2.split('~').last;subtitle=zeile.3;
+ duration=zeile.4;start=zeile.5;new=zeile.6;type=zeile.7;folder=zeile.8;fulltitle=zeile.9;
+ isrecording=zeile.10;foldertitle=fulltitle.split('~').last -%?>
<?% PROCESS item %?>
+ <?% total = total + duration %?>
</tr>
<?% END %?>
+ <?% PROCESS printsumme %?>
</table>
</form>
<?% END %?>
@@ -207,7 +246,7 @@
<td style="padding:0px;" width="20"><a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=0" ><img src="images/home.<?% global.imagetyp %?>" alt="" /></a></td>
<td style="padding:0px;" width="160">
<?% "<b>" IF cgi.param('__sortby') == row %?>
- <a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=<?% IF cgi.param('__sortby') == row && cgi.param('__desc') == 1 %?>0<?% ELSE %?>1<?% END %?>" >
+ <a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=<?% IF cgi.param('__sortby') == row && cgi.param('__desc') == 0 %?>1<?% ELSE %?>0<?% END %?>" >
<?% label %?>
</a>
<?% "</b>" IF cgi.param('__sortby') == row %?>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/schema.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/schema.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/schema.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -141,9 +141,9 @@
</table>
<?% ######################################################################## %?>
<?% BLOCK title %?>
-<?% e.1 | html %?>
-<?% e.2 | html IF e.2 %?>
-<?% e.5 | html %?> - <?% e.6 | html %?>
+<?% e.1 | html %?>
+<?% e.2 | html IF e.2 %?>
+<?% e.5 | html %?> - <?% e.6 | html %?>
<?% END %?>
<?% ######################################################################## %?>
<?% BLOCK getStatus %?>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/search.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/search.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/search.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -33,8 +33,9 @@
</td>
<td>
<?% start %?> - <?% stop %?>
+ <?% IF vps && vps != start %?> (<?% gettext("VPS") %?>:<?% vps %?>) <?% END %?>
</td>
- <td>
+ <td class="push">
<a href="?cmd=search&data=<?% url( title ) %?>">
<img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
</a>
@@ -51,10 +52,10 @@
<?% END %?>
<?% IF data.size <= 1 %?>
-<h1><?% gettext("Search results") %?> : <?% cgi.param('data') | html %?></h1>
+<h1><?% gettext("Search text") %?> : <?% cgi.param('data') | html %?></h1>
<?% ELSE %?>
<?% fields = data.shift %?>
-<h1><?% gettext("Search results") %?> : <?% cgi.param('data') | html %?> - <?% date.format(data.first.7, "%A, %x") | html %?></h1>
+<h1><?% gettext("Search text") %?> : <?% cgi.param('data') | html %?> - <?% date.format(data.first.7, "%A, %x") | html %?></h1>
<table summary="" width="100%">
<tr>
<th width="180"></th>
@@ -65,7 +66,7 @@
<?% FOREACH zeile = data %?>
<?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
<tr<?% " class='two'" IF loop.count mod 2 == 0 %?>>
- <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;start=zeile.5;stop=zeile.6;desc=zeile.8 %?>
+ <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;start=zeile.5;stop=zeile.6;desc=zeile.8;vps=zeile.9 %?>
<?% day = date.format(zeile.7, "%A, %x") %?>
<?% IF old.defined && day != old %?>
</tr>
@@ -85,12 +86,40 @@
</div>
<!-- ###### Seite ###### -->
<div id="sidebar">
- <p class="section"><?% gettext("Search",20) %?></p>
- <form action="">
+ <p class="section"><?% gettext("Search text",20) %?></p>
+ <form method='get' action="">
<p>
- <input type="hidden" name="cmd" value="search" />
- <input type="text" name="data" size="18" value="<?% cgi.param('data') %?>" />
+ <input type='hidden' name='cmd' value='search' />
+ <input type='hidden' name='__action' value='save' />
+ <input type="text" name="data" value="<?% cgi.param('data') %?>" />
+ <br /><br />
+ <?% gettext('Search in fields',30) %?><br />
+ <input style="width:auto;" type="radio" name="__Where" value="all" <?% IF ! cgi.param('__Where') || cgi.param('__Where') == 'all' %?>checked<?% END %?> /><?% gettext('All') %?>
+ <input style="width:auto;" type="radio" name="__Where" value="title" <?% IF cgi.param('__Where') == 'title' %?>checked<?% END %?> /><?% gettext('Only in title') %?>
+ <input style="width:auto;" type="radio" name="__Where" value="titlesubtitle" <?% IF cgi.param('__Where') == 'titlesubtitle' %?>checked<?% END %?>><?% gettext('Only in title and subtitle') %?>
+ <br /><br />
+ <?% gettext('Video format',30) %?><br />
+ <input style="width:auto;" type="radio" name="__VideoFormat" value="all" <?% IF ! cgi.param('__VideoFormat') || cgi.param('__VideoFormat') == 'all' %?>checked<?% END %?> /><?% gettext('All') %?>
+ <input style="width:auto;" type="radio" name="__VideoFormat" value="widescreen" <?% IF cgi.param('__VideoFormat') == 'widescreen' %?>checked<?% END %?> /><?% gettext('16:9 Wide-screen') %?>
+ <br /><br />
+ <?% gettext('Audio format',30) %?><br />
+ <input style="width:auto;" type="radio" name="__AudioFormat" value="all" <?% IF ! cgi.param('__AudioFormat') || cgi.param('__AudioFormat') == 'all' %?>checked<?% END %?> /><?% gettext('All') %?>
+ <input style="width:auto;" type="radio" name="__AudioFormat" value="dts" <?% IF cgi.param('__AudioFormat') == 'dts' %?>checked<?% END %?> /><?% gettext('Dolby Digital') %?>
+ <input style="width:auto;" type="radio" name="__AudioFormat" value="stereo" <?% IF cgi.param('__AudioFormat') == 'stereo' %?>checked<?% END %?> /><?% gettext('Stereo') %?>
+ <br /><br />
+ <?% gettext('Minimum length (in minutes)',30) %?><br />
+ <input type="text" name="__MinLength" value="<?% cgi.param('__MinLength') %?>"/>
+ <br /><br />
+ <?% gettext('Channel',30) %?><br />
+ <select name='__channel'>
+ <option value="0" /><?% gettext('All channels') %?>
+ <?% FOREACH chan = getModule('CHANNELS').ChannelArray('Name') %?>
+ <option value="<?% chan.last %?>" <?% IF cgi.param('__channel') == chan.last %?>selected<?% END %?> /><?% chan.first %?>
+ <?% END %?>
+ </select>
+ <br /><br />
+ <input type='submit' value='<?% gettext('Search') %?>' />
</p>
- </form>
+ </form>
</div>
<?% global.sidebar = 1 %?>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/style.css
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/style.css 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/style.css 2006-05-11 20:11:55 UTC (rev 2771)
@@ -14,13 +14,6 @@
color: black;
}
-#iframe {
- margin: -90px -10px -10px -205px;
- background-color:white;
- font-family: 'Trebuchet MS', Lucida, Verdana, Helvetica, Arial, sans-serif;
- color: black;
-}
-
input,select,textarea {
font-family: 'Trebuchet MS', Lucida, Verdana, Helvetica, Arial, sans-serif;
color: black;
@@ -169,8 +162,12 @@
}
+td.push{
+ vertical-align:middle;
+ text-align: right;
+ white-space: nowrap;
+}
-
.left { text-align:left; }
.middle { text-align:center; }
.right { text-align:right; }
@@ -376,6 +373,7 @@
/* ###### Tabellen ###### */
td{
+ vertical-align:middle;
font-size:10px;
}
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/tlist.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/tlist.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/tlist.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -25,7 +25,7 @@
<?% PROCESS SetState %?>
<td<?% IF state != "" %?> style="<?% state %?>"<?% END %?>>
<?% IF enableform %?>
- <input type="checkbox" value="<?% id %?>" name="<?% title | html %?>" />
+ <input class="push" type="checkbox" value="<?% id %?>" name="<?% title | html %?>" />
<?% END %?>
<?% IF allow('ttoggle') %?>
<a href="javascript:fire('ttoggle','<?% id %?>')">
@@ -50,7 +50,7 @@
<?% PROCESS time t = start %?> - <?% PROCESS time t = stop %?>
<?% vps ? ' (VPS)' : '' %?>
</td>
- <td <?% IF state != "" %?> style="<?% state %?>"<?% END %?>>
+ <td class="push" <?% IF state != "" %?> style="<?% state %?>"<?% END %?>>
<a href="?cmd=search&data=<?% url( title.split('~').first ) %?>">
<img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
</a>
@@ -140,8 +140,8 @@
<p class="section"><?% gettext("Timers",20) %?></p>
<p>
<?% IF allow('tnew') %?>
- <a href="?cmd=tnew"><img src="images/new.<?% global.imagetyp %?>" alt="" title="<?% gettext("Create new timers") %?>" /></a>
- <a href="?cmd=tnew"><?% gettext("Create new timers",20) %?></a><br />
+ <a href="?cmd=tnew"><img src="images/new.<?% global.imagetyp %?>" alt="" title="<?% gettext("Create a new timer") %?>" /></a>
+ <a href="?cmd=tnew"><?% gettext("Create a new timer",20) %?></a><br />
<?% END %?>
<?% IF allow('tupdate') %?>
<a href="javascript:fire('tupdate','0')"><img src="images/refresh.<?% global.imagetyp %?>" alt="" title="<?% gettext("Update timers") %?>" /></a>
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/topten.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/topten.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/topten.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link ../stone/topten.tmpl
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/topten.tmpl
___________________________________________________________________
Name: svn:special
+ *
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/ulist.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/ulist.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/deltab/ulist.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -9,7 +9,7 @@
<td>
<?% right | html %?>
</td>
- <td width="40px" align="right">
+ <td class="push">
<a href="?cmd=uedit&data=<?% id %?>">
<img src="images/edit.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit account of user") %?>" />
</a>
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/asearch.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/asearch.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/asearch.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link alist.tmpl
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/asearch.tmpl
___________________________________________________________________
Name: svn:special
+ *
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/images/audio.gif
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/images/audio.gif 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/images/audio.gif 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link ../../stone/images/audio.gif
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/images/audio.gif
___________________________________________________________________
Name: svn:special
+ *
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/images/audio.png
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/images/audio.png 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/images/audio.png 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link ../../stone/images/audio.png
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/images/audio.png
___________________________________________________________________
Name: svn:special
+ *
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/images/topten.gif
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/images/topten.gif 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/images/topten.gif 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link ../../stone/images/topten.gif
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/images/topten.gif
___________________________________________________________________
Name: svn:special
+ *
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/images/topten.png
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/images/topten.png 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/images/topten.png 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link ../../stone/images/topten.png
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/images/topten.png
___________________________________________________________________
Name: svn:special
+ *
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/print.css
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/print.css 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/print.css 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1,57 @@
+body.frame {
+ padding: 0px 0px 0px 0px;
+ margin: 0px 0px 0px 0px;
+}
+
+.push{
+ display:none;
+}
+
+#logo {
+ display:none;
+}
+
+#logo a img {
+ display:none;
+}
+
+#header {
+ display:none;
+}
+
+#headerNav {
+ display:none;
+}
+
+#headerNav a,
+#headerNav a:active,
+#headerNav a:link,
+#headerNav a:visited {
+ display:none;
+}
+
+#headerNav a:hover {
+ display:none;
+}
+
+/* Sidebar */
+
+#sidebar {
+ display:none;
+}
+
+#sidefooter {
+ display:none;
+}
+
+#sidebar input {
+ display:none;
+}
+
+#sidebar select {
+ display:none;
+}
+
+#shutter {
+ display:none;
+}
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/style.css
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/style.css 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/style.css 2006-05-11 20:11:55 UTC (rev 2771)
@@ -111,6 +111,11 @@
border: 0px;
}
+td.push{
+ vertical-align:middle;
+ text-align: right;
+ white-space: nowrap;
+}
tr.two{
background-color:#eee6c1;
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/topten.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/topten.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/topten.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link ../stone/topten.tmpl
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/lcars/topten.tmpl
___________________________________________________________________
Name: svn:special
+ *
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/asearch.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/asearch.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/asearch.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link alist.tmpl
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/asearch.tmpl
___________________________________________________________________
Name: svn:special
+ *
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/images/audio.gif
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/images/audio.gif 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/images/audio.gif 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link ../../stone/images/audio.gif
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/images/audio.gif
___________________________________________________________________
Name: svn:special
+ *
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/images/audio.png
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/images/audio.png 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/images/audio.png 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link ../../stone/images/audio.png
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/images/audio.png
___________________________________________________________________
Name: svn:special
+ *
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/images/topten.gif
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/images/topten.gif 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/images/topten.gif 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link ../../stone/images/topten.gif
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/images/topten.gif
___________________________________________________________________
Name: svn:special
+ *
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/images/topten.png
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/images/topten.png 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/images/topten.png 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link ../../stone/images/topten.png
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/images/topten.png
___________________________________________________________________
Name: svn:special
+ *
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/print.css
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/print.css 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/print.css 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1,50 @@
+body.frame {
+ padding: 0px 0px 0px 0px;
+ margin: 0px 0px 0px 0px;
+}
+
+.push{
+ display:none;
+}
+
+#logo {
+ display:none;
+}
+
+#logo a img {
+ display:none;
+}
+
+#header {
+ display:none;
+}
+
+#headerNav {
+ display:none;
+}
+
+a.headerNav:active,
+a.headerNav:link,
+a.headerNav:visited {
+ display:none;
+}
+a.headerNav:hover {
+ display:none;
+}
+/* Sidebar */
+
+#sidebar {
+ display:none;
+}
+
+#sidebar input {
+ display:none;
+}
+
+#sidebar select {
+ display:none;
+}
+
+#shutter {
+ display:none;
+}
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/style.css
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/style.css 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/style.css 2006-05-11 20:11:55 UTC (rev 2771)
@@ -105,6 +105,11 @@
border: 0px;
}
+td.push{
+ vertical-align:middle;
+ text-align: right;
+ white-space: nowrap;
+}
tr.two{
background-color:#f7f7f7;
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/topten.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/topten.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/topten.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link ../stone/topten.tmpl
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/snow/topten.tmpl
___________________________________________________________________
Name: svn:special
+ *
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/alist.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/alist.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/alist.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -10,18 +10,18 @@
<?% END %?>
<?% ######################################################################## %?>
<?% BLOCK RowButtons %?>
- <a href="?cmd=search&data=<?% url( title ) %?>">
- <img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
- </a>
+ <a href="?cmd=search&data=<?% url( title ) %?>">
+ <img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
+ </a>
<?% IF allow('aedit') %?>
- <a href="javascript:popupwindow('?cmd=aedit&data=<?% id %?>',620,670,1)">
- <img src="images/edit.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit autotimer") %?>" />
- </a>
+ <a href="javascript:popupwindow('?cmd=aedit&data=<?% id %?>',620,670,1)">
+ <img src="images/edit.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit autotimer") %?>" />
+ </a>
<?% END %?>
<?% IF allow('adelete') %?>
- <a href="javascript:sureandreload('<?% gettext("You will delete this autotimer") %?> : \'<?% title | replace('\'','\\\'') | replace('"','\\\'') %?>\'','adelete','<?% id %?>')">
- <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete autotimer") %?>" />
- </a>
+ <a href="javascript:sureandreload('<?% gettext("You will delete this autotimer") %?> : \'<?% title | replace('\'','\\\'') | replace('"','\\\'') %?>\'','adelete','<?% id %?>')">
+ <img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete autotimer") %?>" />
+ </a>
<?% END %?>
<?% END %?>
<?% ######################################################################## %?>
@@ -78,7 +78,7 @@
</font>
<?% END %?>
</td>
- <td valign="middle" align="right" class="fieldinline<?% IF state != "";" ";state;END %?>">
+ <td class="fieldinline push<?% IF state != "";" ";state;END %?>">
<?% PROCESS RowButtons %?>
</td>
</tr>
@@ -227,7 +227,7 @@
<td width="20"><a href="?cmd=<?% cmd %?><?% datas %?>&__sortby=<?% row %?>&__desc=0" ><img src="images/home.<?% global.imagetyp %?>" alt="" /></a></td>
<td width="160">
<?% "<strong>" IF cgi.param('__sortby') == row %?>
- <a href="?cmd=<?% cmd %?><?% datas %?>&__sortby=<?% row %?>&__desc=<?% IF cgi.param('__sortby') == row && cgi.param('__desc') == 1 %?>0<?% ELSE %?>1<?% END %?>" >
+ <a href="?cmd=<?% cmd %?><?% datas %?>&__sortby=<?% row %?>&__desc=<?% IF cgi.param('__sortby') == row && cgi.param('__desc') == 0 %?>1<?% ELSE %?>0<?% END %?>" >
<?% label %?>
</a>
<?% "</strong>" IF cgi.param('__sortby') == row %?>
@@ -247,6 +247,20 @@
</tr>
</table>
<?% END %?>
+ <table class="sidetable" summary="">
+ <tr><td class="sidehead"><?% gettext("Search text",20) %?></td></tr>
+ <tr>
+ <td class="sidetext">
+ <form action="">
+ <input type="hidden" name="cmd" value="asearch" />
+ <input type="text" name="data" size="18" value="" />
+ </form>
+ </td>
+ </tr>
+ <tr>
+ <td class="sidebottom"></td>
+ </tr>
+ </table>
<p id="sidefooter"> </p>
</div>
<?% INCLUDE header.inc %?>
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/asearch.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/asearch.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/asearch.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1 @@
+link alist.tmpl
\ No newline at end of file
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/asearch.tmpl
___________________________________________________________________
Name: svn:special
+ *
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/bayes.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/bayes.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/bayes.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -49,7 +49,7 @@
<td class="fieldinline" style="white-space: nowrap">
<?% start %?> - <?% stop %?>
</td>
- <td valign="top" align="right" class="fieldinline" style="white-space: nowrap" >
+ <td class="fieldinline push">
<?% PROCESS RowButtons %?>
</td>
</tr>
@@ -78,7 +78,7 @@
</a>
</td>
<td class="fieldinline" style="white-space: nowrap"><?% start %?> - <?% stop %?></td>
- <td class="fieldinline" valign="top" align="right" style="white-space: nowrap" ><?% PROCESS RowButtons %?></td>
+ <td class="fieldinline push"><?% PROCESS RowButtons %?></td>
</tr>
<?% IF global.hideDescription != 1 && desc.length > 0 %?>
<tr<?% ' class="two"' IF z mod 2 == 0 %?>>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/clist.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/clist.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/clist.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -69,7 +69,7 @@
<td class="fieldinline">
<?% CA | truncate (10) | html %?>
</td>
- <td class="fieldinline" align="right">
+ <td class="fieldinline push">
<?% PROCESS RowButtons %?>
</td>
</tr>
@@ -170,7 +170,7 @@
<td width="20"><a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=0" ><img src="images/home.<?% global.imagetyp %?>" alt="" /></a></td>
<td width="160">
<?% "<strong>" IF sortby == row %?>
- <a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=<?% IF sortby == row && orderby == 1 %?>0<?% ELSE %?>1<?% END %?>" >
+ <a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=<?% IF sortby == row && orderby == 0 %?>1<?% ELSE %?>0<?% END %?>" >
<?% label %?>
</a>
<?% "</strong>" IF sortby == row %?>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/display.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/display.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/display.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -6,16 +6,20 @@
<!-- First: <?% FOREACH x = data.first %?><?% loop.count - 1 %?>:<?% x %?>|<?% END %?> -->
<!-- Last: <?% FOREACH x = data.last %?><?% loop.count - 1 %?>:<?% x %?>|<?% END %?> -->
<?% END %?>
-<?% id = data.last.0 %?>
-<?% title = data.last.1 %?>
-<?% subtitle = data.last.2 %?>
-<?% start = data.last.3.match('(.*) (.*) (.*)') %?>
-<?% stop = data.last.4.match('(.*) (.*) (.*)') %?>
-<?% day = start.0 %?>
-<?% channel = data.last.5 %?>
-<?% description = data.last.6 %?>
-<?% bild = data.last.7 %?>
-<?% duration = data.last.8 %?>
+<?%- id = data.last.0;
+ title = data.last.1;
+ subtitle = data.last.2;
+ start = data.last.3.match('(.*) (.*) (.*)');
+ stop = data.last.4.match('(.*) (.*) (.*)');
+ day = start.0;
+ channel = data.last.5;
+ description = data.last.6;
+ bild = data.last.7;
+ duration = data.last.8;
+ video = data.last.9;
+ audio = data.last.10;
+ vps = data.last.11;
+-%?>
<?% ######################################################################## %?>
<?% BLOCK dur %?>
<?% height=12;d = duration div 1 ; IF d >= 0 and d <= 100 %?>
@@ -86,12 +90,13 @@
<?% END %?>
<?% day %?>
<?% start.2 %?> <?% start.1 %?> - <?% stop.1 %?>
+ <?% IF vps && vps != start.1 %?> (<?% gettext("VPS") %?>:<?% vps %?>) <?% END %?>
</div>
</td>
<td align="right">
<?% PROCESS dur %?>
</td>
- <td>
+ <td class="push">
<?% PROCESS RowButtons %?>
</td>
</tr>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/filesys.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/filesys.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/filesys.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -30,7 +30,7 @@
my_graph.set_value_font(param.font,10);
my_graph.set_label_font(param.font,6);
- file = writefile("status_filesys_${name}.png", my_graph.plot(d).png );
+ file = writefile("status_filesys_${name}.gif", my_graph.plot(d).gif );
statusfiles.push(file);
END;
END;
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/global.js
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/global.js 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/global.js 2006-05-11 20:11:55 UTC (rev 2771)
@@ -113,7 +113,16 @@
}
}
-function Play(warnmsg,form) {
+function PlayMusic(ids,proxy) {
+ /*popupwindow('?cmd=mplay&data=' + ids,620,670,0);*/
+ var url = "";
+ if(proxy.length > 0)
+ url = proxy;
+ url = url + '?cmd=mplaylist&data=' + ids + '&binary=1';
+ location.href = url;
+}
+
+function Play(warnmsg,form,proxy) {
// test on checked Boxes
x = 0;
ok = new Array;
@@ -126,7 +135,7 @@
}
}
if(x > 0) {
- popupwindow('?cmd=mplay&data=' + ok.join('_'),620,670,0);
+ PlayMusic(ok.join('_'));
} else {
alert(warnmsg);
}
@@ -140,17 +149,15 @@
return (!window.opera && document.compatMode && document.compatMode!="BackCompat")? document.documentElement : document.body
}
-function popupwindow(url,width,height,reloadonclose,value){
- if (!value)
- value = '';
+function popupwindow(url,width,height,reloadonclose){
if (!ie5&&!ns6)
- window.open(url + value,"","width=width,height=height,scrollbars=1");
+ window.open(url,"","width=width,height=height,scrollbars=1");
else{
document.getElementById("hilfsframe").style.width=width+"px";
document.getElementById("hilfsframe").style.height=height+"px";
document.getElementById("hilfsframe").style.left="30px";
document.getElementById("hilfsframe").style.top=ns6? window.pageYOffset*1+30+"px" : iecompattest().scrollTop*1+30+"px";
- document.getElementById("cframe").src=url + value;
+ document.getElementById("cframe").src=url;
document.getElementById("hilfsframe").style.display = "";
}
reloadframe = reloadonclose;
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/help.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/help.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/help.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -26,7 +26,7 @@
<td valign="middle" align="left" class="fieldinline" >
</td>
- <td valign="middle" align="right" class="fieldinline" >
+ <td class="fieldinline push">
<a href="javascript:popupwindow('?cmd=<?% short %?>',620,670,0)">
<img src="images/watch.<?% global.imagetyp %?>" alt="" />
</a>
@@ -54,7 +54,7 @@
<?% desc | html %?>
</a>
</td>
- <td align="right">
+ <td class="push">
<a href="javascript:popupwindow('?cmd=<?% short %?>',620,670,0)">
<img src="images/watch.<?% global.imagetyp %?>" alt="" />
</a>
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/images/audio.gif
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/images/audio.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/images/audio.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/images/audio.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/images/movie.gif
===================================================================
(Binary files differ)
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/images/movie.png
===================================================================
(Binary files differ)
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/images/topten.gif
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/images/topten.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/images/topten.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/images/topten.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/memory.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/memory.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/memory.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -64,7 +64,7 @@
my_graph.set_x_axis_font(param.font,6);
my_graph.set_y_axis_font(param.font,6);
my_graph.set_legend( 'Swap', 'Active', 'Cached', 'Buffers');
- statusfiles.$name = writefile("status_${name}.png", my_graph.plot(d).png );
+ statusfiles.$name = writefile("status_${name}.gif", my_graph.plot(d).gif );
END;
# ------------------- Piegraph für Speicher
@@ -86,7 +86,7 @@
my_graph.set_title_font(param.font,10);
my_graph.set_label_font(param.font,10);
my_graph.set_value_font(param.font,8);
- statusfiles.$name = writefile("status_${name}.png", my_graph.plot(d2).png );
+ statusfiles.$name = writefile("status_${name}.gif", my_graph.plot(d2).gif );
END;
%?>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/mlist.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/mlist.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/mlist.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -1,6 +1,7 @@
<!--mlist-->
<body class="frame">
<div id="body">
+<?% USE date %?>
<?% ######################################################################## %?>
<?% total = 0 %?>
<?% BLOCK summe %?>
@@ -56,8 +57,8 @@
<td class="fieldinline" style="white-space: nowrap">
<font class="description">
<?% IF allow('mplay') %?>
- <input type="checkbox" value="<?% id %?>" />
- <a title="<?% gettext("Play selected songs") %?>" href="javascript:popupwindow('?cmd=mplay&data=<?% id %?>',620,670,0)">
+ <input class="push" type="checkbox" value="<?% id %?>" />
+ <a title="<?% gettext("Play selected songs") %?>" href="javascript:PlayMusic('<?% id %?>','<?% param.proxy %?>')">
<?% END %?>
<?% playtime %?>
<?% IF track != "" %?> (<?% track %?>)<?% END %?>
@@ -66,10 +67,10 @@
<?% END %?>
</font>
</td>
- <td valign="bottom" align="right" style="white-space: nowrap">
+ <td class="push">
<?% IF allow('mplay') %?>
- <a title="<?% gettext("Play selected songs") %?>" href="javascript:popupwindow('?cmd=mplay&data=<?% id %?>',620,670,0)">
- <img align="right" src="images/play.<?% global.imagetyp %?>" alt="" title="<?% gettext("Play selected songs") %?>" />
+ <a title="<?% gettext("Play selected songs") %?>" href="javascript:PlayMusic('<?% id %?>','<?% param.proxy %?>')">
+ <img src="images/play.<?% global.imagetyp %?>" alt="" title="<?% gettext("Play selected songs") %?>" />
</a>
<?% END %?>
</td>
@@ -88,7 +89,7 @@
<tr valign="bottom" <?% ' class="two"' IF z mod 2 == 0 %?>>
<td class="fieldinline">
<?% IF allow('mplay') %?>
- <input type="checkbox" value="<?% id %?>" />
+ <input class="push" type="checkbox" value="<?% id %?>" />
<?% END %?>
</td>
<td class="fieldinline">
@@ -103,12 +104,12 @@
</a>
<?% END %?>
</td>
- <td class="fieldinline">
+ <td class="fieldinline push">
<?% IF allow('mplay') %?>
- <a title="<?% gettext("Play selected songs") %?>" href="javascript:popupwindow('?cmd=mplay&data=<?% id %?>',620,670,0)">
- <img align="right" src="images/play.<?% global.imagetyp %?>" alt="" title="<?% gettext("Play selected songs") %?>" />
+ <a title="<?% gettext("Play selected songs") %?>" href="javascript:PlayMusic('<?% id %?>','<?% param.proxy %?>')">
+ <img src="images/play.<?% global.imagetyp %?>" alt="" title="<?% gettext("Play selected songs") %?>" />
</a>
- <a title="<?% gettext("Play selected songs") %?>" href="javascript:popupwindow('?cmd=mplay&data=<?% id %?>',620,670,0)">
+ <a title="<?% gettext("Play selected songs") %?>" href="javascript:PlayMusic('<?% id %?>','<?% param.proxy %?>')">
<?% END %?>
<?% playtime %?>
<?% IF track != "" %?> (<?% track %?>)<?% END %?>
@@ -120,7 +121,7 @@
<?% END %?>
<?% ######################################################################## %?>
<?% BLOCK titleline %?>
- <?%- files = param.getCover(album);
+ <?%- files = param.getCover(album,artist);
IF files.size > 0 && files.first.length > 0;
cover = files.first;
END;
@@ -266,7 +267,7 @@
<?% gettext("Genres",20) %?>:<br />
<select name='genres' onchange="di('?cmd=ml&data=','genre:' + this.form.genres.options[this.form.genres.options.selectedIndex].value)">
<?% FOREACH ch = param.genres %?>
- <option value="<?% url( ch.0 ) %?>"<?% ' selected="selected"' IF cgi.param('data').split(':').first == 'genre' && cgi.param('data').split(':').last == ch.0 %?>><?% ch.0 | html %?></option>
+ <option value="<?% url( ch.1 ) %?>"<?% ' selected="selected"' IF cgi.param('data').split(':').first == 'genre' && cgi.param('data').split(':').last == ch.1 %?>><?% ch.0 | html %?></option>
<?% END %?>
</select><br />
<?% gettext("Artists",20) %?>:<br />
@@ -284,7 +285,7 @@
<?% gettext("Year",20) %?>:<br />
<select name='years' onchange="di('?cmd=ml&data=','year:' + this.form.years.options[this.form.years.options.selectedIndex].value)">
<option value=""> </option>
- <?% ch = 2005; WHILE ch >= 1970; %?>
+ <?% ch = date.format(date.now, '%Y', 'en_GB'); WHILE ch >= 1970; %?>
<option value="<?% url( ch ) %?>"<?% ' selected="selected"' IF cgi.param('data').split(':').first == 'year' && cgi.param('data').split(':').last == ch %?>><?% ch | html %?></option>
<?% ch = ch - 1; END %?>
</select>
@@ -315,10 +316,10 @@
<a href="javascript:selAll(document.mlist,0)"><?% gettext("Unselect all",20) %?></a><br />
<a href="javascript:reverse(document.mlist)"><img src="images/invers.<?% global.imagetyp %?>" alt="" /></a>
<a href="javascript:reverse(document.mlist)"><?% gettext("Reverse select",20) %?></a><br />
- <a href="javascript:Play('<?% gettext("You have nothing selected!") %?>',document.mlist)">
+ <a href="javascript:Play('<?% gettext("You have nothing selected!") %?>',document.mlist,'<?% param.proxy %?>')">
<img src="images/play.<?% global.imagetyp %?>" alt="" title="<?% gettext("Play selected songs") %?>" />
</a>
- <a href="javascript:Play('<?% gettext("You have nothing selected!") %?>',document.mlist)">
+ <a href="javascript:Play('<?% gettext("You have nothing selected!") %?>',document.mlist,'<?% param.proxy %?>')">
<?% gettext("Play selected songs",20) %?>
</a>
</td>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/network.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/network.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/network.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -82,7 +82,7 @@
my_graph.set_x_axis_font(param.font,6);
my_graph.set_y_axis_font(param.font,6);
my_graph.set_legend( 'RxBytes', 'RxErrors', 'TxBytes', 'TxErrors');
- statusfiles.$iname = writefile("status_network_${iname}.png", my_graph.plot(d).png );
+ statusfiles.$iname = writefile("status_network_${iname}.gif", my_graph.plot(d).gif );
END;
END;
%?>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/now.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/now.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/now.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -4,7 +4,7 @@
<div id="body">
<?% ######################################################################## %?>
<?% BLOCK dur %?>
- <?% height=6;d = d div 1 ; IF d >= 0 and d <= 100 %?>
+ <?% height=6;d = d div 1 ; IF d > 0 and d <= 100 %?>
<?% IF d >= 1 %?>
<img class="progressleft" src="images/blank.gif" width="<?% 100 - d | format('%d') %?>" height="<?% height %?>" alt="<?% 100 - d %?>%" /><img class="progressright" src="images/blank.gif" width="<?% d | format('%d') %?>" height="<?% height %?>" alt="" />
<?% ELSE %?>
@@ -38,7 +38,7 @@
<img src="images/watch.<?% global.imagetyp %?>" alt="" title="<?% gettext("Switch") %?>" />
</a>
<?% END %?>
- <a class="fieldinline" style="vertical-align:bottom;" href="?cmd=program&data=<?% channel %?>" title="<?% gettext("Program guide for") %?> <?% sender | html %?>">
+ <a href="?cmd=program&data=<?% channel %?>" title="<?% gettext("Program guide for") %?> <?% sender | html %?>">
<font class="channel"><?% channel %?>. </font><?% sender | truncate(20) | html %?></a>
</td>
</tr>
@@ -59,11 +59,13 @@
<tr>
<td class="fieldinline" style="white-space: nowrap">
<font class="description">
- <?% start %?> - <?% stop %?><br />
+ <?% start %?> - <?% stop %?>
+ <?% IF vps && vps != start %?> (<?% gettext("VPS") %?>:<?% vps %?>) <?% END %?>
+ <br />
<?% PROCESS dur d=duration %?>
</font>
</td>
- <td valign="bottom" align="right" style="white-space: nowrap">
+ <td class="push">
<?% PROCESS RowButtons %?>
</td>
</tr>
@@ -81,11 +83,11 @@
<tr<?% ' class="two"' IF loop.count mod 2 == 0 %?>>
<td class="fieldinline">
<?% IF allow('switch') %?>
- <a class="fieldinline" style="vertical-align:bottom;" href="javascript:post('switch','<?% channel %?>')">
- <img src="images/watch.<?% global.imagetyp %?>" alt="" title="<?% gettext("Switch") %?>" />
+ <a href="javascript:post('switch','<?% channel %?>')">
+ <img class="push" src="images/watch.<?% global.imagetyp %?>" alt="" title="<?% gettext("Switch") %?>" />
</a>
<?% END %?>
- <a class="fieldinline" style="vertical-align:bottom;" href="?cmd=program&data=<?% channel %?>" title="<?% gettext("Program guide for") %?> <?% sender | html %?>">
+ <a href="?cmd=program&data=<?% channel %?>" title="<?% gettext("Program guide for") %?> <?% sender | html %?>">
<font class="channel"><?% channel %?>. </font><?% sender | truncate(20) | html %?></a>
</td>
<td class="fieldinline">
@@ -96,9 +98,11 @@
<?% "</em>" IF param.timers.${id} %?>
</a>
</td>
- <td class="fieldinline"><?% start %?> - <?% stop %?></td>
+ <td class="fieldinline"><?% start %?> - <?% stop %?>
+ <?% IF vps && vps != start %?> (<?% gettext("VPS") %?>:<?% vps %?>) <?% END %?>
+ </td>
<td class="fieldinline" style="white-space: nowrap"><?% PROCESS dur d=duration %?></td>
- <td class="fieldinline" style="white-space: nowrap" valign="top" align="right"><?% PROCESS RowButtons %?></td>
+ <td class="fieldinline push"><?% PROCESS RowButtons %?></td>
</tr>
<?% IF global.hideDescription != 1 && desc.length > 0 %?>
<tr<?% ' class="two"' IF loop.count mod 2 == 0 %?>>
@@ -142,7 +146,7 @@
<?% z = 0 %?>
<?% FOREACH zeile = data %?>
<?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
- <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;duration=zeile.8;desc=zeile.9 %?>
+ <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;desc=zeile.8;duration=zeile.9;vps=zeile.10 %?>
<?% IF z >= global.cfgTableColumn || ( old.defined && group != old ) %?>
<?% IF old.defined;WHILE z < global.cfgTableColumn;z = z + 1 %?><td class="fieldempty"></td><?% END %?><?% END %?>
<?% z = 0 %?>
@@ -170,7 +174,7 @@
<tr><th width="150"></th><th></th><th width="75"></th><th width="110"></th><th width="40" align="right"></th></tr>
<?% FOREACH zeile = data %?>
<?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
- <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;duration=zeile.8;desc=zeile.9 %?>
+ <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;group=zeile.5;start=zeile.6;stop=zeile.7;desc=zeile.8;duration=zeile.9;vps=zeile.10 %?>
<?% IF old.defined && group != old %?>
</table>
</td>
@@ -201,20 +205,29 @@
<tr><td class="sidehead"><?% gettext("What is running at",20) %?></td></tr>
<tr>
<td class="sidetext">
- <a href="?cmd=now"><img src="images/forward.<?% global.imagetyp %?>" alt="" title="<?% gettext("Running now") %?>" /></a>
- <a href="?cmd=now"><?% gettext("Running now",20) %?></a><br />
- <a href="?cmd=next"><img src="images/forward.<?% global.imagetyp %?>" alt="" title="<?% gettext("Next") %?>" /></a>
- <a href="?cmd=next"><?% gettext("Next",20) %?></a><br />
- <a href="?cmd=sch<?% IF param.zeit && cgi.param('cmd') != 'next' && now != 1;"&data=";param.zeit;END;%?>">
+ <form action="">
+ <select name="cgroups" onchange="di('?cmd=<?% cgi.param('cmd') %?>&data=<?% cgi.param('data') %?>&__cgrp=',this.form.cgroups.options[this.form.cgroups.options.selectedIndex].value)">
+ <?% FOREACH cgrp = param.cgroups %?>
+ <option value="<?% cgrp.last %?>"<?% ' selected="selected"' IF param.channelgroup == cgrp.last %?>><?% cgrp.first %?></option>
+ <?% END %?>
+ </select>
+ </form>
+
+ <a href="?cmd=now&__cgrp=<?% cgi.param('__cgrp') %?>"><img src="images/forward.<?% global.imagetyp %?>" alt="" title="<?% gettext("Running now") %?>" /></a>
+ <a href="?cmd=now&__cgrp=<?% cgi.param('__cgrp') %?>"><?% gettext("Running now",20) %?></a><br />
+ <a href="?cmd=next&__cgrp=<?% cgi.param('__cgrp') %?>"><img src="images/forward.<?% global.imagetyp %?>" alt="" title="<?% gettext("Next") %?>" /></a>
+ <a href="?cmd=next&__cgrp=<?% cgi.param('__cgrp') %?>"><?% gettext("Next",20) %?></a><br />
+ <a href="?cmd=sch<?% IF param.zeit && cgi.param('cmd') != 'next' && now != 1;"&data=";param.zeit;END;%?>&__cgrp=<?% cgi.param('__cgrp') %?>">
<img alt="" src="images/forward.<?% global.imagetyp %?>" title="<?% gettext("Schema") %?>" /></a>
- <a href="?cmd=sch<?% IF param.zeit && cgi.param('cmd') != 'next' && now != 1;"&data=";param.zeit;END;%?>">
+ <a href="?cmd=sch<?% IF param.zeit && cgi.param('cmd') != 'next' && now != 1;"&data=";param.zeit;END;%?>&__cgrp=<?% cgi.param('__cgrp') %?>">
<?% gettext("Schema",20) %?><?% IF param.zeit && cgi.param('cmd') != 'next' && now != 1;" ";day;END;%?></a><br /><br />
<form action="">
<input type="hidden" name="cmd" value="now" />
<input type="text" name="data" value="<?% IF time.defined %?><?% time %?><?% ELSE %?>20:15<?% END %?>" size="18" />
+ <input type="hidden" name="__cgrp" value="<?% cgi.param('__cgrp') %?>" />
</form>
<form action="">
- <select size="5" name='data' onchange="di('?cmd=now&data=',this.form.data.options[this.form.data.options.selectedIndex].value)">
+ <select size="5" name='data' onchange="di('?cmd=now&__cgrp=<?% cgi.param('__cgrp') %?>&data=',this.form.data.options[this.form.data.options.selectedIndex].value)">
<?% today = [] %?>
<?% tomor = [] %?>
<?% FOREACH zeit = param.periods.split(','); %?>
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/print.css
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/print.css 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/print.css 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1,51 @@
+body.frame {
+ padding: 0px 0px 0px 0px;
+ margin: 0px 0px 0px 0px;
+}
+
+.push{
+ display:none;
+}
+
+#logo {
+ display:none;
+}
+
+#logo a img {
+ display:none;
+}
+
+#header {
+ display:none;
+}
+
+#headerNav {
+ display:none;
+}
+
+a.headerNav:active,
+a.headerNav:link,
+a.headerNav:visited {
+ display:none;
+}
+
+a.headerNav:hover {
+ display:none;
+}
+/* Sidebar */
+
+#sidebar {
+ display:none;
+}
+
+#sidebar input {
+ display:none;
+}
+
+#sidebar select {
+ display:none;
+}
+
+#shutter {
+ display:none;
+}
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/program.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/program.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/program.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -56,10 +56,12 @@
<tr>
<td class="fieldinline" style="white-space: nowrap">
<font class="description">
- <?% start %?> - <?% stop %?><br />
+ <?% start %?> - <?% stop %?>
+ <?% IF vps && vps != start %?> (<?% gettext("VPS") %?>:<?% vps %?>) <?% END %?>
+ <br />
</font>
</td>
- <td class="fieldinline" align="right">
+ <td class="fieldinline push">
<?% PROCESS RowButtons %?>
</td>
</tr>
@@ -75,7 +77,9 @@
<?% BLOCK ItemAsFlat %?>
<tr<?% ' class="two"' IF z mod 2 == 0 %?>>
- <td class="fieldinline"><?% start %?> - <?% stop %?></td>
+ <td class="fieldinline"><?% start %?> - <?% stop %?>
+ <?% IF vps && vps != start %?> (<?% gettext("VPS") %?>:<?% vps %?>) <?% END %?>
+ </td>
<td class="fieldinline">
<a title="<?% title | html %?>" href="javascript:popupwindow('?cmd=display&data=<?% id %?>',620,670,0)" class="fieldinline">
<?% "<em>" IF param.timers.${id} %?>
@@ -84,7 +88,7 @@
<?% "</em>" IF param.timers.${id} %?>
</a>
</td>
- <td class="fieldinline" align="right"><?% PROCESS RowButtons %?></td>
+ <td class="fieldinline push"><?% PROCESS RowButtons %?></td>
</tr>
<?% IF global.hideDescription != 1 && desc.length > 0 %?>
<tr<?% ' class="two"' IF z mod 2 == 0 %?>>
@@ -130,7 +134,7 @@
<?% z = 0 %?>
<?% FOREACH zeile = data %?>
<?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
- <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;desc=zeile.6 %?>
+ <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;desc=zeile.6;video=zeile.7;audio=zeile.8;vps=zeile.9 %?>
<?% day = date.format(zeile.5, "%A, %x") | html %?>
<?% IF old.defined && day != old %?>
<?% WHILE z < global.cfgTableColumn;z = z + 1 %?><td class="fieldempty"></td><?% END %?>
@@ -157,7 +161,7 @@
<?% z = 0 %?>
<?% FOREACH zeile = data %?>
<?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
- <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;desc=zeile.6 %?>
+ <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;start=zeile.3;stop=zeile.4;desc=zeile.6;video=zeile.7;audio=zeile.8;vps=zeile.9 %?>
<?% day = date.format(zeile.5, "%A, %x") | html %?>
<?% IF !old.defined || day != old %?>
<?% IF old.defined %?>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/rdisplay.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/rdisplay.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/rdisplay.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -1,4 +1,9 @@
<!-- rdisplay -->
+<?% IF debug %?>
+<!--
+<?% USE Dumper; Dumper.dump_html(param); %?>
+-->
+<?% END %?>
<?% IF ! global.bodyinc.defined;global.bodyinc = 1 %?>
<body class="hilfsframed">
<?% END %?>
@@ -32,8 +37,37 @@
<?% END %?>
<?% END %?>
<?% ######################################################################## %?>
+<?% BLOCK image %?>
+ <?%- IF data.Type == 'RADIO';
+ mylist = [ "images/audio", global.imagetyp ];
+ files = [ mylist.join('.') ];
+ ELSIF param.previews.size <= 0;
+ mylist = [ "images/movie", global.imagetyp ];
+ files = mylist.join('.');
+ ELSE;
+ files = param.previews;
+ END;
+ -%?>
+ <?% IF files.size %?>
+ <table summary="">
+ <tr>
+ <td>
+ <?% FOREACH bild = files %?>
+ <img class="recorddetails" src="<?% bild %?>" alt="" />
+ <?% IF (loop.count) mod 3 == 0 && loop.count != loop.size %?>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <?% END %?>
+ <?% END %?>
+ </td>
+ </tr>
+ </table>
+ <?% END %?>
+<?% END %?>
+<?% ######################################################################## %?>
<?% BLOCK RowButtons %?>
-<div align="right">
<?% IF global.playbackmode == 0 %?>
<?% IF allow('stream') %?>
<a href="?cmd=stream&data=<?% id %?>">
@@ -68,7 +102,6 @@
<img src="images/delete.<?% global.imagetyp %?>" alt="" title="<?% gettext("Delete recording") %?>" />
</a>
<?% END %?>
-</div>
<?% END %?>
<?% ######################################################################## %?>
<?% BLOCK marks # (c) xpix %?>
@@ -155,23 +188,7 @@
<table width="100%" summary="" >
<tr>
<td valign="top" align="center">
- <?% IF param.previews.size %?>
- <table summary="">
- <tr>
- <td>
- <?% FOREACH bild = param.previews %?>
- <img class="recorddetails" src="<?% bild %?>" alt="" />
- <?% IF (loop.count) mod 3 == 0 && loop.count != loop.size %?>
- </td>
- </tr>
- <tr>
- <td>
- <?% END %?>
- <?% END %?>
- </td>
- </tr>
- </table>
- <?% END %?>
+ <?% PROCESS image %?>
</td>
</tr>
<tr>
@@ -185,8 +202,11 @@
<?% ELSE %?>
<?% gettext("at") %?> <?% data.StartTime %?>
<?% END %?>
+ <?% IF data.Channel %?>
+ <br /><?% gettext('Channel') %?> : <?% data.Channel %?>
+ <?% END %?>
</td>
- <td align="right" >
+ <td class="push">
<?% IF allow('rconvert') && param.reccmds.size > 0 %?>
<p>
<form action="">
@@ -204,8 +224,7 @@
<tr>
<td colspan="2">
<p>
-<?% data.Description.replace('\|', '
-') %?>
+<?% data.Description.replace('\|', '<br />') %?>
</p>
</td>
</tr>
@@ -217,7 +236,9 @@
<tr>
<td>
<?% gettext('Lifetime') %?> : <?% data.Lifetime %?>,
- <?% gettext('Priority') %?> : <?% data.Prio %?></td><td>
+ <?% gettext('Priority') %?> : <?% data.Prio %?>
+ </td>
+ <td class="push">
<?% PROCESS RowButtons id=data.RecordId%?>
</td>
</tr>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/rlist.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/rlist.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/rlist.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -29,11 +29,36 @@
<?% END %?>
<?% END %?>
<?% ######################################################################## %?>
+<?% total = 0 %?>
+<?% BLOCK printsumme %?>
+ <?% IF total > 0 %?>
+ <?%
+ sec = total mod 60;
+ min = total div 60 mod 60;
+ hour = total div 3600;
+ %?>
+ <p class="description" style="padding: 0; margin-left: <?% width %?>px;">
+ <?% gettext("total time") %?> :
+ <?% IF hour > 0 %?><?% hour FILTER format('%02d') %?>:<?% END %?><?% min FILTER format('%02d') %?>:<?% sec FILTER format('%02d')%?>
+ </p>
+ <?% END %?>
+<?% END %?>
+<?% ######################################################################## %?>
<?% BLOCK image %?>
<?%- files = param.getPreview(eventid);
- IF files.size > 0 && files.last.length > 0;
- preview = files.last;
- ELSE;
+ IF type == 'RADIO';
+ mylist = [ "images/audio", global.imagetyp ];
+ preview = mylist.join('.') ;
+ ELSIF files.size > 0;
+#
+# USE date;
+# img = date.format(date.now, '%S') mod files.size;
+# preview = files.$img;
+#
+ img = (files.size div 2);
+ preview = files.$img;
+ END;
+ IF preview.length <= 0;
mylist = [ "images/movie", global.imagetyp ];
preview = mylist.join('.') ;
END;
@@ -80,8 +105,11 @@
<td class="fieldhead">
<?% IF folder <= 1 %?>
<a href="javascript:popupwindow('?cmd=rdisplay&data=<?% id %?>',620,670,0)" class="fieldinline title" title="<?% title | html %?>">
- <?% IF new > 0 %?><img src="images/new.<?% global.imagetyp %?>" alt="" title="<?% gettext("New recording") %?>" /> <?% END %?>
+ <?% IF new > 0 %?><img src="images/new.<?% global.imagetyp %?>" alt="" title="<?% gettext("New recording") %?>" />
+ <?% title | truncate(27) | html %?>
+ <?% ELSE %?>
<?% title | truncate(30) | html %?>
+ <?% END %?>
<?% ELSE %?>
<a href="?cmd=rlist&data=<?% url( fulltitle ) %?><?% orderby %?>" class="fieldinline title">
<?% foldertitle | truncate(30) | html %?>
@@ -127,7 +155,7 @@
<tr>
<?% IF enableform %?>
<td valign="middle" align="left" class="fieldinline">
- <input type="checkbox" value="<?% id %?>" name="<?% fulltitle | html %?>" />
+ <input class="push" type="checkbox" value="<?% id %?>" name="<?% fulltitle | html %?>" />
</td>
<?% END %?>
<td valign="middle" align="left" class="fieldinline">
@@ -135,7 +163,7 @@
<font class="description"><?% PROCESS time t=start %?><?% PROCESS dur d=duration %?></font>
</a>
</td>
- <td valign="middle" align="right">
+ <td class="push">
<?% PROCESS RowButtons %?>
</td>
</tr>
@@ -164,7 +192,7 @@
</a>
<?% ELSE %?>
<?% IF enableform %?>
- <input type="checkbox" value="<?% id %?>" name="<?% fulltitle | html %?>" />
+ <input class="push" type="checkbox" value="<?% id %?>" name="<?% fulltitle | html %?>" />
<?% END %?>
<?% IF param.previewcommand != 'n' %?>
<a href="javascript:popupwindow('?cmd=rdisplay&data=<?% id %?>',620,670,0)" title="<?% fulltitle | html %?>" class="fieldinline">
@@ -194,7 +222,7 @@
</a>
<?% END %?>
</td>
- <td align="right">
+ <td class="push">
<?% IF folder <= 1 %?>
<?% PROCESS RowButtons %?>
<?% END %?>
@@ -220,8 +248,9 @@
<?% z = 0 %?>
<?% FOREACH zeile = data %?>
<?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
- <?%- id=zeile.0;eventid=zeile.1;title=zeile.2.split('~').last;subtitle=zeile.3;duration=zeile.4;start=zeile.5;new=zeile.6;folder=zeile.7;fulltitle=zeile.8
- foldertitle=fulltitle.split('~').last -%?>
+ <?%- id=zeile.0;eventid=zeile.1;title=zeile.2.split('~').last;subtitle=zeile.3;
+ duration=zeile.4;start=zeile.5;new=zeile.6;type=zeile.7;folder=zeile.8;fulltitle=zeile.9;
+ isrecording=zeile.10;foldertitle=fulltitle.split('~').last -%?>
<?% IF z >= global.cfgTableColumn || old != ( folder > 1 ? 2 : 1 ) %?>
<?% IF old.defined;WHILE z < global.cfgTableColumn;z = z + 1 %?><td class="fieldempty"></td><?% END %?>
</tr>
@@ -229,11 +258,13 @@
<?% z = 0;END %?>
<?% END %?>
<?% PROCESS ItemAsArea %?>
+ <?% total = total + duration %?>
<?% z = z + 1; old = ( folder > 1 ? 2 : 1 ) %?>
<?% END %?>
<?% WHILE z < global.cfgTableColumn;z = z + 1 %?><td class="fieldempty"></td><?% END %?>
</tr>
</table>
+<?% PROCESS printsumme width=global.cfgTableColumn*190 %?>
<?% ELSE; # Shows items as flat lines %?>
<table class="largetable" summary="">
<tr><td class="largehead"> </td></tr>
@@ -243,15 +274,18 @@
<tr height="0"><th></th><th></th><th width="200"></th><th width="64" align="right"></th></tr>
<?% FOREACH zeile = data %?>
<?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
- <?%- id=zeile.0;eventid=zeile.1;title=zeile.2.split('~').last;subtitle=zeile.3;duration=zeile.4;start=zeile.5;new=zeile.6;folder=zeile.7;fulltitle=zeile.8
- foldertitle=fulltitle.split('~').last -%?>
+ <?%- id=zeile.0;eventid=zeile.1;title=zeile.2.split('~').last;subtitle=zeile.3;
+ duration=zeile.4;start=zeile.5;new=zeile.6;type=zeile.7;folder=zeile.8;fulltitle=zeile.9;
+ isrecording=zeile.10;foldertitle=fulltitle.split('~').last -%?>
<?% PROCESS ItemAsFlat %?>
+ <?% total = total + duration %?>
<?% END %?>
</table>
</td>
</tr>
<tr><td class="largebottom"></td></tr>
</table>
+<?% PROCESS printsumme width=780 %?>
<?% END %?>
</form>
<?% END %?>
@@ -310,7 +344,7 @@
<td width="20"><a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=0" ><img src="images/home.<?% global.imagetyp %?>" alt="" /></a></td>
<td width="160">
<?% "<strong>" IF cgi.param('__sortby') == row %?>
- <a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=<?% IF cgi.param('__sortby') == row && cgi.param('__desc') == 1 %?>0<?% ELSE %?>1<?% END %?>" >
+ <a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=<?% IF cgi.param('__sortby') == row && cgi.param('__desc') == 0 %?>1<?% ELSE %?>0<?% END %?>" >
<?% label %?>
</a>
<?% "</strong>" IF cgi.param('__sortby') == row %?>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/schema.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/schema.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/schema.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -156,9 +156,9 @@
</table>
<?% ######################################################################## %?>
<?% BLOCK title %?>
-<?% e.1 | html %?>
-<?% e.2 | html IF e.2 %?>
-<?% e.5 | html %?> - <?% e.6 | html %?>
+<?% e.1 | html %?>
+<?% e.2 | html IF e.2 %?>
+<?% e.5 | html %?> - <?% e.6 | html %?>
<?% END %?>
<?% ######################################################################## %?>
<?% BLOCK getStatus %?>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/search.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/search.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/search.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -3,16 +3,6 @@
<body class="frame">
<div id="body">
<?% ######################################################################## %?>
-<?% BLOCK dur %?>
- <?% height=6;d = d div 1 ; IF d >= 0 and d <= 100 %?>
- <?% IF d >= 1 %?>
- <img class="progressleft" src="images/blank.gif" width="<?% 100 - d %?>" height="<?% height %?>" alt="<?% 100 - d %?>%" /><img class="progressright" src="images/blank.gif" width="<?% d %?>" height="<?% height %?>" alt="" />
- <?% ELSE %?>
- <img class="progress" src="images/blank.gif" width="100" height="<?% height %?>" alt="" />
- <?% END %?>
- <?% END %?>
-<?% END %?>
-<?% ######################################################################## %?>
<?% BLOCK RowButtons %?>
<a href="?cmd=search&data=<?% url( title ) %?>">
<img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
@@ -54,8 +44,9 @@
<tr>
<td class="fieldinline" style="white-space: nowrap">
<?% start %?> - <?% stop %?>
+ <?% IF vps && vps != start %?> (<?% gettext("VPS") %?>:<?% vps %?>) <?% END %?>
</td>
- <td valign="top" align="right" class="fieldinline" style="white-space: nowrap" >
+ <td class="fieldinline push">
<?% PROCESS RowButtons %?>
</td>
</tr>
@@ -83,8 +74,10 @@
<?% "</em>" IF param.timers.${id} %?>
</a>
</td>
- <td class="fieldinline" style="white-space: nowrap"><?% start %?> - <?% stop %?></td>
- <td class="fieldinline" valign="top" align="right" style="white-space: nowrap" ><?% PROCESS RowButtons %?></td>
+ <td class="fieldinline" style="white-space: nowrap"><?% start %?> - <?% stop %?>
+ <?% IF vps && vps != start %?> (<?% gettext("VPS") %?>:<?% vps %?>) <?% END %?>
+ </td>
+ <td class="fieldinline push"><?% PROCESS RowButtons %?></td>
</tr>
<?% IF global.hideDescription != 1 && desc.length > 0 %?>
<tr<?% ' class="two"' IF z mod 2 == 0 %?>>
@@ -101,17 +94,17 @@
<?% END %?>
<?% ######################################################################## %?>
<?% IF data.size <= 1 %?>
-<h1><?% gettext("Search results") %?> : <?% cgi.param('data') | html %?></h1>
+<h1><?% gettext("Search text") %?> : <?% cgi.param('data') | html %?></h1>
<?% ELSE %?>
<?% fields = data.shift %?>
-<h1><?% gettext("Search results") %?> : <?% cgi.param('data') | html %?> - <?% date.format(data.first.7, "%A, %x") | html %?></h1>
+<h1><?% gettext("Search text") %?> : <?% cgi.param('data') | html %?> - <?% date.format(data.first.7, "%A, %x") | html %?></h1>
<?% IF global.cfgTableColumn > 1; #Show item as rectangle %?>
<table summary="">
<tr>
<?% z = 0 %?>
<?% FOREACH zeile = data %?>
<?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
- <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;start=zeile.5;stop=zeile.6;desc=zeile.8 %?>
+ <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;sender=zeile.3;channel=zeile.4;start=zeile.5;stop=zeile.6;desc=zeile.8;vps=zeile.9 %?>
<?% day = date.format(zeile.7, "%A, %x") %?>
<?% IF old.defined && day != old %?>
<?% WHILE z < global.cfgTableColumn;z = z + 1 %?><td class="fieldempty"></td><?% END %?>
@@ -170,12 +163,40 @@
<!-- ###### Seite ###### -->
<div id="sidebar">
<table class="sidetable" summary="">
- <tr><td class="sidehead"><?% gettext("Search",20) %?></td></tr>
+ <tr><td class="sidehead"><?% gettext("Search text",20) %?></td></tr>
<tr>
<td class="sidetext">
- <form action="">
- <input type="hidden" name="cmd" value="search" />
- <input type="text" name="data" size="18" value="<?% cgi.param('data') %?>" />
+ <form method='get' action="">
+ <input type='hidden' name='cmd' value='search' />
+ <input type='hidden' name='__action' value='save' />
+ <input type="text" name="data" value="<?% cgi.param('data') %?>" />
+ <br /><br />
+ <?% gettext('Search in fields',30) %?><br />
+ <input style="width:auto;" type="radio" name="__Where" value="all" <?% IF ! cgi.param('__Where') || cgi.param('__Where') == 'all' %?>checked<?% END %?> /><?% gettext('All') %?>
+ <input style="width:auto;" type="radio" name="__Where" value="title" <?% IF cgi.param('__Where') == 'title' %?>checked<?% END %?> /><?% gettext('Only in title') %?>
+ <input style="width:auto;" type="radio" name="__Where" value="titlesubtitle" <?% IF cgi.param('__Where') == 'titlesubtitle' %?>checked<?% END %?> /><?% gettext('Only in title and subtitle') %?>
+ <br /><br />
+ <?% gettext('Video format',30) %?><br />
+ <input style="width:auto;" type="radio" name="__VideoFormat" value="all" <?% IF ! cgi.param('__VideoFormat') || cgi.param('__VideoFormat') == 'all' %?>checked<?% END %?> /><?% gettext('All') %?>
+ <input style="width:auto;" type="radio" name="__VideoFormat" value="widescreen" <?% IF cgi.param('__VideoFormat') == 'widescreen' %?>checked<?% END %?> /><?% gettext('16:9 Wide-screen') %?>
+ <br /><br />
+ <?% gettext('Audio format',30) %?><br />
+ <input style="width:auto;" type="radio" name="__AudioFormat" value="all" <?% IF ! cgi.param('__AudioFormat') || cgi.param('__AudioFormat') == 'all' %?>checked<?% END %?> /><?% gettext('All') %?>
+ <input style="width:auto;" type="radio" name="__AudioFormat" value="dts" <?% IF cgi.param('__AudioFormat') == 'dts' %?>checked<?% END %?> /><?% gettext('Dolby Digital') %?>
+ <input style="width:auto;" type="radio" name="__AudioFormat" value="stereo" <?% IF cgi.param('__AudioFormat') == 'stereo' %?>checked<?% END %?> /><?% gettext('Stereo') %?>
+ <br /><br />
+ <?% gettext('Minimum length (in minutes)',30) %?><br />
+ <input type="text" name="__MinLength" value="<?% cgi.param('__MinLength') %?>" />
+ <br /><br />
+ <?% gettext('Channel',30) %?><br />
+ <select name='__channel'>
+ <option value="0" /><?% gettext('All channels') %?>
+ <?% FOREACH chan = getModule('CHANNELS').ChannelArray('Name') %?>
+ <option value="<?% chan.last %?>" <?% IF cgi.param('__channel') == chan.last %?>selected<?% END %?> /><?% chan.first %?>
+ <?% END %?>
+ </select>
+ <br /><br />
+ <input type='submit' value='<?% gettext('Search') %?>' />
</form>
</td>
</tr>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/style.css
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/style.css 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/style.css 2006-05-11 20:11:55 UTC (rev 2771)
@@ -105,7 +105,18 @@
border: 0px;
}
+td.push{
+ vertical-align:middle;
+ text-align: right;
+ white-space: nowrap;
+}
+td.push{
+ vertical-align:middle;
+ text-align: right;
+ white-space: nowrap;
+}
+
tr.two{
background-color:#d2d2d2;
}
@@ -650,4 +661,3 @@
.channel{
font-size:8px;
}
-z
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/tlist.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/tlist.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/tlist.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -92,16 +92,16 @@
<td class="fieldtext">
<table class="fieldinline" summary="">
<tr>
- <td valign="top" align="left" style="white-space: nowrap">
+ <td valign="middle" align="left" style="white-space: nowrap">
<?% IF enableform %?>
- <input type="checkbox" value="<?% id %?>" name="<?% title | html %?>" />
+ <input class="push" type="checkbox" value="<?% id %?>" name="<?% title | html %?>" />
<?% END %?>
<font class="description<?% IF state != "";" ";state;END %?>">
<?% PROCESS time t = start %?>-<?% PROCESS time t = stop %?>
<?% " (VPS)" IF vps %?>
</font>
</td>
- <td valign="middle" align="right" style="white-space: nowrap">
+ <td class="push">
<?% PROCESS RowButtons %?>
</td>
</tr>
@@ -130,9 +130,9 @@
<font class="channel<?% IF state != "";" ";state;END %?>"><?% channel %?>. <?% sender | html %?></font>
<?% '</a>' IF allow('program') %?>
</td>
- <td class="fieldinline" style="white-space: nowrap">
+ <td class="fieldinline">
<?% IF enableform %?>
- <input type="checkbox" value="<?% id %?>" name="<?% title | html %?>" />
+ <input class="push" type="checkbox" value="<?% id %?>" name="<?% title | html %?>" />
<?% END %?>
<?% IF state != "" %?><font class="<?% state %?>"><?% END %?>
<?% PROCESS time t = start %?>-<?% PROCESS time t = stop %?>
@@ -149,7 +149,7 @@
<?% END %?>
<?% '</a>' IF allow('tedit') %?>
</td>
- <td align="right" class="fieldinline" style="white-space: nowrap">
+ <td class="fieldinline push">
<?% PROCESS RowButtons %?>
</td>
</tr>
@@ -242,6 +242,10 @@
<tr><td class="sidehead"><?% gettext("Timers",20) %?></td></tr>
<tr>
<td class="sidetext">
+<?% IF allow('topten') %?>
+ <a href="?cmd=topten"><img src="images/topten.<?% global.imagetyp %?>" alt="" /></a>
+ <a href="?cmd=topten"><?% gettext("TopTen Entrys") %?></a><br />
+<?% END %?>
<?% IF allow('tnew') %?>
<a href="javascript:popupwindow('?cmd=tnew',620,670,1)"><img src="images/new.<?% global.imagetyp %?>" alt="" /></a>
<a href="javascript:popupwindow('?cmd=tnew',620,670,1)"><?% gettext("Create a new timer",20) %?></a><br />
@@ -250,7 +254,6 @@
<a href="javascript:fire('tupdate','0')"><img src="images/refresh.<?% global.imagetyp %?>" alt="" /></a>
<a href="javascript:fire('tupdate','0')"><?% gettext("Update timers",20) %?></a>
<?% END %?>
-
</td>
</tr>
<tr>
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/topten.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/topten.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/topten.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1,201 @@
+<!-- topten -->
+<?% USE date %?>
+<body class="frame">
+<div id="body">
+<?% ######################################################################## %?>
+<?% BLOCK RowButtons %?>
+ <a href="?cmd=search&data=<?% url( title ) %?>">
+ <img src="images/find.<?% global.imagetyp %?>" alt="" title="<?% gettext("Search for repeats") %?>" />
+ </a>
+ <?% IF param.timers.${id} && allow('tedit') %?>
+ <a href="javascript:popupwindow('?cmd=tedit&data=<?% param.timers.${id}.Id %?>',620,670,0)">
+ <img src="images/onoff.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit this Timer") %?>" />
+ </a>
+ <?% ELSIF allow('tnew') %?>
+ <a href="javascript:popupwindow('?cmd=tnew&data=<?% id %?>',620,670,0)">
+ <img src="images/record.<?% global.imagetyp %?>" alt="" title="<?% gettext("To record") %?>" />
+ </a>
+ <?% END %?>
+<?% END %?>
+<?% ######################################################################## %?>
+<?% BLOCK ItemAsArea %?>
+ <td valign="top">
+ <table class="fieldtable" summary="">
+ <tr>
+ <td class="fieldhead">
+ <a class="fieldinline" style="vertical-align:bottom;" href="?cmd=program&data=<?% channel %?><?% IF id > 0 %?>#<?% id %?><?% END %?>" title="<?% gettext("Program guide for") %?> <?% sender | html %?>">
+ <font class="channel"><?% channel %?>. <?% sender | truncate(20) | html %?></font></a>
+ </td>
+ </tr>
+ <tr>
+ <td class="fieldtext" height="<?% IF global.hideDescription != 1 %?>75<?% ELSE %?>35<?% END %?>">
+ <a title="<?% title | html %?>" href="javascript:popupwindow('?cmd=display&data=<?% id %?>',620,670,0)" class="fieldinline">
+ <?% "<em>" IF param.timers.${id} %?>
+ <font class="title"><?% title | truncate(30) | html %?></font><br />
+ <?% IF subtitle.length > 0 %?><font class="subtitle"><?% subtitle | truncate(32) | html%?></font><?% END %?>
+ <?% IF global.hideDescription != 1 && desc.length > 0 %?><br /><br /><font class="description"><?% desc | replace('\|', ' ') | truncate(65) | html %?></font><?% END %?>
+ <?% "</em>" IF param.timers.${id} %?>
+ </a>
+ </td>
+ </tr>
+ <tr>
+ <td class="fieldtext">
+ <table class="fieldinline" summary="">
+ <tr>
+ <td class="fieldinline" style="white-space: nowrap">
+ <?% start %?>
+ </td>
+ <td class="fieldinline push">
+ <?% PROCESS RowButtons %?>
+ </td>
+ </tr>
+ </table>
+ </td>
+ </tr>
+ <tr>
+ <td class="fieldbottom"></td>
+ </tr>
+ </table>
+ </td>
+<?% END %?>
+<?% ######################################################################## %?>
+<?% BLOCK ItemAsFlat %?>
+ <tr<?% ' class="two"' IF z mod 2 == 0 %?>>
+ <td class="fieldinline">
+ <a class="fieldinline" style="vertical-align:bottom;" href="?cmd=program&data=<?% channel %?><?% IF id > 0 %?>#<?% id %?><?% END %?>" title="<?% gettext("Program guide for") %?> <?% sender | html %?>">
+ <font class="channel"><?% channel %?>. </font><?% sender | truncate(20) | html %?></a>
+ </td>
+ <td class="fieldinline">
+ <a title="<?% title | html %?>" href="javascript:popupwindow('?cmd=display&data=<?% id %?>',620,670,0)" class="fieldinline">
+ <?% "<em>" IF param.timers.${id} %?>
+ <font class="title"><?% title | truncate(50) | html %?></font>
+ <?% IF subtitle.length > 0 %?><font class="subtitle"> - <?% subtitle | truncate(30) | html%?></font><?% END %?>
+ <?% "</em>" IF param.timers.${id} %?>
+ </a>
+ </td>
+ <td class="fieldinline" style="white-space: nowrap"><?% start %?>
+ </td>
+ <td class="fieldinline push"><?% PROCESS RowButtons %?></td>
+ </tr>
+ <?% IF global.hideDescription != 1 && desc.length > 0 %?>
+ <tr<?% ' class="two"' IF z mod 2 == 0 %?>>
+ <td class="fieldinline" > </td>
+ <td class="fieldinline" colspan="4">
+ <a title="<?% title | html %?>" href="javascript:popupwindow('?cmd=display&data=<?% id %?>',620,670,0)" class="fieldinline">
+ <?% "<em>" IF param.timers.${id} %?>
+ <font class="description"><?% desc | replace('\|', ' ') | truncate(100) | html %?></font>
+ <?% "</em>" IF param.timers.${id} %?>
+ </a>
+ </td>
+ </tr>
+ <?% END %?>
+<?% END %?>
+<?% ######################################################################## %?>
+<?% IF data.size > 1 %?>
+<?% fields = data.shift %?>
+<h1><?% gettext("TopTen Entrys") %?></h1>
+<?% IF global.cfgTableColumn > 1; #Show item as rectangle %?>
+<table summary="">
+ <tr>
+ <?% z = 0 %?>
+ <?% FOREACH zeile = data %?>
+ <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+ <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;desc=zeile.3;channel_id=zeile.4;start=zeile.5;video=zeile.6;audio=zeile.7 %?>
+ <?% channel = param.channels.$channel_id.POS %?>
+ <?% sender = param.channels.$channel_id.Name %?>
+ <?% IF old.defined && 1 != old %?>
+ <?% WHILE z < global.cfgTableColumn;z = z + 1 %?><td class="fieldempty"></td><?% END %?>
+ </tr>
+</table>
+<h2><?% day %?></h2>
+<table summary="<?% day %?>">
+ <tr>
+ <?% z = 0 %?>
+ <?% END %?>
+ <?% IF z >= global.cfgTableColumn %?>
+ <?% z = 0 %?>
+ </tr>
+ <tr>
+ <?% END %?>
+ <?% PROCESS ItemAsArea %?>
+ <?% old = 1 %?>
+ <?% z = z + 1 %?>
+ <?% END %?>
+ <?% WHILE z < global.cfgTableColumn;z = z + 1 %?><td class="fieldempty"></td><?% END %?>
+ </tr>
+</table>
+<?% ELSE; # Shows items as flat lines %?>
+ <?% FOREACH zeile = data %?>
+ <?% IF debug;"<!-- Item: ";FOREACH x = zeile;loop.count - 1;":";x.replace("-"," ");"|";END;"-->";END %?>
+ <?% id=zeile.0;title=zeile.1;subtitle=zeile.2;desc=zeile.3;channel_id=zeile.4;start=zeile.5;video=zeile.6;audio=zeile.7 %?>
+ <?% channel = param.channels.$channel_id.POS %?>
+ <?% sender = param.channels.$channel_id.Name %?>
+ <?% IF !old.defined || 1 != old %?>
+ <?% IF old.defined %?>
+ </table>
+ </td>
+ </tr>
+ <tr><td class="largebottom"></td></tr>
+</table>
+ <?% END %?>
+<table class="largetable" summary="">
+ <tr><td class="largehead"><?% day %?></td></tr>
+ <tr>
+ <td class="largetext" align="left">
+ <table summary="" width="100%">
+ <?% z = 1 %?>
+ <tr height="0"><th width="120"></th><th></th><th width="60"></th><th width="40" align="right"></th></tr>
+ <?% END %?>
+ <?% PROCESS ItemAsFlat %?>
+ <?% old = 1 %?>
+ <?% z = z + 1 %?>
+ <?% END %?>
+ </table>
+ </td>
+ </tr>
+ <tr><td class="largebottom"></td></tr>
+</table>
+<?% END %?>
+<?% END %?>
+</div>
+<!-- ###### Seite ###### -->
+<div id="sidebar">
+<?% IF enableform || allow('tnew') || allow('tupdate') %?>
+ <table class="sidetable" summary="">
+ <tr><td class="sidehead"><?% gettext("Timers",20) %?></td></tr>
+ <tr>
+ <td class="sidetext">
+<?% IF allow('topten') %?>
+ <a href="?cmd=topten"><img src="images/topten.<?% global.imagetyp %?>" alt="" /></a>
+ <a href="?cmd=topten"><?% gettext("TopTen Entrys") %?></a><br />
+<?% END %?>
+<?% IF allow('tnew') %?>
+ <a href="javascript:popupwindow('?cmd=tnew',620,670,1)"><img src="images/new.<?% global.imagetyp %?>" alt="" /></a>
+ <a href="javascript:popupwindow('?cmd=tnew',620,670,1)"><?% gettext("Create a new timer",20) %?></a><br />
+<?% END %?>
+<?% IF allow('tupdate') %?>
+ <a href="javascript:fire('tupdate','0')"><img src="images/refresh.<?% global.imagetyp %?>" alt="" /></a>
+ <a href="javascript:fire('tupdate','0')"><?% gettext("Update timers",20) %?></a><br />
+<?% END %?>
+ </td>
+ </tr>
+ <tr>
+ <td class="sidebottom"></td>
+ </tr>
+ </table>
+<?% END %?>
+ <table class="sidetable" summary="">
+ <tr><td class="sidehead"><?% gettext("Search for timers",20) %?></td></tr>
+ <tr>
+ <td class="sidetext">
+ <form action="">
+ <input type="hidden" name="cmd" value="tsearch" />
+ <input type="text" name="data" size="18" <?% IF cgi.param('cmd')=='ts' || cgi.param('cmd')=='tsearch' %?>value="<?% cgi.param('data')%?>"<?% END %?> />
+ </form>
+ </td>
+ </tr>
+ <tr><td class="sidebottom"></td></tr>
+ </table>
+ <p id="sidefooter"> </p>
+</div>
+<?% INCLUDE header.inc %?>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/ulist.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/ulist.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/ulist.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -40,7 +40,7 @@
<td valign="middle" align="left" class="fieldinline" >
</td>
- <td valign="middle" align="right" class="fieldinline" >
+ <td class="fieldinline push">
<?% PROCESS RowButtons %?>
</td>
</tr>
@@ -68,7 +68,7 @@
<td align="right">
<?% right | html %?>
</td>
- <td align="right">
+ <td class="push">
<?% PROCESS RowButtons %?>
</td>
</tr>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/vitals.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/vitals.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/vitals.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -66,7 +66,7 @@
my_graph.set_x_axis_font(param.font,6);
my_graph.set_y_axis_font(param.font,6);
my_graph.set_legend( 'Load (x10)', 'User', 'Util');
- statusfiles.load = writefile("status_${name}.png", my_graph.plot(d).png );
+ statusfiles.load = writefile("status_${name}.gif", my_graph.plot(d).gif );
END;
%?>
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/date.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/date.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/date.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1,31 @@
+<!-- date -->
+<script type="text/javascript">
+
+var weekstring = '<?% gettext('MTWTFSS') %?>';
+var weekdays = weekstring.split('');
+
+function ch_input (checkbox, input) {
+ var txt = '';
+ for(var i=0;i<checkbox.length;++i) {
+ if(checkbox[i].checked) {
+ txt = txt + weekdays[i];
+ } else {
+ txt = txt + '-';
+ }
+ }
+ input.value = txt;
+}
+</script>
+
+<tr>
+ <?% INCLUDE widgets/topic.inc abbr=data.msg %?>
+ <td>
+ <?% val = cgi.param(data.NAME) || data.def %?>
+ <input style="width:80px;" size="20" type="text" name="<?% data.NAME %?>" value="<?% entities(val) %?>" <?% FOREACH p = param.tags; "$p ";END %?> />
+ <?% valarr = val.split(''); z = 0 %?>
+ <?% FOREACH dd = gettext('Mon Tue Wed Thu Fri Sat Sun').split(' ') %?>
+ <input type="checkbox" name="Weekday" <?% "checked" IF ! val.search('^\d+') && valarr.$z != '-' %?> onchange='ch_input(this.form.Weekday, this.form.<?% data.NAME %?>)' /><?% dd %?>
+ <?% z = z + 1;
+ END %?>
+ </td>
+</tr>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/footer.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/footer.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/footer.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -1,3 +1,11 @@
<!-- ###### Ende ###### -->
+<?% IF debug %?>
+<!--
+<?% PERL %?>
+use Data::Dumper;
+print Dumper($stash->_dump_frame(5));
+<?% END %?>
+-->
+<?% END %?>
</body>
</html>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/littlemenu.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/littlemenu.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/littlemenu.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -10,11 +10,11 @@
<tr>
<td class="sidetext">
<a href="?cmd=clist">
- <img src="images/edit.<?% global.imagetyp %?>" alt="" title="<?% gettext("Kanal bearbeiten") %?>" />
+ <img src="images/edit.<?% global.imagetyp %?>" alt="" title="<?% gettext("Edit channels") %?>" />
</a>
<a href="?cmd=clist">
- <?% gettext("Kanal bearbeiten",20) %?>
+ <?% gettext("Edit channels",20) %?>
</a>
</td>
</tr>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/start.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/start.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/start.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -11,7 +11,8 @@
<meta http-equiv="pragma" content="no-cache" />
<meta name="robots" content="noindex,noarchive,nofollow" />
<link rel="shortcut icon" href="favicon.ico" />
- <link rel="stylesheet" type="text/css" href="style.css" />
+ <link rel="stylesheet" type="text/css" href="style.css" media="all" />
+ <link rel="stylesheet" type="text/css" href="print.css" media="print" />
<script language="JavaScript" type="text/javascript" src="global.js"></script>
<?% IF allow("request") %?>
<link rel="alternate" type="application/rss+xml" title="RSS-News" href="?cmd=request&data=rss" />
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/string.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/string.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/string.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -3,10 +3,14 @@
<?% INCLUDE widgets/topic.inc abbr=data.msg %?>
<td>
<?% val = cgi.param(data.NAME) || data.def %?>
+ <?% IF data.readonly %?>
+ <?% val | html %?>
+ <?% ELSE %?>
<?% IF val.defined && ( val.length > 70 || val.search('\n') || param.type == 'text' ) %?>
<textarea style="height:10em;width:395px;" name="<?% data.NAME %?>"><?% val | html %?></textarea>
<?% ELSE %?>
<input style="width:395px;" type="text" name="<?% data.NAME %?>" value="<?% val | html %?>" />
<?% END %?>
+ <?% END %?>
</td>
</tr>
Added: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/url.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/url.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/url.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -0,0 +1,14 @@
+<!-- url -->
+<tr>
+ <?% INCLUDE widgets/topic.inc abbr=data.msg %?>
+ <td>
+ <?% val = cgi.param(data.NAME) || data.def %?>
+ <input style="width:395px;"
+ type="text"
+ name="<?% data.NAME %?>"
+ value="<?% entities(val) %?>"
+ <?% FOREACH p = param.tags; "$p ";END %?>
+ ><br/>
+ <span id='id<?% param.count %?>'></span>
+ </td>
+</tr>
Modified: vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/wait.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/wait.tmpl 2006-05-11 19:56:21 UTC (rev 2770)
+++ vdr/vdr-xxv-skins/trunk/xxv-db-skins/stone/widgets/wait.tmpl 2006-05-11 20:11:55 UTC (rev 2771)
@@ -27,7 +27,7 @@
<table class="editortable" summary="">
<tr>
<td class="editorhead">
- <div style="float:left;"><?% data.msg %?></div>
+ <div style="float:left;"><?% data.msg | truncate(80) | html %?></div>
<?% INCLUDE shutter.inc %?>
</td>
</tr>
More information about the pkg-vdr-dvb-changes
mailing list