r2790 - in vdr/vdr-xxv-skins/trunk: debian xstyle xstyle/bloecke
xstyle/images xstyle/images/old xstyle/javascript
xstyle/style xstyle/widgets
Tobias Grimm
tiber-guest at costa.debian.org
Sat May 20 16:18:08 UTC 2006
Author: tiber-guest
Date: 2006-05-20 16:17:56 +0000 (Sat, 20 May 2006)
New Revision: 2790
Added:
vdr/vdr-xxv-skins/trunk/xstyle/asearch.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/bloecke/stars.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/images/16_9Screen.png
vdr/vdr-xxv-skins/trunk/xstyle/images/1_stars.png
vdr/vdr-xxv-skins/trunk/xstyle/images/2_stars.png
vdr/vdr-xxv-skins/trunk/xstyle/images/3_stars.png
vdr/vdr-xxv-skins/trunk/xstyle/images/4_3Screen.png
vdr/vdr-xxv-skins/trunk/xstyle/images/4_stars.png
vdr/vdr-xxv-skins/trunk/xstyle/images/5_stars.png
vdr/vdr-xxv-skins/trunk/xstyle/images/Kopie von trans.gif
vdr/vdr-xxv-skins/trunk/xstyle/images/back_big.png
vdr/vdr-xxv-skins/trunk/xstyle/images/dolby.png
vdr/vdr-xxv-skins/trunk/xstyle/images/down.png
vdr/vdr-xxv-skins/trunk/xstyle/images/exit.png
vdr/vdr-xxv-skins/trunk/xstyle/images/menu_big.png
vdr/vdr-xxv-skins/trunk/xstyle/images/next.png
vdr/vdr-xxv-skins/trunk/xstyle/images/notimers.png
vdr/vdr-xxv-skins/trunk/xstyle/images/ok.png
vdr/vdr-xxv-skins/trunk/xstyle/images/old/
vdr/vdr-xxv-skins/trunk/xstyle/images/old/Thumbs.db
vdr/vdr-xxv-skins/trunk/xstyle/images/old/asc.png
vdr/vdr-xxv-skins/trunk/xstyle/images/old/at.png
vdr/vdr-xxv-skins/trunk/xstyle/images/old/delete.png
vdr/vdr-xxv-skins/trunk/xstyle/images/old/desc.png
vdr/vdr-xxv-skins/trunk/xstyle/images/old/oben.png
vdr/vdr-xxv-skins/trunk/xstyle/images/old/off.png
vdr/vdr-xxv-skins/trunk/xstyle/images/old/on.png
vdr/vdr-xxv-skins/trunk/xstyle/images/old/plate.png
vdr/vdr-xxv-skins/trunk/xstyle/images/old/record.png
vdr/vdr-xxv-skins/trunk/xstyle/images/old/record_blue.png
vdr/vdr-xxv-skins/trunk/xstyle/images/old/record_green.png
vdr/vdr-xxv-skins/trunk/xstyle/images/old/record_red.png
vdr/vdr-xxv-skins/trunk/xstyle/images/old/schnell_back.png
vdr/vdr-xxv-skins/trunk/xstyle/images/old/schnell_vor.png
vdr/vdr-xxv-skins/trunk/xstyle/images/old/switch.png
vdr/vdr-xxv-skins/trunk/xstyle/images/radio.png
vdr/vdr-xxv-skins/trunk/xstyle/images/star.png
vdr/vdr-xxv-skins/trunk/xstyle/images/stardark.png
vdr/vdr-xxv-skins/trunk/xstyle/images/timers.png
vdr/vdr-xxv-skins/trunk/xstyle/images/up.png
vdr/vdr-xxv-skins/trunk/xstyle/images/view_event.png
vdr/vdr-xxv-skins/trunk/xstyle/images/zurueck.png
vdr/vdr-xxv-skins/trunk/xstyle/remote.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/style/plate.png
vdr/vdr-xxv-skins/trunk/xstyle/topten.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/widgets/date.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/widgets/url.tmpl
Removed:
vdr/vdr-xxv-skins/trunk/xstyle/images/test.rss
vdr/vdr-xxv-skins/trunk/xstyle/schemaOld.tmpl
Modified:
vdr/vdr-xxv-skins/trunk/debian/changelog
vdr/vdr-xxv-skins/trunk/xstyle/HISTORY
vdr/vdr-xxv-skins/trunk/xstyle/alist.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/bloecke/event_links.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/clist.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/display.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/filesys.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/help.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/images/asc.png
vdr/vdr-xxv-skins/trunk/xstyle/images/at.png
vdr/vdr-xxv-skins/trunk/xstyle/images/back.png
vdr/vdr-xxv-skins/trunk/xstyle/images/delete.png
vdr/vdr-xxv-skins/trunk/xstyle/images/desc.png
vdr/vdr-xxv-skins/trunk/xstyle/images/edit.png
vdr/vdr-xxv-skins/trunk/xstyle/images/leer.png
vdr/vdr-xxv-skins/trunk/xstyle/images/movie.png
vdr/vdr-xxv-skins/trunk/xstyle/images/oben.png
vdr/vdr-xxv-skins/trunk/xstyle/images/off.png
vdr/vdr-xxv-skins/trunk/xstyle/images/on.png
vdr/vdr-xxv-skins/trunk/xstyle/images/record.png
vdr/vdr-xxv-skins/trunk/xstyle/images/record_blue.png
vdr/vdr-xxv-skins/trunk/xstyle/images/record_green.png
vdr/vdr-xxv-skins/trunk/xstyle/images/record_red.png
vdr/vdr-xxv-skins/trunk/xstyle/images/repeat.png
vdr/vdr-xxv-skins/trunk/xstyle/images/schnell_back.png
vdr/vdr-xxv-skins/trunk/xstyle/images/schnell_vor.png
vdr/vdr-xxv-skins/trunk/xstyle/images/switch.png
vdr/vdr-xxv-skins/trunk/xstyle/images/vor.png
vdr/vdr-xxv-skins/trunk/xstyle/javascript/global.js
vdr/vdr-xxv-skins/trunk/xstyle/javascript/records.js
vdr/vdr-xxv-skins/trunk/xstyle/memory.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/mlist.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/network.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/next.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/now.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/program.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/rdisplay.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/rlist.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/rsearch.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/schema.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/search.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/skin.cfg
vdr/vdr-xxv-skins/trunk/xstyle/skin.cfg.default
vdr/vdr-xxv-skins/trunk/xstyle/style/style.css
vdr/vdr-xxv-skins/trunk/xstyle/style/xmenu.windows.css
vdr/vdr-xxv-skins/trunk/xstyle/tlist.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/tsearch.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/vitals.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/widgets/dir.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/widgets/file.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/widgets/footer.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/widgets/start.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/widgets/string.tmpl
vdr/vdr-xxv-skins/trunk/xstyle/widgets/table.tmpl
Log:
Updated xstyle skin to version 0.3
Modified: vdr/vdr-xxv-skins/trunk/debian/changelog
===================================================================
--- vdr/vdr-xxv-skins/trunk/debian/changelog 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/debian/changelog 2006-05-20 16:17:56 UTC (rev 2790)
@@ -1,3 +1,10 @@
+vdr-xxv-skins (1.1.1) unstable; urgency=low
+
+ * Tobias Grimm <tg at e-tobi.net>
+ - Updated xstyle skin to version 0.3
+
+ -- Debian VDR Team <pkg-vdr-dvb-devel at lists.alioth.debian.org> Sat, 20 May 2006 18:17:07 +0200
+
vdr-xxv-skins (1.1.0) unstable; urgency=low
* Updated deltab skins to version 0.71
Modified: vdr/vdr-xxv-skins/trunk/xstyle/HISTORY
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/HISTORY 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/HISTORY 2006-05-20 16:17:56 UTC (rev 2790)
@@ -1,3 +1,163 @@
-0.1
+------------------------------------------------------------------------
+r760 | xpix | 2006-04-15 05:25:37 +0200 (Sa, 15 Apr 2006) | 2 lines
-* Veröffentlichung
+* neues Template topten.tmpl
+
+------------------------------------------------------------------------
+r753 | Hulk | 2006-04-09 11:15:56 +0200 (So, 09 Apr 2006) | 1 line
+
+* rdisplay : Anzeige des Kanal auf dem die Aufnahme getätigt wurde.
+------------------------------------------------------------------------
+r749 | xpix | 2006-04-08 14:43:46 +0200 (Sa, 08 Apr 2006) | 4 lines
+
+ * HTML : schema, zusätzlicher Button switch
+ * HTML : Richtigen Zeichensatz im header gesetzt.
+
+
+------------------------------------------------------------------------
+r740 | Hulk | 2006-04-02 08:27:44 +0200 (So, 02 Apr 2006) | 1 line
+
+* rsearch: Anzeige von Radioaufnahme
+------------------------------------------------------------------------
+r733 | xpix | 2006-03-31 06:42:00 +0200 (Fr, 31 Mär 2006) | 2 lines
+
+* anzeige des Audio sowie videoformats
+
+------------------------------------------------------------------------
+r728 | xpix | 2006-03-26 22:44:16 +0200 (So, 26 Mär 2006) | 2 lines
+
+* Titel in schema verlinkt
+
+------------------------------------------------------------------------
+r726 | Hulk | 2006-03-26 20:48:06 +0200 (So, 26 Mär 2006) | 1 line
+
+* MUSIC: Umstellung der Benennung von album.jpg nach artist-album.jpg für mehr Eindeutigkeit.
+------------------------------------------------------------------------
+r719 | xpix | 2006-03-21 18:46:29 +0100 (Di, 21 Mär 2006) | 3 lines
+
+* zweiten RSS Feed eingetragen
+
+
+------------------------------------------------------------------------
+r714 | xpix | 2006-03-12 12:31:16 +0100 (So, 12 Mär 2006) | 2 lines
+
+* den pulldowns in mlist einen leereintrag gegönnt
+
+------------------------------------------------------------------------
+r709 | xpix | 2006-03-12 03:58:17 +0100 (So, 12 Mär 2006) | 2 lines
+
+* neue Grafiken
+
+------------------------------------------------------------------------
+r708 | xpix | 2006-03-12 03:57:44 +0100 (So, 12 Mär 2006) | 3 lines
+
+ * Skin: Anzeige des Levels in default und xstyle eingebaut.
+
+
+------------------------------------------------------------------------
+r706 | xpix | 2006-03-11 19:36:58 +0100 (Sa, 11 Mär 2006) | 5 lines
+
+ * STATUS : Featurerequiest[152] Option damit statt der Tortengrafiken auch eine
+ Tabelle angezeigt werden kann.
+ * STATUS : Featurerequiest[152] Die gemounteten Filesysteme werden jetzt mit angezeigt.
+
+
+------------------------------------------------------------------------
+r704 | xpix | 2006-03-11 17:16:35 +0100 (Sa, 11 Mär 2006) | 3 lines
+
+* Logging jetzt bei status
+* Stars fuer bewertung werden angezeit
+
+------------------------------------------------------------------------
+r699 | xpix | 2006-03-05 08:26:36 +0100 (So, 05 Mär 2006) | 2 lines
+
+* add display a link in alist to discover the timers was programmed from aid
+
+------------------------------------------------------------------------
+r694 | Hulk | 2006-02-23 20:33:42 +0100 (Do, 23 Feb 2006) | 1 line
+
+* RECORDS: Anzeige der Gesamt(abspiel)zeit
+------------------------------------------------------------------------
+r691 | Hulk | 2006-02-22 20:58:27 +0100 (Mi, 22 Feb 2006) | 2 lines
+
+* widget url.tmpl von xstyle übernommen
+* svn propdel svn:executable für nicht ausführbare Dateien
+------------------------------------------------------------------------
+r688 | xpix | 2006-02-19 19:54:48 +0100 (So, 19 Feb 2006) | 2 lines
+
+* neues Widget url.tmpl
+
+------------------------------------------------------------------------
+r674 | xpix | 2006-01-29 21:40:22 +0100 (So, 29 Jan 2006) | 5 lines
+
+ * rlist.tmpl && rdisplay.tmpl :
+ - Radiorecords werden jetzt als solche gekennzeichnet
+ - NoPreview Bilder erneuert
+
+
+------------------------------------------------------------------------
+r667 | xpix | 2006-01-20 06:54:53 +0100 (Fr, 20 Jan 2006) | 4 lines
+
+ * schema.tmpl :
+ - timemarker
+
+
+------------------------------------------------------------------------
+r662 | Hulk | 2006-01-14 20:42:25 +0100 (Sa, 14 Jan 2006) | 1 line
+
+ * next: Progressbar mit 100% ausgeblendet
+------------------------------------------------------------------------
+r657 | xpix | 2006-01-13 18:31:19 +0100 (Fr, 13 Jan 2006) | 9 lines
+
+0.3
+ * schema.tmpl :
+ - bugfixing on mass
+ - icons für funktionen
+ * *.tmpl
+ - icons statt text
+ - bugfixing
+ - kosmetik
+
+------------------------------------------------------------------------
+r656 | Hulk | 2006-01-13 17:39:34 +0100 (Fr, 13 Jan 2006) | 2 lines
+
+* asearch hinzugefügt
+* widget date.tmpl von xstyle übernommen
+------------------------------------------------------------------------
+r653 | xpix | 2006-01-13 03:19:13 +0100 (Fr, 13 Jan 2006) | 4 lines
+
+ * html: FEATUREREQUEST[147] day mit weekdays
+
+
+
+------------------------------------------------------------------------
+r650 | xpix | 2006-01-13 02:19:57 +0100 (Fr, 13 Jan 2006) | 3 lines
+
+ * AUTOTIMER: FEATUREREQUSEST[146] neues Kommando asearch
+
+
+------------------------------------------------------------------------
+r647 | xpix | 2006-01-08 08:21:12 +0100 (So, 08 Jan 2006) | 8 lines
+
+ * Nowmenu ist in groups aufgeteilt
+ * Nextmenu ist in groups aufgeteilt
+ * Programmenu ist in groups aufgeteilt
+ * skin.cfg : global.cfgMaxChannelMenuEntrys = 40
+ * schema : Endlich! Eine Spaltenansicht die man von Fernsehzeitschriften gewöhnt ist
+ * *.tmpl : kleinere änderungen
+
+
+------------------------------------------------------------------------
+r644 | Hulk | 2006-01-07 16:21:01 +0100 (Sa, 07 Jan 2006) | 1 line
+
+ * MUSIC: im Javascript MUSIC::PROXY in URL eingefügt siehe cmd=mplaylist ... &binary=1
+------------------------------------------------------------------------
+r642 | Hulk | 2006-01-05 18:47:17 +0100 (Do, 05 Jan 2006) | 4 lines
+
+* now/next Ausgabe mit CHANNELSGROUPS - FEATUREREQUSEST[145]
+* CSS für Ausdruck ohne Navigationselememte hinzugefügt
+* xstyle - propstat: svn-excutable entfernt
+
+------------------------------------------------------------------------
+r631 | xpix | 2005-12-31 06:30:27 +0100 (Sa, 31 Dez 2005) | 2 lines
+
Modified: vdr/vdr-xxv-skins/trunk/xstyle/alist.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/alist.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/alist.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -6,6 +6,7 @@
<?% IF allow('anew') %?>
<li><a href="?cmd=anew"><?% gettext("Create a new autotimer") %?></a></li>
<?% END %?>
+ <li><a href="#" onClick="suche('<?% gettext("Search text") %?>', '?cmd=asearch&data=')"><?% gettext("Search in autotimer") %?></a></li>
<?% IF allow('aupdate') %?>
<li><a href="?cmd=aupdate"><?% gettext("Start the autotimer process") %?></a></li>
<?% END %?>
@@ -52,7 +53,9 @@
<?% FOREACH field = zeile %?>
<?% c = c + 1 %?>
<?% IF c == 1; # Id Field %?>
+ <?% Id = zeile.0 %?>
<td><nobr>
+ <div id='icons'>
<?% IF allow('aedit') %?>
<a title="<?% gettext("Edit autotimer") %?>"
href="?cmd=aedit&data=<?% zeile.0 %?>"><img src="images/edit.png"></a>
@@ -63,9 +66,17 @@
<img src="images/delete.png">
</a>
<?% END %?>
+ <?% IF param.timers.$Id.allTimer.size %?>
+ <a title="active:<?% param.timers.$Id.activeTimer.size %?> deactive:<?% param.timers.$Id.deactiveTimer.size %?> <?% gettext('Timers') %?>"
+ href="?cmd=tlist&data=<?% param.timers.$Id.allTimer.join(',') %?>"><img src="images/timers.png"></a>
+ <?% ELSE %?>
+ <img title="<?% gettext('Timers not found.') %?>" src="images/notimers.png">
+ <?% END %?>
+ </div>
</td>
<?% ELSIF c == 2; # Activ Field %?>
<td>
+ <div id='icons'>
<?% aus = gettext('Off') %?>
<?% an = gettext('On') %?>
<?% IF allow('atoggle') %?>
@@ -73,9 +84,11 @@
<?% ELSE %?>
[<?% zeile.1 == 'n' ? aus : an %?>]
<?% END %?>
+ </div>
</td>
<?% ELSIF c == 4; # Channel Field %?>
<td>
+ <?% text = "" %?>
<?% FOREACH chid = field.split(',') %?>
<?% text = "$text ${param.channels.$chid.Name}" %?>
<?% LAST IF text.length > 20 %?>
Added: vdr/vdr-xxv-skins/trunk/xstyle/asearch.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/asearch.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/asearch.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -0,0 +1,108 @@
+<!-- TableTemplate -->
+<h1><?% gettext("Wished automated recordings") %?></h1>
+
+<div id="navcontainer">
+<ul id="navlist">
+ <?% IF allow('anew') %?>
+ <li><a href="?cmd=anew"><?% gettext("Create a new autotimer") %?></a></li>
+ <?% END %?>
+ <li><a href="#" onClick="suche('<?% gettext("Search text") %?>', '?cmd=asearch&data=')"><?% gettext("Search in autotimer") %?></a></li>
+ <?% IF allow('aupdate') %?>
+ <li><a href="?cmd=aupdate"><?% gettext("Start the autotimer process") %?></a></li>
+ <?% END %?>
+ <?% IF allow('ai') %?>
+ <li><a href="#" onclick='file=prompt("<?% gettext("Select the file around the autotimers from this to import?") %?>", "/tmp/autotimer.sav"); if(file) location.href="?cmd=ai&data=" + file;'>
+ <?% gettext("Import autotimers") %?>
+ </a></li>
+ <?% END %?>
+ <?% IF allow('ax') %?>
+ <li><a href="#" onclick='file=prompt("<?% gettext("Select the file around autotimers into these to export?") %?>", "/tmp/autotimer.sav"); if(file) location.href="?cmd=ax&data=" + file;'>
+ <?% gettext("Export autotimers") %?>
+ </a></li>
+ <?% END %?>
+</ul>
+</div>
+
+
+<table border="0" width="95%">
+<form name='Autotimer'>
+<?% INCLUDE 'widgets/referer.tmpl' %?>
+
+<?% IF data.size %?>
+ <?% fields = data.shift %?>
+ <tr>
+ <?% FOREACH field = fields %?>
+ <th style="white-space: nowrap">
+ <?% field | html %?>
+ <?% IF param.sortable %?>
+ <a href="?cmd=<?% cgi.param('cmd') %?>&__sortby=<?% field %?>&__desc=0"><img src="images/asc.png"></a><a href="?cmd=<?% cgi.param('cmd') %?>&__sortby=<?% field %?>&__desc=1"><img src="images/desc.png"></a>
+ <?% END %?>
+ </th>
+ <?% END %?>
+ </tr>
+ <?% x = -1 %?>
+ <?% FOREACH zeile = data %?>
+ <?% IF zeile.1 == 'n' %?>
+ <?% myclass = "deactive" %?>
+ <?% ELSE %?>
+ <?% myclass = "" %?>
+ <?% END %?>
+ <?% x = x + 1 %?>
+ <tr class="<?% myclass %?>" <?% IF (x mod 2) == 0 %?>bgcolor='#F5F5F5'<?% END %?>>
+ <?% c = 0 %?>
+ <?% FOREACH field = zeile %?>
+ <?% c = c + 1 %?>
+ <?% IF c == 1; # Id Field %?>
+ <?% Id = zeile.0 %?>
+ <td><nobr>
+ <div id='icons'>
+ <?% IF allow('aedit') %?>
+ <a title="<?% gettext("Edit autotimer") %?>"
+ href="?cmd=aedit&data=<?% zeile.0 %?>"><img src="images/edit.png"></a>
+ <?% END %?>
+ <?% IF allow('adelete') %?>
+ <a title="<?% gettext("Delete autotimer") %?>"
+ href="javascript:sure(document.Autotimer, '<?% gettext("You will delete this autotimer") %?> : <?% zeile.2.replace('\'','\\\'') %?>','?cmd=adelete&data=<?% zeile.0 %?>')">
+ <img src="images/delete.png">
+ </a>
+ <?% END %?>
+ <?% IF param.timers.$Id.allTimer.size %?>
+ <a title="active:<?% param.timers.$Id.activeTimer.size %?> deactive:<?% param.timers.$Id.deactiveTimer.size %?> <?% gettext('Timers') %?>"
+ href="?cmd=tlist&data=<?% param.timers.$Id.allTimer.join(',') %?>"><img src="images/timers.png"></a>
+ <?% ELSE %?>
+ <img title="<?% gettext('Timers not found.') %?>" src="images/notimers.png">
+ <?% END %?>
+ </div>
+ </td>
+ <?% ELSIF c == 2; # Activ Field %?>
+ <td>
+ <div id='icons'>
+ <?% aus = gettext('Off') %?>
+ <?% an = gettext('On') %?>
+ <?% IF allow('atoggle') %?>
+ <a href="javascript:tostatus('?cmd=atoggle&data=<?% zeile.0 %?>')"><img src="images/<?% zeile.1 == 'n' ? "off" : "on" %?>.png"></a>
+ <?% ELSE %?>
+ [<?% zeile.1 == 'n' ? aus : an %?>]
+ <?% END %?>
+ </div>
+ </td>
+ <?% ELSIF c == 4; # Channel Field %?>
+ <td>
+ <?% text = "" %?>
+ <?% FOREACH chid = field.split(',') %?>
+ <?% text = "$text ${param.channels.$chid.Name}" %?>
+ <?% LAST IF text.length > 20 %?>
+ <?% END %?>
+ <?% text | truncate(20) %?>
+ </td>
+ <?% ELSIF c == 6 || c == 7; # Start/Stop Field %?>
+ <td><?% fmttime(field) %?></td>
+ <?% ELSE %?>
+ <td><?% field %?></td>
+ <?% END %?>
+ <?% END %?>
+ </tr>
+ <?% END %?>
+<?% END %?>
+</form>
+</table>
Modified: vdr/vdr-xxv-skins/trunk/xstyle/bloecke/event_links.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/bloecke/event_links.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/bloecke/event_links.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -1,9 +1,27 @@
-<a href="?cmd=search&data=<?% url( data.1 ) %?>"><img src="images/repeat.png" title="[<?% gettext("Rep") %?>]"></a>
- <?% IF param.timers.${data.0} && allow('tedit') %?>
-<a href="?cmd=tedit&data=<?% param.timers.${data.0}.Id %?>"><img src="images/record_blue.png" title="[<?% gettext("Edit this timer") %?>]" /></a>
+<div id='icons'>
+ <?% IF with_display_button %?>
+<a href="?cmd=display&data=<?% epgId %?>" title='<?% gettext("Detailed program information") %?>'><img src="images/view_event.png"></a><?% umbruch %?>
+ <?% END %?>
+<a href="?cmd=search&data=<?% url( data.1 ) %?>"><img src="images/repeat.png" title="[<?% gettext("Rep") %?>]"></a><?% umbruch %?>
+ <?% IF param.timers.${data.0}.Id && allow('tedit') %?>
+<a href="?cmd=tedit&data=<?% param.timers.${data.0}.Id %?>"><img src="images/record_blue.png" title="[<?% gettext("Edit this timer") %?>]" /></a><?% umbruch %?>
<?% ELSIF allow('tnew') %?>
-<a href="?cmd=tnew&data=<?% data.0 %?>"><img src="images/record.png" title="[<?% gettext("To record") %?>]" name='recordlink' id='<?% data.0 %?>' /></a>
+<a href="?cmd=tnew&data=<?% data.0 %?>"><img src="images/record.png" title="[<?% gettext("To record") %?>]" name='recordlink' id='<?% data.0 %?>' /></a><?% umbruch %?>
<?% END %?>
<?% IF allow('switch') && switch %?>
- <a href="?cmd=switch&data=<?% url(data.4) %?>" target='Status'><img src="images/switch.png" title="[<?% gettext("Swt") %?>]" /></a>
+ <a href="?cmd=switch&data=<?% url(data.4) %?>"><img src="images/switch.png" title="[<?% gettext("Swt") %?>]" /></a><?% umbruch %?>
<?% END %?>
+<?% INCLUDE 'bloecke/stars.tmpl' eventid=data.0 %?>
+<?% IF data.-2;
+ vid = data.-2.split(' ');
+ video = (vid.3 == '16:9' ? '16_9Screen.png' : '4_3Screen.png') %?>
+ <img src="images/<?% video %?>" title="[<?% gettext("Videoformat: ") %?><?% vid.3 %?>]" /><?% umbruch %?>
+<?% END %?>
+<?% IF data.-1;
+ aud = data.-1.split("\n");
+ audio = (aud.size > 2 ? 'Dolby' : 'Stereo') %?>
+ <?% IF audio == 'Dolby' %?>
+ <img src="images/dolby.png" title="[<?% gettext("Audioformat: ") %?><?% audio %?>]" /><?% umbruch %?>
+ <?% END %?>
+ </div>
+<?% END %?>
Added: vdr/vdr-xxv-skins/trunk/xstyle/bloecke/stars.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/bloecke/stars.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/bloecke/stars.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -0,0 +1,4 @@
+<?% level = getModule('SHARE').getEventLevel(eventid) %?>
+<?% IF level %?>
+<img class="stars" src="images/<?% level FILTER format('%d') %?>_stars.png" hspace=0 vspace=0 title="<?% level FILTER format('%d') %?> Stars"><?% umbruch %?>
+<?% END %?>
Modified: vdr/vdr-xxv-skins/trunk/xstyle/clist.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/clist.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/clist.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -31,13 +31,15 @@
<?% END %?>
<?% ######################################################################## %?>
<?% BLOCK RowButtons %?>
-<a href="?cmd=switch&data=<?% id %?>" title="<?% gettext("Switch to channel") %?>">[S]</a>
+<div id='icons'>
+<a href="?cmd=switch&data=<?% id %?>" title="<?% gettext("Switch to channel") %?>"><img src="images/switch.png"></a>
<?%- IF allow('cedit') -%?>
-<a href="?cmd=cedit&data=<?% id %?>" title="<?% gettext("Edit channel") %?>">[E]</a>
+<a href="?cmd=cedit&data=<?% id %?>" title="<?% gettext("Edit channel") %?>"><img src="images/edit.png"></a>
<?%- END -%?>
<?%- IF allow('cdelete') -%?>
<a href="javascript:sure(document.KanalListe, '<?% gettext("You will delete this channel") %?> : \'<?% name | replace('\'','\\\'') | replace('"','\\\'') %?>\' ?','?cmd=cdelete&data=<?% POS %?>')"
- title="<?% gettext("Delete channel") %?>" >[D]</a>
+ title="<?% gettext("Delete channel") %?>" ><img src="images/delete.png"></a>
+</div>
<?%- END -%?>
<?% END %?>
<?% ######################################################################## %?>
@@ -81,9 +83,7 @@
<td>
<?% CA | truncate (16) | html %?>
</td>
- <td align="right">
- <?% PROCESS RowButtons %?>
- </td>
+ <td align="right"><?% PROCESS RowButtons %?></td>
</tr>
<?% END %?>
<?% ######################################################################## %?>
@@ -95,24 +95,23 @@
<?% IF search.defined %?> : "<?% search %?>"
<?% END %?>
</h1>
- <p>
- <form name="KanalListe">
+
+<form name="KanalListe">
<?% INCLUDE 'widgets/referer.tmpl'%?>
+
+<div id="navcontainer">
+<ul id="navlist">
<?% IF allow( 'cnew' ) %?>
- <a href="?cmd=cnew">
- [<?% gettext("Create a new channel") %?>]
- </a>
+ <li><a href="?cmd=cnew"><?% gettext("Create a new channel") %?></a></li>
<?% END %?>
<?% IF allow( 'cupdate' ) %?>
- <a href="?cmd=cupdate">
- [<?% gettext("Update channels") %?>]
- </a>
+ <li><a href="?cmd=cupdate"><?% gettext("Update channels") %?></a></li>
<?% END %?>
- <?% gettext("Search for channels") %?> :
- <input type="hidden" name="cmd" value="clist" />
- <input type="text" name="data" size="18" <?% IF search.defined %?>value="<?% search %?>"<?% END %?> />
- </form>
- </p>
+ <li><a href="#" onClick="suche('<?% gettext("Search text") %?>', '?cmd=clist&data=')"><?% gettext("Search for channels") %?></a></li>
+ </ul>
+</div>
+</form>
+
<?% IF enableform %?>
<p>
<a href="#" onclick="selAll(document.clist,1)">[<?% gettext("Select all") %?>]</a>
@@ -139,7 +138,7 @@
<th><?% PROCESS SortItem row="APID" label=gettext('Audio PID (APID)') trunc=10 %?></th>
<th><?% PROCESS SortItem row="TPID" label=gettext('Teletext PID (TPID)') trunc=10 %?></th>
<th><?% PROCESS SortItem row="CA" label=gettext('Conditional access (CA)') trunc=10 %?></th>
- <th width="64" align="right"></th>
+ <th align="right"></th>
</tr>
<?% FOREACH zeile = data %?>
<?% id=zeile.0;name=zeile.1;frequency=zeile.2;parameters=zeile.3;source=zeile.4;srate=zeile.5;VPID=zeile.6;APID=zeile.7;TPID=zeile.8;CA=zeile.9;SID=zeile.10;NID=zeile.11;TID=zeile.12;RID=zeile.13;GRP=zeile.14;POS=zeile.15;CGRP=zeile.16 %?>
Modified: vdr/vdr-xxv-skins/trunk/xstyle/display.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/display.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/display.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -15,7 +15,7 @@
<?% END %?>
<?% FOREACH field = fields %?>
<?% c = c + 1 %?>
- <?% NEXT UNLESS data.first.$c %?>
+ <?%# NEXT UNLESS data.first.$c %?>
<?% NEXT IF field == gettext('Percent') && data.first.$c > 100 %?>
<?% NEXT IF field.match('^__') %?>
<tr>
@@ -34,9 +34,14 @@
<?% ELSIF field == gettext('Description') %?>
<td>
- <img src='epgimages/<?% Image %?>' border=1 align='right'>
+ <?% IF Image %?>
+ <img src='epgimages/<?% Image %?>' border=1 align='right'>
+ <?% END %?>
<?% data.first.$c.replace('\|', '<p>') %?>
</td>
+
+ <?% ELSIF field == gettext('Title') %?>
+ <td><?% data.first.$c.replace('\|', '<p>') %?></td>
<?% ELSE %?>
<td><?% data.first.$c.replace('\|', '<p>') %?></td>
<?% END %?>
Modified: vdr/vdr-xxv-skins/trunk/xstyle/filesys.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/filesys.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/filesys.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -3,7 +3,8 @@
trash = param.usage.shift;
# USE Dumper; Dumper.dump_html(param.usage);
-FILTER null;
+IF param.graphic;
+ FILTER null;
FOREACH device = param.usage;
name = device.first.split('/').last;
@@ -26,30 +27,49 @@
my_graph.set_value_font(param.font,8);
my_graph.set_label_font(param.font,6);
- file = writefile("status_filesys_${name}.png", my_graph.plot(d).png );
+ file = writefile("status_filesys_${name}.png", my_graph.plot(d).gif );
statusfiles.push(file);
END;
+ END;
END;
%?>
<!-- Vitals Template -->
<?% IF param.headingText %?>
<h3><?% param.headingText %?></h3>
<?% END %?>
-<table border="0" width="95%">
-<?% count = 0 %?>
-<?% FOREACH file = statusfiles %?>
- <?% IF count % 2 == 0 %?>
- <?% IF count > 0 %?>
-</tr>
- <?% END %?>
- <tr>
- <?% END %?>
- <td colspan=2 align=center>
- <img src="<?% file %?>" hspace=5>
- </td>
- <?% count = count + 1 %?>
- <?% END %?>
-<?% IF count > 0 %?>
- </tr>
-<?% END %?><tr>
-</table>
+
+<?% IF param.graphic %?>
+ <table border="0" width="95%">
+ <?% count = 0 %?>
+ <?% FOREACH file = statusfiles %?>
+ <?% IF count % 2 == 0 %?>
+ <?% IF count > 0 %?>
+ </tr>
+ <?% END %?>
+ <tr>
+ <?% END %?>
+ <td colspan=2 align=center>
+ <img src="<?% file %?>" hspace=5>
+ </td>
+ <?% count = count + 1 %?>
+ <?% END %?>
+ <?% IF count > 0 %?>
+ </tr>
+ <?% END %?><tr>
+ </table>
+<?% ELSE %?>
+ <table border="0" width="95%">
+ <tr>
+ <?% FOREACH field = trash %?>
+ <th><?% field %?></th>
+ <?% END %?>
+ </tr>
+ <?% FOREACH zeile = data %?>
+ <tr>
+ <?% FOREACH field = zeile %?>
+ <td><?% field.replace('\|', '<p>').replace('\n', '<br>') %?></td>
+ <?% END %?>
+ </tr>
+ <?% END %?>
+ </table>
+<?% END %?>
\ No newline at end of file
Modified: vdr/vdr-xxv-skins/trunk/xstyle/help.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/help.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/help.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -12,8 +12,17 @@
<?% IF allow('now') %?>
var runnow = new WebFXMenu;
- runnow.add(new WebFXMenuItem("<?% gettext("Now",12) %?>", "?cmd=now"));
- runnow.add(new WebFXMenuItem("<?% gettext("Next",12) %?>", "?cmd=next"));
+ var runnowGrp = new WebFXMenu;
+ <?% FOREACH group = getModule('CHANNELS').ChannelGroupsArray('Name') %?>
+ runnowGrp.add(new WebFXMenuItem('<?% group.first %?>', "?cmd=now&data=&__cgrp=<?% group.last %?>"));
+ <?% END %?>
+ runnow.add(new WebFXMenuItem("<?% gettext("Now",12) %?>",null,null,runnowGrp));
+
+ var runnextGrp = new WebFXMenu;
+ <?% FOREACH group = getModule('CHANNELS').ChannelGroupsArray('Name') %?>
+ runnextGrp.add(new WebFXMenuItem('<?% group.first %?>', "?cmd=next&data=&__cgrp=<?% group.last %?>"));
+ <?% END %?>
+ runnow.add(new WebFXMenuItem("<?% gettext("Next",12) %?>",null,null,runnextGrp));
runnow.add(new WebFXMenuSeparator());
<?% USE date %?>
@@ -34,9 +43,9 @@
<?% NEXT UNLESS z %?>
<?% IF tom %?>
- runnow.add(new WebFXMenuItem("<?% date.format(z, "%H:%M (%a)") %?>", "?cmd=now&data=<?% z %?>"));
+ runnow.add(new WebFXMenuItem("<?% date.format(z, "%H:%M (%a)") %?>", "?cmd=now&data=<?% z %?>&__cgrp=<?% cgi.param('__cgrp') %?>"));
<?% ELSE %?>
- runnow.add(new WebFXMenuItem("<?% date.format(z, "%H:%M") %?>", "?cmd=now&data=<?% z %?>"));
+ runnow.add(new WebFXMenuItem("<?% date.format(z, "%H:%M") %?>", "?cmd=now&data=<?% z %?>&__cgrp=<?% cgi.param('__cgrp') %?>"));
<?% END %?>
<?% END %?>
myBar.add(new WebFXMenuButton("<?% gettext("Running now") %?>",null,null,runnow));
@@ -48,10 +57,18 @@
<?% IF allow('schema') %?>
var program = new WebFXMenu;
program.add(new WebFXMenuItem("<?% gettext("Schema") %?>", "?cmd=schema"));
- program.add(new WebFXMenuItem("<?% gettext("Search") %?>", "javascript:suche('<?% gettext('Search text:') %?>')"));
+ <?% IF allow('topten') %?>program.add(new WebFXMenuItem("<?% gettext("TopTen") %?>", "?cmd=t10"));<?% END %?>
+ program.add(new WebFXMenuItem("<?% gettext("Search") %?>", "?cmd=search"));
program.add(new WebFXMenuSeparator());
- <?% FOREACH ch = getModule('CHANNELS').ChannelArray('Name') %?>
- program.add(new WebFXMenuItem("<?% ch.0 | truncate(10) | replace('"', '\\"') %?>", "?cmd=program&data=<?% ch.1 %?>"));
+ <?% FOREACH group = getModule('CHANNELS').ChannelGroupsArray('Name') %?>
+ var programGrp<?% group.last %?> = new WebFXMenu;
+ <?% z = 0 %?>
+ <?% FOREACH ch = getModule('CHANNELS').ChannelArray('Name', "GRP = ${group.last}") %?>
+ <?% z = z + 1 %?>
+ <?% LAST IF z > global.cfgMaxChannelMenuEntrys %?>
+ programGrp<?% group.last %?>.add(new WebFXMenuItem("<?% ch.first.replace('"','-') %?>", "?cmd=program&data=<?% ch.last %?>"));
+ <?% END %?>
+ program.add(new WebFXMenuItem('<?% group.first %?>',null,null,programGrp<?% group.last %?>));
<?% END %?>
myBar.add(new WebFXMenuButton("<?% gettext("Program guide") %?>",null,null,program));
<?% END %?>
@@ -66,15 +83,8 @@
<?% IF allow('mlist') %?>tools.add(new WebFXMenuItem("<?% gettext("Music") %?>", "?cmd=mlist"));<?% END %?>
<?% IF allow('remote') %?>tools.add(new WebFXMenuItem("<?% gettext("Remote") %?>", "?cmd=remote"));<?% END %?>
<?% IF allow('vtxpage') %?>tools.add(new WebFXMenuItem("<?% gettext("Teletext") %?>", "?cmd=vtxpage"));<?% END %?>
-
- <?% IF allow('logger') %?>
- var logger = new WebFXMenu;
- logger.add(new WebFXMenuItem("<?% gettext("Standard") %?>", "?cmd=logger&data=main"));
- logger.add(new WebFXMenuItem("<?% gettext("Preview") %?>", "?cmd=logger&data=preview"));
- logger.add(new WebFXMenuItem("<?% gettext("Syslog") %?>", "?cmd=logger&data=syslog"));
- tools.add(new WebFXMenuItem("<?% gettext("Log files") %?>",null,null,logger));
- <?% END %?>
<?% IF allow('report') %?>tools.add(new WebFXMenuItem("<?% gettext("Report") %?>","?cmd=report"));<?% END %?>
+ tools.add(new WebFXMenuItem("<?% gettext("Channels") %?>", "?cmd=cl"));
myBar.add(new WebFXMenuButton("<?% gettext("Tools") %?>",null,null,tools));
@@ -83,6 +93,7 @@
var admin = new WebFXMenu;
<?% IF allow('ul') %?>admin.add(new WebFXMenuItem("<?% gettext("User") %?>","?cmd=ul"));
<?% ELSIF allow('uprefs') %?>admin.add(new WebFXMenuItem("<?% gettext("Personality") %?>","?cmd=uprefs"));<?% END %?>
+ <?% IF allow('restart') %?>admin.add(new WebFXMenuItem("<?% gettext("EPG Restart") %?>","?cmd=erestart"));<?% END %?>
<?% IF allow('rel') %?>admin.add(new WebFXMenuItem("<?% gettext("Reload") %?>","?cmd=rel"));<?% END %?>
<?% IF allow('logout') %?>admin.add(new WebFXMenuItem("<?% gettext("Logout") %?>","?cmd=logout"));<?% END %?>
<?% IF allow('restart') %?>admin.add(new WebFXMenuItem("<?% gettext("Restart") %?>","?cmd=restart"));<?% END %?>
@@ -96,7 +107,6 @@
<?% FOREACH co = getModule('CONFIG').realModNames %?>
prefs.add(new WebFXMenuItem("<?% co | truncate(10) %?>", "?cmd=configedit&data=<?% co %?>"));
<?% END %?>
- prefs.add(new WebFXMenuItem("<?% gettext("Channels") %?>", "?cmd=cl"));
myBar.add(new WebFXMenuButton("<?% gettext("Preferences") %?>",null,null,prefs));
<?% END %?>
@@ -111,6 +121,12 @@
status.add(new WebFXMenuItem("<?% gettext("Filesystem") %?>", "?cmd=sf"));
status.add(new WebFXMenuItem("<?% gettext("Network") %?>", "?cmd=sn"));
status.add(new WebFXMenuItem("<?% gettext("Hardware") %?>", "?cmd=sh"));
+ <?% IF allow('logger') %?>
+ var logger = new WebFXMenu;
+ logger.add(new WebFXMenuItem("<?% gettext("Standard") %?>", "?cmd=logger&data=main"));
+ logger.add(new WebFXMenuItem("<?% gettext("Syslog") %?>", "?cmd=logger&data=syslog"));
+ status.add(new WebFXMenuItem("<?% gettext("Log files") %?>",null,null,logger));
+ <?% END %?>
myBar.add(new WebFXMenuButton("<?% gettext("Status") %?>",null,null,status));
<?% END %?>
@@ -126,11 +142,6 @@
myBar.add(new WebFXMenuButton("<?% gettext("Documentation") %?>",null,null,info));
<?% END %?>
+document.write(myBar);
</script>
-
-<script>
-document.write(myBar);
-</script>
-
-<p><p>
\ No newline at end of file
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/16_9Screen.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/16_9Screen.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/1_stars.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/1_stars.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/2_stars.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/2_stars.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/3_stars.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/3_stars.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/4_3Screen.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/4_3Screen.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/4_stars.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/4_stars.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/5_stars.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/5_stars.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/Kopie von trans.gif
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/Kopie von trans.gif
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vdr/vdr-xxv-skins/trunk/xstyle/images/asc.png
===================================================================
(Binary files differ)
Modified: vdr/vdr-xxv-skins/trunk/xstyle/images/at.png
===================================================================
(Binary files differ)
Modified: vdr/vdr-xxv-skins/trunk/xstyle/images/back.png
===================================================================
(Binary files differ)
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/back_big.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/back_big.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vdr/vdr-xxv-skins/trunk/xstyle/images/delete.png
===================================================================
(Binary files differ)
Modified: vdr/vdr-xxv-skins/trunk/xstyle/images/desc.png
===================================================================
(Binary files differ)
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/dolby.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/dolby.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/down.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/down.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vdr/vdr-xxv-skins/trunk/xstyle/images/edit.png
===================================================================
(Binary files differ)
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/exit.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/exit.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vdr/vdr-xxv-skins/trunk/xstyle/images/leer.png
===================================================================
(Binary files differ)
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/menu_big.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/menu_big.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vdr/vdr-xxv-skins/trunk/xstyle/images/movie.png
===================================================================
(Binary files differ)
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/next.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/next.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/notimers.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/notimers.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vdr/vdr-xxv-skins/trunk/xstyle/images/oben.png
===================================================================
(Binary files differ)
Modified: vdr/vdr-xxv-skins/trunk/xstyle/images/off.png
===================================================================
(Binary files differ)
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/ok.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/ok.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/old/Thumbs.db
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/old/Thumbs.db
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/old/asc.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/old/asc.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/old/at.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/old/at.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/old/delete.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/old/delete.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/old/desc.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/old/desc.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/old/oben.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/old/oben.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/old/off.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/old/off.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/old/on.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/old/on.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/old/plate.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/old/plate.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/old/record.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/old/record.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/old/record_blue.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/old/record_blue.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/old/record_green.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/old/record_green.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/old/record_red.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/old/record_red.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/old/schnell_back.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/old/schnell_back.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/old/schnell_vor.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/old/schnell_vor.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/old/switch.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/old/switch.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vdr/vdr-xxv-skins/trunk/xstyle/images/on.png
===================================================================
(Binary files differ)
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/radio.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/radio.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vdr/vdr-xxv-skins/trunk/xstyle/images/record.png
===================================================================
(Binary files differ)
Modified: vdr/vdr-xxv-skins/trunk/xstyle/images/record_blue.png
===================================================================
(Binary files differ)
Modified: vdr/vdr-xxv-skins/trunk/xstyle/images/record_green.png
===================================================================
(Binary files differ)
Modified: vdr/vdr-xxv-skins/trunk/xstyle/images/record_red.png
===================================================================
(Binary files differ)
Modified: vdr/vdr-xxv-skins/trunk/xstyle/images/repeat.png
===================================================================
(Binary files differ)
Modified: vdr/vdr-xxv-skins/trunk/xstyle/images/schnell_back.png
===================================================================
(Binary files differ)
Modified: vdr/vdr-xxv-skins/trunk/xstyle/images/schnell_vor.png
===================================================================
(Binary files differ)
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/star.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/star.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/stardark.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/stardark.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vdr/vdr-xxv-skins/trunk/xstyle/images/switch.png
===================================================================
(Binary files differ)
Deleted: vdr/vdr-xxv-skins/trunk/xstyle/images/test.rss
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/images/test.rss 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/images/test.rss 2006-05-20 16:17:56 UTC (rev 2790)
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<rdf:RDF
- xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
- xmlns="http://purl.org/rss/1.0/"
- xmlns:taxo="http://purl.org/rss/1.0/modules/taxonomy/"
- xmlns:dc="http://purl.org/dc/elements/1.1/"
- xmlns:syn="http://purl.org/rss/1.0/modules/syndication/"
- xmlns:admin="http://webns.net/mvcb/"
->
-
-<channel rdf:about="http://freshmeat.net">
-<title>freshmeat.net</title>
-<link>http://freshmeat.net</link>
-<description>the one-stop-shop for all your Linux software needs</description>
-<dc:language>en-us</dc:language>
-<dc:rights>Copyright 1999, Freshmeat.net</dc:rights>
-<dc:date>2000-08-23T07:00+00:00</dc:date>
-<dc:publisher>scoop at freshmeat.net</dc:publisher>
-<dc:creator>scoop at freshmeat.net</dc:creator>
-<dc:subject>Linux Software</dc:subject>
-<syn:updatePeriod>hourly</syn:updatePeriod>
-<syn:updateFrequency>1</syn:updateFrequency>
-<syn:updateBase>1901-01-01T00:00+00:00</syn:updateBase>
-<items>
- <rdf:Seq>
- <rdf:li rdf:resource="http://freshmeat.net/news/1999/06/21/930003829.html" />
- </rdf:Seq>
-</items>
-<image rdf:resource="http://freshmeat.net/images/fm.mini.jpg" />
-<textinput rdf:resource="http://core.freshmeat.net/search.php3" />
-</channel>
-
-<image rdf:about="http://freshmeat.net/images/fm.mini.jpg">
-<title>freshmeat.net</title>
-<url>http://freshmeat.net/images/fm.mini.jpg</url>
-<link>http://freshmeat.net</link>
-<dc:creator>G. Raphics (graphics at freshmeat.net)</dc:creator>
-</image>
-
-<item rdf:about="http://freshmeat.net/news/1999/06/21/930003829.html">
-<title>GTKeyboard 0.85</title>
-<link>http://freshmeat.net/news/1999/06/21/930003829.html</link>
-<description>GTKeyboard is a graphical keyboard that ...</description>
-<dc:creator>David Allen (s2mdalle at titan.vcu.edu)</dc:creator>
-<dc:subject>X11/Utilities</dc:subject>
-</item>
-
-<textinput rdf:about="http://core.freshmeat.net/search.php3">
-<title>quick finder</title>
-<description>Use the text input below to search freshmeat</description>
-<name>query</name>
-<link>http://core.freshmeat.net/search.php3</link>
-</textinput>
-
-</rdf:RDF>
\ No newline at end of file
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/timers.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/timers.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/up.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/up.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/view_event.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/view_event.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vdr/vdr-xxv-skins/trunk/xstyle/images/vor.png
===================================================================
(Binary files differ)
Added: vdr/vdr-xxv-skins/trunk/xstyle/images/zurueck.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/images/zurueck.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vdr/vdr-xxv-skins/trunk/xstyle/javascript/global.js
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/javascript/global.js 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/javascript/global.js 2006-05-20 16:17:56 UTC (rev 2790)
@@ -113,7 +113,7 @@
}
}
-function Play(warnmsg,form) {
+function Play(warnmsg,form,proxy) {
// test on checked Boxes
ok = new Array;
x = 0;
@@ -126,8 +126,11 @@
}
}
if(x > 0) {
- var ur = 'http://' + window.location.host + '/?cmd=mplaylist&data=' + ok.join('_') + '&binary=1';
- location.href = ur;
+ var url = "";
+ if(proxy.length > 0)
+ url = proxy;
+ url = url + '?cmd=mplaylist&data=' + ok.join('_') + '&binary=1';
+ location.href = url;
} else {
alert(warnmsg);
}
@@ -170,17 +173,20 @@
if(inputvalue) {
var url = "cmd=pureperl&data=" + cmd.replace('%s', inputvalue) + "&ajax=text";
var aconn = new XHConn();
- var hosturl = 'http://' + window.location.host;
+ var hosturl = 'http://' + window.location.host + window.location.pathname;
aconn.connect(hosturl, 'GET', url, fnWhenDone, fnWorking, [valobj, msgobj, wrongMsg, goodMsg]);
}
}
-function suche(question, urls, def) {
+function suche(question, urls, def, last) {
var sstring = prompt(question, def);
if(! urls)
urls = "?cmd=search&data=";
if(sstring) {
var url = urls + sstring;
- location.href = url;
}
-}
\ No newline at end of file
+ if(last) {
+ url = url + last;
+ }
+ location.href = url;
+}
Modified: vdr/vdr-xxv-skins/trunk/xstyle/javascript/records.js
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/javascript/records.js 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/javascript/records.js 2006-05-20 16:17:56 UTC (rev 2790)
@@ -5,8 +5,10 @@
var text = oXML.responseText.split(':');
document.getElementById(sData).src = 'images/record_red.png';
document.getElementById(sData).title = '<?% gettext('When you want this timer save then has him a conflict with timer: ') %?>' + text[0];
+ document.getElementById(sData).className = 'problem';
} else {
document.getElementById(sData).src = 'images/record_green.png';
+ document.getElementById(sData).className = 'noproblem';
}
};
@@ -17,7 +19,7 @@
var epgid = tags[i].id;
var url = "cmd=conflict&data=" + epgid + "&ajax=text";
var aconn = new XHConn();
- var hosturl = 'http://' + window.location.host;
+ var hosturl = 'http://' + window.location.host + window.location.pathname;
aconn.connect(hosturl, 'GET', url, fnWhenDone, fnWorking, epgid);
}
}
Modified: vdr/vdr-xxv-skins/trunk/xstyle/memory.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/memory.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/memory.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -58,7 +58,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}.png", my_graph.plot(d).gif );
END;
# ------------------- Piegraph für Speicher
@@ -80,7 +80,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}.png", my_graph.plot(d2).gif );
END;
%?>
<!-- Vitals Template -->
Modified: vdr/vdr-xxv-skins/trunk/xstyle/mlist.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/mlist.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/mlist.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -8,6 +8,7 @@
</th>
<th>
<select name='artists' onChange="di('artist:' + this.form.artists.options[this.form.artists.options.selectedIndex].value, '?cmd=ml&data=')">
+ <option value=""> </option>
<?% FOREACH ch = param.artists %?>
<option value="<?% url( ch.0 ) %?>" <?% "selected" IF cgi.param('data').split(':').first == 'artist' && cgi.param('data').split(':').last == ch.0 %?>><?% ch.0 %?></option>
<?% END %?>
@@ -19,6 +20,7 @@
</th>
<th>
<select name='albums' onChange="di('album:' + this.form.albums.options[this.form.albums.options.selectedIndex].value, '?cmd=ml&data=')">
+ <option value=""> </option>
<?% FOREACH ch = param.albums %?>
<option value="<?% url( ch.0 ) %?>" <?% "selected" IF cgi.param('data').split(':').first == 'album' && cgi.param('data').split(':').last == ch.0 %?>><?% ch.0 | truncate(50) %?></option>
<?% END %?>
@@ -37,8 +39,9 @@
</th>
<th>
<select name='genres' onChange="di('genre:' + this.form.genres.options[this.form.genres.options.selectedIndex].value, '?cmd=ml&data=')">
+ <option value=""> </option>
<?% FOREACH ch = param.genres %?>
- <option value="<?% url( ch.0 ) %?>" <?% "selected" IF cgi.param('data').split(':').first == 'genre' && cgi.param('data').split(':').last == ch.0 %?>><?% ch.0 %?></option>
+ <option value="<?% url( ch.1 ) %?>" <?% "selected" IF cgi.param('data').split(':').first == 'genre' && cgi.param('data').split(':').last == ch.0 %?>><?% ch.0 %?></option>
<?% END %?>
</select>
</th>
@@ -49,7 +52,7 @@
<div id="navcontainer">
<ul id="navlist">
- <li><a href="#" onClick="Play('<?% gettext("You have nothing selected!") %?>',document.musicform)">
+ <li><a href="#" onClick="Play('<?% gettext("You have nothing selected!") %?>',document.musicform,'<?% param.proxy %?>')">
<?% gettext("Play selected songs") %?>
</a></li>
<li><a href="?cmd=mrefresh"><?% gettext("Update Music Database") %?></a></li>
@@ -70,7 +73,7 @@
<?% FOREACH zeile = data %?>
<?% IF zeile.2 != oldalbum %?>
<tr>
- <?%- files = param.getCover(zeile.2);
+ <?%- files = param.getCover(zeile.2,zeile.1 );
IF files.size > 0 && files.first.length > 0;
cover = files.first;
ELSE;
Modified: vdr/vdr-xxv-skins/trunk/xstyle/network.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/network.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/network.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -77,7 +77,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}.png", my_graph.plot(d).gif );
END;
END;
%?>
Modified: vdr/vdr-xxv-skins/trunk/xstyle/next.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/next.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/next.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -1,8 +1,6 @@
<script language="javascript" type="text/javascript">
<!--
-
<?% INCLUDE javascript/records.js %?>
-
-->
</SCRIPT>
<!-- TableTemplate -->
@@ -31,10 +29,18 @@
</h1>
<div id="navcontainer">
+<form>
<ul id="navlist">
- <li><a href="#" onclick="suche('<?% gettext('Please put a time in XX:XX format:') %?>', '?cmd=now&data=', '<?% t %?>')"><?% gettext("Choose time") %?></a></li>
- <li><a href="?cmd=erestart"><?% gettext("Restart EPG Scan") %?></a></li>
+ <li><a href="#" onclick="suche('<?% gettext('Please put a time in XX:XX format:') %?>', '?cmd=now&data=', '<?% t %?>', '&__cgrp=<?% cgi.param('__cgrp') %?>')"><?% gettext("Choose time") %?></a></li>
+ <li>
+ <select name='cgroups' onChange="di(this.form.cgroups.options[this.form.cgroups.options.selectedIndex].value, '?cmd=<?% cgi.param("cmd") %?>&data=<?% param.zeitvon %?>&__cgrp=')">
+ <?% FOREACH cgrp = param.cgroups %?>
+ <option value='<?% cgrp.last %?>' <?% "selected" IF param.channelgroup == cgrp.last %?>><?% cgrp.first %?>
+ <?% END %?>
+ </select>
+ </li>
</ul>
+</form>
</div>
<table border="0" width="95%">
@@ -47,7 +53,7 @@
<?% END %?>
</tr>
<?% FOREACH zeile = data %?>
- <?% 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 %?>
<?% IF group != old %?>
<tr><td colspan="6" bgcolor='#DDDDDD'>
<b><?% group %?></b>
@@ -70,12 +76,12 @@
</td>
<td><?% IF param.timers.${id} %?><b><?% END %?><?% start %?><?% IF param.timers.${id} %?></b><?% END %?></td>
<td><?% IF param.timers.${id} %?><b><?% END %?><?% stop %?><?% IF param.timers.${id} %?></b><?% END %?></td>
+ <?% UNLESS duration > 100 OR duration <= 0 %?>
<td width="100" valign='bottom'><nobr>
- <?% UNLESS duration > 100 %?>
<?% per = (100 - duration) + 0.999 | format('%d'); per = (per > 100 ? 100 : per) %?>
<?% INCLUDE 'bloecke/percentbar.tmpl' barwidth=100 percent=per color_switch=1 %?>
- <?% END %?>
</td>
+ <?% END %?>
</tr>
<?% old = group %?>
<?% END %?>
Modified: vdr/vdr-xxv-skins/trunk/xstyle/now.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/now.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/now.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -1,8 +1,6 @@
<script language="javascript" type="text/javascript">
<!--
-
<?% INCLUDE javascript/records.js %?>
-
-->
</SCRIPT>
<!-- TableTemplate -->
@@ -31,10 +29,18 @@
</h1>
<div id="navcontainer">
+<form>
<ul id="navlist">
- <li><a href="#" onclick="suche('<?% gettext('Please put a time in XX:XX format:') %?>', '?cmd=now&data=', '<?% t %?>')"><?% gettext("Choose time") %?></a></li>
- <li><a href="?cmd=erestart"><?% gettext("Restart EPG Scan") %?></a></li>
+ <li><a href="#" onclick="suche('<?% gettext('Please put a time in XX:XX format:') %?>', '?cmd=now&data=', '<?% t %?>', '&__cgrp=<?% cgi.param('__cgrp') %?>')"><?% gettext("Choose time") %?></a></li>
+ <li>
+ <select name='cgroups' onChange="di(this.form.cgroups.options[this.form.cgroups.options.selectedIndex].value, '?cmd=<?% cgi.param("cmd") %?>&data=<?% param.zeitvon %?>&__cgrp=')">
+ <?% FOREACH cgrp = param.cgroups %?>
+ <option value='<?% cgrp.last %?>' <?% "selected" IF param.channelgroup == cgrp.last %?>><?% cgrp.first %?>
+ <?% END %?>
+ </select>
+ </li>
</ul>
+</form>
</div>
<table border="0" width="95%">
@@ -47,7 +53,7 @@
<?% END %?>
</tr>
<?% FOREACH zeile = data %?>
- <?% 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 %?>
<?% IF group != old %?>
<tr><td colspan="6" bgcolor='#DDDDDD'>
<b><?% group %?></b>
@@ -70,12 +76,12 @@
</td>
<td><?% IF param.timers.${id} %?><b><?% END %?><?% start %?><?% IF param.timers.${id} %?></b><?% END %?></td>
<td><?% IF param.timers.${id} %?><b><?% END %?><?% stop %?><?% IF param.timers.${id} %?></b><?% END %?></td>
+ <?% UNLESS duration > 100 OR duration <= 0 %?>
<td width="100" valign='bottom'><nobr>
- <?% UNLESS duration > 100 %?>
<?% per = (100 - duration) + 0.999 | format('%d'); per = (per > 100 ? 100 : per) %?>
<?% INCLUDE 'bloecke/percentbar.tmpl' barwidth=100 percent=per color_switch=1 %?>
- <?% END %?>
</td>
+ <?% END %?>
</tr>
<?% old = group %?>
<?% END %?>
Modified: vdr/vdr-xxv-skins/trunk/xstyle/program.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/program.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/program.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -70,7 +70,7 @@
</td>
<?% ELSIF c == 3; # Subtitle Field %?>
<?% ELSIF c == 6; # Day Field %?>
- <?% ELSIF c == 7; # Desc Field %?>
+ <?% ELSIF c >= 7; # Desc Field %?>
<?% ELSE %?>
<?% IF param.timers.${zeile.0} %?>
<td><b><?% field %?></b></td>
Modified: vdr/vdr-xxv-skins/trunk/xstyle/rdisplay.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/rdisplay.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/rdisplay.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -104,15 +104,19 @@
</tr>
<tr>
<td>
- <?% IF param.previews.size %?>
<table border="0" align='left'>
<td>
<?% FOREACH bild = param.previews %?>
<img src="<?% bild %?>" width="168" vspace='1'><br>
<?% END %?>
+ <?% IF ! param.previews.size && data.Type == 'TV' %?>
+ <img src="images/movie.png" width="200" title="<?% gettext('Movierecord') %?>" />
+ <?% END %?>
+ <?% IF data.Type == 'RADIO' %?>
+ <img src="images/radio.png" width="200" title="<?% gettext('Radiorecord') %?>" />
+ <?% END %?>
</td>
</table>
- <?% END %?>
</td><td>
<table border="0">
<th colspan=2>
@@ -128,7 +132,7 @@
<tr>
<td> </td>
<td>
- <?% data.Description.replace('\|', '<p>') %?><br>
+ <?% data.Description.replace('[\||\n]', '<br/>') %?><br>
</td>
</tr>
<tr>
@@ -137,9 +141,17 @@
<?% PROCESS marks d=data.Marks %?>
</td>
</tr>
+ <?% IF data.Channel %?>
<tr>
<td> </td>
<td>
+ <?% gettext('Channel') %?> : <?% data.Channel %?>
+ </td>
+ </tr>
+ <?% END %?>
+ <tr>
+ <td> </td>
+ <td>
<?% gettext('Lifetime') %?> : <?% data.Lifetime %?>
</td>
</tr>
@@ -154,3 +166,4 @@
</tr>
</form>
</table>
+
Added: vdr/vdr-xxv-skins/trunk/xstyle/remote.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/remote.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/remote.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -0,0 +1,125 @@
+<img src="images/trans.gif" name="switchimage" width="2" height="1">
+<form name="remoteform" onsubmit="changeInterval(document.remoteform.grabinterval.value); return false">
+
+<script language="javascript" type="text/javascript">
+<!--
+
+var interval = 5
+var last = 0;
+
+function post(url) {
+ // Hmm, brutal und gemein, das Laden der URL als Bild funktioniert...
+ var img = new Image();
+ img.src = url;
+}
+
+function switch_channel(url) {
+ post(url);
+ if(last + 1000 < Date.UTC()) {
+ grab();
+ }
+}
+
+function grab() {
+ if(document.remoteform.grabinterval.value > 0) {
+ Now = new Date();
+ document.livepicture.src = '?cmd=gdisplay&binary=1&laber=' + Now.getTime();
+ }
+ last = Date.UTC();
+}
+
+function changeInterval(newinterval) {
+ window.clearInterval(aktiv);
+ if(newinterval > 0) {
+ inter = newinterval * 1000;
+ aktiv = window.setInterval("grab()", inter);
+ }
+}
+
+inter = interval * 1000;
+aktiv = window.setInterval("grab()", inter);
+
+-->
+</script>
+
+<style type="text/css" media="screen">
+<!--
+#small { font-weight: normal; width: 20px; height: 20px; font-size: 9px; font-family: Verdana, Arial, Geneva, Helvetica, sans-serif}
+-->
+</style>
+<?% USE date %?>
+<!-- remote -->
+<table border=0 cellpadding=0 cellspacing=0>
+<tr>
+ <td rowspan="12">
+ <img src="?cmd=gdisplay&binary=1&laber=<?% date.now %?>" width="<?% param.width %?>" height="<?% param.height %?>" name="livepicture">
+ </td>
+ <td colspan="3" align="right"><div id='icons'><a href='#' onclick="switch_channel('?cmd=remote&data=Power')" title="<?% gettext("Powerdown") %?>"><img src="images/exit.png"></a></div></td>
+</tr>
+<tr>
+ <td align='center'><input id='small' onclick="switch_channel('?cmd=remote&data=1')" type="button" name="1" value="1"></td>
+ <td align='center'><input id='small' onclick="switch_channel('?cmd=remote&data=2')" type="button" name="2" value="2"></td>
+ <td align='center'><input id='small' onclick="switch_channel('?cmd=remote&data=3')" type="button" name="3" value="3"></td>
+</tr>
+<tr>
+ <td align='center'><input id='small' onclick="switch_channel('?cmd=remote&data=4')" type="button" name="4" value="4"></td>
+ <td align='center'><input id='small' onclick="switch_channel('?cmd=remote&data=5')" type="button" name="5" value="5"></td>
+ <td align='center'><input id='small' onclick="switch_channel('?cmd=remote&data=6')" type="button" name="6" value="6"></td>
+</tr>
+<tr>
+ <td align='center'><input id='small' onclick="switch_channel('?cmd=remote&data=7')" type="button" name="7" value="7"></td>
+ <td align='center'><input id='small' onclick="switch_channel('?cmd=remote&data=8')" type="button" name="8" value="8"></td>
+ <td align='center'><input id='small' onclick="switch_channel('?cmd=remote&data=9')" type="button" name="9" value="9"></td>
+</tr>
+<tr>
+ <td> </td>
+ <td align='center'><input id='small' onclick="switch_channel('?cmd=remote&data=Null')" type="button" name="0" value="0"></td>
+ <td> </td>
+</tr>
+<tr>
+ <td colspan="3" align="center"><nobr>
+ <input id='small' onclick="switch_channel('?cmd=remote&data=Red')" type="button" name="red" value=" " style="background:red">
+ <input id='small' onclick="switch_channel('?cmd=remote&data=Green')" type="button" name="green" value=" " style="background:green">
+ <input id='small' onclick="switch_channel('?cmd=remote&data=Yellow')" type="button" name="yellow" value=" " style="background:yellow">
+ <input id='small' onclick="switch_channel('?cmd=remote&data=Blue')" type="button" name="blue" value=" " style="background:blue">
+ </td>
+</tr>
+<tr>
+ <td> </td>
+ <td align='center'><div id='icons'><a href='#' onclick="switch_channel('?cmd=remote&data=Up')" title="^"><img src="images/up.png"></a></div></td>
+ <td> </td>
+</tr>
+<tr>
+ <td align='center'><div id='icons'><a href='#' onclick="switch_channel('?cmd=remote&data=Left')" title="<"><img src="images/zurueck.png"></a></div></td>
+ <td align='center'><div id='icons'><a href='#' onclick="switch_channel('?cmd=remote&data=Ok')" title="<?% gettext("Ok") %?>"><img src="images/ok.png"></a></div></td>
+ <td align='center'><div id='icons'><a href='#' onclick="switch_channel('?cmd=remote&data=Right')" title=">"><img src="images/next.png"></a></div></td>
+</tr>
+<tr>
+ <td> </td>
+ <td align='center'><div id='icons'><a href='#' onclick="switch_channel('?cmd=remote&data=Down')" title="v"><img src="images/down.png"></a></div></td>
+ <td> </td>
+</tr>
+<tr>
+ <td><div id='icons'><a href='#' onclick="switch_channel('?cmd=remote&data=Menu')" title="<?% gettext("Menu") %?>"><img src="images/menu_big.png"></a></div></td>
+ <td> </td>
+ <td><div id='icons'><a href='#' onclick="switch_channel('?cmd=remote&data=Back')" title="<?% gettext("Back") %?>"><img src="images/back_big.png"></a></div></td>
+</tr>
+<tr>
+ <td align='center'><input id='small' onclick="switch_channel('?cmd=remote&data=VolumeMinus')" type="button" name="leiser" value="-"></td>
+ <td align='center'> </td>
+ <td align='center'><input id='small' onclick="switch_channel('?cmd=remote&data=VolumePlus')" type="button" name="lauter" value="+"></td>
+</tr>
+<tr>
+ <td align='center' colspan="3">
+ <input style='width:20px' name="grabinterval" type="text" size="2">
+ <input type="button" onclick="changeInterval(document.remoteform.grabinterval.value)" value="<?% gettext("Set") %?>">
+ </td>
+</tr>
+</form>
+</table>
+
+<script language="javascript" type="text/javascript">
+<!--
+document.remoteform.grabinterval.value = interval;
+//-->
+</script>
Modified: vdr/vdr-xxv-skins/trunk/xstyle/rlist.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/rlist.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/rlist.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -17,9 +17,28 @@
<?% BLOCK image %?>
<?% files = param.getPreview(eventid) %?>
- <img src="<?% files.last || "images/movie.png" %?>" width="200" alt="" />
+ <?% IF type == 'RADIO' %?>
+ <img src="images/radio.png" width="200" title="<?% gettext('Radio recording') %?>" />
+ <?% ELSE %?>
+ <img src="<?% files.last || "images/movie.png" %?>" width="200" title="<?% gettext('Television recording') %?>" />
+ <?% 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 item %?>
<td valign="top">
<table cellspacing="0" cellpadding="0" width="1">
@@ -49,7 +68,7 @@
<a href="?cmd=rdisplay&data=<?% id %?>">
<?% PROCESS image %?><br>
<?% IF new > 0 %?><img src="images/new.png" alt="" title="<?% gettext("New recording") %?>" /><?% END %?>
- <b><?% title | html %?></b>
+ <b><?% (title.match('[a-z]') ? title : fulltitle) %?></b>
<?% IF subtitle %?>
<br> <?% subtitle | html %?>
<?% END %?>
@@ -101,12 +120,16 @@
<?% IF browse.defined && browse != "" %?>
<?% directorys = browse.split('~') %?>
<?% IF directorys.size <= 1 %?>
- <a title="<?% gettext("Back") %?>" href="?cmd=rlist">[^]</a>
+ <div id="icons">
+ <a title="<?% gettext("Back") %?>" href="?cmd=rlist"><img src="images/oben.png"></a>
+ </div>
<?% ELSE %?>
<?% t = directorys.pop %?>
<?% directory = directorys.join('~') %?>
- <a title="<?% gettext("Back") %?>" href="?cmd=rlist">[^]</a>
- <a title="<?% gettext("Back") %?>" href="?cmd=rlist&data=<?% url( directory ) %?>">[<<]</a>
+ <div id="icons">
+ <a title="<?% gettext("Back") %?>" href="?cmd=rlist&data=<?% url( directory ) %?>"><img src="images/schnell_back.png"></a>
+ <a title="<?% gettext("Back") %?>" href="?cmd=rlist"><img src="images/oben.png"></a>
+ </div>
<?% END %?>
<br />
<?% END %?>
@@ -135,8 +158,10 @@
<?% END %?>
</tr>
<?% FOREACH zeile = data %?>
- <?% 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 -%?>
+ <?% total = total + duration %?>
<tr>
<?% IF folder > 1 %?>
<td colspan="4">
@@ -164,7 +189,7 @@
<?% ELSIF c == 2 # title %?>
<a href="?cmd=rdisplay&data=<?% id %?>">
<?% IF new > 0 %?><img src="images/new.png" alt="" title="<?% gettext("New recording") %?>" /> <?% END %?>
- <?% field.split('~').last | truncate(30) %?>
+ <?% (field.split('~').last.match('[a-z]') ? field.split('~').last : zeile.9) | truncate(30) %?>
</a>
<?% ELSE %?>
<a href="?cmd=rdisplay&data=<?% id %?>">
@@ -177,13 +202,12 @@
</tr>
<?% END %?>
</table>
-
+ <?% PROCESS printsumme width=0 %?>
<?% ELSE %?>
<?% IF param.sortable %?>
<?% BLOCK SortItem %?>
-<a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=0" ><img src="images/asc.png"></a>
<?% label | html %?>
-<a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=1" ><img src="images/desc.png"></a>
+<a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=0" ><img src="images/asc.png"></a><a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=1" ><img src="images/desc.png"></a> |
<?% END %?>
<?% gettext('Sorting') %?> :
<?% PROCESS SortItem row="RecordId" label=gettext('Index') %?>
@@ -197,8 +221,10 @@
<?% z = 0 %?>
<?% FOREACH zeile = data %?>
<!-- Item: <?% FOREACH x = zeile %?><?% loop.count - 1 %?>:<?% x %?>|<?% 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 -%?>
+ <?% total = total + duration %?>
<?% IF z >= 3 || old != ( folder > 1 ? 2 : 1 ) %?>
<?% IF old.defined;WHILE z < 3;z = z + 1 %?><td> </td><?% END %?>
</tr>
@@ -210,6 +236,7 @@
<?% END %?>
</tr>
</table>
+ <?% PROCESS printsumme width=0 %?>
<?% END %?>
<?% IF enableform %?>
</form>
Modified: vdr/vdr-xxv-skins/trunk/xstyle/rsearch.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/rsearch.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/rsearch.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -17,9 +17,28 @@
<?% BLOCK image %?>
<?% files = param.getPreview(eventid) %?>
- <img src="<?% files.last || "images/movie.png" %?>" width="200" alt="" />
+ <?% IF type == 'RADIO' %?>
+ <img src="images/radio.png" width="200" title="<?% gettext('Radio recording') %?>" />
+ <?% ELSE %?>
+ <img src="<?% files.last || "images/movie.png" %?>" width="200" title="<?% gettext('Television recording') %?>" />
+ <?% 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 item %?>
<td valign="top">
<table cellspacing="0" cellpadding="0" width="1">
@@ -49,7 +68,7 @@
<a href="?cmd=rdisplay&data=<?% id %?>">
<?% PROCESS image %?><br>
<?% IF new > 0 %?><img src="images/new.png" alt="" title="<?% gettext("New recording") %?>" /><?% END %?>
- <b><?% title | html %?></b>
+ <b><?% (title.match('[a-z]') ? title : fulltitle) %?></b>
<?% IF subtitle %?>
<br> <?% subtitle | html %?>
<?% END %?>
@@ -101,12 +120,16 @@
<?% IF browse.defined && browse != "" %?>
<?% directorys = browse.split('~') %?>
<?% IF directorys.size <= 1 %?>
- <a title="<?% gettext("Back") %?>" href="?cmd=rlist">[^]</a>
+ <div id="icons">
+ <a title="<?% gettext("Back") %?>" href="?cmd=rlist"><img src="images/oben.png"></a>
+ </div>
<?% ELSE %?>
<?% t = directorys.pop %?>
<?% directory = directorys.join('~') %?>
- <a title="<?% gettext("Back") %?>" href="?cmd=rlist">[^]</a>
- <a title="<?% gettext("Back") %?>" href="?cmd=rlist&data=<?% url( directory ) %?>">[<<]</a>
+ <div id="icons">
+ <a title="<?% gettext("Back") %?>" href="?cmd=rlist&data=<?% url( directory ) %?>"><img src="images/schnell_back.png"></a>
+ <a title="<?% gettext("Back") %?>" href="?cmd=rlist"><img src="images/oben.png"></a>
+ </div>
<?% END %?>
<br />
<?% END %?>
@@ -135,8 +158,10 @@
<?% END %?>
</tr>
<?% FOREACH zeile = data %?>
- <?% 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 -%?>
+ <?% total = total + duration %?>
<tr>
<?% IF folder > 1 %?>
<td colspan="4">
@@ -164,7 +189,7 @@
<?% ELSIF c == 2 # title %?>
<a href="?cmd=rdisplay&data=<?% id %?>">
<?% IF new > 0 %?><img src="images/new.png" alt="" title="<?% gettext("New recording") %?>" /> <?% END %?>
- <?% field.split('~').last | truncate(30) %?>
+ <?% (field.split('~').last.match('[a-z]') ? field.split('~').last : zeile.9) | truncate(30) %?>
</a>
<?% ELSE %?>
<a href="?cmd=rdisplay&data=<?% id %?>">
@@ -177,13 +202,12 @@
</tr>
<?% END %?>
</table>
-
+ <?% PROCESS printsumme width=0 %?>
<?% ELSE %?>
<?% IF param.sortable %?>
<?% BLOCK SortItem %?>
-<a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=0" ><img src="images/asc.png"></a>
<?% label | html %?>
-<a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=1" ><img src="images/desc.png"></a>
+<a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=0" ><img src="images/asc.png"></a><a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=1" ><img src="images/desc.png"></a> |
<?% END %?>
<?% gettext('Sorting') %?> :
<?% PROCESS SortItem row="RecordId" label=gettext('Index') %?>
@@ -197,8 +221,10 @@
<?% z = 0 %?>
<?% FOREACH zeile = data %?>
<!-- Item: <?% FOREACH x = zeile %?><?% loop.count - 1 %?>:<?% x %?>|<?% 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 -%?>
+ <?% total = total + duration %?>
<?% IF z >= 3 || old != ( folder > 1 ? 2 : 1 ) %?>
<?% IF old.defined;WHILE z < 3;z = z + 1 %?><td> </td><?% END %?>
</tr>
@@ -210,6 +236,7 @@
<?% END %?>
</tr>
</table>
+ <?% PROCESS printsumme width=0 %?>
<?% END %?>
<?% IF enableform %?>
</form>
Modified: vdr/vdr-xxv-skins/trunk/xstyle/schema.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/schema.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/schema.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -3,16 +3,24 @@
zeitformat = gettext("%A the %D at %H:%M o'clock");
day = date.format(date.now, zeitformat);
-width = 720; # Table width
Duration = param.zeitbis - param.zeitvon;
+# seconds in pixel
+sec_height = 0.1;
+
-%?>
<script language="javascript" type="text/javascript">
+<!--
+ <?% INCLUDE javascript/records.js %?>
+-->
+</SCRIPT>
+
+<script language="javascript" type="text/javascript">
var interval = 300
function reload() {
Now = new Date();
- location.href = '?cmd=schema';
+ location.href = window.location.href;
}
inter = interval * 1000;
@@ -24,146 +32,196 @@
<?% gettext('Display') %?> <?% gettext('from') %?> <?% date.format(param.zeitvon, '%H:%M') %?> <?% gettext('to') %?> <?% date.format(param.zeitbis, '%H:%M') %?> <?% gettext("o'clock") %?>
</h1>
-<!-- TableTemplate -->
-<select name='cgroups' onChange="di(this.form.cgroups.options[this.form.cgroups.options.selectedIndex].value, '?cmd=schema&data=<?% param.zeitvon %?>&__cgrp=')">
-<?% FOREACH cgrp = param.cgroups %?>
- <option value='<?% cgrp.last %?>' <?% "selected" IF param.channelgroup == cgrp.last %?>><?% cgrp.first %?>
-<?% END %?>
-</select>
-<table width='<?% (width + 100) %?>' cellpadding="0" cellspacing="0">
-<tr>
- <td><img alt="" src='images/blank.png' width=100 height=1 border=0 /></td>
- <?% c = 0; colspan = 0; abstand = 15 * 60; # 15 Minuten %?>
- <?%- WHILE c < Duration -%?>
- <?%-
- c = c + abstand;
- percent = (abstand / Duration) * width
- colspan = colspan + 1;
- zeit = param.zeitvon + c;
- -%?>
- <td bgcolor="white" width="<?% offset = (c % 3600 ? 1 : 2);(percent - offset) | format('%d') %?>" align='right'>
- <?% IF c == abstand && zeit > date.now %?>
- <a href='?cmd=schema&data=<?% (param.zeitvon - Duration) %?>&__cgrp=<?% param.channelgroup %?>'><</a>
- <?% END %?>
- <font size='1'><?% date.format(zeit, '%H:%M') %?>
- <?% IF c >= Duration %?>
- <a href='?cmd=schema&data=<?% (param.zeitvon + Duration) %?>&__cgrp=<?% param.channelgroup %?>'>></a>
- <?% END %?>
- </font></td>
- <?% END %?>
-</tr>
+<div id="navcontainer">
+<ul id="navlist">
+ <li><a href='?cmd=schema&data=<?% (param.zeitvon - Duration) %?>&__cgrp=<?% param.channelgroup %?>'><?% tt=param.zeitvon - Duration;date.format(tt, '%H:%M') %?>-<?% date.format(param.zeitvon, '%H:%M') %?></a></li>
+<form>
+ <li>
+ <select name='cgroups' onChange="di(this.form.cgroups.options[this.form.cgroups.options.selectedIndex].value, '?cmd=schema&data=<?% param.zeitvon %?>&__cgrp=')">
+ <?% FOREACH cgrp = param.cgroups %?>
+ <option value='<?% cgrp.last %?>' <?% "selected" IF param.channelgroup == cgrp.last %?>><?% cgrp.first %?>
+ <?% END %?>
+ </select>
+ </li>
+</form>
+ <li><a href='?cmd=schema&data=<?% (param.zeitvon + Duration) %?>&__cgrp=<?% param.channelgroup %?>'><?% tt=param.zeitvon + Duration;date.format(tt, '%H:%M') %?>-<?% tt=tt + Duration;date.format(tt, '%H:%M') %?></a></li>
+</ul>
+</div>
-<tr>
- <?% c = 0 %?>
- <?% abstand = abstand div 3 %?>
- <td> </td>
- <td bgcolor="white" colspan="<?% colspan %?>" style="white-space: nowrap">
- <?%- IF date.now > param.zeitvon && date.now < param.zeitbis -%?>
- <?% a = date.now - param.zeitvon;
- p = (a / Duration) * width;
- %?>
- <div style="position:absolute; z-index:1">
- <div style="position:relative; top:0px; left:0px; width:<?% p | format('%d') %?>px; height:10px; z-index:2; border:thin solid #804000; background-color:#FF0000; text-align: right; -moz-opacity:0.2; filter:Alpha(opacity=20)"><font size="1"> </font></div>
- </div>
- <div style="position:absolute; z-index:1">
- <div style="position:relative; top:0px; left:<?% p | format('%d') %?>px; width:1px; height:100%; border-left:1px solid red; margin:0px; z-Index: 2;"><img alt="" src='images/blank.png' width='1' height='<?% data.keys.size * 23 %?>' border="0" hspace="0" vspace="0" /></div>
- </div>
- <?%- END -%?>
- <?%- WHILE c < Duration;
- c = c + abstand;
- percent = (abstand / Duration) * width
- -%?><img alt="" style="background:white" src='images/blank.png' width="<?%-
- offset = (c % 3600 ? 1 : 2);
- (percent - offset) | format('%d')
- -%?>" height='10' /><img alt=""
- style="background:<?% c % 900 ? "gray" : "black" %?>"
- src='images/blank.png'
- width="<?% c % 3600 ? "1" : "2" %?>"
- height='<?% (c % 900 ? "5" : "10") %?>' />
- <?%- END -%?>
- </td>
-</tr>
+<style>
+/* Schema */
+#channel
+{
+ margin: 3px;
+ position: relative;
+ float:left;
+}
+#channelcontainer
+{
+ height: <?% Duration * sec_height %?>px;
+ width: 200px;
+ border: 1px solid #999;
+ position: relative;
+ background:#FFF url(style/tr_bck.gif) repeat-x;
+ overflow: hidden;
+}
-<?% x = -1 %?>
+#channeltitle, #channeltitle a
+{
+ font-weight:bold;
+ font-size:1.1em;
+ background-color:blue;
+ color:white;
+ padding: 3px;
+
+}
+
+#eventbox
+{
+ margin: 1px;
+ border: 1px solid #999;
+ position: relative;
+ overflow: hidden;
+ background:#FFF url(style/foot_bck.gif) repeat-x;
+}
+
+#eventbox_time
+{
+ margin:3px;
+ font-size:0.8em;
+ float: left;
+ background:#eee;
+}
+
+#eventbox_title
+{
+ font-weight:bold;
+ font-size:1.1em;
+ margin: 3px;
+}
+
+#eventbox_title_link
+{
+ font-size:0.7em;
+ margin: 2px;
+}
+
+#eventbox_subtitle
+{
+ font-weight:bold;
+ font-style:italic;
+ font-size:0.8em;
+ margin: 3px;
+}
+
+#eventbox_text
+{
+ font-style:italic;
+ font-size:0.8em;
+ margin: 3px;
+}
+
+<?% ttm = date.now - param.zeitvon;
+ ttm = ttm * sec_height;
+%?>
+#timemarker
+{
+ margin: 1px;
+ border-top: 1px dashed #F00;
+ position: absolute;
+ top: <?% ttm | format('%d') %?>px;
+ width:100%;
+ font-size:0.6em;
+ text-align: right;
+ color:#F00;
+ z-index:99;
+}
+</style>
+
<?% FOREACH cpos = data.keys.nsort %?>
-<tr><td colspan="<?% (colspan + 1) %?>"><img src='images/blank.png' width='10' height=1 border=0 align='left' /></td></tr>
-<?% x = x + 1;
- channelName = data.$cpos.first.3;
+<?% channelName = data.$cpos.first.3;
channelId = data.$cpos.first.4;
+ oldend = 0;
%?>
-<tr class="<?% myclass %?>" <?% IF (x mod 2) == 0 %?>bgcolor='#E5E5E5'<?% END %?>>
- <td>
- <a href="?cmd=program&data=<?% channelId %?>"><?% channelName | truncate(12) %?></a>
- </td>
- <td colspan="<?% colspan %?>" style="white-space: nowrap">
- <?%- ges = 0; oldend = param.zeitvon -%?>
- <?%-
- FOREACH event = data.$cpos;
- epgId = event.0;
- epgTitle = event.1;
- epgSubTitle = event.2;
- chName = event.3;
- chPos = event.4;
- epgStart = event.5;
- epgStop = event.6;
- epgPercent = event.7;
- epgDesc = event.8;
- second_start= event.9;
- second_stop = event.10;
-
- IF second_start > oldend;
- laenge = second_start - oldend;
- percent = (laenge / Duration) * width;
- ges = ges + percent;
- -%?>
- <img alt="" src='images/blank.png' width='<?% percent | format('%d') %?>' height=8 border=0 align='left' />
- <?% END;
- IF second_start < oldend;
- dur = second_stop - oldend;
- ELSE;
- dur = second_stop - second_start;
- END;
- IF dur < 0; dur = 0; END;
- percent = (dur / Duration) * width;
- IF (ges + percent) > width;
- percent = width - ges;
- END;
- ges = ges + percent;
- trun = percent / 10 | format('%d');
- IF dur < 300;
- trun = 3;
-
- END;
- -%?>
-<?% IF trun <= 3 %?>
- <a href="?cmd=display&data=<?% epgId %?>" title="<?% epgStart %?> - <?% epgStop %?> - <?% dur %?>"><img alt="" src='images/blank.png' width='<?% percent | format('%d') %?>' height=8 border=0 hspace=0 vspace=0 align='left' /></a>
-<?% ELSE %?>
- <table class='<?% PROCESS getStatus e=event t=param.timers r=param.runningTimer %?>' align="left" width="<?% percent | format('%d') %?>" cellpadding="0" cellspacing="0"><tr><td><a href="?cmd=display&data=<?% epgId %?>" title="<?% PROCESS title e=event %?>"><?% epgTitle | truncate(trun) %?></a></td></tr></table>
-<?% END %?>
- <?% oldend = second_stop %?>
+<div id=channel>
+ <div id=channeltitle><a href="?cmd=program&data=<?% channelId %?>"><?% channelName %?></a></div>
+ <div id=channelcontainer>
+ <?% FOREACH event = data.$cpos %?>
+ <?% INCLUDE eventbox e=event o=oldend %?>
+ <?% oldend = event.10 %?>
<?% END %?>
- </td>
-</tr>
-<?% END %?>
-</table>
-</form>
+ <div id=timemarker><?% date.format(date.now, '%H:%M') %?></div>
+ </div>
+</div>
-<?% BLOCK title %?>
-<?% e.1 | html %?>
-<?% e.2 | html IF e.2 %?>
-<?% e.5 | html %?> - <?% e.6 | html %?>
<?% END %?>
-<?%- BLOCK getStatus -%?>
-<?%-
- class = 'schema_normal';
- IF t.exists(e.0);
- class = 'schema_record_plan';
+<?% BLOCK eventbox;
+ epgId = e.0;
+ epgTitle = e.1;
+ epgSubTitle = e.2;
+ chName = e.3;
+ chPos = e.4;
+ epgStart = e.5;
+ epgStop = e.6;
+ epgPercent = e.7;
+ epgDesc = e.8;
+ second_start= e.9;
+ second_stop = e.10;
+ video = e.11;
+ audio = e.12;
+
+ # Schon früher angefangende Sendung ...
+ IF second_start < param.zeitvon;
+ second_start = param.zeitvon;
END;
- IF t.exists(e.0) && r.exists(t.${e.0}.Id);
- class = 'schema_record_now';
+
+ # Sendung die anfängt wenn das schema endet ..
+ IF second_start >= param.zeitbis;
+ RETURN;
END;
-class;
--%?>
+
+ # Sendung die endet wenn das schema anfängt ..
+ IF second_stop <= param.zeitvon;
+ RETURN;
+ END;
+
+ # Sendung mit gleicher Endzeit als alte ..
+ IF second_stop == o;
+ RETURN;
+ END;
+
+ # Dauer der Sendung ...
+ durat = second_stop - second_start;
+
+ # 2.Sendung in Zeitleiste
+ IF o;
+ startt = second_start - o;
+ ELSIF second_start > param.zeitvon;
+ startt = second_start - param.zeitvon;
+ END;
+ %?>
+
+<div id='eventbox' style="height: <?% (durat * sec_height) | format('%d') %?>px;
+<?%- IF date.now < second_start || date.now > second_stop -%?>
+ color : #777;
<?%- END -%?>
+<?%- IF second_start == param.zeitvon -%?>
+ top: 0px;
+ border-top-style:dashed;
+ border-top-color:green;
+ border-top-width:2px;
+<?%- ELSE -%?>
+ top: <?% (startt * sec_height) %?>px;
+<?%- END -%?>">
+ <div id=eventbox_time style="height:95%;">
+ <?% epgStart %?><br/><?% epgStop %?><br/>
+ <?% INCLUDE 'bloecke/event_links.tmpl' data=e umbruch='<br/>' switch=1 %?>
+ </div>
+ <div id=eventbox_title><a href="?cmd=display&data=<?% epgId %?>"><?% epgTitle %?></a></div>
+ <div id=eventbox_subtitle><?% epgSubtitle %?></div>
+ <div id=eventbox_text><?% epgDesc %?></div>
+</div>
+ <?% oldend = second_stop %?>
+<?% END %?>
Deleted: vdr/vdr-xxv-skins/trunk/xstyle/schemaOld.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/schemaOld.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/schemaOld.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -1,169 +0,0 @@
-<?%-
-USE date;
-zeitformat = gettext("%A the %D at %H:%M o'clock");
-day = date.format(date.now, zeitformat);
-
-width = 720; # Table width
-Duration = param.zeitbis - param.zeitvon;
-
--%?>
-<script language="javascript" type="text/javascript">
- var interval = 300
-
- function reload() {
- Now = new Date();
- location.href = '?cmd=schema';
- }
-
- inter = interval * 1000;
- aktiv = window.setTimeout("reload()", inter);
-</script>
-
-<form>
-<h1><?% gettext("What is running at") %?> <?% day %?><br/>
-<?% gettext('Display') %?> <?% gettext('from') %?> <?% date.format(param.zeitvon, '%H:%M') %?> <?% gettext('to') %?> <?% date.format(param.zeitbis, '%H:%M') %?> <?% gettext("o'clock") %?>
-</h1>
-
-<!-- TableTemplate -->
-<select name='cgroups' onChange="di(this.form.cgroups.options[this.form.cgroups.options.selectedIndex].value, '?cmd=schema&data=<?% param.zeitvon %?>&__cgrp=')">
-<?% FOREACH cgrp = param.cgroups %?>
- <option value='<?% cgrp.last %?>' <?% "selected" IF param.channelgroup == cgrp.last %?>><?% cgrp.first %?>
-<?% END %?>
-</select>
-
-<table width='<?% (width + 100) %?>' cellpadding="0" cellspacing="0">
-<tr>
- <td><img alt="" src='images/blank.png' width=100 height=1 border=0 /></td>
- <?% c = 0; colspan = 0; abstand = 15 * 60; # 15 Minuten %?>
- <?%- WHILE c < Duration -%?>
- <?%-
- c = c + abstand;
- percent = (abstand / Duration) * width
- colspan = colspan + 1;
- zeit = param.zeitvon + c;
- -%?>
- <td bgcolor="white" width="<?% offset = (c % 3600 ? 1 : 2);(percent - offset) | format('%d') %?>" align='right'>
- <?% IF c == abstand && zeit > date.now %?>
- <a href='?cmd=schema&data=<?% (param.zeitvon - Duration) %?>&__cgrp=<?% param.channelgroup %?>'><</a>
- <?% END %?>
- <font size='1'><?% date.format(zeit, '%H:%M') %?>
- <?% IF c >= Duration %?>
- <a href='?cmd=schema&data=<?% (param.zeitvon + Duration) %?>&__cgrp=<?% param.channelgroup %?>'>></a>
- <?% END %?>
- </font></td>
- <?% END %?>
-</tr>
-
-<tr>
- <?% c = 0 %?>
- <?% abstand = abstand div 3 %?>
- <td> </td>
- <td bgcolor="white" colspan="<?% colspan %?>" style="white-space: nowrap">
- <?%- IF date.now > param.zeitvon && date.now < param.zeitbis -%?>
- <?% a = date.now - param.zeitvon;
- p = (a / Duration) * width;
- %?>
- <div style="position:absolute; z-index:1">
- <div style="position:relative; top:0px; left:0px; width:<?% p | format('%d') %?>px; height:10px; z-index:2; border:thin solid #804000; background-color:#FF0000; text-align: right; -moz-opacity:0.2; filter:Alpha(opacity=20)"><font size="1"> </font></div>
- </div>
- <div style="position:absolute; z-index:1">
- <div style="position:relative; top:0px; left:<?% p | format('%d') %?>px; width:1px; height:100%; border-left:1px solid red; margin:0px; z-Index: 2;"><img alt="" src='images/blank.png' width='1' height='<?% data.keys.size * 23 %?>' border="0" hspace="0" vspace="0" /></div>
- </div>
- <?%- END -%?>
- <?%- WHILE c < Duration;
- c = c + abstand;
- percent = (abstand / Duration) * width
- -%?><img alt="" style="background:white" src='images/blank.png' width="<?%-
- offset = (c % 3600 ? 1 : 2);
- (percent - offset) | format('%d')
- -%?>" height='10' /><img alt=""
- style="background:<?% c % 900 ? "gray" : "black" %?>"
- src='images/blank.png'
- width="<?% c % 3600 ? "1" : "2" %?>"
- height='<?% (c % 900 ? "5" : "10") %?>' />
- <?%- END -%?>
- </td>
-</tr>
-
-<?% x = -1 %?>
-<?% FOREACH cpos = data.keys.nsort %?>
-<tr><td colspan="<?% (colspan + 1) %?>"><img src='images/blank.png' width='10' height=1 border=0 align='left' /></td></tr>
-<?% x = x + 1;
- channelName = data.$cpos.first.3;
- channelId = data.$cpos.first.4;
-%?>
-<tr class="<?% myclass %?>" <?% IF (x mod 2) == 0 %?>bgcolor='#E5E5E5'<?% END %?>>
- <td>
- <a href="?cmd=program&data=<?% channelId %?>"><?% channelName | truncate(12) %?></a>
- </td>
- <td colspan="<?% colspan %?>" style="white-space: nowrap">
- <?%- ges = 0; oldend = param.zeitvon -%?>
- <?%-
- FOREACH event = data.$cpos;
- epgId = event.0;
- epgTitle = event.1;
- epgSubTitle = event.2;
- chName = event.3;
- chPos = event.4;
- epgStart = event.5;
- epgStop = event.6;
- epgPercent = event.7;
- epgDesc = event.8;
- second_start= event.9;
- second_stop = event.10;
-
- IF second_start > oldend;
- laenge = second_start - oldend;
- percent = (laenge / Duration) * width;
- ges = ges + percent;
- -%?>
- <img alt="" src='images/blank.png' width='<?% percent | format('%d') %?>' height=8 border=0 align='left' />
- <?% END;
- IF second_start < oldend;
- dur = second_stop - oldend;
- ELSE;
- dur = second_stop - second_start;
- END;
- IF dur < 0; dur = 0; END;
- percent = (dur / Duration) * width;
- IF (ges + percent) > width;
- percent = width - ges;
- END;
- ges = ges + percent;
- trun = percent / 10 | format('%d');
- IF dur < 300;
- trun = 3;
-
- END;
- -%?>
-<?% IF trun <= 3 %?>
- <a href="?cmd=display&data=<?% epgId %?>" title="<?% epgStart %?> - <?% epgStop %?> - <?% dur %?>"><img alt="" src='images/blank.png' width='<?% percent | format('%d') %?>' height=8 border=0 hspace=0 vspace=0 align='left' /></a>
-<?% ELSE %?>
- <table class='<?% PROCESS getStatus e=event t=param.timers r=param.runningTimer %?>' align="left" width="<?% percent | format('%d') %?>" cellpadding="0" cellspacing="0"><tr><td><a href="?cmd=display&data=<?% epgId %?>" title="<?% PROCESS title e=event %?>"><?% epgTitle | truncate(trun) %?></a></td></tr></table>
-<?% END %?>
- <?% oldend = second_stop %?>
- <?% END %?>
- </td>
-</tr>
-<?% END %?>
-</table>
-</form>
-
-<?% BLOCK title %?>
-<?% e.1 | html %?>
-<?% e.2 | html IF e.2 %?>
-<?% e.5 | html %?> - <?% e.6 | html %?>
-<?% END %?>
-
-<?%- BLOCK getStatus -%?>
-<?%-
- class = 'schema_normal';
- IF t.exists(e.0);
- class = 'schema_record_plan';
- END;
- IF t.exists(e.0) && r.exists(t.${e.0}.Id);
- class = 'schema_record_now';
- END;
-class;
--%?>
-<?%- END -%?>
Modified: vdr/vdr-xxv-skins/trunk/xstyle/search.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/search.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/search.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -6,10 +6,73 @@
-->
</SCRIPT>
<?% USE date %?>
-<h1><?% gettext("Search results") %?>:
+<h1><?% gettext("Advanced Search") %?>
+<?% IF data.size %?>
<?% found = data.size - 1 %?>
- <?% gettext("Found %s items") | replace("%s", found ) %?>.</h1>
+ : <?% gettext("Found %s items") | replace("%s", found ) %?>
+<?% END %?>
+</h1>
+
<table border="0" width="95%">
+<form method='get'>
+ <input type='hidden' name='cmd' value='search'>
+ <input type='hidden' name='__action' value='save'>
+<tr>
+ <td><?% gettext('Search text') %?>:</td>
+ <td><input type="text" name="data" value="<?% cgi.param('data') || cgi.param('data') %?>"></td>
+</tr>
+<tr>
+ <td><?% gettext('Search in fields') %?>:</td>
+ <td>
+ <input type="radio" name="__Where" value="all" <?% IF ! cgi.param('__Where') || cgi.param('__Where') == 'all' %?>checked<?% END %?>><?% gettext('All') %?>
+ <input type="radio" name="__Where" value="title" <?% IF cgi.param('__Where') == 'title' %?>checked<?% END %?>><?% gettext('Only in title') %?>
+ <input type="radio" name="__Where" value="titlesubtitle" <?% IF cgi.param('__Where') == 'titlesubtitle' %?>checked<?% END %?>><?% gettext('Only in title and subtitle') %?>
+ </td>
+</tr>
+<tr>
+ <td><?% gettext('Video format') %?>:</td>
+ <td>
+ <input type="radio" name="__VideoFormat" value="all" <?% IF ! cgi.param('__VideoFormat') || cgi.param('__VideoFormat') == 'all' %?>checked<?% END %?>><?% gettext('All') %?>
+ <input type="radio" name="__VideoFormat" value="widescreen" <?% IF cgi.param('__VideoFormat') == 'widescreen' %?>checked<?% END %?>><?% gettext('16:9 Wide-screen') %?>
+ </td>
+</tr>
+<tr>
+ <td><?% gettext('Audio format') %?>:</td>
+ <td>
+ <input type="radio" name="__AudioFormat" value="all" <?% IF ! cgi.param('__AudioFormat') || cgi.param('__AudioFormat') == 'all' %?>checked<?% END %?>><?% gettext('All') %?>
+ <input type="radio" name="__AudioFormat" value="dts" <?% IF cgi.param('__AudioFormat') == 'dts' %?>checked<?% END %?>><?% gettext('Dolby Digital') %?>
+ <input type="radio" name="__AudioFormat" value="stereo" <?% IF cgi.param('__AudioFormat') == 'stereo' %?>checked<?% END %?>><?% gettext('Stereo') %?>
+ </td>
+</tr>
+<tr>
+ <td><?% gettext('Minimum length (in minutes)') %?>:</td>
+ <td>
+ <input type="text" name="__MinLength" value="<?% cgi.param('__MinLength') %?>">
+ </td>
+</tr>
+<tr>
+ <td><?% gettext('Channel') %?>:</td>
+ <td>
+ <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>
+ </td>
+</tr>
+<tr>
+ <td colspan=2>
+ <input type='submit' value='<?% gettext('Search') %?>'>
+ <input type='reset' value='<?% gettext('Reset') %?>'>
+ </td>
+</tr>
+</form>
+</table>
+
+
+<?% IF data.size > 1 %?>
+<table border="0" width="95%">
<?% IF data.size %?>
<?% fields = data.shift %?>
<tr>
@@ -64,4 +127,4 @@
<?% END %?>
<?% END %?>
</table>
-
+<?% END %?>
Modified: vdr/vdr-xxv-skins/trunk/xstyle/skin.cfg
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/skin.cfg 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/skin.cfg 2006-05-20 16:17:56 UTC (rev 2790)
@@ -1 +1,3 @@
<?% ######################################################################## %?>
+<?% # How many columns has the Programmenu, 0=Show all entrys %?>
+<?% SET global.cfgMaxChannelMenuEntrys = 40 %?>
Modified: vdr/vdr-xxv-skins/trunk/xstyle/skin.cfg.default
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/skin.cfg.default 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/skin.cfg.default 2006-05-20 16:17:56 UTC (rev 2790)
@@ -1 +1,3 @@
<?% ######################################################################## %?>
+<?% # How many columns has the Programmenu, 0=Show all entrys %?>
+<?% SET global.cfgMaxChannelMenuEntrys = 40 %?>
Added: vdr/vdr-xxv-skins/trunk/xstyle/style/plate.png
===================================================================
(Binary files differ)
Property changes on: vdr/vdr-xxv-skins/trunk/xstyle/style/plate.png
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Modified: vdr/vdr-xxv-skins/trunk/xstyle/style/style.css
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/style/style.css 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/style/style.css 2006-05-20 16:17:56 UTC (rev 2790)
@@ -8,7 +8,7 @@
color: #000064;
border: 0px;
margin: 0px;
- background : url(grgrad.gif) repeat-x;
+ background : #FFF;
}
.content {
@@ -22,6 +22,7 @@
h2 { font-size:1.1em;}
h3 { font-size:1em; margin-top:0px; margin-bottom:0px;}
h4 { font-size:1em;}
+h6 { font-size:0.7em; font-style:italic; margin:20px}
h2,h4 { margin-top:0px;margin-bottom:0px; }
h1,h2,h3,h4 { color:#0075e3;}
@@ -68,11 +69,26 @@
color: #FF0000;
}
-input[type~=button],input[type~=submit], input[type~=reset], select {
+input[type~=button],input[type~=submit], input[type~=reset], input[type~=radio], input[type~=checkbox], select {
cursor: pointer;
}
+/* Timerlist*/
+.deactive{
+ text-decoration:line-through;
+ color:#aaaaaa;
+}
+.active{
+ color:#00aa00;
+ font-weight:bold;
+}
+
+.problem{
+ color:#ff0000;
+}
+
+
/* VTX */
p.vtx{
font-size:16px;
@@ -110,109 +126,7 @@
left: 0;
}
-.timer_On {
- color:green;
-}
-.timer_Off{
- color:red;
-}
-
-.menu{
- background-color:#efefef;
- padding:10px;
- text-align:left;
-}
-
-.normal{
- color:#000064;
- font-weight:normal;
-}
-
-.refresh{
- color:#0000FF;
- font-weight:normal;
-}
-
-.deactive{
- color:#aaaaaa;
-}
-
-.active{
- color:#00aa00;
- font-weight:bold;
-}
-
-.problem{
- color:#ff0000;
-}
-
-.noproblem{
- color:#00AA00;
-}
-
-.problemred{
- color:#ff0000;
- font-weight:bold;
-}
-
-.fastproblem{
- color:#990000;
- font-weight:bold;
-}
-
-.fastproblemgreen{
- font-weight:bold;
-}
-
-.error{
- color:#ff0000;
- font-weight:bold;
-}
-
-.good{
- color:#009900;
- font-weight:normal;
-}
-
-.schema_normal{
- font-size:0.9em;
- border:1px solid #666666;
- border-right:0px;
-}
-
-.schema_record_plan{
- font-size:0.9em;
- font-weight:bold;
- border:1px solid;
- border-right:0px;
-}
-
-.schema_record_now{
- font-size:0.9em;
- font-weight:bold;
- border:1px solid #006600;
- border-right:0px;
- background-color: #DDFFDD;
-}
-
-.schema_record_conflict{
- font-size:0.9em;
- font-weight:bold;
- border:1px solid #006600;
- border-right:0px;
- background-color: #DDFFDD;
-}
-
-.light{
- background-color: #F5F5F5;
-}
-
-.dark{
- background-color: #EEEEEE;
-}
-
-
/*
Tabledesign
*/
@@ -246,7 +160,8 @@
}
tbody tr td
{
- padding : 0px;
+ padding-right : 5px;
+ padding-left : 5px;
color : #666;
}
tbody tr:hover
@@ -325,4 +240,22 @@
border: 1px solid #666;
border-top: 2px solid #666;
border-bottom: 2px solid #666;
-}
\ No newline at end of file
+}
+
+/* Icons */
+
+#icons img {
+ margin: 2px;
+ border: 1px solid #eee;
+}
+
+#icons a:hover img {
+ border: 1px outset #666;
+}
+
+#stars img {
+ padding: 2px;
+ border: 0px solid #eee;
+}
+
+
Modified: vdr/vdr-xxv-skins/trunk/xstyle/style/xmenu.windows.css
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/style/xmenu.windows.css 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/style/xmenu.windows.css 2006-05-20 16:17:56 UTC (rev 2790)
@@ -19,12 +19,12 @@
}
.webfx-menu {
- position: absolute;
+ position: fixed;
z-index: 100;
visibility: hidden;
width: 100px;
background: Menu;
- border: 2px outset Menu;
+ border: 2px outset Buttonface;
padding: 1px;
filter: none;
-moz-opacity: 1;
@@ -72,7 +72,8 @@
float: right;
border: 0;
width: 3px;
- XXXheight: 16px;
margin-top: 3px;
+ XXXheight: 16px;
+ margin-top: 3px;
margin-right: 3px;
}
@@ -90,11 +91,12 @@
}
.webfx-menu-bar {
- background: buttonface;
+ background: buttonface;
position: fixed;
top: 0;
right: 0;
left: 0;
+ z-index: 90;
padding: 4px;
@@ -121,7 +123,8 @@
padding-right: 5px;
/* IE5.0 Does not paint borders and padding on inline elements without a hieght/width */
- height: expression(constExpression(ie50 ? "17px" : "auto"));
white-space: nowrap;
+ height: expression(constExpression(ie50 ? "17px" : "auto"));
+ white-space: nowrap;
}
.webfx-menu-bar a:hover {
@@ -154,7 +157,8 @@
ie does not support outline but ie55 can hide the outline using
a proprietary property on HTMLElement. Did I say that IE sucks at CSS?
*/
- ie-dummy: expression(this.hideFocus=true);
border-left: 1px solid ButtonShadow;
+ ie-dummy: expression(this.hideFocus=true);
+ border-left: 1px solid ButtonShadow;
border-right: 1px solid ButtonHighlight;
border-top: 1px solid ButtonShadow;
border-bottom: 1px solid ButtonHighlight;
Modified: vdr/vdr-xxv-skins/trunk/xstyle/tlist.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/tlist.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/tlist.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -59,7 +59,8 @@
<?% c = c + 1 %?>
<?% NEXT IF fields.$c.match('^__') %?>
<?% IF c == 0; # Id Field %?>
- <td nowrap><nobr>
+ <td>
+ <div id="icons">
<?% IF allow('tedit') %?>
<a href="?cmd=tedit&data=<?% zeile.0 %?>" title="<?% gettext("Edit this timer") %?>"><img src="images/edit.png"></a><br/>
<?% END %?>
@@ -67,9 +68,11 @@
<?% IF allow('tdelete') %?>
<a href="javascript:sure(document.TimerList, '<?% gettext("You will delete this timer") %?> : <?% zeile.7.split('~').first | replace('\'','\\\'') | replace('\"','\\\'') %?>','?cmd=tdelete&data=<?% zeile.0 %?>')" title="<?% gettext("Delete this timer") %?>"><img src="images/delete.png"></a><br/>
<?% END %?>
+ </div>
</td>
<?% ELSIF c == 1; # Id Status %?>
<td>
+ <div id="icons">
<?% aus = gettext('Off') %?>
<?% an = gettext('On') %?>
<?% IF allow('ttoggle') %?>
@@ -81,13 +84,15 @@
<?% ELSE %?>
[<?% aktiv ? aus : an %?>]<?% vps ? ' (VPS)' : '' %?>
<?% END %?>
- </td>
+ <?% INCLUDE 'bloecke/stars.tmpl' eventid=zeile.11 %?>
+ </div>
+ </td>
<?% ELSIF c == 2; # Channel Field %?>
<td nowrap>
<a href="?cmd=program&data=<?% field %?>" title="<?% gettext("Jump to program guide:") %?> <?% zeile.2 %?>"><div class="<?% myclass %?>"><?% zeile.2 %?></div></a>
</td>
<?% ELSIF c == 5 OR c == 6; # Id Zeiten %?>
- <td align='right'><?% fmttime(field) %?></td>
+ <td align='right'><div class="<?% myclass %?>"><?% fmttime(field) %?></div></td>
<?% ELSIF c == 7; # Title %?>
<td>
<?% IF zeile.11 %?><a href="?cmd=display&data=<?% zeile.11 %?>"><?% END %?>
@@ -96,18 +101,8 @@
<?% END %?>
<?% IF zeile.11 %?></a><?% END %?>
</td>
- <?% ELSIF c == 8; # Prio %?>
- <td>
- <?% IF myclass == 'fastproblem' %?>
- <div class="fastproblemgreen"><?% field %?></div>
- <?% ELSIF myclass == 'problem' %?>
- <div class="problemred"><?% field %?></div>
- <?% ELSE %?>
- <?% field %?>
- <?% END %?>
- </td>
<?% ELSE %?>
- <td><?% field %?></td>
+ <td><div class="<?% myclass %?>"><?% field %?></div></td>
<?% END %?>
<?% END %?>
<?% IF enableform %?>
Added: vdr/vdr-xxv-skins/trunk/xstyle/topten.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/topten.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/topten.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -0,0 +1,80 @@
+<script language="javascript" type="text/javascript">
+<!--
+
+ <?% INCLUDE javascript/records.js %?>
+
+-->
+</SCRIPT>
+
+<!-- TableTemplate -->
+<?% USE date %?>
+<h1><?% gettext("TopTen Entrys") %?></h1>
+<h6><?% gettext("This Screen list the most programmed EPG Events from all XXV Users. Of course, we list only Events these are exists in your EPG Table!") %?></h6>
+<p/>
+<table>
+<tr>
+
+<!--
+<div id="navcontainer">
+<ul id="navlist">
+ <li><a href="#" onclick="suche('<?% gettext('Search string:') %?>', '?cmd=search&__channel=<?% channelpos %?>&data=', '<?% cgi.param('search') %?>')">
+ <?% gettext("Search on Channel") %?></a></li>
+ <li><a href='?cmd=switch&data=<?% channelpos %?>'><?% gettext('Switch') %?></a></li>
+ <li><a href='?cmd=livestream&data=<?% channelpos %?>' type='audio/x-mpegurl'><?% gettext('Livestream') %?></a></li>
+</ul>
+</div>
+-->
+
+<table border="0" width="95%">
+<?% IF data.size %?>
+ <?% fields = data.shift %?>
+ <tr>
+ <?% FOREACH field = [gettext('Service'),gettext('Title'),gettext('Channel'),gettext('Start'),gettext('Rank')] %?>
+ <th><?% field %?></th>
+ <?% END %?>
+ </tr>
+ <?% FOREACH zeile = data %?>
+ <?% c = 0 %?>
+ <tr class="<?% myclass %?>"<?% IF (loop.count mod 2) == 0 %?> bgcolor='#F5F5F5'<?% END %?>>
+ <?% FOREACH field = [zeile.0,zeile.1,zeile.4,zeile.5,zeile.8] %?>
+ <?% c = c + 1 %?>
+ <?% IF c == 1; # Id Field %?>
+ <td>
+ <?% INCLUDE 'bloecke/event_links.tmpl' data=zeile umbruch='<br/>' %?>
+ </td>
+ <?% ELSIF c == 2; # Text Field %?>
+ <td>
+ <?% IF param.timers.${zeile.0} %?>
+ <a href="?cmd=display&data=<?% zeile.0 %?>"><b><?% field %?></b>
+ <?% ELSE %?>
+ <a href="?cmd=display&data=<?% zeile.0 %?>"><?% field %?>
+ <?% END %?>
+ <?% IF zeile.2.length > 0 %?>
+ <br><small><?% zeile.2 %?></small>
+ <?% END %?>
+ <?% IF zeile.3.length > 0 %?>
+ <br><small><em><?% zeile.3 | replace('\|',' ') | truncate(300) | html %?></em></small>
+ <?% END %?>
+ </a>
+ </td>
+ <?% ELSIF c == 3; # Channel Field %?>
+ <td>
+ <a href='?cmd=program&data=<?% param.channels.$field.POS %?>'><?% param.channels.$field.Name %?></a>
+ </td>
+ <?% ELSIF c == 5; # Rank Field %?>
+ <td>
+ <?% field | format('%d') %?>
+ </td>
+ <?% ELSE %?>
+ <?% IF param.timers.${zeile.11} %?>
+ <td><b><?% field %?></b></td>
+ <?% ELSE %?>
+ <td><?% field %?></td>
+ <?% END %?>
+ <?% END %?>
+ <?% END %?>
+ </tr>
+ <?% oldday = day %?>
+ <?% END %?>
+<?% END %?>
+</table>
Modified: vdr/vdr-xxv-skins/trunk/xstyle/tsearch.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/tsearch.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/tsearch.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -59,7 +59,8 @@
<?% c = c + 1 %?>
<?% NEXT IF fields.$c.match('^__') %?>
<?% IF c == 0; # Id Field %?>
- <td nowrap><nobr>
+ <td>
+ <div id="icons">
<?% IF allow('tedit') %?>
<a href="?cmd=tedit&data=<?% zeile.0 %?>" title="<?% gettext("Edit this timer") %?>"><img src="images/edit.png"></a><br/>
<?% END %?>
@@ -67,9 +68,11 @@
<?% IF allow('tdelete') %?>
<a href="javascript:sure(document.TimerList, '<?% gettext("You will delete this timer") %?> : <?% zeile.7.split('~').first | replace('\'','\\\'') | replace('\"','\\\'') %?>','?cmd=tdelete&data=<?% zeile.0 %?>')" title="<?% gettext("Delete this timer") %?>"><img src="images/delete.png"></a><br/>
<?% END %?>
+ </div>
</td>
<?% ELSIF c == 1; # Id Status %?>
<td>
+ <div id="icons">
<?% aus = gettext('Off') %?>
<?% an = gettext('On') %?>
<?% IF allow('ttoggle') %?>
@@ -81,13 +84,15 @@
<?% ELSE %?>
[<?% aktiv ? aus : an %?>]<?% vps ? ' (VPS)' : '' %?>
<?% END %?>
- </td>
+ <?% INCLUDE 'bloecke/stars.tmpl' eventid=zeile.11 %?>
+ </div>
+ </td>
<?% ELSIF c == 2; # Channel Field %?>
<td nowrap>
<a href="?cmd=program&data=<?% field %?>" title="<?% gettext("Jump to program guide:") %?> <?% zeile.2 %?>"><div class="<?% myclass %?>"><?% zeile.2 %?></div></a>
</td>
<?% ELSIF c == 5 OR c == 6; # Id Zeiten %?>
- <td align='right'><?% fmttime(field) %?></td>
+ <td align='right'><div class="<?% myclass %?>"><?% fmttime(field) %?></div></td>
<?% ELSIF c == 7; # Title %?>
<td>
<?% IF zeile.11 %?><a href="?cmd=display&data=<?% zeile.11 %?>"><?% END %?>
@@ -96,18 +101,8 @@
<?% END %?>
<?% IF zeile.11 %?></a><?% END %?>
</td>
- <?% ELSIF c == 8; # Prio %?>
- <td>
- <?% IF myclass == 'fastproblem' %?>
- <div class="fastproblemgreen"><?% field %?></div>
- <?% ELSIF myclass == 'problem' %?>
- <div class="problemred"><?% field %?></div>
- <?% ELSE %?>
- <?% field %?>
- <?% END %?>
- </td>
<?% ELSE %?>
- <td><?% field %?></td>
+ <td><div class="<?% myclass %?>"><?% field %?></div></td>
<?% END %?>
<?% END %?>
<?% IF enableform %?>
Modified: vdr/vdr-xxv-skins/trunk/xstyle/vitals.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/vitals.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/vitals.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -60,7 +60,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}.png", my_graph.plot(d).gif );
END;
%?>
<!-- Vitals Template -->
Added: vdr/vdr-xxv-skins/trunk/xstyle/widgets/date.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/widgets/date.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/widgets/date.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -0,0 +1,32 @@
+<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>
+<!-- date -->
+<tr>
+ <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
+ <?% data.msg %?>
+ </td>
+ <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
+ <?% val = cgi.param(data.NAME) || data.def %?>
+ <input type="text" name="<?% data.NAME %?>" value="<?% entities(val) %?>" <?% FOREACH p = param.tags; "$p ";END %?>><br/>
+ <?% 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/xstyle/widgets/dir.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/widgets/dir.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/widgets/dir.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -12,7 +12,10 @@
</tr>
<script>
function check<?% data.NAME %?>Dir () {
- checkValue(document.forms[0].<?% data.NAME %?>, 'id<?% param.count %?>', "-d'%s'", 'Dir: is not exists!', 'Dir exists.');
+ checkValue(document.forms[0].<?% data.NAME %?>, 'id<?% param.count %?>', "-d'%s'",
+ '<?% gettext("Directory does not exist!") %?>',
+ '<?% gettext("Directory exists!") %?>');
}
window.setTimeout("check<?% data.NAME %?>Dir()", 500);
</script>
+
Modified: vdr/vdr-xxv-skins/trunk/xstyle/widgets/file.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/widgets/file.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/widgets/file.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -12,7 +12,9 @@
</tr>
<script>
function check<?% data.NAME %?>File () {
- checkValue(document.forms[0].<?% data.NAME %?>, 'id<?% param.count %?>', "-r'%s'", 'File does not exist!', 'File exists.');
+ checkValue(document.forms[0].<?% data.NAME %?>, 'id<?% param.count %?>', "-r'%s'",
+ '<?% gettext("File does not exist!") %?>',
+ '<?% gettext("File exists!") %?>');
}
window.setTimeout("check<?% data.NAME %?>File()", 500);
</script>
Modified: vdr/vdr-xxv-skins/trunk/xstyle/widgets/footer.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/widgets/footer.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/widgets/footer.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -1,5 +1,5 @@
</div>
-
+<?% debug = 0 %?>
<?% IF debug %?>
<?% data = bench %?>
Modified: vdr/vdr-xxv-skins/trunk/xstyle/widgets/start.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/widgets/start.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/widgets/start.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -1,10 +1,14 @@
<!DOCTYPE html
PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
"http://www.w3.org/TR/html4/loose.dtd">
-<html lang="en-US">
+<html>
<head>
<title><?% IF param.title.defined;param.title;ELSE %?>XXV - <?% user %?><?% END %?></title>
- <link rel="alternate" type="application/rss+xml" title="RSS-News" href="http://<?% info.HOST %?>/?cmd=request&data=rss">
+<?% IF allow('request') %?>
+ <link rel="alternate" type="application/rss+xml" title="RSS-News 1.0" href="http://<?% info.HOST %?>/?cmd=request&data=rss&__version=1">
+ <link rel="alternate" type="application/rss+xml" title="RSS-News 2.0" href="http://<?% info.HOST %?>/?cmd=request&data=rss&__version=2">
+<?% END %?>
+ <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
<meta name="copyright" content="copyright 2004 Xpix">
<!-- Styles -->
<link href="style/style.css" type="text/css" rel="stylesheet" />
@@ -18,7 +22,12 @@
<script type="text/javascript" src="javascript/xmenu.js"></script>
</head>
<body>
+<script language="javascript" type="text/javascript">
+ var proxy = '<?% proxy %?>';
+</SCRIPT>
+
+<?% INCLUDE 'skin.cfg' %?>
<?% INCLUDE 'help.tmpl' %?>
<div class="content">
\ No newline at end of file
Modified: vdr/vdr-xxv-skins/trunk/xstyle/widgets/string.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/widgets/string.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/widgets/string.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -6,9 +6,9 @@
<td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
<?% val = cgi.param(data.NAME) || data.def %?>
<?% IF (val && val.length > 30) || param.type == 'text' %?>
- <textarea cols='50' rows='5' name="<?% data.NAME %?>" <?% FOREACH p = param.tags; "$p ";END %?>><?% entities(val) %?></textarea>
+ <textarea cols='50' rows='5' name="<?% data.NAME %?>" <?% FOREACH p = param.tags; "$p ";END %?><?% IF data.readonly %?> readonly="readonly"<?% END %?>><?% entities(val) %?></textarea>
<?% ELSE %?>
- <input type="text" name="<?% data.NAME %?>" value="<?% entities(val) %?>" <?% FOREACH p = param.tags; "$p ";END %?>>
+ <input type="text" name="<?% data.NAME %?>" value="<?% entities(val) %?>" <?% FOREACH p = param.tags; "$p ";END %?><?% IF data.readonly %?> readonly="readonly"<?% END %?>>
<?% END %?>
</td>
</tr>
Modified: vdr/vdr-xxv-skins/trunk/xstyle/widgets/table.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/widgets/table.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/widgets/table.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -9,6 +9,7 @@
<th width="1%">Name</th><th>Value</th>
<?% END %?>
<?% FOREACH name = data.keys.sort %?>
+ <?% NEXT IF name.match('^__') %?>
<tr>
<td width="50%"><?% name %?></td><td><?% data.$name.replace('\|', '<p>').replace('\n', '<br>') %?></td>
</tr>
Added: vdr/vdr-xxv-skins/trunk/xstyle/widgets/url.tmpl
===================================================================
--- vdr/vdr-xxv-skins/trunk/xstyle/widgets/url.tmpl 2006-05-20 16:07:24 UTC (rev 2789)
+++ vdr/vdr-xxv-skins/trunk/xstyle/widgets/url.tmpl 2006-05-20 16:17:56 UTC (rev 2790)
@@ -0,0 +1,16 @@
+<!-- url -->
+<tr>
+ <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
+ <?% data.msg %?>
+ </td>
+ <td class="<?% (param.count mod 2) == 0 ? 'light' : 'dark' %?>" >
+ <?% val = cgi.param(data.NAME) || data.def %?>
+ <input
+ type="text"
+ name="<?% data.NAME %?>"
+ value="<?% entities(val) %?>"
+ <?% FOREACH p = param.tags; "$p ";END %?>
+ ><br/>
+ <span id='id<?% param.count %?>'></span>
+ </td>
+</tr>
More information about the pkg-vdr-dvb-changes
mailing list