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

[Ole Streicher]

The following commit has been merged in the master branch:
commit 087329c69c07a15be22cd3c572aba5b1349c69c7
Author: Ole Streicher <olebole at debian.org>
Date:   Thu Dec 10 08:46:40 2015 +0100

    Fix empty <li> in popcon entry; use text-transform:capitalize for pkg names

diff --git a/webtools/templates/packages.xhtml b/webtools/templates/packages.xhtml
index 3e7b5d3..c83093e 100644
--- a/webtools/templates/packages.xhtml
+++ b/webtools/templates/packages.xhtml
@@ -127,6 +127,9 @@ dl.debtags dt, dl.debtags dd {
     font-weight: normal;
     margin: 0;
 }
+dl.debtags dt {
+    text-transform: capitalize;
+}
 dl.debtags dd + dt::before {
     content: ' \2022\20';
 }
@@ -257,9 +260,9 @@ function show_fulldesc(hash) {
 	    <py:for each="line, project in enumerate(projects[task][pstatus])">
 	      <tr id="${project.pkg}.short"
 		  class="pkgdesc-short ${'alternate-color' if line % 2 == 1 else ''}">
-		<td>
+		<td style="text-transform:capitalize;">
 		  <a onclick="toggle_visibility('${project.pkg}');" style="cursor:pointer;">
-		    ${project.pkg.capitalize()}
+		    ${project.pkg}
 		  </a>
 		</td>
 		<td>
@@ -446,7 +449,7 @@ function show_fulldesc(hash) {
 			</a>
 			<dl class="debtags desc-inline">
 			  <py:for each="debtag in project.debtags">
-			    <dt>${debtag['tag'].capitalize()}</dt>
+			    <dt>${debtag['tag']}</dt>
 			    <dd>${debtag['value']}</dd>
 			  </py:for>
 			</dl>
@@ -460,11 +463,11 @@ function show_fulldesc(hash) {
 			  <py:if test="project.popcon['vote']">
 			    <li>${project.popcon['vote']} regular users</li>
 			  </py:if>
-			  <li>
-			    <py:if test="project.popcon['recent']">
+			  <py:if test="project.popcon['recent']">
+			    <li>
 			      ${project.popcon['recent']} recent installations
-			    </py:if>
-			  </li>
+			    </li>
+			  </py:if>
 			  (of ${popconsubmit} submissions)
 			</ul>
 		      </dd>

-- 
Static and dynamic websites for Debian Pure Blends