browsercms 3.5.1 → 3.5.2

data/app/assets/javascripts/bcms/ckeditor.js

@@ -3,55 +3,5 @@
 //  See /assets/ckeditor/config.js for default configuration.
 //
 //= require ckeditor-jquery
+//= require bcms/ckeditor_load
 
-jQuery(function($){
-  $('textarea.editor').each(function(e){
-    if(editorEnabled()) {
-      loadEditor(this.id)
-    }
-  });
-});
-
-function editorEnabled() {
-  return $.cookie('editorEnabled') ? $.cookie('editorEnabled') == "true" : true
-}
-
-function disableEditor(id) {
-  if(typeof(CKEDITOR) != "undefined" && CKEDITOR.instances[id] != null) {
-    $('#'+id).val(CKEDITOR.instances[id].getData()).show()
-    CKEDITOR.instances[id].destroy();
-    $.cookie('editorEnabled', false, { expires: 90, path: '/' })
-  }
-}
-
-function enableEditor(id) {
-  if(typeof(CKEDITOR) != "undefined" && CKEDITOR.instances[id] != null) {
-    CKEDITOR.instances[id].setData($('#'+id).val())
-    $('#'+id).hide()
-    $.cookie('editorEnabled', true, { expires: 90, path: '/' })
-  }
-}
-
-function toggleEditor(id, status) {
-  loadEditor(id)
-  if(status == 'Simple Text' || status.value == 'disabled'){
-    disableEditor(id)
-  } else {
-    enableEditor(id)
-  }
-}
-
-function loadEditor(id) {
-  if(typeof(CKEDITOR) != "undefined") {
-    if (CKEDITOR.instances[id] == null) {
-      CKEDITOR.replace(id, {
-//  Commented out as do not have image search available
-//        filebrowserImageBrowseUrl : '/ckfinder/ckfinder.html?Type=Image&Connector=/cms/sections/file_browser.xml'
-      });
-    }
-    $.cookie('editorEnabled', true, { expires: 90, path: '/' })
-    return true
-  } else {
-    return false
-  }
-}

data/app/assets/javascripts/bcms/ckeditor_load.js.erb

@@ -0,0 +1,48 @@
+jQuery(function($){
+  $('textarea.editor').each(function(e){
+    if(editorEnabled()) {
+      loadEditor(this.id)
+    }
+  });
+});
+
+function editorEnabled() {
+  return $.cookie('editorEnabled') ? $.cookie('editorEnabled') == "true" : true
+}
+
+function disableEditor(id) {
+  if(typeof(CKEDITOR) != "undefined" && CKEDITOR.instances[id] != null) {
+    $('#'+id).val(CKEDITOR.instances[id].getData()).show()
+    CKEDITOR.instances[id].destroy();
+    $.cookie('editorEnabled', false, { expires: 90, path: '/' })
+  }
+}
+
+function enableEditor(id) {
+  if(typeof(CKEDITOR) != "undefined" && CKEDITOR.instances[id] != null) {
+    CKEDITOR.instances[id].setData($('#'+id).val())
+    $('#'+id).hide()
+    $.cookie('editorEnabled', true, { expires: 90, path: '/' })
+  }
+}
+
+function toggleEditor(id, status) {
+  loadEditor(id)
+  if(status == 'Simple Text' || status.value == 'disabled'){
+    disableEditor(id)
+  } else {
+    enableEditor(id)
+  }
+}
+
+function loadEditor(id) {
+  if(typeof(CKEDITOR) != "undefined") {
+    if (CKEDITOR.instances[id] == null) {
+      CKEDITOR.replace(id, { customConfig : '<%= asset_path(Rails.application.config.cms.ckeditor.configuration_file) %>' });
+    }
+    $.cookie('editorEnabled', true, { expires: 90, path: '/' })
+    return true
+  } else {
+    return false
+  }
+}

data/app/assets/javascripts/{ckeditor/config.js → bcms/ckeditor_standard_config.js}

@@ -1,4 +1,7 @@
-// Default configuration for the CKeditor in BrowseCMS projects.
+// This is a custom configuration file that will be used by BrowserCMS to load instances of 
+// the CKEditor.
+// As per http://docs.cksource.com/ckeditor_api/symbols/CKEDITOR.config.html#.customConfig using a custom config
+// avoids the need to 'mask' the core default config.js file that CKEDITOR comes packaged with.
 
 CKEDITOR.config.toolbar_CMS = [
   ['Source','-','Cut','Copy','Paste','PasteText','PasteFromWord','-','SpellChecker','Scayt','-','Undo','Redo','Find','Replace','RemoveFormat','-','NumberedList','BulletedList','Outdent','Indent','HorizontalRule'],
@@ -14,7 +17,6 @@ CKEDITOR.config.toolbar_CMSForms = [
 	['TextField','Select','Checkbox','Radio','Textarea','Button','ImageButton','HiddenField']
 ];
 
-CKEDITOR.config.width = 598
-CKEDITOR.config.height = 400
-
-CKEDITOR.config.toolbar = 'CMS'
+CKEDITOR.config.width = 598;
+CKEDITOR.config.height = 400;
+CKEDITOR.config.toolbar = 'CMS';

data/app/controllers/cms/resource_controller.rb

@@ -36,7 +36,7 @@ class ResourceController < Cms::BaseController
 
   def update
     @object = resource.find(params[:id])
-    if @object.update_attributes(params["cms_#{variable_name}"])
+    if @object.update_attributes(params["#{variable_name}"])
       flash[:notice] = "#{resource_name.singularize.titleize} '#{object_name}' was updated"
       redirect_to after_update_url
     else

data/app/models/cms/redirect.rb

@@ -3,6 +3,10 @@ module Cms
     validates_presence_of :from_path, :to_path
     validates_uniqueness_of :from_path
 
-    include DefaultAccessible
+    def self.from(path)
+      where(:from_path => path).first
+    end
+
+    attr_accessible :from_path, :to_path
   end
 end

data/app/views/cms/redirects/edit.html.erb

@@ -1,3 +1,3 @@
 <% @page_title = @toolbar_title = "Edit Redirect" %>
-<%= content_for :functions, link_to(span_tag("List All"), cms_redirects_path, :class => "button") %>
+<%= content_for :functions, link_to(span_tag("List All"), redirects_path, :class => "button") %>
 <%= render :partial => 'form' %>

data/doc/release_notes.md

@@ -1,3 +1,9 @@
+v3.5.2
+======
+
+* Refactor CKEditor integration to make it easier to support external integrations (like CKFinder/KCFinder modules)
+* [#527] Fix bug that prevented editing users/groups/redirects.
+
 v3.5.1
 ======
 

data/lib/cms/engine.rb

@@ -25,6 +25,9 @@ module Cms
     # Allows additional menu items to be added to the 'Tools' menu on the Admin tab.
     config.cms.tools_menu = ActiveSupport::OrderedOptions.new
 
+    # Define configuration for the CKEditor
+    config.cms.ckeditor = ActiveSupport::OrderedOptions.new
+    
     # Make sure we use our rails model template (rather then its default) when `rails g cms:content_block` is run.
     config.app_generators do |g|
       path = File::expand_path('../../templates', __FILE__)
@@ -60,6 +63,11 @@ module Cms
       #   config.cms.site_domain = "www.browsercms.org"
       app.config.cms.site_domain = "localhost:3000"
       
+      # Determines which ckeditor file will be used to configure all instances.
+      # There should be at most ONE of these, so use manifest files which require the below one to augement it.
+      app.config.cms.ckeditor.configuration_file = 'bcms/ckeditor_standard_config.js'
+      
+      # Define menu items to be added dynamically to the CMS Admin tab.
       app.config.cms.tools_menu = []
     end
 

data/lib/cms/version.rb

@@ -2,7 +2,7 @@
 # Allows the precise version of BrowserCMS to be determined programatically.
 #
 module Cms
-  VERSION = "3.5.1"
+  VERSION = "3.5.2"
 
   # Return the current version of the CMS.
   def self.version

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: browsercms
 version: !ruby/object:Gem::Version
-  version: 3.5.1
+  version: 3.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-01 00:00:00.000000000 Z
+date: 2012-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -363,7 +363,8 @@ files:
 - app/assets/images/cms/usercontrols_bg.png
 - app/assets/images/cms/usercontrols_bg_cap.png
 - app/assets/javascripts/bcms/ckeditor.js
-- app/assets/javascripts/ckeditor/config.js
+- app/assets/javascripts/bcms/ckeditor_load.js.erb
+- app/assets/javascripts/bcms/ckeditor_standard_config.js
 - app/assets/javascripts/cms/application.js
 - app/assets/javascripts/cms/attachment_manager.js.erb
 - app/assets/javascripts/cms/content_library.js
@@ -772,7 +773,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4016751009646854184
+      hash: -1523236011724183372
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24