Index: package_branches/invirt-web/cherrypy-rebased/code/templates/helloworld.mako =================================================================== --- package_branches/invirt-web/cherrypy-rebased/code/templates/helloworld.mako (revision 2666) +++ package_branches/invirt-web/cherrypy-rebased/code/templates/helloworld.mako (revision 2666) @@ -0,0 +1,7 @@ +<%inherit file="skeleton.mako" /> + +Hello world! + +<%def name="title()"> +helloworld + Index: package_branches/invirt-web/cherrypy-rebased/code/templates/skeleton.mako =================================================================== --- package_branches/invirt-web/cherrypy-rebased/code/templates/skeleton.mako (revision 2666) +++ package_branches/invirt-web/cherrypy-rebased/code/templates/skeleton.mako (revision 2666) @@ -0,0 +1,82 @@ +<%page expression_filter="h"/> + + +${self.title()} — XVM + + + + + + + + +% if False: +
+

We are in the process of modifying the service. Things likely will not work.

+
+% endif + +% if error_text is not UNDEFINED: +
+

STDERR:

${error_text}
+
+% endif + +% if not simple: +% if user: +

Welcome, ${user}.

+% endif + + + +% endif + +
+% if result: +${result} +% endif +
+ +% if not simple: +

${self.title()} — XVM

+% endif +${next.body()} +% if not simple: +
+Questions? Contact xvm@mit.edu. +% endif + + + +<%def name="title()"> +XVM + Index: package_branches/invirt-web/cherrypy-rebased/code/templates/skeleton.tmpl =================================================================== --- package_branches/invirt-web/cherrypy-rebased/code/templates/skeleton.tmpl (revision 2665) +++ (revision ) @@ -1,80 +1,0 @@ -#from functions import functions -#extends functions - -#def full_body - - -$title — XVM - - - - - - - - -#if False -
-

We are in the process of modifying the service. Things likely will not work.

-
-#end if - -
-#if $varExists('error_text') -

STDERR:

$error_text
-#end if -
- -#if not $varExists('simple') or not $simple -

Welcome, $user.

- - -#end if -
-#if $varExists('result') -$result -#end if -
- -#if not $varExists('simple') or not $simple -

$title — XVM

-#end if -#filter None -$body -#end filter -#if not $varExists('simple') or not $simple -
-Questions? Contact xvm@mit.edu. -#end if - - -#end def