diff options
| -rw-r--r-- | skins/deltab/alist.tmpl | 8 | ||||
| -rw-r--r-- | skins/deltab/clist.tmpl | 14 | ||||
| -rw-r--r-- | skins/deltab/rlist.tmpl | 21 | ||||
| -rw-r--r-- | skins/stone/alist.tmpl | 8 | ||||
| -rw-r--r-- | skins/stone/clist.tmpl | 14 | ||||
| -rw-r--r-- | skins/stone/rlist.tmpl | 16 | ||||
| -rw-r--r-- | skins/stone_flat/alist.tmpl | 8 | ||||
| -rw-r--r-- | skins/stone_flat/clist.tmpl | 14 | ||||
| -rw-r--r-- | skins/stone_flat/rlist.tmpl | 20 | ||||
| -rw-r--r-- | skins/xstyle/rlist.tmpl | 25 |
10 files changed, 46 insertions, 102 deletions
diff --git a/skins/deltab/alist.tmpl b/skins/deltab/alist.tmpl index 5b64190..98b7eb9 100644 --- a/skins/deltab/alist.tmpl +++ b/skins/deltab/alist.tmpl @@ -139,10 +139,10 @@ <td style="padding:0px;" width="20"><a href="?cmd=<?% cmd %?><?% datas %?>&__sortby=<?% row %?>&__desc=1" ><img src="images/down.<?% global.imagetyp %?>" alt="" /></a></td> </tr> <?% END %?> - <?% PROCESS SortItem row="Id" label=gettext('Index',20) %?> - <?% PROCESS SortItem row="Search" label=gettext('Search',20) %?> - <?% PROCESS SortItem row="Channels" label=gettext('Channels',20) %?> - <?% PROCESS SortItem row="Dir" label=gettext('Group all recordings into one directory',20) %?> + <?% FOREACH row = fields %?> + <?% NEXT IF row.match('^__') %?> + <?% PROCESS SortItem label=chop(row,20) %?> + <?% END %?> </table> <?% END %?> <p class="section"><?% gettext("Search text",20) %?></p> diff --git a/skins/deltab/clist.tmpl b/skins/deltab/clist.tmpl index 0474d83..4e7b18f 100644 --- a/skins/deltab/clist.tmpl +++ b/skins/deltab/clist.tmpl @@ -157,16 +157,10 @@ <p class="section"><?% gettext("Sorting") %?></td></tr> <p> <table summary=""> - <?% PROCESS SortItem row="POS" label=gettext('Position',20) %?> - <?% PROCESS SortItem row="Name" label=gettext('Name',20) %?> - <?% PROCESS SortItem row="Frequency" label=gettext('Transponder frequency',20) %?> - <?% PROCESS SortItem row="Parameters" label=gettext('Various parameters, depending on signal source',20) %?> - <?% PROCESS SortItem row="Source" label=gettext('Signal source',20) %?> - <!--<?% PROCESS SortItem row="Srate" label=gettext('Symbol rate',20) %?>--> - <?% PROCESS SortItem row="VPID" label=gettext('Video PID (VPID)',20) %?> - <?% PROCESS SortItem row="APID" label=gettext('Audio PID (APID)',20) %?> - <?% PROCESS SortItem row="TPID" label=gettext('Teletext PID (TPID)',20) %?> - <?% PROCESS SortItem row="CA" label=gettext('Conditional access (CA)',20) %?> + <?% FOREACH row = fields %?> + <?% NEXT IF row.match('^__') %?> + <?% PROCESS SortItem label=chop(row,20) %?> + <?% END %?> </table> </p> <?% END %?> diff --git a/skins/deltab/rlist.tmpl b/skins/deltab/rlist.tmpl index 644ba35..7aaaac7 100644 --- a/skins/deltab/rlist.tmpl +++ b/skins/deltab/rlist.tmpl @@ -1,6 +1,5 @@ <!-- rlist --> <div id="body"> -<?% USE date %?> <?% ######################################################################## %?> <?% enableform = allow('rdelete') && data.size > 1 %?> <?% IF cgi.param('cmd')=='rl' || cgi.param('cmd')=='rlist' %?> @@ -16,10 +15,6 @@ <?% END %?> <?% END %?> <?% ######################################################################## %?> -<?% BLOCK time %?> -<?% date.format(t,"%x",locale) %?> <?% date.format(t,"%H:%M",locale) %?> -<?% END %?> -<?% ######################################################################## %?> <?% BLOCK durMin # d in Minuten%?> <?% Stunden = d div 60 %?> <?% Minuten = d mod 60 %?> @@ -73,11 +68,6 @@ mylist = [ "images/audio", global.imagetyp ]; preview = mylist.join('.') ; ELSIF files.size > 0; -# -# USE date; -# img = date.format(date.now, '%S') mod files.size; -# preview = files.$img; -# img = (files.size div 2); preview = files.$img; END; @@ -157,7 +147,7 @@ </td> <td> <a href="?cmd=rdisplay&data=<?% id %?>" title="<?% title %?>"> - <?% PROCESS time t=start%?> <?% PROCESS dur d=duration %?> + <?% start%?> <?% PROCESS dur d=duration %?> </a> </td> <td> @@ -268,11 +258,10 @@ <td style="padding:0px;" width="20"><a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=1" ><img src="images/down.<?% global.imagetyp %?>" alt="" /></a></td> </tr> <?% END %?> - <?% PROCESS SortItem row=fields.0 label=gettext('Index',20) %?> - <?% PROCESS SortItem row=fields.2 label=gettext('Title',20) %?> - <?% PROCESS SortItem row=fields.3 label=gettext('Subtitle',20) %?> - <?% PROCESS SortItem row=fields.5 label=gettext('Start',20) %?> - <?% PROCESS SortItem row=fields.4 label=gettext('Duration',20) %?> + <?% FOREACH row = fields %?> + <?% NEXT IF row.match('^__') %?> + <?% PROCESS SortItem label=chop(row,20) %?> + <?% END %?> </table> <?% END %?> <?% IF enableform %?> diff --git a/skins/stone/alist.tmpl b/skins/stone/alist.tmpl index 743a468..31b1fb1 100644 --- a/skins/stone/alist.tmpl +++ b/skins/stone/alist.tmpl @@ -165,10 +165,10 @@ <li><a href="?cmd=<?% cmd %?><?% datas %?>&__sortby=<?% row %?>&__desc=1" ><img src="images/down.<?% global.imagetyp %?>" alt="" /></a></li> </ul> <?% END %?> - <?% PROCESS SortItem row="Id" label=gettext('Index',20) %?> - <?% PROCESS SortItem row="Search" label=gettext('Search',20) %?> - <?% PROCESS SortItem row="Channels" label=gettext('Channels',20) %?> - <?% PROCESS SortItem row="Dir" label=gettext('Group all recordings into one directory',20) %?> + <?% FOREACH row = fields %?> + <?% NEXT IF row.match('^__') %?> + <?% PROCESS SortItem label=chop(row,20) %?> + <?% END %?> </td> </tr> <tr> diff --git a/skins/stone/clist.tmpl b/skins/stone/clist.tmpl index d194dda..bf36164 100644 --- a/skins/stone/clist.tmpl +++ b/skins/stone/clist.tmpl @@ -197,16 +197,10 @@ <li><a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=1" ><img src="images/down.<?% global.imagetyp %?>" alt="" /></a></li> </ul> <?% END %?> - <?% PROCESS SortItem row="POS" label=gettext('Position',20) %?> - <?% PROCESS SortItem row="Name" label=gettext('Name',20) %?> - <?% PROCESS SortItem row="Frequency" label=gettext('Transponder frequency',20) %?> - <?% PROCESS SortItem row="Parameters" label=gettext('Various parameters, depending on signal source',20) %?> - <?% PROCESS SortItem row="Source" label=gettext('Signal source',20) %?> - <!--<?% PROCESS SortItem row="Srate" label=gettext('Symbol rate',20) %?>--> - <?% PROCESS SortItem row="VPID" label=gettext('Video PID (VPID)',20) %?> - <?% PROCESS SortItem row="APID" label=gettext('Audio PID (APID)',20) %?> - <?% PROCESS SortItem row="TPID" label=gettext('Teletext PID (TPID)',20) %?> - <?% PROCESS SortItem row="CA" label=gettext('Conditional access (CA)',20) %?> + <?% FOREACH row = fields %?> + <?% NEXT IF row.match('^__') %?> + <?% PROCESS SortItem label=chop(row,20) %?> + <?% END %?> </td> </tr> <tr> diff --git a/skins/stone/rlist.tmpl b/skins/stone/rlist.tmpl index 038978a..341537e 100644 --- a/skins/stone/rlist.tmpl +++ b/skins/stone/rlist.tmpl @@ -1,6 +1,5 @@ <!-- rlist --> <body class="frame"> -<?% USE date %?> <?% ######################################################################## %?> <div id="body"> <?% ######################################################################## %?> @@ -18,10 +17,6 @@ <?% END %?> <?% END %?> <?% ######################################################################## %?> -<?% BLOCK time %?> -<?% date.format(t,"%x %H:%M",locale) %?> -<?% END %?> -<?% ######################################################################## %?> <?% BLOCK dur # d in Sekunden %?> <?% Stunden = d div 3600 %?> <?% Minuten = d div 60 mod 60 %?> @@ -181,7 +176,7 @@ <?% END %?> <td class="push" style="vertical-align:middle; text-align:left;" > <a href="javascript:popup('rdisplay','<?% id %?>',620,670,0)" class="fieldinline"> - <font class="description"><?% PROCESS time t=start %?><br /><?% PROCESS dur d=duration %?></font> + <font class="description"><?% start %?><br /><?% PROCESS dur d=duration %?></font> </a> </td> <td class="push"> @@ -308,11 +303,10 @@ <li><a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=1" ><img src="images/down.<?% global.imagetyp %?>" alt="" /></a></li> </ul> <?% END %?> - <?% PROCESS SortItem row=fields.0 label=gettext('Index',20) %?> - <?% PROCESS SortItem row=fields.2 label=gettext('Title',20) %?> - <?% PROCESS SortItem row=fields.3 label=gettext('Subtitle',20) %?> - <?% PROCESS SortItem row=fields.5 label=gettext('Start',20) %?> - <?% PROCESS SortItem row=fields.4 label=gettext('Duration',20) %?> + <?% FOREACH row = fields %?> + <?% NEXT IF row.match('^__') %?> + <?% PROCESS SortItem label=chop(row,20) %?> + <?% END %?> </td> </tr> <tr> diff --git a/skins/stone_flat/alist.tmpl b/skins/stone_flat/alist.tmpl index 78e7deb..2be87bd 100644 --- a/skins/stone_flat/alist.tmpl +++ b/skins/stone_flat/alist.tmpl @@ -159,10 +159,10 @@ <li><a href="?cmd=<?% cmd %?><?% datas %?>&__sortby=<?% row %?>&__desc=1" ><img src="images/down.<?% global.imagetyp %?>" alt="" /></a></li> </ul> <?% END %?> - <?% PROCESS SortItem row="Id" label=gettext('Index',20) %?> - <?% PROCESS SortItem row="Search" label=gettext('Search',20) %?> - <?% PROCESS SortItem row="Channels" label=gettext('Channels',20) %?> - <?% PROCESS SortItem row="Dir" label=gettext('Group all recordings into one directory',20) %?> + <?% FOREACH row = fields %?> + <?% NEXT IF row.match('^__') %?> + <?% PROCESS SortItem label=chop(row,20) %?> + <?% END %?> </td> </tr> <tr> diff --git a/skins/stone_flat/clist.tmpl b/skins/stone_flat/clist.tmpl index d28b11f..10c05ab 100644 --- a/skins/stone_flat/clist.tmpl +++ b/skins/stone_flat/clist.tmpl @@ -197,16 +197,10 @@ <li><a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=1" ><img src="images/down.<?% global.imagetyp %?>" alt="" /></a></li> </ul> <?% END %?> - <?% PROCESS SortItem row="POS" label=gettext('Position',20) %?> - <?% PROCESS SortItem row="Name" label=gettext('Name',20) %?> - <?% PROCESS SortItem row="Frequency" label=gettext('Transponder frequency',20) %?> - <?% PROCESS SortItem row="Parameters" label=gettext('Various parameters, depending on signal source',20) %?> - <?% PROCESS SortItem row="Source" label=gettext('Signal source',20) %?> - <!--<?% PROCESS SortItem row="Srate" label=gettext('Symbol rate',20) %?>--> - <?% PROCESS SortItem row="VPID" label=gettext('Video PID (VPID)',20) %?> - <?% PROCESS SortItem row="APID" label=gettext('Audio PID (APID)',20) %?> - <?% PROCESS SortItem row="TPID" label=gettext('Teletext PID (TPID)',20) %?> - <?% PROCESS SortItem row="CA" label=gettext('Conditional access (CA)',20) %?> + <?% FOREACH row = fields %?> + <?% NEXT IF row.match('^__') %?> + <?% PROCESS SortItem label=chop(row,20) %?> + <?% END %?> </td> </tr> <tr> diff --git a/skins/stone_flat/rlist.tmpl b/skins/stone_flat/rlist.tmpl index 5a09633..62d8a7a 100644 --- a/skins/stone_flat/rlist.tmpl +++ b/skins/stone_flat/rlist.tmpl @@ -1,6 +1,5 @@ <!-- rlist --> <body class="frame"> -<?% USE date %?> <?% ######################################################################## %?> <div id="body"> <?% ######################################################################## %?> @@ -18,12 +17,6 @@ <?% END %?> <?% END %?> <?% ######################################################################## %?> -<?% BLOCK time %?> -<?% date.format(t,"%x",locale) %?> -<br /> -<?% date.format(t,"%H:%M",locale) %?> -<?% END %?> -<?% ######################################################################## %?> <?% BLOCK dur # d in Sekunden %?> <?% Stunden = d div 3600 %?> <?% Minuten = d div 60 mod 60 %?> @@ -150,9 +143,7 @@ <td class="fieldinline push"> <?% IF folder <= 1 %?> <a href="javascript:popup('rdisplay','<?% id %?>',620,670,0)" class="fieldinline description"> - <?% PROCESS time t=start %?> - <br /> - <br /> + <?% start %?><br /> <?% PROCESS dur d=duration %?> </a> <br /> @@ -275,11 +266,10 @@ <li><a href="?cmd=<?% cmd %?><?% daten %?>&__sortby=<?% row %?>&__desc=1" ><img src="images/down.<?% global.imagetyp %?>" alt="" /></a></li> </ul> <?% END %?> - <?% PROCESS SortItem row=fields.0 label=gettext('Index',20) %?> - <?% PROCESS SortItem row=fields.2 label=gettext('Title',20) %?> - <?% PROCESS SortItem row=fields.3 label=gettext('Subtitle',20) %?> - <?% PROCESS SortItem row=fields.5 label=gettext('Start',20) %?> - <?% PROCESS SortItem row=fields.4 label=gettext('Duration',20) %?> + <?% FOREACH row = fields %?> + <?% NEXT IF row.match('^__') %?> + <?% PROCESS SortItem label=chop(row,20) %?> + <?% END %?> </td> </tr> <tr> diff --git a/skins/xstyle/rlist.tmpl b/skins/xstyle/rlist.tmpl index 90d6fec..64a0991 100644 --- a/skins/xstyle/rlist.tmpl +++ b/skins/xstyle/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 %?> @@ -101,7 +96,7 @@ <?% IF enableform %?> <input type="checkbox" value="<?% id %?>" name="<?% title %?>" /> <?% END %?> - <?% PROCESS time t=start %?><br /> + <?% start %?><br /> <?% gettext("Duration") %?>: <?% PROCESS dur d=duration %?> </td> </tr> @@ -174,13 +169,8 @@ <th style="white-space: nowrap"> <?% 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> - <?% 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> - <?% END %?> <?% END %?> </th> <?% END %?> @@ -192,7 +182,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") %?>" /> @@ -215,7 +205,7 @@ <?% IF enableform %?> <input type="checkbox" value="<?% id %?>" name="<?% title | html %?>" /> <?% END %?> - <?% PROCESS time t=start %?> + <?% start %?> <?% ELSIF c == 4 %?> <?% PROCESS dur d=field %?> <?% ELSIF c == 2 # title %?> @@ -241,11 +231,10 @@ <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') %?> - <?% 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 %?> <?% # ---------------- Folder Display %?> |
