From 2bb7c4475da5c01d9410ed2e5242fe2cbe67a94d Mon Sep 17 00:00:00 2001
From: Andreas Brachold
Date: Tue, 5 Feb 2008 17:15:10 +0000
Subject: * 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
---
skins/deltab/alist.tmpl | 8 ++++----
skins/deltab/clist.tmpl | 14 ++++----------
skins/deltab/rlist.tmpl | 21 +++++----------------
skins/stone/alist.tmpl | 8 ++++----
skins/stone/clist.tmpl | 14 ++++----------
skins/stone/rlist.tmpl | 16 +++++-----------
skins/stone_flat/alist.tmpl | 8 ++++----
skins/stone_flat/clist.tmpl | 14 ++++----------
skins/stone_flat/rlist.tmpl | 20 +++++---------------
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 @@
% 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 %?>
% END %?>
% 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 %?>
% 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 @@
% 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 %?>
% 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 %?>
% 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 %?>
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 @@
-% USE date %?>
% enableform = allow('rdelete') %?>
% IF cgi.param('cmd')=='rl' || cgi.param('cmd')=='rlist' %?>
% browse = cgi.param('data') %?>
% END %?>
-% 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 %?>
% END %?>
- % PROCESS time t=start %?>
+ % start %?>
% gettext("Duration") %?>: % PROCESS dur d=duration %?>
@@ -174,13 +169,8 @@
% field %?>
% IF param.sortable %?>
- % IF c == 0 %?>
-
-
- % ELSE %?>
- % END %?>
% END %?>
% END %?>
@@ -192,7 +182,7 @@
% total = total + duration %?>