svn commit: r1738614 - in /ofbiz/trunk/applications/content/webapp/content/website: WebSiteCMSContent.ftl WebSiteCMSNav.ftl

Author: jleroux
Date: Mon Apr 11 17:53:33 2016
New Revision: 1738614

URL: http://svn.apache.org/viewvc?rev=1738614&view=rev
Log:
A modified patch from James Young to complete "Improved CMS tree: more functionality and faster for large trees" - https://issues.apache.org/jira/browse/OFBIZ-4502

jleroux: I put back the cmseditor id for ELECTRONIC_TEXT in WebSiteCMSContent.ftl and added back the createEditor() call in callDocument function jQuerry Ajax Request

Modified:
    ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl
    ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl

Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl?rev=1738614&r1=1738613&r2=1738614&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSContent.ftl Mon Apr 11 17:53:33 2016
@@ -352,12 +352,13 @@
             </tr>
           <#elseif (dataResourceTypeId == 'ELECTRONIC_TEXT')>
             <tr>
-              <td colspan="2"><h1 style="margin-top:20px">${uiLabelMap.ContentText}</h1></td>
-            </tr>
-            <tr>
               <td colspan="2">
                 <div id="editorcontainer" class="nocolumns">
-                   <textarea style="height: 350px; width: 99%; display: inline-block; " name="textData"><#if (dataText?has_content)>${dataText.textData!}</#if></textarea>
+                    <div id="cmseditor" style="margin: 0; width: 100%; border: 1px solid black;">
+                    <#if (dataText?has_content)>
+                      ${StringUtil.wrapString(dataText.textData!)}
+                    </#if>
+                    </div>
                 </div>
               </td>
             </tr>

Modified: ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl
URL: http://svn.apache.org/viewvc/ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl?rev=1738614&r1=1738613&r2=1738614&view=diff
==============================================================================
--- ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl (original)
+++ ofbiz/trunk/applications/content/webapp/content/website/WebSiteCMSNav.ftl Mon Apr 11 17:53:33 2016
@@ -38,9 +38,6 @@
     };
 
     jQuery(document).ready(loadTrees);
-    <#--
-    jQuery(document).ready(createEditor);
-    -->
 
     var contentRoot = '${contentRoot!}';
     var menuRoot = '${menuRoot!}';
@@ -441,11 +438,7 @@ var contextmenu = { 'items': {
             },
             success: function(msg) {
                 jQuery('#cmscontent').html(msg);
-
-<#--
-                // CREATE / LOAD Editor
                 createEditor();
--->
             }
         });
      }
@@ -617,7 +610,7 @@ function callMetaInfo(contentId) {
     ${uiLabelMap.ContentWebSiteAddNewErrors}
 </div>
 <div>&nbsp;</div>
-<#if (errors?has_content)>
+<#if (errorRoot?has_content)>
     <div id="${errorRoot}"></div>
 <#else>
     <a href="javascript:void(0);" class="buttontext">${uiLabelMap.ContentWebSiteAddError}</a>