Author: sdumitriu
Date: 2008-02-13 16:31:37 +0100 (Wed, 13 Feb 2008)
New Revision: 7594
Added:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/global.vm
Removed:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/global.vm
Log:
XWIKI-2114: Upgrade the default templates
XSALBATROSS-13: Move Albatross templates files to the XWiki Core templates
directory to share them with other skins
Deleted:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/global.vm
===================================================================
--- xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/global.vm
2008-02-13 15:31:02 UTC (rev 7593)
+++ xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/global.vm
2008-02-13 15:31:37 UTC (rev 7594)
@@ -1,77 +0,0 @@
-###
-### Global header
-###
-### The uppermost area of each page
-### Contains the company logo, links to global actions and the search facility
-###
-#if($context.getMode()==0) ## Visible only in a page
-<div id="headerglobal" class="layoutsection">
-#if($context.action == "view")
-<div class="minwidthb"></div>
-#else
-<div class="minwidthd"></div>
-#end
- <div id="company">
- <div id="companylogo">
- <a href="$!xwiki.getURL("Main.WebHome", "view")" title="Home" rel="home">
-#set($logoname = $xwiki.getSkinPreference("logo", "logo.png"))
-#set($logo = $!prefdoc.getAttachment($logoname))
-#if(!$logo)
-#set($logourl = $xwiki.getSkinFile($logoname))
- <img src="$!logourl" alt="XWiki" width="200" height="70"/>
-#else
-#set($logourl = $prefdoc.getAttachmentURL($logo.filename, "download"))
- <img src="$!logourl" alt="XWiki"/>
-#end
- </a>
- </div>
- <div id="globaldoctitle">
- <h1>$!headertitle</h1>
- </div>
- </div>
- <div id="globallinks">
- <div id="globalmenu">
-#if (!$isguest)
-#if ($context.user == 'XWiki.superadmin')
- $!msg.get("superadmin") #sep()
-#else
- <a class="glink" href="$!xwiki.getURL($context.user, "view")"
id="headeruser">$!xwiki.getUserName($context.user, false)</a> #sep()
-#end
-#end
-#if ($context.action != "loginerror")
-#if ($isguest)
-#set($loginurl = $xwiki.getURL("XWiki.XWikiLogin", "login",
"xredirect=$xwiki.getURLEncoded($logredir)"))
- <a class="glink" href="$!loginurl"
id="headerlogin">$!msg.get("login")</a>#sep()
-#else
-#set($logouturl = $xwiki.getURL("XWiki.XWikiLogout","logout",
"xredirect=$xwiki.getURLEncoded($logredir)"))
- <a class="glink" href="$!logouturl"
id="headerlogout">$!msg.get("logout")</a>#sep()
-#end
-#end
-#if($isguest && $xwiki.hasAccessLevel("register", "XWiki.XWikiPreferences"))
-#set($regurl = $xwiki.getURL("XWiki.Register", "register"))
- <a class="glink" href="$!regurl"
id="headerregister">$!msg.get("core.register")</a>#sep()
-#end
-#if($hasadmin)
- <a class="glink" href="$!xwiki.getURL("XWiki.XWikiPreferences","admin")"
id="headeradmin">$!msg.get("admin")</a> #sep()
-#end
-#if($xwiki.isMultiLingual())
- <span class="glink" id="headerlanguages">
- <a href="$!doc.getURL("view",
"language=$doc.getDefaultLanguage()")">$!doc.getDefaultLanguage()</a>
- #foreach($lang in $doc.translationList)
- / <a href="$!doc.getURL("view", "language=$lang")">$!lang</a>
- #end
- </span>
-#end
-## <a href="$!xwiki.getURL("Doc.WebHome","view")">$!msg.get("doc")</a>
- </div> #*
-#if($searchdoc.isNew()==false)
- <div id="globalsearch">
- <form action="$!searchdoc.getURL("view")">
- <p><input type="text" name="text" value="" size="15"/> <input
type="submit" class="button" value="Search"/></p>
- </form>
- </div>
-#end *#
- </div>
-</div>
-#end
-### TODO: Format the header for pdf output
Copied: xwiki-platform/web/trunk/standard/src/main/webapp/templates/global.vm
(from rev 7593,
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/global.vm)
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/global.vm
(rev 0)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/global.vm
2008-02-13 15:31:37 UTC (rev 7594)
@@ -0,0 +1,77 @@
+###
+### Global header
+###
+### The uppermost area of each page
+### Contains the company logo, links to global actions and the search facility
+###
+#if($context.getMode()==0) ## Visible only in a page
+<div id="headerglobal" class="layoutsection">
+#if($context.action == "view")
+<div class="minwidthb"></div>
+#else
+<div class="minwidthd"></div>
+#end
+ <div id="company">
+ <div id="companylogo">
+ <a href="$!xwiki.getURL("Main.WebHome", "view")" title="Home" rel="home">
+#set($logoname = $xwiki.getSkinPreference("logo", "logo.png"))
+#set($logo = $!prefdoc.getAttachment($logoname))
+#if(!$logo)
+#set($logourl = $xwiki.getSkinFile($logoname))
+ <img src="$!logourl" alt="XWiki" width="200" height="70"/>
+#else
+#set($logourl = $prefdoc.getAttachmentURL($logo.filename, "download"))
+ <img src="$!logourl" alt="XWiki"/>
+#end
+ </a>
+ </div>
+ <div id="globaldoctitle">
+ <h1>$!headertitle</h1>
+ </div>
+ </div>
+ <div id="globallinks">
+ <div id="globalmenu">
+#if (!$isguest)
+#if ($context.user == 'XWiki.superadmin')
+ $!msg.get("superadmin") #sep()
+#else
+ <a class="glink" href="$!xwiki.getURL($context.user, "view")"
id="headeruser">$!xwiki.getUserName($context.user, false)</a> #sep()
+#end
+#end
+#if ($context.action != "loginerror")
+#if ($isguest)
+#set($loginurl = $xwiki.getURL("XWiki.XWikiLogin", "login",
"xredirect=$xwiki.getURLEncoded($logredir)"))
+ <a class="glink" href="$!loginurl"
id="headerlogin">$!msg.get("login")</a>#sep()
+#else
+#set($logouturl = $xwiki.getURL("XWiki.XWikiLogout","logout",
"xredirect=$xwiki.getURLEncoded($logredir)"))
+ <a class="glink" href="$!logouturl"
id="headerlogout">$!msg.get("logout")</a>#sep()
+#end
+#end
+#if($isguest && $xwiki.hasAccessLevel("register", "XWiki.XWikiPreferences"))
+#set($regurl = $xwiki.getURL("XWiki.Register", "register"))
+ <a class="glink" href="$!regurl"
id="headerregister">$!msg.get("core.register")</a>#sep()
+#end
+#if($hasadmin)
+ <a class="glink" href="$!xwiki.getURL("XWiki.XWikiPreferences","admin")"
id="headeradmin">$!msg.get("admin")</a> #sep()
+#end
+#if($xwiki.isMultiLingual())
+ <span class="glink" id="headerlanguages">
+ <a href="$!doc.getURL("view",
"language=$doc.getDefaultLanguage()")">$!doc.getDefaultLanguage()</a>
+ #foreach($lang in $doc.translationList)
+ / <a href="$!doc.getURL("view", "language=$lang")">$!lang</a>
+ #end
+ </span>
+#end
+## <a href="$!xwiki.getURL("Doc.WebHome","view")">$!msg.get("doc")</a>
+ </div> #*
+#if($searchdoc.isNew()==false)
+ <div id="globalsearch">
+ <form action="$!searchdoc.getURL("view")">
+ <p><input type="text" name="text" value="" size="15"/> <input
type="submit" class="button" value="Search"/></p>
+ </form>
+ </div>
+#end *#
+ </div>
+</div>
+#end
+### TODO: Format the header for pdf output
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
