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

[CDD Subversion Commit]

Author: tille
Date: Sun Jun 15 21:59:28 2008
New Revision: 808

Modified:
   cdd/trunk/webtools/cddtasktools.py
   cdd/trunk/webtools/tasks.py
   cdd/trunk/webtools/templates/tasks.xhtml
Log:
Further enhancements, translations and verbatim markup not yet fully working


Modified: cdd/trunk/webtools/cddtasktools.py
==============================================================================
--- cdd/trunk/webtools/cddtasktools.py	(original)
+++ cdd/trunk/webtools/cddtasktools.py	Sun Jun 15 21:59:28 2008
@@ -21,6 +21,8 @@
 import bz2
 import re
 
+from genshi import Markup
+
 from debian_bundle import deb822
 
 BASEURL  = 'http://ftp.debian.org/'
@@ -380,7 +382,8 @@
                     responsible = stanza['responsible'].strip()
                     if responsible != '':
                         responsible = re.sub('\s*(.+)\s+<(.+ at .+)>\s*', '<a href="mailto:\\2">\\1</a>', responsible)
-                        dep.responsible = responsible
+                        # Markup to make sure the string is inserted verbatim in Template
+                        dep.responsible = Markup(responsible)
                     continue
 
                 if key in dep_strength_keys:
@@ -428,7 +431,11 @@
                                     dep.license = 'non-free'
                                 else:
                                     dep.license = 'unknown'
-                                dep.pkgShortDesc = self.available.packages[component][dep.pkg].pkgShortDesc
+                                try:
+                                    dep.pkgShortDesc = Markup(self.available.packages[component][dep.pkg].pkgShortDesc)
+                                except UnicodeDecodeError:
+                                    print self.available.packages[component][dep.pkg].pkgShortDesc
+                                    dep.pkgShortDesc = self.available.packages[component][dep.pkg].pkgShortDesc
                                 dep.pkgLongDesc  = self.available.packages[component][dep.pkg].pkgLongDesc
                                 dep.homepage     = self.available.packages[component][dep.pkg].homepage
                                 dep.version      = self.available.packages[component][dep.pkg].version

Modified: cdd/trunk/webtools/tasks.py
==============================================================================
--- cdd/trunk/webtools/tasks.py	(original)
+++ cdd/trunk/webtools/tasks.py	Sun Jun 15 21:59:28 2008
@@ -56,6 +56,7 @@
 	l10nstring[lang].install()
 	_ = l10nstring[lang].ugettext
 	data['lang']              = lang
+	data['maintainer']        = _('Maintainer')
 
 	typenames = dict (
                       official    = _('Official'),

Modified: cdd/trunk/webtools/templates/tasks.xhtml
==============================================================================
--- cdd/trunk/webtools/templates/tasks.xhtml	(original)
+++ cdd/trunk/webtools/templates/tasks.xhtml	Sun Jun 15 21:59:28 2008
@@ -56,12 +56,12 @@
        <tbody>
 	 <tr class="deb-${type}">
 	   <td class="project-name">
-	     <a name="${project}" id="${project}"/>
+	     <a name="${project.pkg}" id="${project.pkg}"/>
 	     <strong>${project.pkg}</strong>
-             <span py:if="project.wnpp != None"> - ${project.wnpp}</span><br/>
-	     <em>project.pkgShortDesc -- Markup! -- </em><br/>
-	     <a href="$project.homepage}"></a>${project.homepage}
-	     <div py:if="project.responsible != None">${maintainer}: project.responsible</div>
+             <a py:if="project.wnpp != None" href="http://bugs.debian.org/#${project.wnpp}">wnpp</a>
+	     <em>project.pkgShortDesc - Unicode Problems by Markup in cddtasktools.py</em><br/>
+	     <a href="$project.homepage}">${project.homepage}</a>
+	     <div py:if="project.responsible != None">${maintainer}: ${project.responsible}</div>
 	   </td>
 	 </tr>
        </tbody>