projects
/
invirt/packages/invirt-web.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Get username from cherrypy request object
[invirt/packages/invirt-web.git]
/
code
/
templates
/
skeleton.mako
diff --git
a/code/templates/skeleton.mako
b/code/templates/skeleton.mako
index
0fd67e3
..
a619a67
100644
(file)
--- a/
code/templates/skeleton.mako
+++ b/
code/templates/skeleton.mako
@@
-1,4
+1,5
@@
<%page expression_filter="h"/>
<%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">
<!DOCTYPE html
PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
@@
-45,8
+46,8
@@
function helppopup(name){
% endif
% if not simple:
% 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">
% endif
<ul class="navigation">