[Blends-commit] [SCM] website branch, master, updated. 3c35c9dec50d9f383aab00777d33fe32d080c8b3

Wed Jul 10 13:07:57 UTC 2013

The following commit has been merged in the master branch:
commit 3c35c9dec50d9f383aab00777d33fe32d080c8b3
Author: Andreas Tille <tille at debian.org>
Date:   Wed Jul 10 15:10:07 2013 +0200

    Simplify editing uthermometer template by creating it via script.  (Alternatively one template with additional control parameter could be used but it is not yet decided how different the Ubuntu Thermometer should finally be)

diff --git a/webtools/templates/debian2ubuntu-termometer.sh b/webtools/templates/debian2ubuntu-termometer.sh
new file mode 100755
index 0000000..9be6632
--- /dev/null
+++ b/webtools/templates/debian2ubuntu-termometer.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+sed \
+    -e 's%\(<title>\)\($projectname Thermometer</title>\)%\1Ubuntu \2%' \
+    -e 's%\(<caption><h3>\)\($projectname Package Thermometer</h3></caption>\)%\1Ubuntu \2%' \
+    -e 's%\(<th>stable</th><th>testing</th><th>unstable</th><th>stable-bpo</th>\)<th>experimental</th><th>UNRELEASED</th>%\1<th>precise</th><th>quantal</th><th>raring</th>%' \
+    -e 's%''${pkg.debianstatus}''%''${pkg.ubuntustatus}''%' \
+    -e 's%\(<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>%\1<td>${pkg.precise}</td><td>${pkg.quantal}</td><td>${pkg.raring}</td>%' \
+    thermometer.xhtml > uthermometer.xhtml
diff --git a/webtools/templates/uthermometer.xhtml b/webtools/templates/uthermometer.xhtml
index 0c7e3fe..17ba519 100644
--- a/webtools/templates/uthermometer.xhtml
+++ b/webtools/templates/uthermometer.xhtml
@@ -9,6 +9,16 @@
 <link href="../inc/style.css" type="text/css" rel="stylesheet"/>
 </head>
 <body>
+<div style="text-align: center;">
+<a href="$projecturl"><span py:choose="logourl">
+           <span py:when="None">${projectname} Project</span>
+           <span py:otherwise=""><img src="$logourl" alt="$projectname Project" height="93" /></span>
+     </span>
+</a>
+</div>
+<div class="heading" py:if="projectadvertising">
+    <div class="tabBar" style="text-align: center;">$projectadvertising</div>
+</div>
 <table class="pkg">
 <caption><h3>Ubuntu $projectname Package Thermometer</h3></caption>
 <tr class='title'>

-- 
Static and dynamic websites for Debian Pure Blends

