Author: sdumitriu
Date: 2008-02-13 16:33:01 +0100 (Wed, 13 Feb 2008)
New Revision: 7597
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/admin.vm
xwiki-platform/web/trunk/standard/src/main/webapp/templates/attachmentsinline.vm
xwiki-platform/web/trunk/standard/src/main/webapp/templates/changeavatar.vm
xwiki-platform/web/trunk/standard/src/main/webapp/templates/changemyavatar.vm
xwiki-platform/web/trunk/standard/src/main/webapp/templates/commentsinline.vm
xwiki-platform/web/trunk/standard/src/main/webapp/templates/docdoesnotexist.vm
xwiki-platform/web/trunk/standard/src/main/webapp/templates/global.vm
xwiki-platform/web/trunk/standard/src/main/webapp/templates/historyinline.vm
xwiki-platform/web/trunk/standard/src/main/webapp/templates/menuview.vm
xwiki-platform/web/trunk/standard/src/main/webapp/templates/passwd.vm
xwiki-platform/web/trunk/standard/src/main/webapp/templates/space.vm
xwiki-platform/web/trunk/standard/src/main/webapp/templates/watchlist.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
Modified: xwiki-platform/web/trunk/standard/src/main/webapp/templates/admin.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/admin.vm
2008-02-13 15:32:19 UTC (rev 7596)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/admin.vm
2008-02-13 15:33:01 UTC (rev 7597)
@@ -65,7 +65,7 @@
## Content
##
#set($force = $!request.get("force"))
-#if(!$hasadmin)
+#if(!$hasAdmin)
#xwikimessageboxstart($msg.get("error") $msg.get('notallowed'))
#xwikimessageboxend()
#elseif (($tdoc.getLocked()==true)&&(!$force))
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/attachmentsinline.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/templates/attachmentsinline.vm
2008-02-13 15:32:19 UTC (rev 7596)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/templates/attachmentsinline.vm
2008-02-13 15:33:01 UTC (rev 7597)
@@ -39,7 +39,7 @@
<span class="mime">#mimetypeimg($attach.getMimeType().toLowerCase()
$attach.getFilename().toLowerCase())</span>
<div class="information">
<span class="name"><a
href="$doc.getAttachmentURL("${attach.filename}", "download")"
title="$msg.get("downloadthisattachment")">#packName($attach.filename)</a></span>
-#if($hasedit || $hasadmin)
+#if($hasEdit || $hasAdmin)
<span class="xwikibuttonlinks"><a class="deletelink"
href="$doc.getAttachmentURL("${attach.filename}", "delattachment",
"xredirect=${redirect}")" onclick="return
confirm('$msg.get("confirmdelattachment")');"
title="$msg.get("deletethisattachment")">$msg.get("delete")</a></span>
#end
<span class="version"><a
href="$doc.getAttachmentURL("${attach.filename}", "viewattachrev")"
title="$msg.get("viewattachmenthistory")">$attach.version</a></span>
@@ -54,7 +54,7 @@
#else
<div>$msg.get("noattachments")</div>
#end
-#if($hasedit || $hasadmin)
+#if($hasEdit || $hasAdmin)
<form action="$doc.getURL("upload")" enctype="multipart/form-data"
method="post">
<div>
<input type="hidden" name="xredirect" value="$xwiki.getFormEncoded($redirect)"
/>
@@ -78,7 +78,7 @@
#if($inline && ($inline == true))
<script type="text/javascript">
//<![CDATA[
-#if($hasedit || $hasadmin)
+#if($hasEdit || $hasAdmin)
document.getElementById("attachform").className = "collapsed";
#end
document.getElementById("attachments").className = "hidden";
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/changeavatar.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/changeavatar.vm
2008-02-13 15:32:19 UTC (rev 7596)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/changeavatar.vm
2008-02-13 15:33:01 UTC (rev 7597)
@@ -5,7 +5,7 @@
### TODO: Check dimensions
### TODO: Document version to return to? (rev and language)
###
-#if($doc.getObject("XWikiUsers", 0) && ($context.user == $doc.fullName ||
$hasadmin))
+#if($doc.getObject("XWikiUsers") && ($context.user == $doc.fullName ||
$hasAdmin))
#set($date = $doc.attachmentList.get(0).date)
#set($name = $doc.attachmentList.get(0).filename)
#foreach($attachment in $doc.attachmentList)
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/changemyavatar.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/templates/changemyavatar.vm
2008-02-13 15:32:19 UTC (rev 7596)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/templates/changemyavatar.vm
2008-02-13 15:33:01 UTC (rev 7597)
@@ -8,7 +8,7 @@
<div class="minwidthb"></div>
<div class="main layoutsubsection">
#if($doc.getObject("XWikiUsers", 0))
-#if($context.user == $doc.fullName || $hasadmin)
+#if($context.user == $doc.fullName || $hasAdmin)
<form action="$doc.getURL("upload")" enctype="multipart/form-data"
method="post" onsubmit="if(this.filepath.value == ''){ return false; }">
<div>
<h2 class="heading-1">$msg.get("changephoto",
[$xwiki.getUserName($doc.fullName, false)])</h2>
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/commentsinline.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/templates/commentsinline.vm
2008-02-13 15:32:19 UTC (rev 7596)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/templates/commentsinline.vm
2008-02-13 15:33:01 UTC (rev 7597)
@@ -23,7 +23,7 @@
#if($date)
| <span class="commentdate">$xwiki.formatDate($date, "dd.MM.yyyy")
$msg.get("at") $xwiki.formatDate($date, "hh:mm a")</span>
#end
-#if($hasedit) <span class="commentdelete"><a class="commentremove"
href="$doc.getURL("objectremove" ,
"classname=XWiki.XWikiComments&classid=${comment.number}&xredirect=${request.getRequestURL()}")"
+#if($hasEdit) <span class="commentdelete"><a class="commentremove"
href="$doc.getURL("objectremove" ,
"classname=XWiki.XWikiComments&classid=${comment.number}&xredirect=${request.getRequestURL()}")"
onclick="return
confirm('$msg.get("confirmcommentremove")')">[$msg.get("removethiscomment")]</a></span>#end
</div>
<div
class="commentcontent">$doc.getRenderedContent($doc.display("comment","view",$comment))
</div>
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/docdoesnotexist.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/templates/docdoesnotexist.vm
2008-02-13 15:32:19 UTC (rev 7596)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/templates/docdoesnotexist.vm
2008-02-13 15:33:01 UTC (rev 7597)
@@ -9,7 +9,7 @@
$xwiki.includeForm("XWiki.DocumentDoesNotExist",false)
#else
#xwikimessageboxstart($msg.get("notice") $msg.get("thispagedoesnotexist"))
-#if($hasedit)
+#if($hasEdit)
#set($url = $doc.getURL("edit", $editparams))
$xwiki.parseMessage("youcanclicktoedit")
#end
Modified: xwiki-platform/web/trunk/standard/src/main/webapp/templates/global.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/global.vm
2008-02-13 15:32:19 UTC (rev 7596)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/global.vm
2008-02-13 15:33:01 UTC (rev 7597)
@@ -31,7 +31,7 @@
</div>
<div id="globallinks">
<div id="globalmenu">
-#if (!$isguest)
+#if (!$isGuest)
#if ($context.user == 'XWiki.superadmin')
$!msg.get("superadmin") #sep()
#else
@@ -39,7 +39,7 @@
#end
#end
#if ($context.action != "loginerror")
-#if ($isguest)
+#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
@@ -47,11 +47,11 @@
<a class="glink" href="$!logouturl"
id="headerlogout">$!msg.get("logout")</a>#sep()
#end
#end
-#if($isguest && $xwiki.hasAccessLevel("register", "XWiki.XWikiPreferences"))
+#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)
+#if($hasAdmin)
<a class="glink" href="$!xwiki.getURL("XWiki.XWikiPreferences","admin")"
id="headeradmin">$!msg.get("admin")</a> #sep()
#end
#if($xwiki.isMultiLingual())
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/historyinline.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/templates/historyinline.vm
2008-02-13 15:32:19 UTC (rev 7596)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/templates/historyinline.vm
2008-02-13 15:33:01 UTC (rev 7597)
@@ -14,7 +14,7 @@
#if($xwiki.hasEditComment())
<th>$msg.get("comment")</th>
#end
-#if($hasedit || $hasadmin)
+#if($hasEdit || $hasAdmin)
<th colspan="2"></th>
#end
</tr>
@@ -46,10 +46,10 @@
#if($xwiki.hasEditComment())
<td>$!{revinfo.comment}</td>
#end
-#if($hasedit || $hasadmin)
+#if($hasEdit || $hasAdmin)
<td class="xwikibuttonlink"><a
href="$tdoc.getURL("rollback","rev=$nextversion$lang")" onclick="if
(confirm('$msg.get("readytorollback") $nextversion')){this.href +=
'&confirm=1'; return true;} return false;">$msg.get("rollback")</a></td>
#end
-#if($hasadmin)
+#if($hasAdmin)
<td class="xwikibuttonlink"><a
href="$tdoc.getURL("deleteversions","rev=$nextversion$lang")" onclick="if
(confirm('$msg.get("core.versions.delete.confirm.single",
[$nextversion])')){this.href += '&confirm=1'; return true;} return
false;">$msg.get("core.versions.delete.single")</a></td>
#end
</tr>
@@ -58,7 +58,7 @@
</table>
<div class="buttons">
<div class="buttonwrapper"><input type="submit" accesskey="c"
value="$msg.get("compare")" class="button"/></div>
- #if($hasadmin)
+ #if($hasAdmin)
<div class="buttonwrapper"><input class="button" type="submit"
name="deleteversions" value="$msg.get("core.versions.delete.many")"
onclick="document.forms.${formname}.action='$doc.getURL("deleteversions")'; if
(document.forms.${formname}.onsubmit) document.forms.${formname}.onsubmit();"
/></div>
#end
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/menuview.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/menuview.vm
2008-02-13 15:32:19 UTC (rev 7596)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/menuview.vm
2008-02-13 15:33:01 UTC (rev 7597)
@@ -6,7 +6,7 @@
##
## Edit mode
##
-#if($hasedit && !$isReadOnly)
+#if($hasEdit && !$isReadOnly)
## Check inline editing option
#if($doc.content.indexOf("includeForm(")!=-1)
#set($editaction = "inline")
@@ -16,14 +16,14 @@
##
## Create menu
##
-##if($hasedit)
+##if($hasEdit)
### #xwikitopmenuentrystart($doc.getURL($editaction, $languageparams)
$msg.get("core.menu.create") "tmCreate")
##xwikitopmenuentrystart($xwiki.getURL("XWiki.CreateSubpage", "view",
"parent=${doc.fullName}") $msg.get("core.menu.create") "tmCreate")
##submenuitem($xwiki.getURL("XWiki.CreatePage", "view",
"parent=${doc.fullName}") $msg.get("core.menu.create.page"))
##submenuitem($xwiki.getURL("XWiki.CreatePage", "view", "tocreate=space")
$msg.get("core.menu.create.space"))
##submenuitem($xwiki.getURL("Blog.CreateBlogPost", "view")
$msg.get("core.menu.create.blogpost"))
##if($xwiki.hasAccessLevel("edit",
"Main.EventCalendar"))#submenuitem($xwiki.getURL("Main.EventCalendar", "view")
$msg.get("core.menu.create.event"))#end
-##if($hasadmin)#submenuitem($xwiki.getURL("Panels.WebHome", "view")
$msg.get("core.menu.create.panel"))#end
+##if($hasAdmin)#submenuitem($xwiki.getURL("Panels.WebHome", "view")
$msg.get("core.menu.create.panel"))#end
##xwikitopmenuentryend()
##end
##
@@ -39,7 +39,7 @@
#submenuitem($doc.getURL("edit", "editor=rights") $msg.get("core.menu.rights"))
#submenuseparator()
#submenuitem($doc.getURL("edit", "editor=object")
$msg.get("core.menu.edit.object"))
-#if($hasadmin)
+#if($hasAdmin)
#submenuitem($doc.getURL("edit", "editor=class")
$msg.get("core.menu.edit.class"))
#end
#xwikitopmenuentryend()
Modified: xwiki-platform/web/trunk/standard/src/main/webapp/templates/passwd.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/passwd.vm
2008-02-13 15:32:19 UTC (rev 7596)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/passwd.vm
2008-02-13 15:33:01 UTC (rev 7597)
@@ -7,7 +7,7 @@
<div class="main layoutsubsection">
#if($doc.getObject("XWikiUsers", 0))
#set($i = $context.user.indexOf(":")+1)
-#if($context.user.substring($i) == $doc.fullName || $hasadmin)
+#if($context.user.substring($i) == $doc.fullName || $hasAdmin)
<form action="$doc.getURL("save")" method="post"
onsubmit="if($('xwikipassword').value != $('xwikipassword2').value)
{alert('$msg.get("passwordmissmatch")'); return false; }">
<h2 class="heading-1">$msg.get("changepassword",
[$xwiki.getUserName($doc.fullName, false)])</h2>
<dl>
Modified: xwiki-platform/web/trunk/standard/src/main/webapp/templates/space.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/space.vm
2008-02-13 15:32:19 UTC (rev 7596)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/space.vm
2008-02-13 15:33:01 UTC (rev 7597)
@@ -18,7 +18,7 @@
<div class="minwidth"></div>
<hr/>
<div id="breadcrumbs">
- <span class="breadcrumbspace"><a href="$spaceviewurl">$doc.web</a>: </span>
+ <span class="breadcrumbspace"><a href="$spaceViewUrl">$doc.web</a>: </span>
#breadcrumb($doc "<a href='$doc.getURL('view')'>$tdoc.displayTitle</a>" 0)
</div>
<hr/>
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/watchlist.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/watchlist.vm
2008-02-13 15:32:19 UTC (rev 7596)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/watchlist.vm
2008-02-13 15:33:01 UTC (rev 7597)
@@ -9,7 +9,7 @@
#if($doc.getObject("XWikiUsers", 0))
#set($i = $context.user.indexOf(":")+1)
#set($isMyProfile = $context.user.substring($i) == $doc.fullName)
-#if ($isMyProfile || $hasadmin)
+#if ($isMyProfile || $hasAdmin)
#if ($request.removedocument || $request.removespace)
#set ($el = "")
#if ($isMyProfile)
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
