Author: sdumitriu
Date: 2008-02-14 01:05:58 +0100 (Thu, 14 Feb 2008)
New Revision: 7714
Added:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/deprecatedVars.vm
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/userinactive.vm
xwiki-platform/web/trunk/standard/src/main/webapp/templates/xwikivars.vm
Log:
XWIKI-2114: Upgrade the default templates
Added:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/deprecatedVars.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/templates/deprecatedVars.vm
(rev 0)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/templates/deprecatedVars.vm
2008-02-14 00:05:58 UTC (rev 7714)
@@ -0,0 +1,3 @@
+#set($hasedit = $hasEdit)
+#set($hasadmin = $hasAdmin)
+#set($isguest = $isGuest)
\ No newline at end of file
Property changes on:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/deprecatedVars.vm
___________________________________________________________________
Name: svn:eol-style
+ native
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/userinactive.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/userinactive.vm
2008-02-13 22:25:58 UTC (rev 7713)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/userinactive.vm
2008-02-14 00:05:58 UTC (rev 7714)
@@ -1,23 +1,30 @@
-#template("xwiki.vm")
-#template("httpheader.vm")
-#template("header.vm")
-#template("baseheader.vm")
-<div id="xwikicontent">
+###
+### User inactive message
+###
+###
+#template("startpage.vm")
+<div class="main layoutsubsection">
+#if($xwiki.exists("XWiki.UserInactive"))
+ $xwiki.includeForm("XWiki.UserInactive", false)
+#else
#if ($cause == "disabled")
-$msg.get("accountdisabled")
+#xwikimessageboxstart($msg.get("notice") $msg.get("accountdisabled"))
#else
-$msg.get("accountnotactive")
-<br />
+#xwikimessageboxstart($msg.get("notice") $msg.get("accountnotactive"))
+#set($confirmdoc = $xwiki.getDocument("XWiki.RegisterNewUserConfirmation"))
+#if(!$confirmdoc.isNew())
$msg.get("accountnotactive_email")
-<br />
-#set($confirmdoc = $xwiki.getDocument("XWiki.RegisterNewUserConfirmation"))
<form action="$confirmdoc.getURL("view")" method="post">
+<div>
<input type="hidden" name="xwikiname" value="$context.user" />
<input type="text" name="validkey" size="16" />
<input type="submit" value="$msg.get("confirmaccount")" />
+</div>
</form>
#end
-
+#end
+#xwikimessageboxend()
+#end
+<div class="clearfloats"></div>
</div>
-#template("basefooter.vm")
-#template("footer.vm")
+#template("endpage.vm")
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/xwikivars.vm
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/xwikivars.vm
2008-02-13 22:25:58 UTC (rev 7713)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/xwikivars.vm
2008-02-14 00:05:58 UTC (rev 7714)
@@ -61,4 +61,5 @@
#end
#elseif($languageparams != "")
#set($docvariant = "$languageparams")
-#end
\ No newline at end of file
+#end
+#template("deprecatedVars.vm")
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
