[xwiki-notifications] r7579 - in xwiki-platform: skins/trunk/albatross/src/main/resources/albatross web/trunk/standard/src/main/webapp/templates

[SVN]

Author: sdumitriu
Date: 2008-02-13 16:02:10 +0100 (Wed, 13 Feb 2008)
New Revision: 7579

Added:
   xwiki-platform/web/trunk/standard/src/main/webapp/templates/xwikivars.vm
Removed:
   
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/xwikivars.vm
Log:
skin cleanup


Deleted: 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/xwikivars.vm
===================================================================
--- 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/xwikivars.vm  
    2008-02-13 14:35:41 UTC (rev 7578)
+++ 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/xwikivars.vm  
    2008-02-13 15:02:10 UTC (rev 7579)
@@ -1,65 +0,0 @@
-#template("fudocs.vm")
-#template("macros.vm")
-#set($isguest = $context.getUser().equals("XWiki.XWikiGuest"))
-#set($hasedit = $xwiki.hasAccessLevel("edit"))
-#set($hasadmin = $xwiki.hasAccessLevel("admin"))
-#set($hasGlobalAdmin = $xwiki.hasAccessLevel("admin", $context.user, 
"XWiki.XWikiPreferences"))
-#set($hasSpaceAdmin = $xwiki.hasAccessLevel("admin", $context.user, 
"${doc.space}.WebPreferences"))
-#set($isReadOnly = $xwiki.isReadOnly())
-#set($spaceviewurl = $spaceDoc.getURL("view"))
-#set($viewurl = $doc.getURL("view"))
-#set($objuser = $docuser.getObject("XWiki.XWikiUsers",0))
-## 
=====================================================================================
-## Advanced users are:
-## - super admin
-## - user documents who have their usertype property set to "Advanced"
-## - guest users who have admin rights (i.e. when the wiki is empty with no 
rights set)
-## 
=====================================================================================
-#if($context.user == "XWiki.superadmin")
-  #set($isAdvancedUser = true)
-#elseif($isguest && $hasadmin)
-  #set($isAdvancedUser = true)
-#elseif(!$objuser.getProperty("usertype").value)
-  #set($isAdvancedUser = false)
-#else
-  #set($isAdvancedUser = ($objuser.getProperty("usertype").value == 
"Advanced"))
-#end
-#set($parent ="<a 
href='$doc.getParentURL()'>${xwiki.getDocument($doc.parent).displayTitle}</a>")
-#if($tdoc)
-#set($headertitle = "<a href='$viewurl'>${tdoc.displayTitle}</a>")
-#else
-#set($headertitle = "<a href='$viewurl'>${doc.displayTitle}</a>")
-#end
-#set($skin=$xwiki.getSkin())
-#set($copyright=$xwiki.getWebCopyright())
-#set($xwikimode=$context.getMode())
-#set($logredir = $xwiki.getFormEncoded($xwiki.getRequestURL()))
-##
-#if($xwiki.exists("XWiki.MaintenanceInfo"))
-#set($maintenanceinfo = "XWiki.MaintenanceInfo")
-#else
-#if($xwiki.exists("xwiki:XWiki.MaintenanceInfo"))
-#set($maintenanceinfo = "xwiki:XWiki.MaintenanceInfo")
-#end
-#end
-## Check language option
-#set($languageparams = "")
-#if(($xwiki.isMultiLingual()==true)&&($tdoc.realLanguage!=""))
-#set($languageparams="language=${tdoc.realLanguage}")
-#end
-## Check revision option
-#if ($request.rev)
-#set($revparams="rev=${request.rev}")
-#else
-#set($revparams = "")
-#end
-#set($docvariant = "")
-#if($revparams != "")
-#if($languageparams != "")
-#set($docvariant = "$languageparams&amp;$revparams")
-#else
-#set($docvariant = "$revparams")
-#end
-#elseif($languageparams != "")
-#set($docvariant = "$languageparams")
-#end
\ No newline at end of file

Copied: 
xwiki-platform/web/trunk/standard/src/main/webapp/templates/xwikivars.vm (from 
rev 7578, 
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/xwikivars.vm)
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/xwikivars.vm    
                        (rev 0)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/xwikivars.vm    
2008-02-13 15:02:10 UTC (rev 7579)
@@ -0,0 +1,65 @@
+#template("fudocs.vm")
+#template("macros.vm")
+#set($isguest = $context.getUser().equals("XWiki.XWikiGuest"))
+#set($hasedit = $xwiki.hasAccessLevel("edit"))
+#set($hasadmin = $xwiki.hasAccessLevel("admin"))
+#set($hasGlobalAdmin = $xwiki.hasAccessLevel("admin", $context.user, 
"XWiki.XWikiPreferences"))
+#set($hasSpaceAdmin = $xwiki.hasAccessLevel("admin", $context.user, 
"${doc.space}.WebPreferences"))
+#set($isReadOnly = $xwiki.isReadOnly())
+#set($spaceviewurl = $spaceDoc.getURL("view"))
+#set($viewurl = $doc.getURL("view"))
+#set($objuser = $docuser.getObject("XWiki.XWikiUsers",0))
+## 
=====================================================================================
+## Advanced users are:
+## - super admin
+## - user documents who have their usertype property set to "Advanced"
+## - guest users who have admin rights (i.e. when the wiki is empty with no 
rights set)
+## 
=====================================================================================
+#if($context.user == "XWiki.superadmin")
+  #set($isAdvancedUser = true)
+#elseif($isguest && $hasadmin)
+  #set($isAdvancedUser = true)
+#elseif(!$objuser.getProperty("usertype").value)
+  #set($isAdvancedUser = false)
+#else
+  #set($isAdvancedUser = ($objuser.getProperty("usertype").value == 
"Advanced"))
+#end
+#set($parent ="<a 
href='$doc.getParentURL()'>${xwiki.getDocument($doc.parent).displayTitle}</a>")
+#if($tdoc)
+#set($headertitle = "<a href='$viewurl'>${tdoc.displayTitle}</a>")
+#else
+#set($headertitle = "<a href='$viewurl'>${doc.displayTitle}</a>")
+#end
+#set($skin=$xwiki.getSkin())
+#set($copyright=$xwiki.getWebCopyright())
+#set($xwikimode=$context.getMode())
+#set($logredir = $xwiki.getFormEncoded($xwiki.getRequestURL()))
+##
+#if($xwiki.exists("XWiki.MaintenanceInfo"))
+#set($maintenanceinfo = "XWiki.MaintenanceInfo")
+#else
+#if($xwiki.exists("xwiki:XWiki.MaintenanceInfo"))
+#set($maintenanceinfo = "xwiki:XWiki.MaintenanceInfo")
+#end
+#end
+## Check language option
+#set($languageparams = "")
+#if(($xwiki.isMultiLingual()==true)&&($tdoc.realLanguage!=""))
+#set($languageparams="language=${tdoc.realLanguage}")
+#end
+## Check revision option
+#if ($request.rev)
+#set($revparams="rev=${request.rev}")
+#else
+#set($revparams = "")
+#end
+#set($docvariant = "")
+#if($revparams != "")
+#if($languageparams != "")
+#set($docvariant = "$languageparams&amp;$revparams")
+#else
+#set($docvariant = "$revparams")
+#end
+#elseif($languageparams != "")
+#set($docvariant = "$languageparams")
+#end
\ No newline at end of file

_______________________________________________
notifications mailing list
notifications@xwiki.org
http://lists.xwiki.org/mailman/listinfo/notifications