Updates to cherrypy init for engine

[invirt/packages/invirt-web.git] / code / templates / functions.mako

diff --git a/code/templates/functions.mako b/code/templates/functions.mako
index a72648a..f5a9166 100644 (file)
--- a/code/templates/functions.mako
+++ b/code/templates/functions.mako
@@ -27,7 +27,7 @@ ${databaseList(sorted(database.Autoinstall.query(), key=lambda x: x.description)
 <%def name="vmTypeList(default=None)">
 % for vmtype in (('linux-hvm', 'HVM'), ('linux', 'ParaVM'), ):
 <label>
 <%def name="vmTypeList(default=None)">
 % for vmtype in (('linux-hvm', 'HVM'), ('linux', 'ParaVM'), ):
 <label>

-   <input ${'checked="checked"' if default == vmtype[0] else ''} type="radio" name="vmtype" id="vmtype-${vmtype[0]}" value="${vmtype[0]}">${vmtype[1]}</input>
+   <input ${'checked="checked"' if default == vmtype[0] else '' | n} type="radio" name="vmtype" id="vmtype-${vmtype[0]}" value="${vmtype[0]}" />${vmtype[1]}

 </label>
 % endfor
 </%def>
 </label>
 % endfor
 </%def>

@@ -43,9 +43,12 @@ ${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)">
 ## Return HTML code for a (?) link to a specified help topic
 %>
 
 <%def name="helppopup(subj)">
 ## Return HTML code for a (?) link to a specified help topic

-<span class="helplink"><a href="help?simple=true;subject=${subj | u}" target="_blank" onclick="return helppopup(${subj | u,jquote})">(?)</a></span>
+<span class="helplink"><a href="help?simple=true;subject=${subj | u}" target="_blank" onclick="return helppopup(${subj | jquote})">(?)</a></span>

 </%def>
 </%def>