[Blends-commit] r3339 - /blends/trunk/webtools/templates/tasks.xhtml

[tille at users.alioth.debian.org]

Author: tille
Date: Mon May 21 11:59:56 2012
New Revision: 3339

URL: http://svn.debian.org/wsvn/blends/?sc=1&rev=3339
Log:
Move Version information about Vcs based packages into right hand column to not spoil the layout

Modified:
    blends/trunk/webtools/templates/tasks.xhtml

Modified: blends/trunk/webtools/templates/tasks.xhtml
URL: http://svn.debian.org/wsvn/blends/blends/trunk/webtools/templates/tasks.xhtml?rev=3339&op=diff
==============================================================================
--- blends/trunk/webtools/templates/tasks.xhtml (original)
+++ blends/trunk/webtools/templates/tasks.xhtml Mon May 21 11:59:56 2012
@@ -94,9 +94,7 @@
                ${project.responsible} <span py:if="project.properties.has_key('changed_by')">(${project.properties['changed_by']})</span>
              </div>
 	   </td>
-	   <td py:if="project.component" class="project-info">
-	    <div py:choose="">
-            <span py:when="project.pkgstatus != 'new' and project.pkgstatus != 'pkgvcs'">
+	   <td py:if="project.component and project.pkgstatus != 'new' and project.pkgstatus != 'pkgvcs'" class="project-info">
 	     <span py:if="project.version != []" class="tooltip" id="${project.pkg}-versions">
 	       <table class="versionclass">
 		 <tr><th colspan="3" class="versionclass"><strong>Versions of package ${project.pkg}</strong></th></tr>
@@ -131,11 +129,6 @@
 		 <div class="project-infomissing"><a href="http://debtags.alioth.debian.org/edit.html?pkg=${project.pkg}">Go tagging</a></div>
 	       </div>
 	     </div>
-	    </span>
-            <span py:otherwise="">
-	     <span py:if="project.version != []">Version: ${project.version[0]}</span>
-            </span>
-            </div>
            </td>
            <td class="project-license">
              <em>${license}: ${project.properties['license']}</em>
@@ -156,6 +149,7 @@
                </div>
             </div>
             <div class="language" py:if="project.properties.has_key('language') and project.component != 'main'">Language: ${project.properties['language']}</div>
+            <div py:if="project.version != [] and (project.pkgstatus == 'new' or project.pkgstatus == 'pkgvcs')">Version: ${project.version[0]}</div>
            </td>
          </tr>
          <tr>