Merged 3.1 to HEAD

13275: updated web-client to use tinymce v3
 13276: overlay display fix for when field has large content


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13585 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/web/jsp/content/edit-html-inline.jsp

@@ -33,7 +33,6 @@
 <f:verbatim>
 <script language="javascript" type="text/javascript" src="<%=request.getContextPath()%>/scripts/tiny_mce/tiny_mce.js"></script>
 <script language="javascript" type="text/javascript">
-
 <%-- Init the Tiny MCE in-line HTML editor --%>
 tinyMCE.init({
 theme : "advanced",
@@ -55,6 +54,7 @@ function saveContent(id, content)
 {
  //document.forms['edit-file']['edit-file:editorOutput'].value = content;
  document.getElementById("dialog:dialog-body:editorOutput").value=content;
+ return content;
 }
 
 </script>