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

[Ole Streicher]

The following commit has been merged in the master branch:
commit 064a0fa8f527e3bd7ae9a80958640b3f6b8abba8
Author: Ole Streicher <olebole at debian.org>
Date:   Sun Dec 27 11:05:44 2015 +0100

    Display inst values of popcon in package list

diff --git a/webtools/templates/packages.xhtml b/webtools/templates/packages.xhtml
index 7d07af7..660d337 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -465,8 +465,7 @@ function show_fulldesc(hash) {
 			</dl>
 		      </dd>
 		    </py:if>
-		    <py:if test="project.popcon and
-				 (project.popcon['vote'] or project.popcon['recent'])">
+		    <py:if test="project.popcon and project.popcon['insts']">
 		      <dt>Popularity</dt>
 		      <dd>
 			<ul class="desc-inline">
@@ -475,10 +474,13 @@ function show_fulldesc(hash) {
 			  </py:if>
 			  <py:if test="project.popcon['recent']">
 			    <li>
-			      ${project.popcon['recent']} recent installations
+			      ${project.popcon['recent']} recent
 			    </li>
 			  </py:if>
-			  (of ${popconsubmit} submissions)
+			  <li>
+			    ${project.popcon['insts']} total installations
+			    (of ${popconsubmit} submissions)
+			  </li>
 			</ul>
 		      </dd>
 		    </py:if>

-- 
Static and dynamic websites for Debian Pure Blends