Use expandOwner/expandAdmin rather than removed expandLocker

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

index 9c60c56..aee4769 100644 (file)
--- a/code/templates/skeleton.mako
+++ b/code/templates/skeleton.mako
@@ -5,11 +5,11 @@ 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" />
-  <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/prototype.js"></script>
    <script type="text/javascript">
  var helpWin = null;
  function closeWin(){
@@ -48,7 +48,11 @@ function helppopup(name){
  
  % if not simple:
  % if cherrypy.request.login:
-<p class="loggedin">Welcome, <span class="name">${cherrypy.request.login}</span>.</p>
+<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">
@@ -62,15 +66,16 @@ function helppopup(name){
  
  % 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 />