diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2008-02-05 17:15:10 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2008-02-05 17:15:10 +0000 |
| commit | ef6b47f7c9acf0b90263bd1cfe2fa2428b1df13a (patch) | |
| tree | 143fc6df90d0a6da8da3fcc9bde032aeb4dbe1fa /html | |
| parent | 7846ea22a774f42f23ab9bca2854c452c55b7078 (diff) | |
| download | xxv-ef6b47f7c9acf0b90263bd1cfe2fa2428b1df13a.tar.gz xxv-ef6b47f7c9acf0b90263bd1cfe2fa2428b1df13a.tar.bz2 | |
* debian-install.sh missed by pakaging
* report: RECORDS - status message with wrong id
* alist/clist/rlist: reorder sorting parameter, remove double sql query
* rlist: move time formating from template to perl code
Diffstat (limited to 'html')
| -rw-r--r-- | html/clist.tmpl | 2 | ||||
| -rw-r--r-- | html/rlist.tmpl | 26 |
2 files changed, 11 insertions, 17 deletions
diff --git a/html/clist.tmpl b/html/clist.tmpl index 6f9862c..039c57f 100644 --- a/html/clist.tmpl +++ b/html/clist.tmpl @@ -134,7 +134,7 @@ <th width="120"><?% PROCESS SortItem row="Name" label=gettext('Name') trunc=20 %?></th> <th><?% PROCESS SortItem row="Frequency" label=gettext('Transponder frequency') trunc=6 %?></th> <th><?% PROCESS SortItem row="Parameters" label=gettext('Various parameters, depending on signal source') trunc=8 %?></th> - <th><?% PROCESS SortItem row="Srate" label=gettext('Symbol rate') trunc=6 %?></th> + <th><?% PROCESS SortItem row="Source" label=gettext('Source') trunc=6 %?></th> <th><?% PROCESS SortItem row="VPID" label=gettext('Video PID (VPID)') trunc=10 %?></th> <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> diff --git a/html/rlist.tmpl b/html/rlist.tmpl index b2e8de4..884d975 100644 --- a/html/rlist.tmpl +++ b/html/rlist.tmpl @@ -1,14 +1,9 @@ <body class="frame"> -<?% USE date %?> <?% enableform = allow('rdelete') %?> <?% IF cgi.param('cmd')=='rl' || cgi.param('cmd')=='rlist' %?> <?% browse = cgi.param('data') %?> <?% END %?> <div id="body"> -<?% BLOCK time %?> -<?% date.format(t,"%x %H:%M",locale) %?> -<?% END %?> - <?% BLOCK dur # d in Sekunden %?> <?% IF d > 1 %?> <?% Stunden = d div 3600 %?> @@ -99,7 +94,7 @@ <?% IF enableform %?> <input type="checkbox" value="<?% id %?>" name="<?% fulltitle %?>" /> <?% END %?> - <?% PROCESS time t=start %?><br /> + <?% start %?><br /> <?% gettext("Duration") %?>: <?% PROCESS dur d=duration %?> </td> </tr> @@ -165,8 +160,8 @@ <?% field %?> <?% IF param.sortable %?> <?% IF c == 0 %?> - <a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=__RecordStart&__desc=0"><img src="images/asc.png"></a> - <a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=__RecordStart&__desc=1"><img src="images/desc.png"></a> + <a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=starttime&__desc=0"><img src="images/asc.png"></a> + <a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=starttime&__desc=1"><img src="images/desc.png"></a> <?% ELSE %?> <a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% field %?>&__desc=0"><img src="images/asc.png"></a> <a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% field %?>&__desc=1"><img src="images/desc.png"></a> @@ -182,7 +177,7 @@ <?% total = total + duration %?> <tr> <?% IF folder > 1 %?> - <td colspan="4"> + <td colspan="5"> <a href="?cmd=rlist&data=<?% url( fulltitle ) %?>"> <?% IF new %?> <img src="images/newfolder.png" alt="" title="<?% gettext("New recording") %?>" /> @@ -205,7 +200,7 @@ <?% IF enableform %?> <input type="checkbox" value="<?% id %?>" name="<?% fulltitle %?>" /> <?% END %?> - <?% PROCESS time t=start %?> + <?% start %?> <?% ELSIF c == 4 %?> <?% PROCESS dur d=field %?> <?% ELSIF c == 2 # title %?> @@ -224,7 +219,7 @@ </tr> <?% END %?> <tr> - <td colspan="4"> + <td colspan="5"> <?% PROCESS printsumme width=0 %?> </td> </tr> @@ -237,11 +232,10 @@ <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') %?> - <?% PROCESS SortItem row="title" label=gettext('Title') %?> - <?% PROCESS SortItem row="subtitle" label=gettext('Subtitle') %?> - <?% PROCESS SortItem row="__RecordStart" label=gettext('Start') %?> - <?% PROCESS SortItem row="duration" label=gettext('Duration') %?> + <?% FOREACH row = fields %?> + <?% NEXT IF row.match('^__') %?> + <?% PROCESS SortItem label=row %?> + <?% END %?> <?% END %?> <div> <?% FOREACH zeile = data %?> |