Index: web/gwt/src/main/java/com/xpn/xwiki/gwt/api/server/XWikiServiceImpl.java
===================================================================
--- web/gwt/src/main/java/com/xpn/xwiki/gwt/api/server/XWikiServiceImpl.java (revision 3127)
+++ web/gwt/src/main/java/com/xpn/xwiki/gwt/api/server/XWikiServiceImpl.java (working copy)
@@ -407,6 +407,7 @@
while(it.hasNext()){
objs.add(addObject(doc, (String) it.next()));
}
+
context.getWiki().saveDocument(doc, oldDoc, context);
return objs;
} catch (XWikiException e) {
Index: web/standard/src/main/webapp/skins/albatross/editactions.vm
===================================================================
--- web/standard/src/main/webapp/skins/albatross/editactions.vm (revision 3127)
+++ web/standard/src/main/webapp/skins/albatross/editactions.vm (working copy)
@@ -19,10 +19,32 @@
return false ;
}
}
- return true; // There is only the wiki editor, with some content
+
+#if($xwiki.isEditCommentSuggested()||$xwiki.isEditCommentMandatory())
+ #if($xwiki.isEditCommentMandatory())
+ var commentField = document.forms.${formname}.comment
+ while (commentField.value=="") {
+ commentField.value = prompt("${msg.get("core.comment.prompt")}");
+ }
+ #else
+ var commentField = document.forms.${formname}.comment
+ if (commentField.value=="") {
+ commentField.value = prompt("${msg.get("core.comment.prompt")}");
+ }
+ #end
+#end
+ return true; // There is only the wiki editor, with some content
}
// ]]>
+#if((!$commentFieldAdded)&&($xwiki.hasEditComment())
+#set($commentFieldAdded = 1)
+#if($xwiki.isEditCommentHidden())
+
+#else
+$msg.get("core.comment"):
+#end
+#end
#set($param = "")
#if ($sectionNumber && ($sectionNumber != 0))
#set($param = "section=$sectionNumber")
Index: web/standard/src/main/webapp/skins/albatross/editinline.vm
===================================================================
--- web/standard/src/main/webapp/skins/albatross/editinline.vm (revision 3127)
+++ web/standard/src/main/webapp/skins/albatross/editinline.vm (working copy)
@@ -19,6 +19,7 @@
$msg.get("forcelock")
#else
+#set($editactions = "top")
#template("editactions.vm")
#foreach($class in $doc.xWikiClasses)
@@ -27,6 +28,7 @@
#end
$cdoc.getRenderedContent()
## clear
+#set($editactions = "bottom")
#template("editactions.vm")
#end
## form
Index: web/standard/src/main/webapp/skins/albatross/editwysiwyg.vm
===================================================================
--- web/standard/src/main/webapp/skins/albatross/editwysiwyg.vm (revision 3127)
+++ web/standard/src/main/webapp/skins/albatross/editwysiwyg.vm (working copy)
@@ -5,6 +5,7 @@
#set($xredirect=$!request.getParameter("xredirect"))
##