drg_default_html_editor 0.4.18 → 0.4.21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a91d9e11ca2d07063f52a3a2ae4a6dd8f0b2d958
-  data.tar.gz: b482394f6af580f773440a03866dad4af5723a84
+  metadata.gz: cc37e55dfb38ded0ad6f5cb6e7e15175dc41b6b4
+  data.tar.gz: e42fd7f102c436c7fb00bd15675a1db8fda67ac5
 SHA512:
-  metadata.gz: 8ee067a57d025929e2a831f15862c4f530efbbb0e5929e4c0c2d94311aa7903cac02b8a5439fed4788cb73abf8ca75554e46279620a5d45b2c5d3c50d7be7e71
-  data.tar.gz: 1d3e6ca86e4fda085c81a46ea813785b6304c0acbca9303f00eaa27ae3d9eafe99b4e2b06873e679189c53413c1516c92aa7d05a3c38ba2d2ec2d8631e6c19d6
+  metadata.gz: d9b8f29604b009988f3bea017e242fa54125d7bf5f9693c008035f2a0f86d9debddef3fc8f1a9f2db82d0e47615e9c1b4bd761a5d3f745f9689faa32e689fc64
+  data.tar.gz: 64e30420d98102856ee7f54e61f1466b110b202ec4af9b8b6cc8251634720ce0af22b250a9489c24f39ac3a4da480eaab4576c54d7dd667f03bf4e3b3205f163

data/README.md

@@ -1,12 +1,13 @@
 # DrgDefaultHtmlEditor
 
-Default HTML editor and file manager plugin for DRG CMS. DrgDefaultHtmlEditor consists 
-of CK editor component and EL Finder file manager component.
+Default HTML editor and file manager plugin for DRG CMS. Since DRG CMS doesn't come with HTML editor. DrgDefaultHtmlEditor gem adds html_field and file_select data entry fields to DRG CMS forms.
+
+DrgDefaultHtmlEditor consists of CK editor component and EL Finder file manager component.
 
 Configuration
 ----------------
 
-Add this line to your gem file:
+Add this line to your Gemfile:
 ```ruby
   gem 'drg_default_html_editor'
 ```  
@@ -18,6 +19,11 @@ Usage in Forms:
         name: body
         type: html_field
         options: "height: 500, width: 550, toolbar: 'basic'" 
+ #  or 
+        options: 
+          height: 500
+          width: 550
+          toolbar: "'basic'" 
 		
       20:
         name: picture

data/app/assets/stylesheets/drg_default_html_editor_cms.css

@@ -8,8 +8,8 @@
  * You're free to add application-wide styles to this file and they'll appear at the top of the
  * compiled file, but it's generally better to create a new file per style scope.
  *
- *= require ../javascripts/drg_default_html_editor/elfinder/css/elfinder.min.css
- *= require ../javascripts/drg_default_html_editor/elfinder/css/theme.css
+ *= require drg_default_html_editor/elfinder/css/elfinder.min.css
+ *= require drg_default_html_editor/elfinder/css/theme.css
 */
 
 

data/config/initializers/load_patches.rb

@@ -0,0 +1,30 @@
+#--
+# Copyright (c) 2014+ Damjan Rems
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+
+#require 'patches/drgcms_form_field.rb'
+
+patches_path = File.expand_path("../../../lib/patches", __FILE__) 
+# Add to DrgCms patches paths
+DrgCms::add_patches_path(patches_path)
+# Load initialy
+Dir["#{patches_path}/**/*.rb"].each { |file| require file }

data/lib/drg_default_html_editor/version.rb

@@ -1,3 +1,3 @@
 module DrgDefaultHtmlEditor
-  VERSION = "0.4.18"
+  VERSION = "0.4.21"
 end

data/lib/drg_default_html_editor.rb

@@ -4,3 +4,5 @@ require 'el_finder'
 
 module DrgDefaultHtmlEditor
 end
+
+#DrgCms.add_patches_path(File.dirname(__FILE__) + '/patches')

data/{config/initializers → lib}/patch_drgcms_form_field.rb

@@ -36,11 +36,12 @@ def render
   return ro_standard if @readonly
   set_initial_value
 #
+ record = record_text_for(@yaml['name'])
  @js << <<EOJS
 
-$('#record_#{@yaml['name']}').dblclick(function(){
-   $('#record_div_#{@yaml['name']}').show();
-   var f = $('#record_div_#{@yaml['name']}').elfinder({
+$('##{record}_#{@yaml['name']}').dblclick(function(){
+   $('##{record}_div_#{@yaml['name']}').show();
+   var f = $('##{record}_div_#{@yaml['name']}').elfinder({
            url : '/elfinder',
            transport : new elFinderSupportVer1(),
            height: 490,
@@ -49,15 +50,15 @@ $('#record_#{@yaml['name']}').dblclick(function(){
            lang: '#{I18n.locale}',
            getFileCallback : function(file) {
              file = file.replace('//','/');
-             $('#record_#{@yaml['name']}').val(file);
-             $('#record_div_#{@yaml['name']}').hide();
+             $('##{record}_#{@yaml['name']}').val(file);
+             $('##{record}_div_#{@yaml['name']}').hide();
            },
    });
 });
 EOJS
 
-  @html << @parent.text_field('record', @yaml['name'], @yaml['html']) +
-           "<div id='record_div_#{@yaml['name']}'></div>".html_safe
+  @html << @parent.text_field(record, @yaml['name'], @yaml['html']) +
+           "<div id='#{record}_div_#{@yaml['name']}'></div>".html_safe
   self
 end
 
@@ -65,7 +66,7 @@ end
 # Return html url code required for FileManager icon on CMS menu.
 ###########################################################################
 def self.file_manager_url(parent)
-  url = "assets/drg_default_html_editor/elfinder/elfinder.html?CKEditorFuncNum=1&langCode=#{I18n.locale}"
+  url = "/assets/drg_default_html_editor/elfinder/elfinder.html?CKEditorFuncNum=1&langCode=#{I18n.locale}"
         
   parent.link_to( parent.image_tag('drg_cms/file_manager.png', 
                                     class: 'dc-link-img', 
@@ -104,8 +105,9 @@ def render
   @yaml['options'] << ", language: '#{I18n.locale}'" unless @yaml['options'].match('language:')
   
   options = @yaml['options'] ? ",{#{@yaml['options']}}" : ''
-  @html << @parent.text_area('record', @yaml['name'], @yaml['html']) 
-  @js << "CKEDITOR.replace( 'record_#{@yaml['name']}'#{options} );"
+  record = record_text_for(@yaml['name'])
+  @html << @parent.text_area(record, @yaml['name'], @yaml['html']) 
+  @js << "CKEDITOR.replace( '#{record}_#{@yaml['name']}'#{options} );"
   self
 end
 end

data/lib/patches/drgcms_form_field.rb

@@ -0,0 +1,113 @@
+#--
+# Copyright (c) 2012+ Damjan Rems
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+DrgcmsFormFields rescue nil
+
+module DrgcmsFormFields
+###########################################################################
+# Class for creating ElFinder file manager enabled form field.
+###########################################################################
+class Elfinder < DrgcmsField
+  
+###########################################################################
+# Return code required to render elfinder DRG CMS form field.
+###########################################################################
+def render
+  return ro_standard if @readonly
+  set_initial_value
+#
+ record = record_text_for(@yaml['name'])
+ @js << <<EOJS
+
+$('##{record}_#{@yaml['name']}').dblclick(function(){
+   $('##{record}_div_#{@yaml['name']}').show();
+   var f = $('##{record}_div_#{@yaml['name']}').elfinder({
+           url : '/elfinder',
+           transport : new elFinderSupportVer1(),
+           height: 490,
+           docked: false,
+           dialog: { width: 400, modal: true },
+           lang: '#{I18n.locale}',
+           getFileCallback : function(file) {
+             file = file.replace('//','/');
+             $('##{record}_#{@yaml['name']}').val(file);
+             $('##{record}_div_#{@yaml['name']}').hide();
+           },
+   });
+});
+EOJS
+
+  @html << @parent.text_field(record, @yaml['name'], @yaml['html']) +
+           "<div id='#{record}_div_#{@yaml['name']}'></div>".html_safe
+  self
+end
+
+###########################################################################
+# Return html url code required for FileManager icon on CMS menu.
+###########################################################################
+def self.file_manager_url(parent)
+  url = "/assets/drg_default_html_editor/elfinder/elfinder.html?CKEditorFuncNum=1&langCode=#{I18n.locale}"
+        
+  parent.link_to( parent.fa_icon('archive lg', 
+                  title: parent.t('drgcms.file_manager')),
+                  '#',
+                 { onclick: "window.open('#{url}', 
+                  '#{parent.t('drgcms.file_manager')}',
+                  'width=700,height=500')"} ) 
+end
+
+end
+
+###########################################################################
+# Class for creating ckeditor DRG CMS form field.
+###########################################################################
+class Ckeditor < DrgcmsFormFields::DrgcmsField
+  
+###########################################################################
+# Return code required to render ckeditor DRG CMS form field.
+###########################################################################
+def render
+  return ro_standard if @readonly
+  set_initial_value
+# read configuration from site settings
+  ck_config = '/assets/ckeditor_config.js'
+  ck_css    = '/assets/ckeditor_css.css' 
+  ck = @parent.dc_get_site ? @parent.dc_get_site.params['ck_editor'] : nil # site might not be available yet
+  if ck
+    ck_config = ck['config_file'] if ck['config_file']
+    ck_css    = ck['css_file'] if ck['css_file']
+  end
+#  
+  @yaml['options'] ||= ''
+  @yaml['options'] << ", customConfig: '#{ck_config}'"
+  @yaml['options'] << ", contentsCss: '#{ck_css}'" unless ck_css.blank?
+  @yaml['options'] << ", language: '#{I18n.locale}'" unless @yaml['options'].match('language:')
+  
+  options = @yaml['options'] ? ",{#{@yaml['options']}}" : ''
+  record = record_text_for(@yaml['name'])
+  @html << @parent.text_area(record, @yaml['name'], @yaml['html']) 
+  @js << "CKEDITOR.replace( '#{record}_#{@yaml['name']}'#{options} );"
+  self
+end
+end
+
+end

data/{config/initializers → lib/patches}/patch_for_elfinder.rb

@@ -20,6 +20,8 @@
 # OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
 # WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 #++
+ElFinder rescue nil
+
 module ElFinder
 class Connector
   

data/test/patch_drgcms_form_field.rb

@@ -0,0 +1,115 @@
+#--
+# Copyright (c) 2012+ Damjan Rems
+#
+# Permission is hereby granted, free of charge, to any person obtaining
+# a copy of this software and associated documentation files (the
+# "Software"), to deal in the Software without restriction, including
+# without limitation the rights to use, copy, modify, merge, publish,
+# distribute, sublicense, and/or sell copies of the Software, and to
+# permit persons to whom the Software is furnished to do so, subject to
+# the following conditions:
+#
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+# MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+# LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+# OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+#++
+DrgcmsFormField rescue nil  # force loading of drgcms_form_field.rb in development ;-)
+
+module DrgcmsFormField
+
+###########################################################################
+# Class for creating ElFinder file manager enabled form field.
+###########################################################################
+class Elfinder < DrgcmsField
+  
+###########################################################################
+# Return code required to render elfinder DRG CMS form field.
+###########################################################################
+def render
+  return ro_standard if @readonly
+  set_initial_value
+#
+ record = record_text_for(@yaml['name'])
+ @js << <<EOJS
+
+$('##{record}_#{@yaml['name']}').dblclick(function(){
+   $('##{record}_div_#{@yaml['name']}').show();
+   var f = $('##{record}_div_#{@yaml['name']}').elfinder({
+           url : '/elfinder',
+           transport : new elFinderSupportVer1(),
+           height: 490,
+           docked: false,
+           dialog: { width: 400, modal: true },
+           lang: '#{I18n.locale}',
+           getFileCallback : function(file) {
+             file = file.replace('//','/');
+             $('##{record}_#{@yaml['name']}').val(file);
+             $('##{record}_div_#{@yaml['name']}').hide();
+           },
+   });
+});
+EOJS
+
+  @html << @parent.text_field(record, @yaml['name'], @yaml['html']) +
+           "<div id='#{record}_div_#{@yaml['name']}'></div>".html_safe
+  self
+end
+
+###########################################################################
+# Return html url code required for FileManager icon on CMS menu.
+###########################################################################
+def self.file_manager_url(parent)
+  url = "/assets/drg_default_html_editor/elfinder/elfinder.html?CKEditorFuncNum=1&langCode=#{I18n.locale}"
+        
+  parent.link_to( parent.image_tag('drg_cms/file_manager.png', 
+                                    class: 'dc-link-img', 
+                                    title: parent.t('drgcms.file_manager')),
+                                    '#',
+                                    { onclick: "window.open('#{url}',
+                                               '#{parent.t('drgcms.file_manager')}',
+                                               'width=700,height=500')"} ) 
+end
+
+end
+
+###########################################################################
+# Class for creating ckeditor DRG CMS form field.
+###########################################################################
+class Ckeditor < DrgcmsField
+  
+###########################################################################
+# Return code required to render ckeditor DRG CMS form field.
+###########################################################################
+def render
+  return ro_standard if @readonly
+  set_initial_value
+# read configuration from site settings
+  ck_config = '/assets/ckeditor_config.js'
+  ck_css    = '/assets/ckeditor_css.css' 
+  ck = @parent.dc_get_site ? @parent.dc_get_site.params['ck_editor'] : nil # site might not be available yet
+  if ck
+    ck_config = ck['config_file'] if ck['config_file']
+    ck_css    = ck['css_file'] if ck['css_file']
+  end
+#  
+  @yaml['options'] ||= ''
+  @yaml['options'] << ", customConfig: '#{ck_config}'"
+  @yaml['options'] << ", contentsCss: '#{ck_css}'" unless ck_css.blank?
+  @yaml['options'] << ", language: '#{I18n.locale}'" unless @yaml['options'].match('language:')
+  
+  options = @yaml['options'] ? ",{#{@yaml['options']}}" : ''
+  record = record_text_for(@yaml['name'])
+  @html << @parent.text_area(record, @yaml['name'], @yaml['html']) 
+  @js << "CKEDITOR.replace( '#{record}_#{@yaml['name']}'#{options} );"
+  self
+end
+end
+
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: drg_default_html_editor
 version: !ruby/object:Gem::Version
-  version: 0.4.18
+  version: 0.4.21
 platform: ruby
 authors:
 - Damjan Rems
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-22 00:00:00.000000000 Z
+date: 2015-04-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -476,13 +476,15 @@ files:
 - app/assets/stylesheets/drg_default_html_editor_application.css
 - app/assets/stylesheets/drg_default_html_editor_cms.css
 - app/controllers/dc_elfinder_controller.rb
-- config/initializers/patch_drgcms_form_field.rb
-- config/initializers/patch_for_elfinder.rb
+- config/initializers/load_patches.rb
 - config/routes.rb
 - lib/drg_default_html_editor.rb
 - lib/drg_default_html_editor.rb~
 - lib/drg_default_html_editor/engine.rb
 - lib/drg_default_html_editor/version.rb
+- lib/patch_drgcms_form_field.rb
+- lib/patches/drgcms_form_field.rb
+- lib/patches/patch_for_elfinder.rb
 - lib/tasks/drg_default_html_editor_copy_assets.rake
 - lib/tasks/drg_default_html_editor_tasks.rake
 - test/drg_default_html_editor_test.rb
@@ -515,6 +517,7 @@ files:
 - test/dummy/public/favicon.ico
 - test/dummy/script/rails
 - test/integration/navigation_test.rb
+- test/patch_drgcms_form_field.rb
 - test/test_helper.rb
 homepage: http://www.drgcms.org
 licenses:
@@ -536,13 +539,14 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: 'DRG CMS: Default HTML editor and file manager plugin'
 test_files:
 - test/test_helper.rb
 - test/integration/navigation_test.rb
+- test/patch_drgcms_form_field.rb
 - test/drg_default_html_editor_test.rb
 - test/dummy/README.rdoc
 - test/dummy/config/locales/en.yml