Author: sdumitriu
Date: 2008-02-14 01:19:51 +0100 (Thu, 14 Feb 2008)
New Revision: 7715
Removed:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/resetversionsfooter.vm
xwiki-platform/web/trunk/standard/src/main/webapp/templates/resetversionsheader.vm
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/resetversions.vm
xwiki-platform/web/trunk/standard/src/main/webapp/templates/resetversionsdone.vm
Log:
XWIKI-2114: Upgrade the default templates
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/resetversions.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/templates/resetversions.vm
2008-02-14 00:05:58 UTC (rev 7714)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/templates/resetversions.vm
2008-02-14 00:19:51 UTC (rev 7715)
@@ -1,18 +1,10 @@
-#template("xwiki.vm")
-#template("httpheader.vm")
-#template("header.vm")
-#template("resetversionsheader.vm")
-#if($message)
-<div id="xwikimessage">
-$message
-</div>
-#end
-<div id="xwikicontent">
-<br />
-$msg.get("confirmresetversions")
-<br />
-<br />
-<br />
-</div>
-#template("resetversionsfooter.vm")
-#template("footer.vm")
+###
+### Reset versions page
+###
+###
+#template("startpage.vm")
+<div class="main layoutsubsection">
+#xwikimessagebox($msg.get("resetversions") $msg.get("confirmresetversions")
$doc.getURL("reset", "confirm=1") $doc.getURL("view") $msg.get("yes")
$msg.get("no"))
+<div class="clearfloats"></div>
+</div>
+#template("endpage.vm")
Modified:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/resetversionsdone.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/templates/resetversionsdone.vm
2008-02-14 00:05:58 UTC (rev 7714)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/templates/resetversionsdone.vm
2008-02-14 00:19:51 UTC (rev 7715)
@@ -1,18 +1,12 @@
-#template("xwiki.vm")
-#template("httpheader.vm")
-#template("header.vm")
-#template("baseheader.vm")
-#if($message)
-<div id="xwikimessage">
-$message
-</div>
-#end
-<div id="xwikicontent">
-<br />
-$msg.get("resetversionsdone")
-<br />
-<br />
-<br />
-</div>
-#template("basefooter.vm")
-#template("footer.vm")
+###
+### History reset confirmation message
+###
+###
+#template("startpage.vm")
+<div class="main layoutsubsection">
+#xwikimessageboxstart($msg.get("resetversions") $msg.get("resetversionsdone"))
+$!message
+#xwikimessageboxend()
+<div class="clearfloats"></div>
+</div>
+#template("endpage.vm")
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/resetversionsfooter.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/templates/resetversionsfooter.vm
2008-02-14 00:05:58 UTC (rev 7714)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/templates/resetversionsfooter.vm
2008-02-14 00:19:51 UTC (rev 7715)
@@ -1,6 +0,0 @@
-<div class="xwiki${xwikimode}b" id="xwikinav_footer">
-<div class="xwikiactions">
-<a href="$doc.getURL("view")">$msg.get("view")</a><span> | </span>
-<a href="" onclick="if (confirm('$msg.get("confirmresetversions2")')==false) {
return false; } else { location='$doc.getURL("reset", "confirm=1")'; return
false; }">$msg.get("resetversions")</a>
-</div>
-</div>
Deleted:
xwiki-platform/web/trunk/standard/src/main/webapp/templates/resetversionsheader.vm
===================================================================
---
xwiki-platform/web/trunk/standard/src/main/webapp/templates/resetversionsheader.vm
2008-02-14 00:05:58 UTC (rev 7714)
+++
xwiki-platform/web/trunk/standard/src/main/webapp/templates/resetversionsheader.vm
2008-02-14 00:19:51 UTC (rev 7715)
@@ -1,6 +0,0 @@
-<div class="xwiki${xwikimode}b" id="xwikinav_header">
-<div class="xwikiactions">
-<a href="$doc.getURL("view")">$msg.get("view")</a><span> | </span>
-<a href="" onclick="if (confirm('$msg.get("confirmresetversions2")')==false) {
return false; } else { location='$doc.getURL("reset", "confirm=1")'; return
false; }">$msg.get("resetversions")</a>
-</div>
-</div>
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
