Format installed size like package size

[deb/packages.git] / templates / html / show.tmpl

diff --git a/templates/html/show.tmpl b/templates/html/show.tmpl
index c03f50e3f92472e2ed555373a3cb811deeef3729..8fc9143544a924066c7cb38dff5d0a80287353b9 100644 (file)
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@ -64,7 +64,7 @@
 <div id="pmoreinfo">
 <h2>[% g('Links for %s', pkg) %]</h2>
 [% IF screenshots_url && screenshots_thumb_url && !is_source %]
-<a id="screenshot" href="[% screenshots_url _ pkg %]"><img src="[% screenshots_thumb_url _ pkg %]" alt="Screenshot" border="0"/></a>
+<a id="screenshot" href="[% screenshots_url _ pkg %]"><img src="[% "$screenshots_thumb_url/$pkg/$version" %]" alt="Screenshot" border="0"/></a>
 [% END %]
 <h3>[% g('%s Resources:', organisation) %]</h3>
 <ul>
@@ -95,13 +95,13 @@
 
 [% IF patch_tracking_url && src %]
   [% FOREACH src.downloads %]
-    [% IF name.match('\.(debian|diff)\.(gz|bz2|lzma)$') %]
+    [% IF name.match('\.(debian\.tar|diff)\.(gz|bz2|lzma)$') %]
     <li><a href="[% "$patch_tracking_url/$src.pkg/$src.version" %]">[% g("%s Patch Tracker", organisation) %]</a></li>
     [% END -%]
   [% END -%]
 [% ELSIF patch_tracking_url && is_source %]
   [% FOREACH srcfiles %]
-    [% IF filename.match('\.(debian|diff)\.(gz|bz2|lzma)$') %]
+    [% IF filename.match('\.(debian\.tar|diff)\.(gz|bz2|lzma)$') %]
     <li><a href="[% "$patch_tracking_url/$pkg/$version" %]">[% g("%s Patch Tracker", organisation) %]</a></li>
     [% END -%]
   [% END -%]
@@ -322,7 +322,7 @@
        version_class = 'vold';
    END %]
 [% "<td class='$version_class'>$d.version</td>" IF versions.multiple %]
-<td class="size">[% g('%s&nbsp;kB', num.format_number(d.pkgsize,1)) %]</td><td class="size">[% g('%s&nbsp;kB', d.instsize) %]</td>
+<td class="size">[% g('%s&nbsp;kB', num.format_number(d.pkgsize,1)) %]</td><td class="size">[% g('%s&nbsp;kB', num.format_number(d.instsize,1)) %]</td>
 <td>
 [% IF d.contents_avail %]
   [<a href="[% make_url(filelist_url,'','arch',d.arch) %]">[% g('list of files') %]</a>]