diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2008-02-28 20:26:03 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2008-02-28 20:26:03 +0000 |
| commit | ee5da34a3018428d8e291d118bd2e3d22fc38e52 (patch) | |
| tree | 7676c3572a43f60d22b3dda32be47da014d5a2a6 | |
| parent | 169c4940c4556f0b68e163f8c3431c97920982ad (diff) | |
| download | xxv-ee5da34a3018428d8e291d118bd2e3d22fc38e52.tar.gz xxv-ee5da34a3018428d8e291d118bd2e3d22fc38e52.tar.bz2 | |
* RECORDS: deliver preview image by command rimage 'id_frame'
* RECORDS: rlist add paging
* RECORDS: rlist list founded preview image by sql query
* RECORDS: hold founded preview image into database
| -rw-r--r-- | skins/deltab/rdisplay.tmpl | 29 | ||||
| -rw-r--r-- | skins/deltab/rlist.tmpl | 25 | ||||
| -rw-r--r-- | skins/stone/rdisplay.tmpl | 36 | ||||
| -rw-r--r-- | skins/stone/rlist.tmpl | 30 | ||||
| -rw-r--r-- | skins/stone_flat/rdisplay.tmpl | 37 | ||||
| -rw-r--r-- | skins/stone_flat/rlist.tmpl | 30 | ||||
| -rw-r--r-- | skins/xstyle/rdisplay.tmpl | 24 | ||||
| -rw-r--r-- | skins/xstyle/rlist.tmpl | 20 |
8 files changed, 100 insertions, 131 deletions
diff --git a/skins/deltab/rdisplay.tmpl b/skins/deltab/rdisplay.tmpl index 2a7594e..ef4088d 100644 --- a/skins/deltab/rdisplay.tmpl +++ b/skins/deltab/rdisplay.tmpl @@ -4,17 +4,6 @@ <?% subtitle = data.SubTitle %?> <?% id = data.RecordId %?> <?% allowplay = 1 IF allow('rplay') or allow('playrecord') %?> -<?%- IF data.Type == 'RADIO'; - mylist = [ "images/audio", global.imagetyp ]; - files = [ mylist.join('.') ]; - ELSIF param.previews.size <= 0; - mylist = [ "images/movie", global.imagetyp ]; - files = mylist.join('.'); - ELSE; - files = param.previews; - END; - -%?> - <script language="javascript" type="text/javascript"> <!-- function setstart(wert) { @@ -38,15 +27,17 @@ <?% END %?> <?% ######################################################################## %?> <?% BLOCK image %?> - <?% IF files.size %?> + <?% files = data.preview.split(',') %?> + <?% IF data.Type == 'RADIO' %?> + <img class="recorddetails" src="images/audio.<?% global.imagetyp %?>" alt="" title="<?% gettext('Radio recording') %?>" /> + <?% ELSIF files.size > 0; %?> <table summary=""> <tr> <td> - <?% FOREACH f = files %?> - <?% i = f.split('/').-1 %?> - <?% x = ( i.split('\.').0 ) / 25 %?> - <?% IF allowplay %?><a href="javascript:setstart('<?% PROCESS hfs d=x %?>')" ><?% END %?> - <img class="recorddetails" src="<?% f %?>" alt="" title="<?% PROCESS hfs d=x %?>" /> + <?% FOREACH frame = files %?> + <?% x = ( frame ) / 25 %?> + <?% IF allowplay %?><a href="javascript:setstart('<?% PROCESS hfs d=x %?>')" ><?% END %?> + <img src="?cmd=ri&data=<?% data.RecordId %?>_<?% frame %?>" alt="" title="<?% PROCESS hfs d=x %?>" /> <?% IF allowplay %?></a><?% END %?> <?% IF (loop.count) mod 5 == 0 && loop.count != loop.size %?> </td> @@ -58,7 +49,9 @@ </td> </tr> </table> - <?% END %?> + <?% ELSE %?> + <img class="recorddetails" src="images/movie.<?% global.imagetyp %?>" alt="" title="<?% gettext('Television recording') %?>" /> + <?% END; %?> <?% END %?> <?% ######################################################################## %?> <?% BLOCK marks %?> diff --git a/skins/deltab/rlist.tmpl b/skins/deltab/rlist.tmpl index 7aaaac7..06b0cf4 100644 --- a/skins/deltab/rlist.tmpl +++ b/skins/deltab/rlist.tmpl @@ -63,20 +63,16 @@ <?% END %?> <?% ######################################################################## %?> <?% BLOCK image %?> - <?%- files = param.getPreview(id); - IF type == 'RADIO'; - mylist = [ "images/audio", global.imagetyp ]; - preview = mylist.join('.') ; - ELSIF files.size > 0; - img = (files.size div 2); - preview = files.$img; - END; - IF preview.length <= 0; - mylist = [ "images/movie", global.imagetyp ]; - preview = mylist.join('.') ; - END; - -%?> - <img class="recording" src="<?% preview %?>" alt="" /> + <?% files = preview.split(',') %?> + <?% IF type == 'RADIO' %?> + <img class="recording" src="<?% "images/audio.${global.imagetyp}" %?>" alt="" /> + <?% ELSIF files.size > 0; + img = (files.size div 2); + frame = files.$img %?> + <img class="recording" src="?cmd=ri&data=<?% id %?>_<?% frame %?>" alt="" /> + <?% ELSE %?> + <img class="recording" src="<?% "images/movie.${global.imagetyp}" %?>" alt="" /> + <?% END; %?> <?% END %?> <?% ######################################################################## %?> <?% BLOCK RowButtons %?> @@ -196,6 +192,7 @@ fulltitle=zeile.9; isrecording=zeile.10; description=zeile.11; + preview=zeile.12; foldertitle=fulltitle.split('~').last; IF foldertitle == " "; foldertitle=fulltitle.split('~').last(2).join(" "); END; PROCESS item; diff --git a/skins/stone/rdisplay.tmpl b/skins/stone/rdisplay.tmpl index 5565423..7896ca1 100644 --- a/skins/stone/rdisplay.tmpl +++ b/skins/stone/rdisplay.tmpl @@ -5,16 +5,8 @@ <?% id = data.RecordId %?> <?% allowplay = 1 IF allow('rplay') or allow('playrecord') %?> -<?%- IF data.Type == 'RADIO'; - files = "images/audio.${global.imagetyp}"; - ELSIF param.previews.size <= 0; - files = "images/movie.${global.imagetyp}"; - ELSE; - files = param.previews; - END; --%?> - <?% IF ! global.bodyinc.defined;global.bodyinc = 1 %?> +<?% files = data.preview.split(',') %?> <script language="javascript" type="text/javascript"> <!-- var pics = <?% files.size %?>; @@ -44,29 +36,29 @@ <?% END %?> <?% ######################################################################## %?> <?% BLOCK image %?> -<?% IF files.size %?> + <?% IF data.Type == 'RADIO' %?> + <img class="recorddetails" src="images/audio.<?% global.imagetyp %?>" alt="" title="<?% gettext('Radio recording') %?>" /> + <?% ELSIF files.size > 0; %?> <div id="slideframe"> <?% IF files.size > 3 %?>
<div id="slideleft"><img src="images/back.<?% global.imagetyp %?>" title="<?% gettext("Back") %?>" alt="" /></div>
<div id="slideright"><img src="images/forward.<?% global.imagetyp %?>" title="<?% gettext("Next") %?>" alt="" /></div> <?% END %?>
<div id="slidelist" style="left:<?% IF files.size <= 3 %?><?% 280 - (160 * ( files.size / 2 ) ) %?><?% ELSE %?>0<?% END %?>px; width:<?% files.size * 200 %?>px;" >
- <?% FOREACH f = files %?> - <?% i = f.split('/').-1 %?> - <?% x = ( i.split('\.').0 ) / 25 %?> - <?% IF allowplay %?> - <a href="javascript:setstart('<?% PROCESS hfs d=x %?>')" > - <?% END %?> - <img class="recorddetails" src="<?% f %?>" alt="" title="<?% PROCESS hfs d=x %?>" /> - <?% IF allowplay %?> - </a> - <?% END %?> - <?% END %?> + <?% FOREACH frame = files %?> + <?% d = ( frame ) / 25 %?> + <?% IF allowplay %?><a href="javascript:setstart('<?% PROCESS hfs %?>')" ><?% END %?> + <img src="?cmd=ri&data=<?% data.RecordId %?>_<?% frame %?>" alt="" title="<?% PROCESS hfs %?>" /> + <?% IF allowplay %?></a><?% END %?> + <?% END %?> <div id="slideend"></div>
</div>
</div>
+ <?% ELSE %?> + <img class="recorddetails" src="images/movie.<?% global.imagetyp %?>" alt="" title="<?% gettext('Television recording') %?>" /> + <?% END; %?> <?% END %?> -<?% END %?> + <?% quest=data.Title;IF data.SubTitle.length > 0;quest=data.SubTitle;END %?> <?% ######################################################################## %?> diff --git a/skins/stone/rlist.tmpl b/skins/stone/rlist.tmpl index 341537e..192625a 100644 --- a/skins/stone/rlist.tmpl +++ b/skins/stone/rlist.tmpl @@ -47,25 +47,16 @@ <?% END %?> <?% ######################################################################## %?> <?% BLOCK image %?> - <?%- files = param.getPreview(id); - IF type == 'RADIO'; - 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; - IF preview.length <= 0; - mylist = [ "images/movie", global.imagetyp ]; - preview = mylist.join('.') ; - END; - -%?> - <img class="recording" src="<?% preview %?>" alt="" /> + <?% files = preview.split(',') %?> + <?% IF type == 'RADIO' %?> + <img class="recording" src="<?% "images/audio.${global.imagetyp}" %?>" alt="" /> + <?% ELSIF files.size > 0; + img = (files.size div 2); + frame = files.$img %?> + <img class="recording" src="?cmd=ri&data=<?% id %?>_<?% frame %?>" alt="" /> + <?% ELSE %?> + <img class="recording" src="<?% "images/movie.${global.imagetyp}" %?>" alt="" /> + <?% END; %?> <?% END %?> <?% ######################################################################## %?> <?% BLOCK RowButtons %?> @@ -222,6 +213,7 @@ fulltitle=zeile.9; isrecording=zeile.10; description=zeile.11; + preview=zeile.12; foldertitle=fulltitle.split('~').last; IF foldertitle == " "; foldertitle=fulltitle.split('~').last(2).join(" "); END; -%?> diff --git a/skins/stone_flat/rdisplay.tmpl b/skins/stone_flat/rdisplay.tmpl index 78d3017..6055afc 100644 --- a/skins/stone_flat/rdisplay.tmpl +++ b/skins/stone_flat/rdisplay.tmpl @@ -4,17 +4,9 @@ <?% subtitle = data.SubTitle %?> <?% id = data.RecordId %?> <?% allowplay = 1 IF allow('rplay') or allow('playrecord') %?> - -<?%- IF data.Type == 'RADIO'; - files = "images/audio.${global.imagetyp}"; - ELSIF param.previews.size <= 0; - files = "images/movie.${global.imagetyp}"; - ELSE; - files = param.previews; - END; --%?> - <?% IF ! global.bodyinc.defined;global.bodyinc = 1 %?> + +<?% files = data.preview.split(',') %?> <script language="javascript" type="text/javascript"> <!-- var pics = <?% files.size %?>; @@ -44,28 +36,27 @@ <?% END %?> <?% ######################################################################## %?> <?% BLOCK image %?> -<?% IF files.size %?> + <?% IF data.Type == 'RADIO' %?> + <img class="recorddetails" src="images/audio.<?% global.imagetyp %?>" alt="" title="<?% gettext('Radio recording') %?>" /> + <?% ELSIF files.size > 0; %?> <div id="slideframe"> <?% IF files.size > 3 %?>
<div id="slideleft"><img src="images/back.<?% global.imagetyp %?>" title="<?% gettext("Back") %?>" alt="" /></div>
<div id="slideright"><img src="images/forward.<?% global.imagetyp %?>" title="<?% gettext("Next") %?>" alt="" /></div> <?% END %?>
<div id="slidelist" style="left:<?% IF files.size <= 3 %?><?% 280 - (160 * ( files.size / 2 ) ) %?><?% ELSE %?>0<?% END %?>px; width:<?% files.size * 200 %?>px;" >
- <?% FOREACH f = files %?> - <?% i = f.split('/').-1 %?> - <?% x = ( i.split('\.').0 ) / 25 %?> - <?% IF allowplay %?> - <a href="javascript:setstart('<?% PROCESS hfs d=x %?>')" > - <?% END %?> - <img class="recorddetails" src="<?% f %?>" alt="" title="<?% PROCESS hfs d=x %?>" /> - <?% IF allowplay %?> - </a> - <?% END %?> - <?% END %?> + <?% FOREACH frame = files %?> + <?% d = ( frame ) / 25 %?> + <?% IF allowplay %?><a href="javascript:setstart('<?% PROCESS hfs %?>')" ><?% END %?> + <img src="?cmd=ri&data=<?% data.RecordId %?>_<?% frame %?>" alt="" title="<?% PROCESS hfs %?>" /> + <?% IF allowplay %?></a><?% END %?> + <?% END %?> <div id="slideend"></div>
</div>
</div>
-<?% END %?> + <?% ELSE %?> + <img class="recorddetails" src="images/movie.<?% global.imagetyp %?>" alt="" title="<?% gettext('Television recording') %?>" /> + <?% END; %?> <?% END %?> <?% quest=data.Title;IF data.SubTitle.length > 0;quest=data.SubTitle;END %?> diff --git a/skins/stone_flat/rlist.tmpl b/skins/stone_flat/rlist.tmpl index 62d8a7a..66ec23a 100644 --- a/skins/stone_flat/rlist.tmpl +++ b/skins/stone_flat/rlist.tmpl @@ -47,25 +47,16 @@ <?% END %?> <?% ######################################################################## %?> <?% BLOCK image %?> - <?%- files = param.getPreview(id); - IF type == 'RADIO'; - 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; - IF preview.length <= 0; - mylist = [ "images/movie", global.imagetyp ]; - preview = mylist.join('.') ; - END; - -%?> - <img class="recording" src="<?% preview %?>" alt="" /> + <?% files = preview.split(',') %?> + <?% IF type == 'RADIO' %?> + <img class="recording" src="<?% "images/audio.${global.imagetyp}" %?>" alt="" /> + <?% ELSIF files.size > 0; + img = (files.size div 2); + frame = files.$img %?> + <img class="recording" src="?cmd=ri&data=<?% id %?>_<?% frame %?>" alt="" /> + <?% ELSE %?> + <img class="recording" src="<?% "images/movie.${global.imagetyp}" %?>" alt="" /> + <?% END; %?> <?% END %?> <?% ######################################################################## %?> <?% BLOCK RowButtons %?> @@ -186,6 +177,7 @@ fulltitle=zeile.9; isrecording=zeile.10; description=zeile.11; + preview=zeile.12; foldertitle=fulltitle.split('~').last; IF foldertitle == " "; foldertitle=fulltitle.split('~').last(2).join(" "); END; PROCESS ItemAsFlat; diff --git a/skins/xstyle/rdisplay.tmpl b/skins/xstyle/rdisplay.tmpl index e5223ca..db077d3 100644 --- a/skins/xstyle/rdisplay.tmpl +++ b/skins/xstyle/rdisplay.tmpl @@ -55,6 +55,9 @@ </table> <?% END %?> +<?% BLOCK hfs # d in Sekunden %?> + <?% d div 3600 %?>:<?% d div 60 mod 60 | format('%02d') %?>:<?% d mod 60 | format('%02d') %?> +<?% END %?> <?% BLOCK dur # d in Sekunden %?> <?% IF d > 1 %?> <?% Stunden = d div 3600 %?> @@ -119,19 +122,22 @@ </tr> <tr> <td> + <?% files = data.preview.split(',') %?> + <?% IF data.Type == 'RADIO' %?> + <img src="images/radio.png" alt="" title="<?% gettext('Radio recording') %?>" /> + <?% ELSIF files.size > 0; %?> <table border="0" align='left'> + <?% FOREACH frame = files %?> + <tr> <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 %?> + <img src="?cmd=ri&data=<?% data.RecordId %?>_<?% frame %?>" alt="" width="200" title="<?% gettext('Television recording') %?> : <?% x=frame / 25;PROCESS hfs d=x %?>" /> </td> + </tr> + <?% END %?> </table> + <?% ELSE %?> + <img src="images/movie.png" alt="" width="200" title="<?% gettext('Television recording') %?>" /> + <?% END; %?> </td><td> <table border="0"> <th colspan=2> diff --git a/skins/xstyle/rlist.tmpl b/skins/xstyle/rlist.tmpl index 64a0991..f9e1e77 100644 --- a/skins/xstyle/rlist.tmpl +++ b/skins/xstyle/rlist.tmpl @@ -12,14 +12,18 @@ <?% Stunden | format('%d') %?>:<?% Minuten | format('%02d') %?>:<?% Sekunden | format('%02d') %?> <?% END %?> <?% END %?> - +<?% ######################################################################## %?> <?% BLOCK image %?> - <?% files = param.getPreview(id) %?> - <?% 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 %?> + <?% files = preview.split(',') %?> + <?% IF type == 'RADIO' %?> + <img src="images/radio.png" alt="" title="<?% gettext('Radio recording') %?>" /> + <?% ELSIF files.size > 0; + img = (files.size div 2); + frame = files.$img %?> + <img src="?cmd=ri&data=<?% id %?>_<?% frame %?>" alt="" width="200" title="<?% gettext('Television recording') %?>" /> + <?% ELSE %?> + <img src="images/movie.png" alt="" width="200" title="<?% gettext('Television recording') %?>" /> + <?% END; %?> <?% END %?> <?% ######################################################################## %?> <?% total = 0 %?> @@ -252,6 +256,7 @@ fulltitle=zeile.9; isrecording=zeile.10; desc=zeile.11; + preview=zeile.12; foldertitle=fulltitle.split('~').last -%?> <?% NEXT IF folder < 2 %?> @@ -275,6 +280,7 @@ fulltitle=zeile.9; isrecording=zeile.10; desc=zeile.11; + preview=zeile.12; foldertitle=fulltitle.split('~').last -%?> <?% NEXT IF folder > 1 %?> |
