X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/f6bddba1c55448fae6674bb03838fceb4bd982ba..93de0c02b63e2eb954a00d4e8b481b5df0560dfb:/code/templates/functions.mako

diff --git a/code/templates/functions.mako b/code/templates/functions.mako
index a72648a..7b46a35 100644
--- a/code/templates/functions.mako
+++ b/code/templates/functions.mako
@@ -15,19 +15,19 @@ onchange="${onchange}"\
 </%def>
 
 <%def name="cdromList(default='', onchange=None)">
-${databaseList(sorted(database.CDROM.query(), key=lambda x: x.description),
+${databaseList(sorted(database.CDROM.query, key=lambda x: x.description),
                default, onchange, 'cdrom', 'cdromlist', 'cdrom_id', 'description')|n}
 </%def>
 
 <%def name="autoList(default='', onchange=None)">
-${databaseList(sorted(database.Autoinstall.query(), key=lambda x: x.description),
+${databaseList(sorted(database.Autoinstall.query, key=lambda x: x.description),
                default, onchange, 'autoinstall', 'autoinstalllist', 'autoinstall_id', 'description')|n}
 </%def>
 
 <%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>
@@ -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 nl2br(string):
+    return string.replace('\n', '<br/>')
 %>
 
 <%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>