diff options
| author | Andreas Brachold <vdr07@deltab.de> | 2007-12-01 08:00:37 +0000 |
|---|---|---|
| committer | Andreas Brachold <vdr07@deltab.de> | 2007-12-01 08:00:37 +0000 |
| commit | 81fbf315439fca3083e926041b8ec55ec9ce662b (patch) | |
| tree | 50dae420c45e98f42d9e5ed63e6af6e011ec3eb2 | |
| parent | 3fb56d6d506bfe076fc9058aed1397beed192380 (diff) | |
| download | xxv-81fbf315439fca3083e926041b8ec55ec9ce662b.tar.gz xxv-81fbf315439fca3083e926041b8ec55ec9ce662b.tar.bz2 | |
* rlist/rdisplay: Fix isn't numeric in sprintf at Filters.pm
| -rw-r--r-- | skins/xstyle/rdisplay.tmpl | 12 | ||||
| -rw-r--r-- | skins/xstyle/rlist.tmpl | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/skins/xstyle/rdisplay.tmpl b/skins/xstyle/rdisplay.tmpl index 4eca85f..558bf03 100644 --- a/skins/xstyle/rdisplay.tmpl +++ b/skins/xstyle/rdisplay.tmpl @@ -19,15 +19,15 @@ Stunden = c div 3600; Minuten = c div 60 mod 60; -%?> - <td bgcolor="white" width="<?% offset = (c % 3600 ? 1 : 2);(percent - offset) | format('%d') %?>" align='right'> - <font size='1'><?% Stunden | format('%02d') %?>:<?% Minuten | format('%02d') %?></font> + <td bgcolor="white" width="<?% offset = (c % 3600 ? 1 : 2);(percent - offset) div 1 %?>" align='right'> + <font size='1'><?% Stunden div 1 | format('%02d') %?>:<?% Minuten div 1 | format('%02d') %?></font> </td> <?% END %?> </tr> <tr> <?% c = 0 %?> <?% abstand = abstand div 3 %?> - <td bgcolor="white" colspan="<?% colspan %?>"><nobr><?%- WHILE c < range -%?><?%- c = c + abstand; percent = (abstand / data.Duration) * width -%?><img style="background:white" src='/images/trans.gif' width="<?% offset = (c % 3600 ? 1 : 2);(percent - offset) | format('%d') %?>" height='10'><img style="background:<?% c % 900 ? "gray" : "black" %?>" src='/images/trans.gif' width="<?% c % 3600 ? "1" : "2" %?>" height='<?% (c % 900 ? "5" : "10") %?>'><?%- END -%?></td> + <td bgcolor="white" colspan="<?% colspan %?>"><nobr><?%- WHILE c < range -%?><?%- c = c + abstand; percent = (abstand / data.Duration) * width -%?><img style="background:white" src='/images/trans.gif' width="<?% offset = (c % 3600 ? 1 : 2);(percent - offset) div 1 %?>" height='10'><img style="background:<?% c % 900 ? "gray" : "black" %?>" src='/images/trans.gif' width="<?% c % 3600 ? "1" : "2" %?>" height='<?% (c % 900 ? "5" : "10") %?>'><?%- END -%?></td> </tr> <tr> <td colspan="<?% colspan %?>"><nobr><?%- secold = 0; @@ -42,13 +42,13 @@ sec = sec + m.2; percent = ((sec-secold) / data.Duration) * width; bgcolor = (bgcolor == 'red' ? 'white' : 'red'); - -%?><img style="background:<?% bgcolor %?>" src='images/trans.gif' width="<?% percent | format('%d') %?>" height='10' title="<?% (b < 0 ? "0:00:00.00" : ml.$b) %?> - <?% ml.$c %?>"> + -%?><img style="background:<?% bgcolor %?>" src='images/trans.gif' width="<?% percent div 1 %?>" height='10' title="<?% (b < 0 ? "0:00:00.00" : ml.$b) %?> - <?% ml.$c %?>"> <?%- secold = sec; END; IF data.Duration > secold; bgcolor = (bgcolor == 'red' ? 'white' : 'red'); percent = ((data.Duration - secold) / data.Duration) * width; - -%?><img style="background:<?% bgcolor %?>" src="images/trans.gif" width="<?% percent | format('%d') %?>" height="10" title="<?% (c < 0 ? "0:00:00.00" : ml.$c) %?> - <?% data.Duration div 3600 | format('%d') %?>:<?% data.Duration div 60 mod 60 | format('%02d') %?>:<?% data.Duration mod 60 | format('%02d') %?>" /> + -%?><img style="background:<?% bgcolor %?>" src="images/trans.gif" width="<?% percent div 1 %?>" height="10" title="<?% (c < 0 ? "0:00:00.00" : ml.$c) %?> - <?% data.Duration div 3600 %?>:<?% data.Duration div 60 mod 60 div 1 | format('%02d') %?>:<?% data.Duration mod 60 div 1 | format('%02d') %?>" /> <?% END %?> </td> </tr> @@ -60,7 +60,7 @@ <?% Stunden = d div 3600 %?> <?% Minuten = d div 60 mod 60 %?> <?% Sekunden = d mod 60 %?> - <?% gettext('Duration') %?> : <?% Stunden | format('%d') %?>:<?% Minuten | format('%02d') %?>:<?% Sekunden | format('%02d') %?> + <?% gettext('Duration') %?> : <?% Stunden div 1 %?>:<?% Minuten div 1 | format('%02d') %?>:<?% Sekunden div 1 | format('%02d') %?> <?% END %?> <?% END %?> diff --git a/skins/xstyle/rlist.tmpl b/skins/xstyle/rlist.tmpl index fba0297..94c4162 100644 --- a/skins/xstyle/rlist.tmpl +++ b/skins/xstyle/rlist.tmpl @@ -64,8 +64,8 @@ <a href="?cmd=rlist&data=<?% url( fulltitle ) %?>"> <b><?% foldertitle | html %?></b><br /> - <img src="images/<?% new > 0 ? "newfolder" : "foldericon" %?>.png" alt="" title="<?% new > 0 ? gettext("New recording") : "" %?>" /> - <?% folder %?><?% IF new > 0 %?> (<?% new %?>)<?% END %?> <?% gettext("more recordings") %?> ... + <img src="images/<?% new ? "newfolder" : "foldericon" %?>.png" alt="" title="<?% new ? gettext("New recording") : "" %?>" /> + <?% folder %?><?% IF new %?> (<?% new %?>)<?% END %?> <?% gettext("more recordings") %?> ... </a> </div> </td> @@ -89,7 +89,7 @@ </div> <div style="height:3em; overflow:hidden;"> <?% INCLUDE bloecke/tooltip.tmpl cmd="rdisplay" linkid=id ttp_offset=0 %?> - <?% IF new > 0 %?><img src="images/new.png" alt="" title="<?% gettext("New recording") %?>" /><?% END %?> + <?% IF new %?><img src="images/new.png" alt="" title="<?% gettext("New recording") %?>" /><?% END %?> <b><?% (title.match('[a-z]') ? title : fulltitle) %?></b> <br /><?% subtitle %?></font><br /> </a> @@ -191,12 +191,12 @@ <?% IF folder > 1 %?> <td colspan="4"> <a href="?cmd=rlist&data=<?% url( fulltitle ) %?>"> - <?% IF new > 0 %?> + <?% IF new %?> <img src="images/newfolder.png" alt="" title="<?% gettext("New recording") %?>" /> <?% ELSE %?> <img src="images/foldericon.png" alt="" /> <?% END %?> - <b><?% foldertitle.split('~').last %?></b> <?% folder %?><?% IF new > 0 %?> (<?% new %?>)<?% END %?> <?% gettext("more recordings") %?> ... + <b><?% foldertitle.split('~').last %?></b> <?% folder %?><?% IF new %?> (<?% new %?>)<?% END %?> <?% gettext("more recordings") %?> ... </a> </td> <?% ELSE %?> @@ -217,7 +217,7 @@ <?% PROCESS dur d=field %?> <?% ELSIF c == 2 # title %?> <?% INCLUDE bloecke/tooltip.tmpl cmd="rdisplay" linkid=id ttp_offset=0 %?> - <?% IF new > 0 %?><img src="images/new.png" alt="" title="<?% gettext("New recording") %?>" /> <?% END %?> + <?% IF new %?><img src="images/new.png" alt="" title="<?% gettext("New recording") %?>" /> <?% END %?> <?% val = (field.split('~').last.match('[a-z]') ? field.split('~').last : zeile.9); chop(val,30) %?> </a> <?% ELSE %?> |
