diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2008-01-25 16:24:07 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2008-01-25 16:24:07 +0000 |
| commit | fb3e038cc7e44d3726854c7484d161886495b631 (patch) | |
| tree | fca5510e21450259ac7d6238cf8fc4482877698e /html | |
| parent | 79ba68495443e4d8383320c19c3fe366819ea796 (diff) | |
| download | xxv-fb3e038cc7e44d3726854c7484d161886495b631.tar.gz xxv-fb3e038cc7e44d3726854c7484d161886495b631.tar.bz2 | |
* Tools: add date format with weekday
* Change language, now independent from external settings
* EPG/TIMERS: move time formating from template to perl code
* RECORDS: [Bug #13014] vfat-Recordings with '/' can't assign
* AUTOTIMER: [Bug #012960] AUTOTIMER with PDC ignore user settings
* AJAX: Ignore now unknown formats
Diffstat (limited to 'html')
| -rw-r--r-- | html/program.tmpl | 3 | ||||
| -rw-r--r-- | html/search.tmpl | 5 | ||||
| -rw-r--r-- | html/tlist.tmpl | 31 |
3 files changed, 19 insertions, 20 deletions
diff --git a/html/program.tmpl b/html/program.tmpl index 216c96e..e8c64a5 100644 --- a/html/program.tmpl +++ b/html/program.tmpl @@ -7,7 +7,6 @@ </SCRIPT> <!-- TableTemplate --> -<?% USE date %?> <?% FOREACH ch = param.channels %?> <?% IF cgi.param('data') == ch.1 || cgi.param('data') == ch.0 || param.current == ch.1 %?> <?% channel = ch.0 %?> @@ -52,7 +51,7 @@ </tr> <?% FOREACH zeile = data %?> <?% c = 0 %?> - <?% day = date.format(zeile.5, "%A, %x", locale) %?> + <?% day = zeile.5 %?> <?% IF !oldday.defined || day != oldday %?> <tr><td colspan="<?% zeile.size %?>" bgcolor='#DDDDDD'> <b><?% day %?></b> diff --git a/html/search.tmpl b/html/search.tmpl index a1d4cba..ccaed1e 100644 --- a/html/search.tmpl +++ b/html/search.tmpl @@ -5,7 +5,6 @@ --> </SCRIPT> -<?% USE date %?> <?% enableform = ( allow('tnew') ) && data.size > 1 %?> <h1><?% gettext("Advanced Search") %?> <?% IF data.size %?> @@ -56,7 +55,7 @@ <td> <select name='__channel'> <option value="0"><?% gettext('All channels') %?> - <?% FOREACH chan = getModule('CHANNELS').ChannelArray('Name') %?> + <?% FOREACH chan = param.channels %?> <option value="<?% chan.last %?>" <?% IF cgi.param('__channel') == chan.last %?>selected<?% END %?>><?% chan.first %?> <?% END %?> </select> @@ -98,7 +97,7 @@ </tr> <?% FOREACH zeile = data %?> <?% c = -1 %?> - <?% day = date.format(zeile.7, "%A, %x", locale) %?> + <?% day = zeile.7 %?> <?% IF !oldday.defined || day != oldday %?> <tr><td colspan="<?% zeile.size %?>" bgcolor='#DDDDDD'> <b><?% day %?></b> diff --git a/html/tlist.tmpl b/html/tlist.tmpl index 3629f2e..0b0ef33 100644 --- a/html/tlist.tmpl +++ b/html/tlist.tmpl @@ -1,5 +1,4 @@ <!-- tlist --> -<?% USE date %?> <?% enableform = allow('tdelete') || allow('ttoggle'); rest = param.capacity; %?> @@ -7,7 +6,7 @@ <?% IF data.size <= 1 %?> <h1><?% gettext("Planned recordings") %?></h1> <?% ELSE %?> -<h1><?% gettext("Planned recordings") %?> - <?% date.format(data.1.9, "%A, %x", locale) %?></h1> +<h1><?% gettext("Planned recordings") %?> - <?% data.1.4 %?></h1> <?% END %?> <?% IF allow('tnew') %?> @@ -42,36 +41,38 @@ <table border="0" width="95%"> <tr> <?% fields = data.shift %?> + <?% c = -1 %?> <?% FOREACH field = fields %?> - <?% NEXT IF field.match('^__') %?> + <?% c = c + 1 %?> + <?% NEXT IF field.match('^__') or c == 4 %?> <th><?% field %?></th> <?% END %?> <?% IF enableform %?> - <th><?% gettext("Selection") %?></th> + <th width="64"><?% gettext("Selection",7) %?></th> <?% END %?> </tr> <?% FOREACH zeile = data %?> <?% aktiv= ( zeile.1 ? zeile.1 mod 2 : 0 ); pdc= ( zeile.1 ? zeile.1 mod 8 div 4 : 0 ); - day = date.format(zeile.9, "%A, %x", locale); - IF aktiv; rest = rest - zeile.13; END; + day = zeile.4; + IF aktiv; rest = rest - zeile.12; END; %?> <?% IF oldDay != day %?> - <tr><td colspan='<?% zeile.size + 1 %?>' bgcolor='#DDDDDD'><b><?% day %?></b></td><tr> + <tr><td colspan='<?% zeile.size %?>' bgcolor='#DDDDDD'><b><?% day %?></b></td><tr> <?% END %?> <?% myclass = "normal" %?> <?% UNLESS aktiv %?> <?% myclass = "deactive" %?> - <?% ELSIF zeile.10 %?> + <?% ELSIF zeile.9 %?> <?% myclass = 'problem' %?> - <?% ELSIF zeile.15 %?> + <?% ELSIF zeile.14 %?> <?% myclass = "active" %?> <?% END %?> <tr class="<?% myclass %?>" <?% IF (loop.count mod 2) == 0 %?>bgcolor='#F5F5F5'<?% END %?>> <?% c = -1 %?> <?% FOREACH field = zeile %?> <?% c = c + 1 %?> - <?% NEXT IF fields.$c.match('^__') %?> + <?% NEXT IF fields.$c.match('^__') or c == 4 %?> <?% IF c == 0; # Id Field %?> <td nowrap><nobr> <a href="?cmd=search&data=<?% url( zeile.7.split('~').last ) %?>" title="<?% gettext("Search for repeats") %?>"><div class="<?% myclass %?>">[R]</div></a> @@ -89,15 +90,15 @@ <?% IF allow('ttoggle') %?> <a name='<?% zeile.0 %?>' href="javascript:tostatus('?cmd=ttoggle&data=<?% zeile.0 %?>')" title="<?% gettext("Toggle timer") %?> <?% aktiv ? aus : an %?>"><div class="<?% myclass %?>">[<?% aktiv ? an : aus %?>]</div></a> <?% IF pdc;'(';gettext('PDC');')';END %?> - <?% IF zeile.12 && allow('aedit') %?> - <a href="?cmd=aedit&data=<?% zeile.12 %?>" title="<?% gettext("Edit autotimer") %?>"><div class="<?% myclass %?>">(AT)</div></a><br> + <?% IF zeile.11 && allow('aedit') %?> + <a href="?cmd=aedit&data=<?% zeile.11 %?>" title="<?% gettext("Edit autotimer") %?>"><div class="<?% myclass %?>">(AT)</div></a><br> <?% END %?> <?% IF rest <= 0 %?><a href="javascript:alert('<?% gettext("Not enough space to record this timer!") %?>')">(!)</a><br/><?% END %?> <?% ELSE %?> [<?% aktiv ? aus : an %?>]<?% IF pdc;' (';gettext('PDC');')';END %?> <?% END %?> - <?% level = getModule('SHARE').getEventLevel(zeile.11) %?> + <?% level = getModule('SHARE').getEventLevel(zeile.10) %?> <?% IF level %?><?% "*" FILTER repeat(level) %?><?% END %?> </td> <?% ELSIF c == 2; # Channel Field %?> @@ -106,11 +107,11 @@ </td> <?% ELSIF c == 7; # Title %?> <td> - <?% IF zeile.11 %?><?% INCLUDE bloecke/tooltip.tmpl cmd="display" title=field desc=zeile.14 eventid=zeile.11 linkid=zeile.11 ttp_offset=0 %?><?% END %?> + <?% IF zeile.10 %?><?% INCLUDE bloecke/tooltip.tmpl cmd="display" title=field desc=zeile.13 eventid=zeile.10 linkid=zeile.10 ttp_offset=0 %?><?% END %?> <?% FOREACH f = field.split('~') %?> <div class="<?% myclass %?>"><?% f %?></div> <?% END %?> - <?% IF zeile.11 %?></a><?% END %?> + <?% IF zeile.10 %?></a><?% END %?> </td> <?% ELSIF c == 8; # Prio %?> <td> |
