Make commands work from list and info pages

[invirt/packages/invirt-web.git] / code / templates / skeleton.mako
diff --git a/code/templates/skeleton.mako b/code/templates/skeleton.mako

index 0fd67e3..9c60c56 100644 (file)
--- a/code/templates/skeleton.mako
+++ b/code/templates/skeleton.mako
@@ -1,9 +1,11 @@
  <%page expression_filter="h"/>
+<%namespace name="fn" file="functions.mako" inheritable="True"/>
  <!DOCTYPE html
  PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
  "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
  <html>
  <head><title>${self.title()} &mdash; XVM</title>
+  <base href="${cherrypy.request.base}" />
    <link href="static/favicon.ico" type="image/x-icon" rel="shortcut icon">
    <link rel="stylesheet" href="static/style.css" type="text/css" />
    <link rel="stylesheet" href="static/layout.css" type="text/css" media="screen" />
@@ -45,15 +47,15 @@ function helppopup(name){
  % endif
  
  % if not simple:
-% if user:
-<p class="loggedin">Welcome, <span class="name">${user}</span>.</p>
+% if cherrypy.request.login:
+<p class="loggedin">Welcome, <span class="name">${cherrypy.request.login}</span>.</p>
  % endif
  
  <ul class="navigation">
  <li><a href="list">List</a></li>
  % if machine:
-<li><a href="info?machine_id=${machine.machine_id}">Info</a></li>
-<li><a href="vnc?machine_id=${machine.machine_id}">Console</a></li>
+<li><a href="machine/${machine.machine_id}">Info</a></li>
+<li><a href="machine/${machine.machine_id}/vnc">Console</a></li>
  % endif
  <li><a href="help">Help</a></li>
  </ul>