[Blends-commit] [SCM] website branch, master, updated. 9d37e39709be7d604048ef6f3ff1a41cd0ae857c

[Ole Streicher]

The following commit has been merged in the master branch:
commit 9d37e39709be7d604048ef6f3ff1a41cd0ae857c
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Mon Dec 7 16:59:18 2015 +0100

    Use edit symbol in metapackage description as well.

diff --git a/webtools/templates/packages.xhtml b/webtools/templates/packages.xhtml
index 50a3197..4d6e5c6 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -170,28 +170,32 @@ function show_fulldesc(hash) {
 	<h1>
 	  $projectname ${tasks[task].metapkg.PrintedName.capitalize()} packages
 	</h1>
-	<em py:choose="">
+	<em>
+	  <py:choose>
+	    <py:when test="lang in tasks[task].metapkg.desc">
+	      ${tasks[task].metapkg.desc[lang]['short']}
+	    </py:when>
+	    <py:otherwise>
+	      ${tasks[task].metapkg.desc['en']['short']}
+	    </py:otherwise>
+	  </py:choose>
+	</em>
+	<py:choose>
 	  <py:when test="lang in tasks[task].metapkg.desc">
-	    ${tasks[task].metapkg.desc[lang]['short']}
+	    <a class="editlink tooltip" href="http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${tasks[task].metapkg.pkg}" py:if="lang != 'en'">
+	      ✏
+	      <span>${fixtranslation}</span>
+	    </a>
+	    ${tasks[task].metapkg.desc[lang]['long']}
 	  </py:when>
 	  <py:otherwise>
-	    ${tasks[task].metapkg.desc['en']['short']}
-	  </py:otherwise>
-	</em>
-	<p py:choose="">
-	  <span py:when="lang in tasks[task].metapkg.desc">
-	    ${tasks[task].metapkg.desc[lang]['long']}
-            <div class="transmpkg" py:if="lang != 'en'">
-	      <a href="http://ddtp.debian.net/ddtss/index.cgi/${lang}/forexternalreview/${tasks[task].metapkg.pkg}">${fixtranslation}</a>
-	    </div>
-          </span>
-	  <span py:otherwise="">
+	    <a class="editlink tooltip" href="http://ddtp.debian.net/ddtss/index.cgi/${lang}/fetch?package=${tasks[task].metapkg.pkg}" py:if="lang != 'en'">
+	      ✏
+	      <span>${translatedesc}</span>
+	    </a>
 	    ${tasks[task].metapkg.desc['en']['long']}
-            <div class="transmpkg" py:if="lang != 'en'">
-	      <a href="http://ddtp.debian.net/ddtss/index.cgi/${lang}/fetch?package=${tasks[task].metapkg.pkg}">${translatedesc}</a>
-	    </div>
-          </span>
-	</p>
+	  </py:otherwise>
+	</py:choose>
 	<table width="90%">
 	  <py:for each="pstatus in dependencies[task]">
 	    <tr>
@@ -407,7 +411,7 @@ function show_fulldesc(hash) {
 		    <dd>
 		      <a class="editlink tooltip" href="http://debtags.alioth.debian.org/edit.html?pkg=${project.pkg}">
 			✏
-			<span>Edit&bpsp;tags</span>
+			<span>Edit tags</span>
 		      </a>
 		      <ul class="desc-inline">
 			<py:for each="debtag in project.debtags">

-- 
Static and dynamic websites for Debian Pure Blends