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

[CDD Subversion Commit]

Author: tille
Date: Sat Jun 14 13:53:43 2008
New Revision: 806

Modified:
   cdd/trunk/webtools/tasks.py
   cdd/trunk/webtools/templates/tasks.xhtml
Log:
Some reasonable test output more parameters to add


Modified: cdd/trunk/webtools/tasks.py
==============================================================================
--- cdd/trunk/webtools/tasks.py	(original)
+++ cdd/trunk/webtools/tasks.py	Sat Jun 14 13:53:43 2008
@@ -67,11 +67,19 @@
 	for task in tasks:
 
 		data['task']         = task
-		# data['shortdesc']    = task_details[task]['ShortDesc']
-		# data['longdesc']    = task_details[task]['LongDesc']
-		data['projects'] = cdeps.GetListOfDepsForTask(task, dependencytypes=())
+		# data['shortdesc']  = task_details[task]['ShortDesc']
+		# data['longdesc']   = task_details[task]['LongDesc']
+		data['projectkeys']  = cdeps.GetListOfDepsForTask(task, dependencytypes=())
+		data['dependencies'] = cdeps.tasks[task].dependencies.keys()
+		data['projects']     = cdeps.tasks[task].dependencies
 
-		outputfile = OUTPUTDIR[CDD] + task + '_' + lang + '.html'
+		# print data['dependencies'] # ['unofficial', 'prospective', 'official', 'unknown']
+		# print data['dependencies']['official'] # TypeError: list indices must be integers
+		# print data['projects'] # {'unofficial': [<cddtasktools.DependantPackage instance at 0xa7e8a4c>, <cddtasktools.DependantPackage instance at 0xa7ed4cc>,
+		# print data['projects']['official'][0]['Homepage'] # AttributeError: DependantPackage instance has no attribute '__getitem__'
+		print data['projects']['official'][0].homepage
+
+		outputfile = OUTPUTDIR[CDD] + '/' + task + '_' + lang + '.html'
 		try:
 			os.unlink(outputfile)
 		except: # simply continue if file does not exist

Modified: cdd/trunk/webtools/templates/tasks.xhtml
==============================================================================
--- cdd/trunk/webtools/templates/tasks.xhtml	(original)
+++ cdd/trunk/webtools/templates/tasks.xhtml	Sat Jun 14 13:53:43 2008
@@ -46,34 +46,18 @@
 	<td class="main">
 		<div class="pageBody">
 			<h1>$projectname $task packages</h1>
-<py:for each="type in ('official', 'unofficial', 'prospective')">
+<py:for each="type in dependencies">
 			<h2>
 <a id="${type}-debs" name="${type}-debs"/>
        ${typeheading}
 </h2>
-   <py:for each="project in projectkeys">
-			
+   <py:for each="project in projects[type]">
      <table class="project" summary="$project">
        <tbody>
 	 <tr class="deb-${type}">
 	   <td class="project-name">
 	     <a name="${project}" id="${project}"/>
-	     <strong>${projects[task]['Projectname']}</strong>
-             <span py:if="projects[task]['WNPP'] != None"> - ${projects[task]['WNPP']}</span><br/>
-	     <em>${projects[task]['ProjectShortDescription']}</em><br/>
-	     <a href="${projects[task]['URL']}"></a>${projects[task]['URL']}
-	     <div py:if="projects[task]['mailto'] != None">${maintainer}:
-                 <a href="mailto:${projects[task]['mailto']}">${projects[task]['mailtoname']}</a>
-	     </div>
-	   </td>
-	   <td class="project-license">
-	     <div py:if="projects[task]['Version'] != None"><em>${version}: ${projects[task]['Version']}</em></div>
-	     <em>${license}: ${projects[task]['License']}</em><br/>
-							<a href="http://packages.debian.org/unstable/science/aeskulap">Official Debian package</a> - <a href="http://ftp.debian.org/pool/main/a/aeskulap/aeskulap_0.2.2b1-1_i386.deb"><img src="deb-icon.png"/></a>
-	   </td>
-	 </tr>
-	 <tr>
-	   <td colspan="2" class="project-description">${projects[task]['ProjectLongDescription']}
+	     <strong>${project.pkg}</strong>
 	   </td>
 	 </tr>
        </tbody>