Translate newlines to break tags in the machine description.

svn path=/package_branches/invirt-web/cherrypy-rebased/; revision=2682

diff --git a/code/templates/functions.mako b/code/templates/functions.mako
index a72648a..4f23635 100644 (file)
--- a/code/templates/functions.mako
+++ b/code/templates/functions.mako
@@ -43,6 +43,9 @@ ${databaseList(sorted(database.Autoinstall.query(), key=lambda x: x.description)
 <%!
 def jquote(string):
     return "'" + string.replace('\\', '\\\\').replace("'", "\\'").replace('\n', '\\n') + "'"
 <%!
 def jquote(string):
     return "'" + string.replace('\\', '\\\\').replace("'", "\\'").replace('\n', '\\n') + "'"

+
+def nl2br(string):
+    return string.replace('\n', '<br/>')

 %>
 
 <%def name="helppopup(subj)">
 %>
 
 <%def name="helppopup(subj)">

diff --git a/code/templates/list.mako b/code/templates/list.mako
index e500896..71afd55 100644 (file)
--- a/code/templates/list.mako
+++ b/code/templates/list.mako
@@ -120,7 +120,7 @@ ${has_vnc[machine]}
 </td>
       </tr>
       <tr>
 </td>
       </tr>
       <tr>

-        <td colspan="7" style="padding-left: 1em; color: #666">${machine.description}</td>
+        <td colspan="7" style="padding-left: 1em; color: #666">${machine.description|self.fn.module.nl2br}</td>

       </tr>
 </%def>
 
       </tr>
 </%def>