[Blends-commit] [SCM] website branch, master, updated. 71aedad66794acbf0bd7aa36ea6e68c6b35bfc74

Sat Jul 6 19:10:13 UTC 2013

The following commit has been merged in the master branch:
commit ecb4ec4281176f07b1293aa20d1a4c2972e6e381
Author: Andreas Tille <tille at debian.org>
Date:   Sat Jul 6 20:16:46 2013 +0200

    Get the lines marked according GIS thermometer

diff --git a/misc/thermometer/templates/thermometer.xhtml b/misc/thermometer/templates/thermometer.xhtml
index 747512b..ea243d6 100644
--- a/misc/thermometer/templates/thermometer.xhtml
+++ b/misc/thermometer/templates/thermometer.xhtml
@@ -3,6 +3,60 @@
      "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"
       xmlns:py="http://genshi.edgewall.org/">
+ <style type="text/css">
+<!--
+table.pkg {
+        border-collapse: collapse;
+}
+.pkg th, .pkg td {
+        text-align: left;
+        border: 1px solid black;
+        padding: 0.2em;
+}
+.pkg thead {
+        background-color: silver;
+        color: #000000;
+}
+table.pkg tr.title {
+        color: #ffffff;
+        background-color: #df0451;
+}
+
+/* orange */
+table.pkg tr.ubuntuOutOfDate {
+        color: #000000;
+        background-color: #f09005;
+}
+
+/* white */
+table.pkg tr.unpackaged {
+        color: #000000;
+        background-color: #ffffff;
+}
+
+/* yellow */
+table.pkg tr.debianOutOfDate {
+        color: #000000;
+        background-color: #f0f005;
+}
+
+/* green */
+table.pkg tr.upToDate {
+        color: #000000;
+        background-color: #a0f005;
+}
+
+/* red */
+table.pkg tr.obsolete {
+        color: #000000;
+        background-color: #f03000;
+}
+table.pkg tr.othered {
+        color: #000000;
+        background-color: #dc5858;
+}
+-->
+</style>
 <head>
 <title>$projectname Thermometer</title>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8"/>
@@ -16,8 +70,8 @@
  <th>stable</th><th>testing</th><th>unstable</th><th>stable-bpo</th>
 </tr>
 <py:for each="pkg in blend_data">
- <tr>
-  <td>${pkg.source} (<a href='http://packages.qa.debian.org/${pkg.source}'>PTS</a>,<a href='${pkg.homepage}'>UP</a>)</td>
+ <tr class='${pkg.debianstatus}'>
+  <td><strong>${pkg.source}</strong> (<a href='http://packages.qa.debian.org/${pkg.source}'>PTS</a>,<a href='${pkg.homepage}'>UP</a>)</td>
   <td>${pkg.stable}</td><td>${pkg.testing}</td><td>${pkg.unstable}</td><td>${pkg.stable_bpo}</td>
  </tr>
 </py:for>
diff --git a/misc/thermometer/thermometer.py b/misc/thermometer/thermometer.py
index 3f32a72..fe1b870 100755
--- a/misc/thermometer/thermometer.py
+++ b/misc/thermometer/thermometer.py
@@ -97,7 +97,12 @@ def main():
            d.unstable_upstream AS upstream,
            d.unstable_status AS status,
            homepage,
-           wnpp
+           wnpp,
+           CASE WHEN stable.version >= unstable.version THEN 'upToDate'
+                WHEN stable.version <  unstable.version THEN 'debianOutOfDate'
+                WHEN stable.version IS NULL             THEN '_no_stable'
+                WHEN unstable.version IS NULL           THEN '_no_unstable'
+                ELSE 'unpackaged' END AS debianstatus
      FROM (
       SELECT DISTINCT p.source, '' AS wnpp FROM packages p
       JOIN blends_dependencies bd ON bd.package = p.package

-- 
Static and dynamic websites for Debian Pure Blends

