The following commit has been merged in the master branch:
commit 53ba35344a1f7aa844eeffbe2af5d710080c62f7
Author: Andreas Tille <ti...@debian.org>
Date: Wed Jul 10 15:41:29 2013 +0200
Legend on left column (needs better layout)
diff --git a/webtools/templates/thermometer.xhtml
b/webtools/templates/thermometer.xhtml
index 55126d1..d0cc4e8 100644
--- a/webtools/templates/thermometer.xhtml
+++ b/webtools/templates/thermometer.xhtml
@@ -27,36 +27,38 @@
<div class="sectionTop"></div>
<div class="row">${idxsummary}</div>
</div>
+ <span class="section">Color legend</span>
+ <div class="section">
+ <div class="sectionTop">
+ <table border="1">
+ <py:for each="leg in legend">
+ <tr><td><table class='pkg'><tr
class='${leg[0]}'><td></td></tr></table></td>
+ <td><small>${leg[1]}</small></td>
+ </tr>
+ </py:for>
+ </table>
+ </div>
+ </div>
</td>
<td class="main">
<div class="pageBody">
-<table class="pkg">
-<caption><h3>$projectname Package Thermometer</h3></caption>
-<tr class='title'>
- <th>Package</th>
-
<th>stable</th><th>testing</th><th>unstable</th><th>stable-bpo</th><th>experimental</th><th>UNRELEASED</th>
-</tr>
-<py:for each="pkg in blend_data">
- <tr class='${pkg.debianstatus}'>
- <td><strong>${pkg.source}</strong> (<span py:choose="pkg.is_in_debian"><span
py:when="1"><a href='http://packages.qa.debian.org/${pkg.source}'>PTS</a>,
</span><span py:otherwise=""><span py:if="pkg.wnpp != ''"><a
href="http://bugs.debian.org/${pkg.wnpp}";>WNPP</a>, </span></span></span><span
py:if="pkg.vcs_browser != ''"><a href="${pkg.vcs_browser}">VCS</a>, </span><a
href='${pkg.homepage}'>UP</a>)</td>
-
<td>${pkg.stable}</td><td>${pkg.testing}</td><td>${pkg.unstable}</td><td>${pkg.stable_bpo}</td><td>${pkg.experimental}</td><td>${pkg.UNRELEASED}</td>
- </tr>
-</py:for>
-</table>
-<table border="1">
-<caption><h3>Color legend</h3></caption>
-
-<py:for each="leg in legend">
- <tr><td><table class='pkg'><tr class='${leg[0]}'><td></td></tr></table></td>
- <td><small>${leg[1]}</small></td>
- </tr>
-</py:for>
-</table>
+ <table class="pkg">
+ <caption><h3>$projectname Package Thermometer</h3></caption>
+ <tr class='title'>
+ <th>Package</th>
+
<th>stable</th><th>testing</th><th>unstable</th><th>stable-bpo</th><th>experimental</th><th>UNRELEASED</th>
+ </tr>
+ <py:for each="pkg in blend_data">
+ <tr class='${pkg.debianstatus}'>
+ <td><strong>${pkg.source}</strong> (<span
py:choose="pkg.is_in_debian"><span py:when="1"><a
href='http://packages.qa.debian.org/${pkg.source}'>PTS</a>, </span><span
py:otherwise=""><span py:if="pkg.wnpp != ''"><a
href="http://bugs.debian.org/${pkg.wnpp}";>WNPP</a>, </span></span></span><span
py:if="pkg.vcs_browser != ''"><a href="${pkg.vcs_browser}">VCS</a>, </span><a
href='${pkg.homepage}'>UP</a>)</td>
+
<td>${pkg.stable}</td><td>${pkg.testing}</td><td>${pkg.unstable}</td><td>${pkg.stable_bpo}</td><td>${pkg.experimental}</td><td>${pkg.UNRELEASED}</td>
+ </tr>
+ </py:for>
+ </table>
</div>
</td>
</tr>
</table>
-
<div id="footer">
<hr class="hidecss" />
<address>Status at: ${updatetimestamp}</address>
diff --git a/webtools/templates/uthermometer.xhtml
b/webtools/templates/uthermometer.xhtml
index 37bcfcf..9db281b 100644
--- a/webtools/templates/uthermometer.xhtml
+++ b/webtools/templates/uthermometer.xhtml
@@ -27,36 +27,38 @@
<div class="sectionTop"></div>
<div class="row">${idxsummary}</div>
</div>
+ <span class="section">Color legend</span>
+ <div class="section">
+ <div class="sectionTop">
+ <table border="1">
+ <py:for each="leg in legend">
+ <tr><td><table class='pkg'><tr
class='${leg[0]}'><td></td></tr></table></td>
+ <td><small>${leg[1]}</small></td>
+ </tr>
+ </py:for>
+ </table>
+ </div>
+ </div>
</td>
<td class="main">
<div class="pageBody">
-<table class="pkg">
-<caption><h3>$projectname packages in Ubuntu Thermometer</h3></caption>
-<tr class='title'>
- <th>Package</th>
-
<th>stable</th><th>testing</th><th>unstable</th><th>stable-bpo</th><th>precise</th><th>quantal</th><th>raring</th>
-</tr>
-<py:for each="pkg in blend_data">
- <tr class='${pkg.ubuntustatus}'>
- <td><strong>${pkg.source}</strong> (<span py:choose="pkg.is_in_debian"><span
py:when="1"><a href='http://packages.qa.debian.org/${pkg.source}'>PTS</a>,
</span><span py:otherwise=""><span py:if="pkg.wnpp != ''"><a
href="http://bugs.debian.org/${pkg.wnpp}";>WNPP</a>, </span></span></span><span
py:if="pkg.vcs_browser != ''"><a href="${pkg.vcs_browser}">VCS</a>, </span><a
href='${pkg.homepage}'>UP</a>)</td>
-
<td>${pkg.stable}</td><td>${pkg.testing}</td><td>${pkg.unstable}</td><td>${pkg.stable_bpo}</td><td>${pkg.precise}</td><td>${pkg.quantal}</td><td>${pkg.raring}</td>
- </tr>
-</py:for>
-</table>
-<table border="1">
-<caption><h3>Color legend</h3></caption>
-
-<py:for each="leg in legend">
- <tr><td><table class='pkg'><tr class='${leg[0]}'><td></td></tr></table></td>
- <td><small>${leg[1]}</small></td>
- </tr>
-</py:for>
-</table>
+ <table class="pkg">
+ <caption><h3>$projectname packages in Ubuntu
Thermometer</h3></caption>
+ <tr class='title'>
+ <th>Package</th>
+
<th>stable</th><th>testing</th><th>unstable</th><th>stable-bpo</th><th>precise</th><th>quantal</th><th>raring</th>
+ </tr>
+ <py:for each="pkg in blend_data">
+ <tr class='${pkg.ubuntustatus}'>
+ <td><strong>${pkg.source}</strong> (<span
py:choose="pkg.is_in_debian"><span py:when="1"><a
href='http://packages.qa.debian.org/${pkg.source}'>PTS</a>, </span><span
py:otherwise=""><span py:if="pkg.wnpp != ''"><a
href="http://bugs.debian.org/${pkg.wnpp}";>WNPP</a>, </span></span></span><span
py:if="pkg.vcs_browser != ''"><a href="${pkg.vcs_browser}">VCS</a>, </span><a
href='${pkg.homepage}'>UP</a>)</td>
+
<td>${pkg.stable}</td><td>${pkg.testing}</td><td>${pkg.unstable}</td><td>${pkg.stable_bpo}</td><td>${pkg.precise}</td><td>${pkg.quantal}</td><td>${pkg.raring}</td>
+ </tr>
+ </py:for>
+ </table>
</div>
</td>
</tr>
</table>
-
<div id="footer">
<hr class="hidecss" />
<address>Status at: ${updatetimestamp}</address>
--
Static and dynamic websites for Debian Pure Blends
_______________________________________________
Blends-commit mailing list
Blends-commit@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/blends-commit
