scribble_cms 0.82 → 0.88

data/app/assets/javascripts/scribbler.js

@@ -1,12 +1,38 @@
 // Place all the behaviors and hooks related to the matching controller here.
 // All this logic will automatically be available in application.js.
-$(document).ready(function() {
-  tinyMCE.init({
+
+window.initScribblerTinyMce = function(){
+  tinymce.remove("textarea")
+  $('textarea').not('.plain').not(".mini-editor").tinymce({
     mode: 'textareas',
     theme: 'modern',
     plugins: "autolink code colorpicker hr image link lists paste table textcolor",
     menubar: '',
-    toolbar: "undo redo | styleselect | bold italic | link unlink image | alignleft aligncenter alignright | bullist numlist table | textcolor | code",
-    valid_elements : '*[*]'
-   });
+    toolbar: "undo redo | styleselect | bold italic | link unlink image | alignleft aligncenter alignright | bullist numlist table | textcolor fontsizeselect | code",
+    valid_elements : '*[*]',
+    elementpath: false,
+    statusbar: true,
+    fontsize_formats: "8px 10px 12px 14px 16px 18px 24pt 36px 48px",
+    convert_urls: false
+  });
+  
+  $('textarea.mini-editor').tinymce({
+    mode: 'textareas',
+    theme: 'modern',
+    plugins: "autolink link lists paste textcolor",
+    menubar: '',
+    toolbar: "bold italic | link unlink | bullist numlist | code",
+    valid_elements : '*[*]',
+    elementpath: false,
+    statusbar: true,
+    fontsize_formats: "8px 10px 12px 14px 16px 18px 24pt 36px 48px"
+  });
+}
+
+$(document).ready(function() {
+  window.initScribblerTinyMce()
+});
+
+$(document).ajaxComplete(function() {
+  window.initScribblerTinyMce()
 });

data/app/assets/stylesheets/ext/tinymce.content.min.css

@@ -1 +1 @@
-body{background-color:#FFFFFF;color:#000000;font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px;scrollbar-3dlight-color:#F0F0EE;scrollbar-arrow-color:#676662;scrollbar-base-color:#F0F0EE;scrollbar-darkshadow-color:#DDDDDD;scrollbar-face-color:#E0E0DD;scrollbar-highlight-color:#F0F0EE;scrollbar-shadow-color:#F0F0EE;scrollbar-track-color:#F5F5F5}td,th{font-family:Verdana,Arial,Helvetica,sans-serif;font-size:14px}.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#D5D5D5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}hr{cursor:default}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid #F00;cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td[data-mce-selected],th[data-mce-selected]{background-color:#3399ff !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2d8ac7}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #7ACAFF}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2d8ac7}.mce-resize-bar-dragging{background-color:blue;opacity:.25;filter:alpha(opacity=25);zoom:1}
+body{background-color:#FFFFFF;color:#000000;font-size:14px;scrollbar-3dlight-color:#F0F0EE;scrollbar-arrow-color:#676662;scrollbar-base-color:#F0F0EE;scrollbar-darkshadow-color:#DDDDDD;scrollbar-face-color:#E0E0DD;scrollbar-highlight-color:#F0F0EE;scrollbar-shadow-color:#F0F0EE;scrollbar-track-color:#F5F5F5}td,th{font-size:14px}.mce-content-body .mce-reset{margin:0;padding:0;border:0;outline:0;vertical-align:top;background:transparent;text-decoration:none;color:black;font-family:Arial;font-size:11px;text-shadow:none;float:none;position:static;width:auto;height:auto;white-space:nowrap;cursor:inherit;line-height:normal;font-weight:normal;text-align:left;-webkit-tap-highlight-color:transparent;-moz-box-sizing:content-box;-webkit-box-sizing:content-box;box-sizing:content-box;direction:ltr;max-width:none}.mce-object{border:1px dotted #3A3A3A;background:#D5D5D5 url(img/object.gif) no-repeat center}.mce-preview-object{display:inline-block;position:relative;margin:0 2px 0 2px;line-height:0;border:1px solid gray}.mce-preview-object[data-mce-selected="2"] .mce-shim{display:none}.mce-preview-object .mce-shim{position:absolute;top:0;left:0;width:100%;height:100%;background:url(data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///yH5BAEAAAAALAAAAAABAAEAAAIBRAA7)}figure.align-left{float:left}figure.align-right{float:right}figure.image.align-center{display:table;margin-left:auto;margin-right:auto}figure.image{display:inline-block;border:1px solid gray;margin:0 2px 0 1px;background:#f5f2f0}figure.image img{margin:8px 8px 0 8px}figure.image figcaption{margin:6px 8px 6px 8px;text-align:center}.mce-toc{border:1px solid gray}.mce-toc h2{margin:4px}.mce-toc li{list-style-type:none}.mce-pagebreak{cursor:default;display:block;border:0;width:100%;height:5px;border:1px dashed #666;margin-top:15px;page-break-before:always}@media print{.mce-pagebreak{border:0}}.mce-item-anchor{cursor:default;display:inline-block;-webkit-user-select:all;-webkit-user-modify:read-only;-moz-user-select:all;-moz-user-modify:read-only;user-select:all;user-modify:read-only;width:9px !important;height:9px !important;border:1px dotted #3A3A3A;background:#D5D5D5 url(img/anchor.gif) no-repeat center}.mce-nbsp,.mce-shy{background:#AAA}.mce-shy::after{content:'-'}hr{cursor:default}.mce-match-marker{background:#AAA;color:#fff}.mce-match-marker-selected{background:#3399ff;color:#fff}.mce-spellchecker-word{border-bottom:2px solid #F00;cursor:default}.mce-spellchecker-grammar{border-bottom:2px solid #008000;cursor:default}.mce-item-table,.mce-item-table td,.mce-item-table th,.mce-item-table caption{border:1px dashed #BBB}td[data-mce-selected],th[data-mce-selected]{background-color:#3399ff !important}.mce-edit-focus{outline:1px dotted #333}.mce-content-body *[contentEditable=false] *[contentEditable=true]:focus{outline:2px solid #2d8ac7}.mce-content-body *[contentEditable=false] *[contentEditable=true]:hover{outline:2px solid #7ACAFF}.mce-content-body *[contentEditable=false][data-mce-selected]{outline:2px solid #2d8ac7}.mce-resize-bar-dragging{background-color:blue;opacity:.25;filter:alpha(opacity=25);zoom:1}

data/app/helpers/scribbler_admin_helper.rb

@@ -1,13 +1,17 @@
 module ScribblerAdminHelper
-  
+
   # Form
   def scribbler_form_element(element,form)
-    render :partial => "/scribbler_content/forms/#{element.element_type}", :locals => {:element => element, :f => form} 
-  end    
-  
-  
+    render :partial => "/scribbler_content/forms/#{element.element_type}", :locals => {:element => element, :f => form}
+  end
+
+
   def scribbler_layout(&block)
     render :partial => "/scribbler_admin/scribbler_layout", :locals => {:content => capture(&block)}
-  end 
-  
+  end
+
+  def scribbler_assets
+    render 'scribbler_admin/scribbler_assets'
+  end
+
 end

data/app/helpers/scribbler_content_helper.rb

@@ -20,6 +20,10 @@ module ScribblerContentHelper
     if block_given?
       options[:default] = capture(&block).html_safe.strip.force_encoding("UTF-8")
     end
+    
+    if options[:i18n]
+      group = "#{group}-#{I18n.locale}"
+    end
 
     scribbler_group(container.to_s, group.to_s) do |g|
       v = g.send(type.to_s, name.to_s, options)

data/app/models/scribbler_container.rb

@@ -3,7 +3,6 @@ class ScribblerContainer < ActiveRecord::Base
   #= Configuration
       #== Associations
       has_many :groups, :class_name => "::ScribblerGroup", :foreign_key => "container_id"
-       belongs_to :element, :class_name => "Alchemy::Element", :foreign_key => "element_id"
       #== Plugins and modules
         #=== PlugIns
           # => Stuff in Here

data/app/models/scribbler_group.rb

@@ -143,7 +143,7 @@ class ScribblerGroup < ActiveRecord::Base
 
     def process_data!(data)
       data.each do |key, content|
-        content.symbolize_keys!
+        content.to_hash.symbolize_keys!
         e_id    = content.delete(:id)
         e_type  = content.delete(:type)
         e_rel   = content.delete(:release)

data/app/views/scribbler_admin/_scribbler_assets.html.erb

@@ -0,0 +1,7 @@
+<% ScribbleCms.js_files.each do |js| %>
+  <%= javascript_include_tag(js) %>
+<% end %>
+
+<% ScribbleCms.css_files.each do |css| %>
+  <%= stylesheet_link_tag(css, :media => 'all') %>
+<% end %>

data/app/views/scribbler_admin/_scribbler_layout.html.erb

@@ -1,3 +1,5 @@
+<%= scribbler_assets %>
+
 <div id="scribbler-admin-area" class="cf">
   <% if @containers.empty? %>
     <span class="metainfo">Es liegen keine Inhalte vor, die bearbeitet werden können</span>
@@ -6,5 +8,5 @@
       <%= render :partial => "/scribbler_admin/scribbler_sidebar" unless request.xhr? %>
     </div>
     <div id="scribbler-edit-area"><%= content %></div>
-  <% end %>  
+  <% end %>
 </div>

data/app/views/scribbler_admin/group_edit.html.erb

@@ -56,11 +56,6 @@
 
 <% end %>
 
-<script type="text/javascript">
-  f = "Alchemy.Tinymce.init(<%= element_ids %>)"
-  window.setTimeout(f, 250)
-</script>
-
 
 
 

data/lib/scribble_cms/engine.rb

@@ -1,6 +1,8 @@
 module Scribbler
   class Engine < Rails::Engine
 
+
+
     engine_name 'scribbler'
 
     initializer "dragonfly.scribbler" do
@@ -14,20 +16,19 @@ module Scribbler
       end
     end
 
-    if defined?(ActiveAdmin)
-      initializer 'activeadmin.tinymce', :group => :all do |app|
-        js = ['ext/tinymce.min.js', 'scribbler.js']
-        css = ['ext/tinymce.skin.css', 'ext/tinymce.content.min.css']
 
-        app.config.assets.precompile += js
-        app.config.assets.precompile += css
+    initializer 'activeadmin.tinymce', :group => :all do |app|
+
+      app.config.assets.precompile += ScribbleCms.js_files
+      app.config.assets.precompile += ScribbleCms.css_files
 
+      if defined?(ActiveAdmin)
         ActiveAdmin.application.tap do |config|
-          js.each do |j|
+          ScribbleCms.js_files.each do |j|
             config.register_javascript j
           end
 
-          css.each do |s|
+          ScribbleCms.css_files.each do |s|
             config.register_stylesheet s
           end
         end

data/lib/scribble_cms.rb

@@ -10,6 +10,15 @@ module ScribbleCms
 
   self.tiny_mce_css = "default_tinymce"
   self.tiny_mce_js  = "Alchemy.Tinymce.initAll();"
+
+  def self.js_files
+    ['ext/tinymce.min.js', 'ext/jquery.tinymce.min.js', 'scribbler.js']
+  end
+
+  def self.css_files
+    ['ext/tinymce.skin.css', 'ext/tinymce.content.min.css']
+  end
+
 end
 
 ActionController::Base.send(:include, ScribbleCms::ScribblerControllerPlugin)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scribble_cms
 version: !ruby/object:Gem::Version
-  version: '0.82'
+  version: '0.88'
 platform: ruby
 authors:
 - Florian Eck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-08 00:00:00.000000000 Z
+date: 2017-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: friendly_extensions
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: 0.2.6
 - !ruby/object:Gem::Dependency
   name: dragonfly
   requirement: !ruby/object:Gem::Requirement
@@ -42,16 +42,16 @@ dependencies:
   name: smart_search
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.79
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.79
+        version: '0'
 description: Easy-to-use tool for placing user-editable content in your pages
 email:
 - florian.eck@el-digital.de
@@ -70,6 +70,7 @@ files:
 - app/assets/fonts/tinymce.ttf
 - app/assets/fonts/tinymce.woff
 - app/assets/javascripts/ext/jquery.Jcrop.min.js
+- app/assets/javascripts/ext/jquery.tinymce.min.js
 - app/assets/javascripts/ext/tinymce.min.js
 - app/assets/javascripts/scribbler.js
 - app/assets/stylesheets/ext/jquery.Jcrop.css
@@ -87,6 +88,7 @@ files:
 - app/models/scribbler_text.rb
 - app/models/scribbler_var.rb
 - app/views/admin/_scribbler_group_form.html.erb
+- app/views/scribbler_admin/_scribbler_assets.html.erb
 - app/views/scribbler_admin/_scribbler_layout.html.erb
 - app/views/scribbler_admin/_scribbler_sidebar.html.erb
 - app/views/scribbler_admin/container_edit.html.erb
@@ -128,8 +130,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.12
 signing_key: 
 specification_version: 4
-summary: Easy-to-use tool for placing user-editable content in your pages
+summary: Eay-to-use tool for placing user-editable content in your pages
 test_files: []