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

[Ole Streicher]

The following commit has been merged in the master branch:
commit db3508edc929087b4baeaf78b2d923315c59fd7c
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Dec 9 12:00:44 2015 +0100

    Small formatting corrections

diff --git a/webtools/templates/packages.xhtml b/webtools/templates/packages.xhtml
index b561bb1..3e7b5d3 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -404,13 +404,9 @@ function show_fulldesc(hash) {
 		      <dt>${maintainer[pstatus]}</dt>
 		      <dd>
 			<ul class="desc-inline">
-			  <li>
-			    ${project.responsible}
-			  </li>
+			  <li>${project.responsible}</li>
 			  <py:if test="project.properties.get('changed_by')">
-			    <li>
-			      ${project.properties['changed_by']}
-			    </li>
+			    <li>${project.properties['changed_by']}</li>
 			  </py:if>
 			</ul>
 		      </dd>
@@ -448,31 +444,28 @@ function show_fulldesc(hash) {
 			  ✏
 			  <span>Edit tags</span>
 			</a>
-			<ul class="desc-inline">
+			<dl class="debtags desc-inline">
 			  <py:for each="debtag in project.debtags">
-			    <li>
-			      ${debtag['tag']}: ${debtag['value']}
-			    </li>
+			    <dt>${debtag['tag'].capitalize()}</dt>
+			    <dd>${debtag['value']}</dd>
 			  </py:for>
-			</ul>
+			</dl>
 		      </dd>
 		    </py:if>
-		    <py:if test="project.popcon">
+		    <py:if test="project.popcon and
+				 (project.popcon['vote'] or project.popcon['recent'])">
 		      <dt>Popularity</dt>
 		      <dd>
 			<ul class="desc-inline">
-			  <py:if test="project.popcon['vote'] and
-				       (project.popcon['vote'] or project.popcon['recent'])">
-			    <li>
-			      ${project.popcon['vote']} regular users
-			    </li>
+			  <py:if test="project.popcon['vote']">
+			    <li>${project.popcon['vote']} regular users</li>
 			  </py:if>
 			  <li>
 			    <py:if test="project.popcon['recent']">
 			      ${project.popcon['recent']} recent installations
-			      (of ${popconsubmit} submissions)
 			    </py:if>
 			  </li>
+			  (of ${popconsubmit} submissions)
 			</ul>
 		      </dd>
 		    </py:if>
@@ -482,9 +475,7 @@ function show_fulldesc(hash) {
 			<ul class="desc-inline">
 			  <py:for each="enh in project.properties['Enhances'].keys()">
 			    <li>
-			      <a href="${project.properties['Enhances'][enh]}">
-				${enh}
-			      </a>
+			      <a href="${project.properties['Enhances'][enh]}">${enh}</a>
 			    </li>
 			  </py:for>
 			</ul>
@@ -502,9 +493,7 @@ function show_fulldesc(hash) {
 			</py:if>
 			<py:if test="project.pkgstatus == 'new'">
 			  <li>
-			    <a href="${project.properties['pkg-url']}">
-			      NEW entry
-			    </a>
+			    <a href="${project.properties['pkg-url']}">NEW entry</a>
 			  </li>
 			</py:if>
 			<py:if test="project.pkgstatus != 'new' and project.pkgstatus != 'pkgvcs'">
@@ -544,9 +533,7 @@ function show_fulldesc(hash) {
 		      <dd>
 			<ul class="desc-inline">
 			  <li>
-			    <a href="${project.properties['homepage']}">
-			      Home page
-			    </a>
+			    <a href="${project.properties['homepage']}">Home page</a>
 			  </li>
 			  <py:if test="'registration' in project.properties">
 			    <li>

-- 
Static and dynamic websites for Debian Pure Blends