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

CDD Subversion Commit noreply at alioth.debian.org
Tue Jun 3 08:43:13 UTC 2008


Author: tille
Date: Tue Jun  3 08:43:13 2008
New Revision: 783

Removed:
   cdd/trunk/webtools/templates/tasks_foot.xhtml
   cdd/trunk/webtools/templates/tasks_head.xhtml
Modified:
   cdd/trunk/webtools/tasks.py
   cdd/trunk/webtools/templates/tasks.xhtml
Log:
Reunified template parts because validation fails otherwise.


Modified: cdd/trunk/webtools/tasks.py
==============================================================================
--- cdd/trunk/webtools/tasks.py	(original)
+++ cdd/trunk/webtools/tasks.py	Tue Jun  3 08:43:13 2008
@@ -46,7 +46,7 @@
        }
 
 CDD='debian-med'
-OUTPUTDIR = { 'debian-med'     : './', # HTMLBASE+"/debian-med/static/tasks/",
+OUTPUTDIR = { 'debian-med'     : './output', # HTMLBASE+"/debian-med/static/tasks/",
               'debian-edu'     : HTMLBASE+"/cdd/htdocs/edu/tasks/",
               'debian-gis'     : HTMLBASE+"/cdd/htdocs/gis/tasks/",
               'debian-science' : HTMLBASE+"/cdd/htdocs/science/tasks/",
@@ -66,8 +66,9 @@
 
 	for task in tasks:
 
-		data['task']          = data['tasks'].keys()
-		data['taskshortdesc']
+		data['task']         = task
+		# data['shortdesc']    = task_details[task]['ShortDesc']
+		# data['longdesc']    = task_details[task]['LongDesc']
 		list_of_dependencies = cdeps.GetListOfDepsForTask(task, dependencytypes=('official',))
 
 
@@ -77,12 +78,12 @@
 		except: # simply continue if file does not exist
 			pass
 
-		template = loader.load('tasks_head.xhtml')
+		template = loader.load('tasks.xhtml')
 		f = open(outputfile, "w")
 		print >> f, template.generate(**data).render('xhtml')
 
-		template = loader.load('tasks_entries.xhtml')
-		for type in ('official', 'unofficial', 'prospective'):
-			data['typename'] = typenames['type']
+#		template = loader.load('tasks.xhtml')
+#		for type in ('official', 'unofficial', 'prospective'):
+#			data['typename'] = typenames['type']
 
 		f.close()

Modified: cdd/trunk/webtools/templates/tasks.xhtml
==============================================================================
--- cdd/trunk/webtools/templates/tasks.xhtml	(original)
+++ cdd/trunk/webtools/templates/tasks.xhtml	Tue Jun  3 08:43:13 2008
@@ -1,3 +1,52 @@
+<!DOCTYPE html
+     PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
+     "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en"
+      xmlns:py="http://genshi.edgewall.org/">
+<head>
+<title>$projectname</title>
+<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8"/>
+<link href="$css" type="text/css" rel="stylesheet"/>
+</head>
+<body>
+<div style="text-align: center;">
+<a href="$projecturl">
+	<img src="$logourl" alt="$projectname Project"/>
+</a>
+</div>
+<div class="heading" py:if="projectadvertising">
+	<div class="tabBar" style="text-align: center;">$projectadvertising</div>
+</div>
+<table class="columns">
+<tr>
+	<td class="left">
+		<span class="section">summary</span>
+		<div class="section">
+			<div class="sectionTop"/>
+			<div class="row">
+				<strong>$task</strong><br/>
+				<em>${tasks[task]['ShortDesc']}</em><br/>
+				<p>${tasks[task]['LongDesc']}</p>
+			</div>
+			<div class="row">
+				<p>
+					The list to the right includes various software projects which are of some interest to the Debian-Med Project.					Currently, only a few of them are available as Debian packages.					It is our goal, however, to include all software in Debian-Med which can sensibly add to a high quality Custom Debian Distribution.				</p>
+				<p>
+					For a better overview of the project's availability as a Debian package, each head row has a color code according to this scheme:				</p>
+				<ul>
+					<li>Green: The project is <a href="#official-debs">available as an official Debian package</a></li>
+					<li>Yellow: The project is <a href="#inofficial-debs">available as an inofficial Debian package</a></li>
+					<li>Red: The project is <a href="#debs-not-available">not (yet) available as a Debian package</a></li>
+				</ul>
+				<p>
+					If you discover a project which looks like a good candidate for Debian-Med to you, or if you have prepared an inofficial Debian package, please do not hesitate to send a description of that project to the <a href="mailto:debian-med at lists.debian.org">Debian-Med mailing list</a>				</p>
+			</div>
+		</div>
+	</td>
+	<td class="main">
+		<div class="pageBody">
+			<h1>$projectname $task packages</h1>
+<py:for each="type in ('official', 'unofficial', 'prospective')">
 			<h2>
 <a id="${type}-debs" name="${type}-debs"/>
        ${typeheading}
@@ -10,17 +59,17 @@
 	   <td class="project-name">
 	     <a name="${project}" id="${project}"/>
 	     <strong>${projects[task]['Projectname']}</strong>
-               <span py:def=${projects[task]['WNPP']}> - ${projects[task]['WNPP']}</span><br/>
+             <span py:match="${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:def=${projects[task]['mailto']}>${maintainer}:
+	     <div py:match="${projects[task]['mailto']} != None">${maintainer}:
                  <a href="mailto:${projects[task]['mailto']}">${projects[task]['mailtoname']}</a>
 	     </div>
 	   </td>
 	   <td class="project-license">
-	     <div py:def=${projects[task]['Version']}><em>${version}: ${projects[task]['Version']}</em></div>
+	     <div py:match="${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>
+							<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>
@@ -31,8 +80,21 @@
      </table>
    </py:for>
 
+<!--
 							<a href="http://sourceforge.net/project/showfiles.php?group_id=61662%26package_id=60298">Unofficial Debian package</a>
 
 
 
 							Debian package not available
+-->
+</py:for>
+		</div>
+	</td>
+</tr>
+</table>
+<address>Last update: Thu, 03 Apr 2008 12:01:16 -0000</address>
+<address>Please note: this page gets automatically updated twice a day, on 00:00 and 12:00 UTC.</address>
+<hr/>
+<address>$ SVN export - rev. 1583 - Last update by <a href="http://alioth.debian.org/users/tille">tille</a> - Fri, 14 Mar 2008 07:32:46 +0000 $</address>
+</body>
+</html>



More information about the Cdd-commits mailing list