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

[Ole Streicher]

The following commit has been merged in the master branch:
commit 23a44a9e72d79781c195ac7ed1f6bd8edb40bc59
Author: Ole Streicher <debian at liska.ath.cx>
Date:   Wed Dec 9 10:45:41 2015 +0100

    (temporarily) remove total popcon installations

diff --git a/webtools/templates/packages.xhtml b/webtools/templates/packages.xhtml
index 6cf09c8..08085e1 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -443,13 +443,18 @@ function show_fulldesc(hash) {
 		    <py:if test="project.popcon">
 		      <dt>Popularity</dt>
 		      <dd>
-			<ul>
-			  <li>
-			    ${project.popcon['vote']} regular users
-			  </li>
+			<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>
 			  <li>
-			    ${project.popcon['recent']} recent,
-			    ${project.popcon['inst']} total installations (of ${popconsubmit} submissions)
+			    <py:if test="project.popcon['recent']">
+			      ${project.popcon['recent']} recent installations
+			      (of ${popconsubmit} submissions)
+			    </py:if>
 			  </li>
 			</ul>
 		      </dd>

-- 
Static and dynamic websites for Debian Pure Blends