Author: sdumitriu
Date: 2008-02-13 16:32:19 +0100 (Wed, 13 Feb 2008)
New Revision: 7596
Added:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/passwd.vm
Removed:
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/passwd.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/passwd.vm
===================================================================
--- xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/passwd.vm
2008-02-13 15:31:54 UTC (rev 7595)
+++ xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/passwd.vm
2008-02-13 15:32:19 UTC (rev 7596)
@@ -1,35 +0,0 @@
-###
-### Change a user's password
-###
-###
-#template("startpage.vm")
-<div class="minwidthb"></div>
-<div class="main layoutsubsection">
-#if($doc.getObject("XWikiUsers", 0))
-#set($i = $context.user.indexOf(":")+1)
-#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>
- <dt><label id="xwikipasswordlabel"
for="xwikipassword">$msg.get("newpassword"):</label></dt>
- <dd><input id="xwikipassword" type="password"
name="XWiki.XWikiUsers_0_password" value="" size="20"/></dd>
- <dt><label id="xwikipassword2label"
for="xwikipassword2">$msg.get("reenterpassword"):</label></dt>
- <dd><input id="xwikipassword2" type="password" name="password2" value=""
size="20"/></dd>
-</dl>
- <div class="padded">
- <input type="submit" value="$msg.get("setthispassword")" class="button"/>
- </div>
- <div class="padded">
- <a href="$doc.getURL("view")">$msg.get("cancelpwd")</a>
- </div>
- </form>
-#else
-#xwikimessageboxstart($msg.get("error") $msg.get("notallowed"))
-#xwikimessageboxend()
-#end
-#else
-#xwikimessageboxstart($msg.get("password") $msg.get("notauser"))
-#xwikimessageboxend()
-#end
-</div></div>
-#template("endpage.vm")
\ No newline at end of file
Copied: xwiki-platform/web/trunk/standard/src/main/webapp/templates/passwd.vm
(from rev 7595,
xwiki-platform/skins/trunk/albatross/src/main/resources/albatross/passwd.vm)
===================================================================
--- xwiki-platform/web/trunk/standard/src/main/webapp/templates/passwd.vm
(rev 0)
+++ xwiki-platform/web/trunk/standard/src/main/webapp/templates/passwd.vm
2008-02-13 15:32:19 UTC (rev 7596)
@@ -0,0 +1,35 @@
+###
+### Change a user's password
+###
+###
+#template("startpage.vm")
+<div class="minwidthb"></div>
+<div class="main layoutsubsection">
+#if($doc.getObject("XWikiUsers", 0))
+#set($i = $context.user.indexOf(":")+1)
+#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>
+ <dt><label id="xwikipasswordlabel"
for="xwikipassword">$msg.get("newpassword"):</label></dt>
+ <dd><input id="xwikipassword" type="password"
name="XWiki.XWikiUsers_0_password" value="" size="20"/></dd>
+ <dt><label id="xwikipassword2label"
for="xwikipassword2">$msg.get("reenterpassword"):</label></dt>
+ <dd><input id="xwikipassword2" type="password" name="password2" value=""
size="20"/></dd>
+</dl>
+ <div class="padded">
+ <input type="submit" value="$msg.get("setthispassword")" class="button"/>
+ </div>
+ <div class="padded">
+ <a href="$doc.getURL("view")">$msg.get("cancelpwd")</a>
+ </div>
+ </form>
+#else
+#xwikimessageboxstart($msg.get("error") $msg.get("notallowed"))
+#xwikimessageboxend()
+#end
+#else
+#xwikimessageboxstart($msg.get("password") $msg.get("notauser"))
+#xwikimessageboxend()
+#end
+</div></div>
+#template("endpage.vm")
\ No newline at end of file
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
