Author: sdumitriu
Date: 2008-02-13 16:06:07 +0100 (Wed, 13 Feb 2008)
New Revision: 7582
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/header.vm
xwiki-platform/web/trunk/standard/src/main/webapp/templates/xwiki.vm
Log:
skin cleanup
Modified: xwiki-platform/web/trunk/standard/src/main/webapp/templates/header.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/header.vm
2008-02-13 15:04:18 UTC (rev 7581)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/header.vm
2008-02-13 15:06:07 UTC (rev 7582)
@@ -2,13 +2,12 @@
<div id="xwikibanner">
<div id="xwikilogo">
<a href="$xwiki.getURL("Main.WebHome", "view")">
-#set($prefdoc = $!xwiki.getDocument("XWiki.XWikiPreferences"))
-#set($logo = $!prefdoc.getAttachment("logo"))
+#set($logo = $!preferencesDoc.getAttachment("logo"))
#if(!$logo)
#set($logourl = $xwiki.getSkinFile("logo.gif"))
<img src="$logourl" alt="XWiki" width="150" height="40" />
#else
-#set($logourl = $prefdoc.getAttachmentURL($logo.filename, "download"))
+#set($logourl = $preferencesDoc.getAttachmentURL($logo.filename, "download"))
<img src="$logourl" alt="XWiki" />
#end
</a>
@@ -28,9 +27,7 @@
<a href="$regurl">$msg.get("register")</a>
#else
#set($logouturl = $xwiki.getURL("XWiki.XWikiLogout","logout",
"xredirect=$logredir"))
-#set($docuser = $xwiki.getDocument($context.user))
-#set($objuser = $docuser.getObject("XWiki.XWikiUsers",0))
-$msg.get("hello") <a
href="$docuser.getURL("view")">$docuser.display("first_name", "view",
$objuser)</a><br />
+$msg.get("hello") <a
href="$crtUserDoc.getURL("view")">$crtUserDoc.display("first_name", "view",
$userObj)</a><br />
<a href="$logouturl">$msg.get("logout")</a>
#end
#end
Modified: xwiki-platform/web/trunk/standard/src/main/webapp/templates/xwiki.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/xwiki.vm
2008-02-13 15:04:18 UTC (rev 7581)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/xwiki.vm
2008-02-13 15:06:07 UTC (rev 7582)
@@ -1,9 +1,9 @@
-#set($viewurl = $doc.getURL("view"))
+#set($viewUrl = $doc.getURL("view"))
#set($parent ="<a href='$doc.getParentURL()'>${doc.parent}</a>")
#if($tdoc)
-#set($headertitle = "<a href='$viewurl'>${tdoc.displayTitle}</a>")
+#set($headertitle = "<a href='$viewUrl'>${tdoc.displayTitle}</a>")
#else
-#set($headertitle = "<a href='$viewurl'>${doc.displayTitle}</a>")
+#set($headertitle = "<a href='$viewUrl'>${doc.displayTitle}</a>")
#end
#set($skin=$xwiki.getSkin())
#set($copyright=$xwiki.getWebCopyright())
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
