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

[Ole Streicher]

The following commit has been merged in the master branch:
commit 92fe277c4a75f48f9b7906458849dbb10040a74f
Author: Ole Streicher <olebole at debian.org>
Date:   Wed Apr 20 17:51:06 2016 +0200

    Better version: don't create the table cells at all for screenshot and
    versions/tagging

diff --git a/webtools/templates/tasks.xhtml b/webtools/templates/tasks.xhtml
index 543878f..af0b73f 100644
--- a/webtools/templates/tasks.xhtml
+++ b/webtools/templates/tasks.xhtml
@@ -96,7 +96,8 @@
                <a href="mailto:${project.properties['maintainer']['email']}">${project.properties['maintainer']['name']}</a> <span py:if="'uploader' in project.properties">(<a href="mailto:${project.properties['uploader']['email']}">${project.properties['uploader']['name']}</a>)</span>
              </div>
 	   </td>
-	   <td py:if="'component' in project.properties and project.properties['pkgstatus'] != 'new' and project.properties['pkgstatus'] != 'pkgvcs'" class="project-info">
+	   <td py:if="project.properties['component'] == 'main'
+		      and project.properties['pkgstatus'] in ('official_high', 'official_low', 'experimental')" class="project-info">
 	     <span py:if="project.properties['version']" class="tooltip" id="${project.properties['name']}-versions">
 	       <table class="versionclass">
 		 <tr><th colspan="3" class="versionclass"><strong>Versions of package ${project.properties['name']}</strong></th></tr>
@@ -127,10 +128,7 @@
 	     </div>
 	     <div py:choose="">
 	       <div py:when="'debtags' in project.properties" class="project-info" onmouseover="TagToTip('${project.properties['name']}-debtags', FIX, ['${project.properties['name']}', 0, 0])" onmouseout="UnTip()"><a href="https://debtags.debian.org/edit/${project.properties['name']}">Edit Debtags</a></div>
-	       <div py:when="project.properties['component'] == 'main'
-			     and project.properties['pkgstatus'] in ('official_high', 'official_low', 'experimental')"
-		    class="project-infomissing"><a href="https://debtags.debian.org/edit/${project.properties['name']}">Go tagging</a></div>
-	       <div py:otherwise=""></div>
+	       <div py:otherwise="" class="project-infomissing"><a href="https://debtags.debian.org/edit/${project.properties['name']}">Go tagging</a></div>
 	     </div>
            </td>
            <td class="project-license">
@@ -198,7 +196,8 @@
 	       <span class="year" py:if="'year' in project.properties['published']">(${project.properties['published']['year']})</span>
 	     </div>
 	   </td>
-	   <td py:if="'component' in project.properties and project.properties['pkgstatus'] != 'new' and project.properties['pkgstatus'] != 'pkgvcs'" class="project-icon">
+	   <td py:if="project.properties['component'] == 'main'
+		      and project.properties['pkgstatus'] in ('official_high', 'official_low', 'experimental')" class="project-icon">
 	     <div py:choose="">
 	       <div py:when="'screenshot' in project.properties">
 		 <span class="tooltip" id="${project.properties['name']}-screenshot">
@@ -214,10 +213,8 @@
 		 </span>
                  <a href="http://screenshots.debian.net/package/${project.properties['name']}"><img class="icon" src="${project.properties['screenshot']['icon']}" width="300" alt="Screenshots of package ${project.properties['name']}" onmouseover="TagToTip('${project.properties['name']}-screenshot', FIX, ['${project.properties['name']}', 80, -100])" onmouseout="UnTip()" /></a>
                </div>
-	       <div py:when="project.properties['component'] == 'main'
-			     and project.properties['pkgstatus'] in ('official_high', 'official_low', 'experimental')"
+	       <div py:otherwise=""
 		    class="project-infomissing"><a href="http://screenshots.debian.net/uploadfile?packagename=${project.properties['name']}">Upload screenshot</a></div>
-               <div py:otherwise=""></div>
 	     </div>
            </td>
          </tr>

-- 
Static and dynamic websites for Debian Pure Blends