X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-web.git/blobdiff_plain/d6a12bd1e32e3f9bc63c2c6f1d2d2793a9eee4d2..2be0969e153ace507ec07b27d156b50e54e00f94:/code/templates/skeleton.mako

diff --git a/code/templates/skeleton.mako b/code/templates/skeleton.mako
index d602252..e5f3346 100644
--- a/code/templates/skeleton.mako
+++ b/code/templates/skeleton.mako
@@ -5,10 +5,12 @@ 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>
-  <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" />
-  <script type="text/javascript" src="static/prototype.js"></script>
+  <base href="${cherrypy.request.base}${"/admin/" if cherrypy.request.state.isadmin else ""}" />
+  <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" />
+  <script type="text/javascript" src="/static/nc.js"></script>
+  <script type="text/javascript" src="/static/prototype.js"></script>
   <script type="text/javascript">
 var helpWin = null;
 function closeWin(){
@@ -46,30 +48,35 @@ 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>.
+% if cherrypy.request.state.isadmin:
+You are currently authenticated as an administrator.
+% endif
+</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>
 
 % endif
 
-<div id="result" class="result">
+% if not simple:
+<h1>${self.title()} &mdash; XVM</h1>
+% endif
+
 % if result:
+<div id="result" class="result">
 ${result}
-% endif
 </div>
-
-% if not simple:
-<h1>${self.title()} &mdash; XVM</h1>
 % endif
+
 ${next.body()}
 % if not simple:
 <hr />
