configurize web templates

svn path=/trunk/packages/sipb-xen-www/; revision=866

diff --git a/code/main.py b/code/main.py
index 8990e51..bb863c1 100755 (executable)
--- a/code/main.py
+++ b/code/main.py
@@ -85,6 +85,7 @@ def makeErrorPre(old, addition):
         return '<p>STDERR:</p><pre>' + str(addition) + '</pre>'
 
 Template.database = database
         return '<p>STDERR:</p><pre>' + str(addition) + '</pre>'
 
 Template.database = database

+Template.config = config

 Template.helppopup = staticmethod(helppopup)
 Template.err = None
 
 Template.helppopup = staticmethod(helppopup)
 Template.err = None
 

diff --git a/code/templates/info.tmpl b/code/templates/info.tmpl
index 2c3d28c..9346129 100644 (file)
--- a/code/templates/info.tmpl
+++ b/code/templates/info.tmpl
@@ -87,7 +87,7 @@ $errorRow('administrator', $err)
 $errorRow('contact', $err)
 #end filter
 #if not $on
 $errorRow('contact', $err)
 #end filter
 #if not $on

-    <tr><td>Machine Name:</td><td><input type="text" name="name" value="$defaults.name"/></td></tr>
+    <tr><td>Machine Name:</td><td><input type="text" name="name" value="$defaults.name"/>.${config.dns.domains[0]}</td></tr>

 #filter None
 $errorRow('name', $err)
 #end filter
 #filter None
 $errorRow('name', $err)
 #end filter

diff --git a/code/templates/list.tmpl b/code/templates/list.tmpl
index 89a75d8..63dfa38 100644 (file)
--- a/code/templates/list.tmpl
+++ b/code/templates/list.tmpl
@@ -25,7 +25,7 @@ VM List
 #end filter
        <tr>
          <td>Name</td>
 #end filter
        <tr>
          <td>Name</td>

-         <td><input type="text" name="name" value="$defaults.name"/>.xvm.mit.edu</td>
+         <td><input type="text" name="name" value="$defaults.name"/>.${config.dns.domains[0]}</td>

        </tr>
 #filter None
 $errorRow('name', $err)
        </tr>
 #filter None
 $errorRow('name', $err)