[Cdd-commits] r765 - in cdd/trunk/webtools: . templates

[CDD Subversion Commit]

Author: tille
Date: Mon May 26 06:46:13 2008
New Revision: 765

Modified:
   cdd/trunk/webtools/cddtasktools.py
   cdd/trunk/webtools/tasks_idx.py
   cdd/trunk/webtools/templates/tasks_idx.xhtml
Log:
Add short descriptions of tasks.


Modified: cdd/trunk/webtools/cddtasktools.py
==============================================================================
--- cdd/trunk/webtools/cddtasktools.py	(original)
+++ cdd/trunk/webtools/cddtasktools.py	Mon May 26 06:46:13 2008
@@ -438,7 +438,7 @@
                     continue
                 # The following keys will be mostly used for programs that
                 # are not yet existing in Debian and will go to our todo list
-                if key == 'homepage':
+                if key == 'Homepage':
                     if dep != None:
                         dep.homepage = stanza['homepage']
                     else:

Modified: cdd/trunk/webtools/tasks_idx.py
==============================================================================
--- cdd/trunk/webtools/tasks_idx.py	(original)
+++ cdd/trunk/webtools/tasks_idx.py	Mon May 26 06:46:13 2008
@@ -1,11 +1,23 @@
 #!/usr/bin/python
 
+import apt
+import apt_pkg
+import apt_inst
+
 from os import path
 import gettext
 
 from genshi.template import TemplateLoader
 from genshi import Markup
 
+from cddtasktools import CddDependencies, HTMLBASE, REPOS
+
+CDD='debian-med'
+
+cdeps=CddDependencies(CDD)
+cdeps.GetAllDependencies()
+tasksdict = cdeps.GetTaskDescDict()
+
 # Define directories used
 current_dir = path.dirname(__file__)
 locale_dir = path.join(current_dir, 'locale')
@@ -28,10 +40,13 @@
 		projectname	= 'Debian Med',
 		projecturl	= 'http://debian-med.alioth.debian.org/',
 		logourl		= 'http://people.debian.org/~tille/debian-med/logos/med-06.jpg',
-		tasks		= ('Bio', 'Bio-dev', 'Imaging'),
-		taskshortdesc	= 'Debian-Med imaging packages'
+		tasks		= tasksdict,
              )
 
+#for task in tasksdict.keys():
+#    	 data['tasks'].append(tasksdict[task]['Task'])
+#    	 data['taskshortdesc'].append(tasksdict[task]['ShortDesc'])
+
 for lang in languages:
 	l10nstring[lang].install()
 	_ = l10nstring[lang].ugettext

Modified: cdd/trunk/webtools/templates/tasks_idx.xhtml
==============================================================================
--- cdd/trunk/webtools/templates/tasks_idx.xhtml	(original)
+++ cdd/trunk/webtools/templates/tasks_idx.xhtml	Mon May 26 06:46:13 2008
@@ -34,11 +34,12 @@
 			<p>
 				This is a list of the Tasks $projectname is made of:
 			</p>
-			<ul>
-                             <py:for each="task in tasks">
-                                <li>${task}</li>
+			<dl>
+                             <py:for each="task in tasks.keys()">
+                                <dt>${task}</dt>
+				<dd>${tasks[task]['ShortDesc']}</dd>
                              </py:for>
-			</ul>
+			</dl>
 		</div>
 	</td>
 </tr>