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

[Ole Streicher]

The following commit has been merged in the master branch:
commit 084c6762d6747b948e716ff9e84066d2d41debca
Author: Ole Streicher <olebole at debian.org>
Date:   Wed Dec 9 08:57:54 2015 +0100

    Add popcon values

diff --git a/webtools/templates/packages.xhtml b/webtools/templates/packages.xhtml
index f5abe3f..6cf09c8 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -424,22 +424,36 @@ function show_fulldesc(hash) {
 			</ul>
 		      </dd>
 		    </py:if>
-		  <py:if test="project.debtags">
-		    <dt>Tags</dt>
-		    <dd>
-		      <a class="editlink tooltip" href="http://debtags.alioth.debian.org/edit.html?pkg=${project.pkg}">
-			✏
-			<span>Edit tags</span>
-		      </a>
-		      <ul class="desc-inline">
-			<py:for each="debtag in project.debtags">
+		    <py:if test="project.debtags">
+		      <dt>Tags</dt>
+		      <dd>
+			<a class="editlink tooltip" href="http://debtags.alioth.debian.org/edit.html?pkg=${project.pkg}">
+			  ✏
+			  <span>Edit tags</span>
+			</a>
+			<ul class="desc-inline">
+			  <py:for each="debtag in project.debtags">
+			    <li>
+			      ${debtag['tag']}: ${debtag['value']}
+			    </li>
+			  </py:for>
+			</ul>
+		      </dd>
+		    </py:if>
+		    <py:if test="project.popcon">
+		      <dt>Popularity</dt>
+		      <dd>
+			<ul>
 			  <li>
-			    ${debtag['tag']}: ${debtag['value']}
+			    ${project.popcon['vote']} regular users
 			  </li>
-			</py:for>
-		      </ul>
-		    </dd>
-		  </py:if>
+			  <li>
+			    ${project.popcon['recent']} recent,
+			    ${project.popcon['inst']} total installations (of ${popconsubmit} submissions)
+			  </li>
+			</ul>
+		      </dd>
+		    </py:if>
 		    <py:if test="project.properties['Enhances'] != {}">
 		      <dt>Enhancements</dt>
 		      <dd>

-- 
Static and dynamic websites for Debian Pure Blends