The following commit has been merged in the debian-master branch:
commit 2df82b1faab891977631dc568e8e1e75663aaaa7
Merge: ba150ebc596b6b8addbea2b76311734fad82aca9
dac75b8abb280a76e977858d2abe593ed5cf6635
Author: Simon Paillard <[email protected]>
Date: Thu Aug 11 20:34:12 2011 +0200
Merge branch 'master' into debian-master
diff --combined templates/html/show.tmpl
index d6797de,8b4a6e2..5d7bec3
--- a/templates/html/show.tmpl
+++ b/templates/html/show.tmpl
@@@ -64,9 -64,7 +64,9 @@@
<div id="pmoreinfo">
<h2>[% g('Links for %s', pkg) %]</h2>
[% IF screenshots_url && screenshots_thumb_url && !is_source %]
+<div class="screenshot">
<a id="screenshot" href="[% screenshots_url _ pkg %]"><img src="[%
"$screenshots_thumb_url/$pkg/$version" %]" alt="Screenshot" border="0"/></a>
+</div>
[% END %]
<h3>[% g('%s Resources:', organisation) %]</h3>
<ul>
@@@ -97,13 -95,13 +97,13 @@@
[% IF patch_tracking_url && src %]
[% FOREACH src.downloads %]
- [% IF name.match('\.(debian\.tar|diff)\.(gz|bz2|lzma)$') %]
+ [% IF name.match('\.(debian\.tar|diff)\.(gz|xz|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\.tar|diff)\.(gz|bz2|lzma)$') %]
+ [% IF filename.match('\.(debian\.tar|diff)\.(gz|xz|bz2|lzma)$') %]
<li><a href="[% "$patch_tracking_url/$pkg/$version" %]">[% g("%s Patch
Tracker", organisation) %]</a></li>
[% END -%]
[% END -%]
@@@ -112,7 -110,7 +112,7 @@@
</ul>
[% IF src %]
- <p>[% g('Download Source Package <a href="%s">%s</a>:', src.url, src.pkg) %]
+ <h3>[% g('Download Source Package <a href="%s">%s</a>:', src.url, src.pkg)
%]</h3>
[% FOREACH src.downloads %]
[% '<ul>' IF loop.first %]
<li><a href="[% server _ path %]">[[% name %]]</a></li>
--
APT Archive Web-Frontend (Alioth repository)
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
