[Blends-commit] [SCM] website branch, master, updated. 299be9844a834b38dea93f0f5ef6821e035b3bc6

[Andreas Tille]

The following commit has been merged in the master branch:
commit 299be9844a834b38dea93f0f5ef6821e035b3bc6
Author: Andreas Tille <tille at debian.org>
Date:   Mon Jul 15 12:10:49 2013 +0200

    Add upstream information to package thermometer

diff --git a/htdocs/inc/style.css b/htdocs/inc/style.css
index 8eb1b42..ed23bfc 100644
--- a/htdocs/inc/style.css
+++ b/htdocs/inc/style.css
@@ -1057,6 +1057,9 @@ table.pkg {
         background-color: silver;
         color: #000000;
 }
+
+/* begin copy from GIS package thermometer */
+
 table.pkg tr.title {
         color: #ffffff;
         background-color: #df0451;
@@ -1074,18 +1077,43 @@ table.pkg tr.unpackaged {
         background-color: #ffffff;
 }
 
+/* white for no upstream status available */
+table.pkg td.none {
+        color: #000000;
+        background-color: #ffffff;
+}
+
 /* yellow */
 table.pkg tr.debianOutOfDate {
         color: #000000;
         background-color: #f0f005;
 }
 
+/* dark yellow */
+table.pkg td.outdated {
+        color: #000000;
+        background-color: #d0d002;
+}
+
 /* green */
 table.pkg tr.upToDate {
         color: #000000;
         background-color: #a0f005;
 }
 
+/* dark green */
+table.pkg td.uptodate {
+        color: #000000;
+        background-color: #004400;
+        color: #ffffff;
+}
+
+/* blue */
+table.pkg tr.newer-in-debian {
+        color: #000000;
+        background-color: #a0050f;
+}
+
 /* red */
 table.pkg tr.obsolete {
         color: #000000;
diff --git a/misc/sql/gis-thermometer.sh b/misc/sql/gis-thermometer.sh
index 4fc7690..c5c6799 100755
--- a/misc/sql/gis-thermometer.sh
+++ b/misc/sql/gis-thermometer.sh
@@ -30,6 +30,7 @@ SELECT b.source,
        raring.version AS raring,
        d.unstable_upstream AS upstream,
        d.unstable_status AS status,
+       CASE WHEN d.unstable_status IS NOT NULL THEN CAST(unstable_status AS text) ELSE 'none' END AS upstreamstatus,
        homepage,
        wnpp,
        tasks.tasks
diff --git a/webtools/templates/thermometer.xhtml b/webtools/templates/thermometer.xhtml
index 0477db0..66ab200 100644
--- a/webtools/templates/thermometer.xhtml
+++ b/webtools/templates/thermometer.xhtml
@@ -62,12 +62,12 @@
         <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>
+            <th>stable</th><th>testing</th><th>unstable</th><th>stable-bpo</th><th>experimental</th><th>UNRELEASED</th><th>upstream</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>
+           <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><td class='${pkg.upstreamstatus}'>${pkg.upstream}</td>
          </tr>
          </py:for>
      </table>
diff --git a/webtools/thermometer.py b/webtools/thermometer.py
index 52a306b..e5a4843 100755
--- a/webtools/thermometer.py
+++ b/webtools/thermometer.py
@@ -77,7 +77,7 @@ def main():
            quantal.version AS quantal,
            raring.version AS raring,
            d.unstable_upstream AS upstream,
-           d.unstable_status AS status,
+           CASE WHEN d.unstable_status IS NOT NULL THEN CAST(unstable_status AS text) ELSE 'none' END AS upstreamstatus,
            homepage,
            wnpp,
            is_in_debian,

-- 
Static and dynamic websites for Debian Pure Blends