Changeset 2764

Timestamp:

09/03/10 22:54:19 (17 months ago)

Author:

mattlevine

Message:

1. Adding ckeditor to the frontend.

Location:

branches/5.2.1/www/default

Files:

• includes/display_objects/datacollection/index.cfm (modified) (3 diffs)
• includes/display_objects/dsp_edit_profile.cfm (modified) (3 diffs)
• includes/display_objects/htmlhead/global.cfm (modified) (3 diffs)
• includes/display_objects/htmlhead/htmlEditor.cfm (added)
• js/global.js (modified) (1 diff)

branches/5.2.1/www/default/includes/display_objects/datacollection/index.cfm

@@ -7 +7 @@
 Mura CMS is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ï¿œSee the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Mura CMS.  If not, see <http://www.gnu.org/licenses/>.
+along with Mura CMS. ï¿œIf not, see <http://www.gnu.org/licenses/>.
 
 Linking Mura CMS statically or dynamically with other modules constitutes
 the preparation of a derivative work based on Mura CMS. Thus, the terms and     
-conditions of the GNU General Public License version 2 (“GPL”) cover the entire combined work.
+conditions of the GNU General Public License version 2 (ￜGPLￜ) cover the entire combined work.
 
 However, as a special exception, the copyright holders of Mura CMS grant you permission
 to combine Mura CMS with programs or libraries that are released under the GNU Lesser General Public License version 2.1.
 
-In addition, as a special exception,  the copyright holders of Mura CMS grant you permission
-to combine Mura CMS  with independent software modules that communicate with Mura CMS solely
+In addition, as a special exception, ï¿œthe copyright holders of Mura CMS grant you permission
+to combine Mura CMS ï¿œwith independent software modules that communicate with Mura CMS solely
 through modules packaged as Mura CMS plugins and deployed through the Mura CMS plugin installation API,
-provided that these modules (a) may only modify the  /trunk/www/plugins/ directory through the Mura CMS
+provided that these modules (a) may only modify the ￜ/trunk/www/plugins/ directory through the Mura CMS
 plugin installation API, (b) must not alter any default objects in the Mura CMS database
 and (c) must not alter any files in the following directories except in cases where the code contains
@@ -38 +38 @@
 For clarity, if you create a modified version of Mura CMS, you are not obligated to grant this special exception
 for your modified version; it is your choice whether to do so, or to make such modified version available under
-the GNU General Public License version 2  without this exception.  You may, if you choose, apply this exception
+the GNU General Public License version 2 ï¿œwithout this exception. ï¿œYou may, if you choose, apply this exception
 to your own modified versions of Mura CMS.
 --->
@@ -118 +118 @@
         <cfinclude template="dsp_response.cfm">
         <cfelse>
-        <cfset addToHTMLHeadQueue("fckeditor.cfm")>
+        <cfset addToHTMLHeadQueue("htmlEditor.cfm")>
         #setDynamicContent(application.dataCollectionManager.renderForm(rsForm.contentid,request.siteid,rsForm.body,rsForm.responseChart))#
         <script type="text/javascript">

branches/5.2.1/www/default/includes/display_objects/dsp_edit_profile.cfm

@@ -7 +7 @@
 Mura CMS is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ï¿œSee the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Mura CMS.  If not, see <http://www.gnu.org/licenses/>.
+along with Mura CMS. ï¿œIf not, see <http://www.gnu.org/licenses/>.
 
 Linking Mura CMS statically or dynamically with other modules constitutes
 the preparation of a derivative work based on Mura CMS. Thus, the terms and     
-conditions of the GNU General Public License version 2 (“GPL”) cover the entire combined work.
+conditions of the GNU General Public License version 2 (ￜGPLￜ) cover the entire combined work.
 
 However, as a special exception, the copyright holders of Mura CMS grant you permission
 to combine Mura CMS with programs or libraries that are released under the GNU Lesser General Public License version 2.1.
 
-In addition, as a special exception,  the copyright holders of Mura CMS grant you permission
-to combine Mura CMS  with independent software modules that communicate with Mura CMS solely
+In addition, as a special exception, ï¿œthe copyright holders of Mura CMS grant you permission
+to combine Mura CMS ï¿œwith independent software modules that communicate with Mura CMS solely
 through modules packaged as Mura CMS plugins and deployed through the Mura CMS plugin installation API,
-provided that these modules (a) may only modify the  /trunk/www/plugins/ directory through the Mura CMS
+provided that these modules (a) may only modify the ￜ/trunk/www/plugins/ directory through the Mura CMS
 plugin installation API, (b) must not alter any default objects in the Mura CMS database
 and (c) must not alter any files in the following directories except in cases where the code contains
@@ -38 +38 @@
 For clarity, if you create a modified version of Mura CMS, you are not obligated to grant this special exception
 for your modified version; it is your choice whether to do so, or to make such modified version available under
-the GNU General Public License version 2  without this exception.  You may, if you choose, apply this exception
+the GNU General Public License version 2 ï¿œwithout this exception. ï¿œYou may, if you choose, apply this exception
 to your own modified versions of Mura CMS.
 --->
@@ -49 +49 @@
 <cfparam name="msg" default="#rbFactory.getKey('user.message')#">
 <cfparam name="request.categoryID" default="">
-<cfset addToHTMLHeadQueue("fckeditor.cfm")>
+<cfset addToHTMLHeadQueue("htmlEditor.cfm")>
 </cfsilent>
 <cfoutput>

branches/5.2.1/www/default/includes/display_objects/htmlhead/global.cfm

@@ -7 +7 @@
 Mura CMS is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. ï¿œSee the
 GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
-along with Mura CMS.  If not, see <http://www.gnu.org/licenses/>.
+along with Mura CMS. ï¿œIf not, see <http://www.gnu.org/licenses/>.
 
 Linking Mura CMS statically or dynamically with other modules constitutes
 the preparation of a derivative work based on Mura CMS. Thus, the terms and     
-conditions of the GNU General Public License version 2 (“GPL”) cover the entire combined work.
+conditions of the GNU General Public License version 2 (ￜGPLￜ) cover the entire combined work.
 
 However, as a special exception, the copyright holders of Mura CMS grant you permission
 to combine Mura CMS with programs or libraries that are released under the GNU Lesser General Public License version 2.1.
 
-In addition, as a special exception,  the copyright holders of Mura CMS grant you permission
-to combine Mura CMS  with independent software modules that communicate with Mura CMS solely
+In addition, as a special exception, ï¿œthe copyright holders of Mura CMS grant you permission
+to combine Mura CMS ï¿œwith independent software modules that communicate with Mura CMS solely
 through modules packaged as Mura CMS plugins and deployed through the Mura CMS plugin installation API,
-provided that these modules (a) may only modify the  /trunk/www/plugins/ directory through the Mura CMS
+provided that these modules (a) may only modify the ￜ/trunk/www/plugins/ directory through the Mura CMS
 plugin installation API, (b) must not alter any default objects in the Mura CMS database
 and (c) must not alter any files in the following directories except in cases where the code contains
@@ -38 +38 @@
 For clarity, if you create a modified version of Mura CMS, you are not obligated to grant this special exception
 for your modified version; it is your choice whether to do so, or to make such modified version available under
-the GNU General Public License version 2  without this exception.  You may, if you choose, apply this exception
+the GNU General Public License version 2 ï¿œwithout this exception. ï¿œYou may, if you choose, apply this exception
 to your own modified versions of Mura CMS.
 --->
@@ -61 +61 @@
 var assetpath="#event.getSite().getAssetPath()#";
 var themepath="#event.getSite().getThemeAssetPath()#";
+var htmlEditorType='#application.configBean.getValue("htmlEditorType")#';
+var rb='#lcase(session.rb)#';
 </script>
 </cfoutput>

branches/5.2.1/www/default/js/global.js

@@ -664 +664 @@
         for (i = 0; i < allPageTags.length; i++) {
                 if (allPageTags[i].className == "htmlEditor") {
-                        var oFCKeditor = new FCKeditor(allPageTags[i].id);
-                        oFCKeditor.ToolbarSet                   = "htmlEditor";
-                        oFCKeditor.Config.EditorAreaCSS = themepath + '/css/editor.css';
-                        oFCKeditor.Config.StylesXmlPath = themepath + '/css/fckstyles.xml';
-                        oFCKeditor.BasePath = context + '/wysiwyg/';
-                        oFCKeditor.Height = height;
-                        oFCKeditor.Width = width;
-                        oFCKeditor.Config.ImageBrowser=false;
-                        oFCKeditor.Config.ImageUpload=false;
-                        oFCKeditor.Config.ForcePasteAsPlainText = true;
-                        oFCKeditor.Config.StartupFocus = false;
-                        oFCKeditor.ReplaceTextarea();
-                        editors.push(oFCKeditor);
-                }
-        }
-}
+                        if (htmlEditorType=='fckeditor') {
+                                var oFCKeditor = new FCKeditor(allPageTags[i].id);
+                                oFCKeditor.ToolbarSet                   = "htmlEditor";
+                                oFCKeditor.Config.EditorAreaCSS = themepath + '/css/editor.css';
+                                oFCKeditor.Config.StylesXmlPath = themepath + '/css/fckstyles.xml';
+                                oFCKeditor.BasePath = context + '/wysiwyg/';
+                                oFCKeditor.Height = height;
+                                oFCKeditor.Width = width;
+                                oFCKeditor.Config.ImageBrowser=false;
+                                oFCKeditor.Config.ImageUpload=false;
+                                oFCKeditor.Config.ForcePasteAsPlainText = true;
+                                oFCKeditor.Config.StartupFocus = false;
+                                oFCKeditor.ReplaceTextarea();
+                                editors.push(oFCKeditor);
+                        } else {
+                                var instance=CKEDITOR.instances[allPageTags[i].id];
+                                if (instance) {
+                                        CKEDITOR.remove(instance);
+                                } 
+                                
+                                if(jQuery('#' + allPageTags[i].id).html() == ''){
+                                        jQuery('#' + allPageTags[i].id).html("<p></p>")
+                                }
+                                
+                                jQuery('#' + allPageTags[i].id).ckeditor(getHTMLEditorConfig(),htmlEditorOnComplete);
+                                        
+                        }
+                }
+        }
+}
+
+var HTMLEditorLoadCount=0;
+
+function htmlEditorOnComplete( editorInstance ) {       
+        
+        if( htmlEditorType=='fckeditor'){
+                editorInstance.ResetIsDirty();
+                var totalIntances=FCKeditorAPI.Instances;
+        }else{
+                var instance=jQuery(editorInstance).ckeditorGet();
+                instance.resetDirty();
+                var totalIntances=CKEDITOR.instances;
+                //CKFinder.setupCKEditor( instance, { basePath : context + '/tasks/widgets/ckfinder/', rememberLastFolder : false } ) ;
+        }
+        
+        HTMLEditorLoadCount++;
+    
+    var count = 0;
+
+    for (k in totalIntances){ count++ }
+
+    if (HTMLEditorLoadCount >= count ) {
+        document.getElementById("actionButtons").style.display="block"; 
+    } else {
+        document.getElementById("actionButtons").style.display="none";
+        }
+ 
+}
+
+function getHTMLEditorConfig() {
+        var htmlEditorConfig={
+                toolbar:'Default',
+                contentsCss: themeAssetPath + '/css/editor.css',
+                defaultLanguage: rb
+                }
+        return htmlEditorConfig;
+        }
 
 addLoadEvent(setKeyCheck);