[Blends-commit] [SCM] website branch, master, updated. 9ca4c42bb13d781723fbbf9e9eb981c48c113623

Thu Aug 1 13:41:47 UTC 2013

The following commit has been merged in the master branch:
commit 9ca4c42bb13d781723fbbf9e9eb981c48c113623
Author: Andreas Tille <tille at debian.org>
Date:   Thu Aug 1 15:45:16 2013 +0200

    Print full titles of tasks not just their internal name

diff --git a/webtools/bugs_udd.py b/webtools/bugs_udd.py
index d23bcb8..3edd276 100755
--- a/webtools/bugs_udd.py
+++ b/webtools/bugs_udd.py
@@ -111,7 +111,7 @@ def main():
     
     # What tasks are involved
     query = """PREPARE query_get_tasks (text) AS
-      SELECT task, description, long_description FROM blends_tasks WHERE blend = $1 ORDER BY task;
+      SELECT task, title, description, long_description FROM blends_tasks WHERE blend = $1 ORDER BY task;
     """
     _execute_udd_query(query)
 
@@ -145,6 +145,7 @@ def main():
         for t in RowDictionaries(curs):
             task = t['task']
             bugs_data[task] = {}
+            bugs_data[task]['title']		= t['title']
             bugs_data[task]['description']	= t['description']
             bugs_data[task]['long_description']	= t['long_description']
             bugs_data[task]['nopenbugs']	= 0
diff --git a/webtools/templates/bugs_idx_udd.xhtml b/webtools/templates/bugs_idx_udd.xhtml
index 3dd5e36..50233bf 100644
--- a/webtools/templates/bugs_idx_udd.xhtml
+++ b/webtools/templates/bugs_idx_udd.xhtml
@@ -49,7 +49,7 @@
 			<p>$gtstrListOfBugspages</p>
 			<dl>
                              <py:for each="task in sorted(bugs_data.iterkeys())">
-                                <dt class="${bugs_data[task]['weightedclass']}"><a href="${task}.html" name="${task}" id="${task}">${task.capitalize()} - ${bugs_data[task]['description']}</a> (${bugs_data[task]['weighttask']}<sup>*</sup>)</dt>
+                                <dt class="${bugs_data[task]['weightedclass']}"><a href="${task}.html" name="${task}" id="${task}">${bugs_data[task]['title'].capitalize()} - ${bugs_data[task]['description']}</a> (${bugs_data[task]['weighttask']}<sup>*</sup>)</dt>
 				<dd>${bugs_data[task]['long_description']}</dd>
                              </py:for>
 			</dl>
diff --git a/webtools/templates/bugs_udd.xhtml b/webtools/templates/bugs_udd.xhtml
index eb29c94..f225336 100644
--- a/webtools/templates/bugs_udd.xhtml
+++ b/webtools/templates/bugs_udd.xhtml
@@ -4,7 +4,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="${lang}" lang="${lang}"
       xmlns:py="http://genshi.edgewall.org/">
 <head>
-<title>$projectname ${task.capitalize()} bugs</title>
+<title>$projectname ${bugs_data[task]['title'].capitalize()} bugs</title>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8"/>
 <link href="${css}" type="text/css" rel="stylesheet"/>
 </head>
@@ -51,8 +51,8 @@
                           <py:for each="t in sorted(bugs_data.iterkeys())">
                             <div py:choose="t">
                               <span py:when="task"
-                              class="curlink"><a href="${t}.html">${t.capitalize()}</a> ${bugs_data[t]['nopenbugs']} (${bugs_data[t]['weighttask']})</span>
-                              <span py:otherwise="" class="link ${bugs_data[t]['weightedclass']}"><a href="${t}.html">${t.capitalize()}</a> ${bugs_data[t]['nopenbugs']} (${bugs_data[t]['weighttask']})</span>
+                              class="curlink"><a href="${t}.html">${bugs_data[t]['title'].capitalize()}</a> ${bugs_data[t]['nopenbugs']} (${bugs_data[t]['weighttask']})</span>
+                              <span py:otherwise="" class="link ${bugs_data[t]['weightedclass']}"><a href="${t}.html">${bugs_data[t]['title'].capitalize()}</a> ${bugs_data[t]['nopenbugs']} (${bugs_data[t]['weighttask']})</span>
                             </div>
                           </py:for>
                         </div>
@@ -78,7 +78,7 @@
 	<td class="main">
 		<div class="pageBody">
 
-<h1>Summary bugs page of task ${task.capitalize()}</h1>
+<h1>Summary bugs page of task ${bugs_data[task]['title'].capitalize()}</h1>
 
 <div class="severitysummary">${bugs_data[task]['weightedsev']}<sup>*</sup></div>
 
@@ -133,7 +133,7 @@
     </py:for>
    </span>
   <span py:otherwise=""><h2>$projectname
-  ${task.capitalize()} has no known nbugs = ${bugs_data[task]['nopenbugs']} ndone = ${bugs_data[task]['ndonebugs']}</h2></span>
+  ${bugs_data[task]['title'].capitalize()} has no known nbugs = ${bugs_data[task]['nopenbugs']} ndone = ${bugs_data[task]['ndonebugs']}</h2></span>
 </span>
 <div class="footnotecontent">
   <sup>*</sup>${weightexplanation}

-- 
Static and dynamic websites for Debian Pure Blends

