r1293 - xwiki/trunk/src/main/web/skins/xwiki10

[Phung Hai Nam]

Author: namphunghai
Date: 2006-09-07 05:22:41 +0200 (Thu, 07 Sep 2006)
New Revision: 1293

Modified:
   xwiki/trunk/src/main/web/skins/xwiki10/editactions.vm
   xwiki/trunk/src/main/web/skins/xwiki10/previewactions.vm
Log:
XWIKI-174. Add sectional editting function for the skins/xwiki10 skin.( modify editaction.vm and previewactions.vm ) . Needn't add the test for this

Modified: xwiki/trunk/src/main/web/skins/xwiki10/editactions.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/editactions.vm	2006-09-07 00:36:39 UTC (rev 1292)
+++ xwiki/trunk/src/main/web/skins/xwiki10/editactions.vm	2006-09-07 03:22:41 UTC (rev 1293)
@@ -14,10 +14,14 @@
   return true;
 }
 </script>
+#set($param = "")
+#if ($sectionNumber != 0)
+   #set($param = "section=$sectionNumber")
+#end
 ##<div class="layoutsubsection editactions">
   <button class="button" type="submit" name="formaction" value="_cancel_" onclick="this.form.action='$doc.getURL("cancel")'; if (this.form.onsubmit) this.form.onsubmit();if (checkDocumentContent()) this.form.submit(); return false;">$msg.get("cancel")</button>
-#if($previewenabled)  <button class="button" type="submit" name="formaction" value="_preview_" onclick="this.form.action='$doc.getURL("preview")'; if (this.form.onsubmit) this.form.onsubmit();if (checkDocumentContent()) this.form.submit(); return false;">$msg.get("preview")</button>#end
-  <button class="button" type="submit" name="formaction" value="_saveandcontinue_" onclick="this.form.action='$doc.getURL("saveandcontinue")'; if (this.form.onsubmit) this.form.onsubmit();if (checkDocumentContent()) this.form.submit(); return false;">$msg.get("saveandcontinue")</button>
-  <button  class="button" type="submit" name="formaction" value="_save_" onclick="this.form.action='$doc.getURL("${saveaction}")'; if (this.form.onsubmit) this.form.onsubmit();if (checkDocumentContent()) this.form.submit(); return false;" >$msg.get("saveandview")</button>
+#if($previewenabled)  <button class="button" type="submit" name="formaction" value="_preview_" onclick="this.form.action='$doc.getURL("preview", $param)'; if (this.form.onsubmit) this.form.onsubmit();if (checkDocumentContent()) this.form.submit(); return false;">$msg.get("preview")</button>#end
+  <button class="button" type="submit" name="formaction" value="_saveandcontinue_" onclick="this.form.action='$doc.getURL("saveandcontinue", $param)'; if (this.form.onsubmit) this.form.onsubmit();if (checkDocumentContent()) this.form.submit(); return false;">$msg.get("saveandcontinue")</button>
+  <button  class="button" type="submit" name="formaction" value="_save_" onclick="this.form.action='$doc.getURL("${saveaction}", $param)'; if (this.form.onsubmit) this.form.onsubmit();if (checkDocumentContent()) this.form.submit(); return false;" >$msg.get("saveandview")</button>
 ##</div>
 #end

Modified: xwiki/trunk/src/main/web/skins/xwiki10/previewactions.vm
===================================================================
--- xwiki/trunk/src/main/web/skins/xwiki10/previewactions.vm	2006-09-07 00:36:39 UTC (rev 1292)
+++ xwiki/trunk/src/main/web/skins/xwiki10/previewactions.vm	2006-09-07 03:22:41 UTC (rev 1293)
@@ -22,14 +22,17 @@
 #set($editor=$tdoc.getURL("edit", "editor=wiki&amp;$docvariant"))
 #end
 #end
+#if ($sectionNumber != 0)
+#set($editparams = "section=$sectionNumber")
+#end
 <form style="display: inline;" action="$tdoc.getURL("cancel")" method="post"><div style="display: inline;"><button class="button" type="submit">$msg.get("cancel")</button></div></form>
 <form style="display: inline;" action="$editor" method="post"><div style="display: inline;">
 #foreach($param in $request.getParameterNames())#foreach($value in $request.getParameterValues($param))<input type="hidden" name="$param" value="$xwiki.getFormEncoded($value)"/>#end#end
 <button class="button" type="submit">$msg.get("backtoedit")</button></div></form>
-<form style="display: inline;" action="$tdoc.getURL("saveandcontinue")" method="post"><div style="display: inline;">
+<form style="display: inline;" action="$tdoc.getURL("saveandcontinue", $editparams)" method="post"><div style="display: inline;">
 <input type="hidden" name="xredirect" value="$request.getHeader("Referer")"/>#foreach($param in $request.getParameterNames())#foreach($value in $request.getParameterValues($param))<input type="hidden" name="$param" value="$xwiki.getFormEncoded($value)"/>#end#end
 <button class="button" type="submit">$msg.get("saveandcontinue")</button></div></form>
-<form style="display: inline;" action="$tdoc.getURL("save")" method="post"><div style="display: inline;">
+<form style="display: inline;" action="$tdoc.getURL("save", $editparams)" method="post"><div style="display: inline;">
 #foreach($param in $request.getParameterNames())#foreach($value in $request.getParameterValues($param))<input type="hidden" name="$param" value="$xwiki.getFormEncoded($value)"/>#end#end
 <button class="button" type="submit">$msg.get("saveandview")</button></div></form>
 #end