(Forget to make this to test it)

svn path=/trunk/web/; revision=206

diff --git a/templates/skeleton.py b/templates/skeleton.py
index b2643b4..dc00887 100644 (file)
--- a/templates/skeleton.py
+++ b/templates/skeleton.py
@@ -32,12 +32,12 @@ VFFSL=valueFromFrameOrSearchList
 VFSL=valueFromSearchList
 VFN=valueForName
 currentTime=time.time
 VFSL=valueFromSearchList
 VFN=valueForName
 currentTime=time.time

-__CHEETAH_version__ = '2.0rc8'
-__CHEETAH_versionTuple__ = (2, 0, 0, 'candidate', 8)
-__CHEETAH_genTime__ = 1192883107.2947011
-__CHEETAH_genTimestamp__ = 'Sat Oct 20 08:25:07 2007'
+__CHEETAH_version__ = '2.0rc7'
+__CHEETAH_versionTuple__ = (2, 0, 0, 'candidate', 7)
+__CHEETAH_genTime__ = 1192883610.434917
+__CHEETAH_genTimestamp__ = 'Sat Oct 20 08:33:30 2007'

 __CHEETAH_src__ = 'skeleton.tmpl'
 __CHEETAH_src__ = 'skeleton.tmpl'

-__CHEETAH_srcLastModified__ = 'Sat Oct 20 08:22:11 2007'
+__CHEETAH_srcLastModified__ = 'Sat Oct 20 08:33:05 2007'

 __CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine'
 
 if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple:
 __CHEETAH_docstring__ = 'Autogenerated by CHEETAH: The Python-Powered Template Engine'
 
 if __CHEETAH_versionTuple__ < RequiredCheetahVersionTuple:

@@ -100,10 +100,10 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
   <script type="text/javascript">
 var helpWin = null;
 function closeWin(){
   <script type="text/javascript">
 var helpWin = null;
 function closeWin(){

-\tif (helpWin != null){
-\t\tif(!helpWin.closed)
-\t\t\thelpWin.close();
-\t}
+       if (helpWin != null){
+               if(!helpWin.closed)
+                       helpWin.close();
+       }

 }
 
 function helppopup(name){
 }
 
 function helppopup(name){

@@ -117,12 +117,12 @@ function helppopup(name){
 Ajax.Responders.register({
   onCreate: function(){
     if (Ajax.activeRequestCount > 0) {
 Ajax.Responders.register({
   onCreate: function(){
     if (Ajax.activeRequestCount > 0) {

-       document.getElementById("loadingnotice").style.display = \'block\';
+       document.getElementById("loadingnotice").style.display = 'block';

     }
   }, 
   onComplete: function(){
     if (Ajax.activeRequestCount == 0) {
     }
   }, 
   onComplete: function(){
     if (Ajax.activeRequestCount == 0) {

-      document.getElementById("loadingnotice").style.display = \'none\';
+      document.getElementById("loadingnotice").style.display = 'none';

     } 
   }
 });
     } 
   }
 });

@@ -130,7 +130,7 @@ function replaceFunc(transport) {
   try {
     d = transport.responseText.evalJSON();
   } catch (e) {
   try {
     d = transport.responseText.evalJSON();
   } catch (e) {

-    $(\'body\').innerHTML = \'<pre>\'+transport.responseText+\'</pre>\'
+    $('body').innerHTML = '<pre>'+transport.responseText+'</pre>'

     return;
   }
   for(key in d) {
     return;
   }
   for(key in d) {

@@ -139,8 +139,8 @@ function replaceFunc(transport) {
 }
 
 function jsFormSubmit(location, elt){
 }
 
 function jsFormSubmit(location, elt){

-  new Ajax.Request(location, {method: \'post\', 
-  parameters: Form.serialize(elt)+\'&js=true\', 
+  new Ajax.Request(location, {method: 'post', 
+  parameters: Form.serialize(elt)+'&js=true', 

   onSuccess: replaceFunc,
   onComplete: function() {Form.enable(elt);}
   });
   onSuccess: replaceFunc,
   onComplete: function() {Form.enable(elt);}
   });

@@ -149,19 +149,16 @@ function jsFormSubmit(location, elt){
 }
 
 function rowFormSubmit(elt, retpage){
 }
 
 function rowFormSubmit(elt, retpage){

-  new Ajax.Request(\'command\', {method: \'post\', 
-  parameters: Form.serialize(elt)+\'&js=\'+retpage, 
+  new Ajax.Request('command', {method: 'post', 
+  parameters: Form.serialize(elt)+'&js='+retpage, 

   onSuccess: replaceFunc
   });
   return false;
 }
 
   onSuccess: replaceFunc
   });
   return false;
 }
 

-window.onload = {
+window.onload = function (){

   //Fix bug with disabled elements
   //Fix bug with disabled elements

-  $''')
-        _v = 'form' # "$('form')" on line 75, col 4
-        if _v is not None: write(_filter(_v, rawExpr="$('form')")) # from line 75, col 4.
-        write('''.each(Form.enable);
+  $$('form').each(Form.enable);

 }
 
 </script>
 }
 
 </script>

@@ -171,16 +168,13 @@ window.onload = {
 <div id="err">
 ''')
         if VFFSL(SL,"varExists",False)('error_text'): # generated from line 83, col 1
 <div id="err">
 ''')
         if VFFSL(SL,"varExists",False)('error_text'): # generated from line 83, col 1

-            write('''<p>STDERR:</p><pre>''')
+            write('<p>STDERR:</p><pre>')

             _v = VFFSL(SL,"error_text",True) # '$error_text' on line 84, col 20
             if _v is not None: write(_filter(_v, rawExpr='$error_text')) # from line 84, col 20.
             _v = VFFSL(SL,"error_text",True) # '$error_text' on line 84, col 20
             if _v is not None: write(_filter(_v, rawExpr='$error_text')) # from line 84, col 20.

-            write('''</pre>
-''')
-        write('''</div>
-
-''')
+            write('</pre>\n')
+        write('</div>\n\n')

         if not VFFSL(SL,"varExists",False)('simple') or not VFFSL(SL,"simple",True): # generated from line 88, col 1
         if not VFFSL(SL,"varExists",False)('simple') or not VFFSL(SL,"simple",True): # generated from line 88, col 1

-            write('''<p>[You are logged in as ''')
+            write('<p>[You are logged in as ')

             _v = VFFSL(SL,"user.username",True) # '$user.username' on line 89, col 26
             if _v is not None: write(_filter(_v, rawExpr='$user.username')) # from line 89, col 26.
             write('''.]</p>
             _v = VFFSL(SL,"user.username",True) # '$user.username' on line 89, col 26
             if _v is not None: write(_filter(_v, rawExpr='$user.username')) # from line 89, col 26.
             write('''.]</p>

@@ -189,17 +183,14 @@ window.onload = {
 <p><a href="list">List</a> 
 ''')
             if VFFSL(SL,"varExists",False)('machine'): # generated from line 93, col 1
 <p><a href="list">List</a> 
 ''')
             if VFFSL(SL,"varExists",False)('machine'): # generated from line 93, col 1

-                write('''<a href="info?machine_id=''')
+                write('<a href="info?machine_id=')

                 _v = VFFSL(SL,"machine.machine_id",True) # '$machine.machine_id' on line 94, col 26
                 if _v is not None: write(_filter(_v, rawExpr='$machine.machine_id')) # from line 94, col 26.
                 _v = VFFSL(SL,"machine.machine_id",True) # '$machine.machine_id' on line 94, col 26
                 if _v is not None: write(_filter(_v, rawExpr='$machine.machine_id')) # from line 94, col 26.

-                write('''">Info</a>
-<a href="vnc?machine_id=''')
+                write('">Info</a>\n<a href="vnc?machine_id=')

                 _v = VFFSL(SL,"machine.machine_id",True) # '$machine.machine_id' on line 95, col 25
                 if _v is not None: write(_filter(_v, rawExpr='$machine.machine_id')) # from line 95, col 25.
                 _v = VFFSL(SL,"machine.machine_id",True) # '$machine.machine_id' on line 95, col 25
                 if _v is not None: write(_filter(_v, rawExpr='$machine.machine_id')) # from line 95, col 25.

-                write('''">Console</a>
-''')
-            write('''<a href="help">Help</a></p>
-''')
+                write('">Console</a>\n')
+            write('<a href="help">Help</a></p>\n')

         write('''</div>
 
 <div id="loadingnotice" class="loadingnotice">LOADING</div>
         write('''</div>
 
 <div id="loadingnotice" class="loadingnotice">LOADING</div>

@@ -208,15 +199,10 @@ window.onload = {
 ''')
         _v = VFFSL(SL,"body",True) # '$body' on line 104, col 1
         if _v is not None: write(_filter(_v, rawExpr='$body')) # from line 104, col 1.
 ''')
         _v = VFFSL(SL,"body",True) # '$body' on line 104, col 1
         if _v is not None: write(_filter(_v, rawExpr='$body')) # from line 104, col 1.

-        write('''
-''')
+        write('\n')

         if not VFFSL(SL,"varExists",False)('simple') or not VFFSL(SL,"simple",True): # generated from line 105, col 1
         if not VFFSL(SL,"varExists",False)('simple') or not VFFSL(SL,"simple",True): # generated from line 105, col 1

-            write('''<hr />
-Questions? Contact <a href="mailto:sipb-xen-dev@mit.edu">sipb-xen-dev@mit.edu</a>.
-''')
-        write('''</body>
-</html>
-''')
+            write('<hr />\nQuestions? Contact <a href="mailto:sipb-xen-dev@mit.edu">sipb-xen-dev@mit.edu</a>.\n')
+        write('</body>\n</html>\n')

         
         ########################################
         ## END - generated method body
         
         ########################################
         ## END - generated method body

@@ -243,8 +229,7 @@ Questions? Contact <a href="mailto:sipb-xen-dev@mit.edu">sipb-xen-dev@mit.edu</a
         ########################################
         ## START - generated method body
         
         ########################################
         ## START - generated method body
         

-        write('''
-''')
+        write('\n')

         
         ########################################
         ## END - generated method body
         
         ########################################
         ## END - generated method body

diff --git a/templates/skeleton.tmpl b/templates/skeleton.tmpl
index 7964aca..dab9ab0 100644 (file)
--- a/templates/skeleton.tmpl
+++ b/templates/skeleton.tmpl
@@ -70,9 +70,9 @@ function rowFormSubmit(elt, retpage){
   return false;
 }
 
   return false;
 }
 

-window.onload = {
+window.onload = function (){

   //Fix bug with disabled elements
   //Fix bug with disabled elements

-  $$('form').each(Form.enable);
+  \$\$('form').each(Form.enable);

 }
 
 </script>
 }
 
 </script>