scribble_cms 0.71 → 0.82

data/app/models/scribbler_container.rb

@@ -1,45 +1,45 @@
 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        
-  
+          # => Stuff in Here
+
         #=== include Modules
           # => Stuff in Here
-  
+
       #== Konstanten
           # => Stuff in Here
-  
+
       #== Validation and Callbacks
         #=== Validation
         validates_uniqueness_of :name, :on => :create, :message => "must be unique"
-          
+
         #=== Callbacks
         before_create { self.description = self.name }
-          
-          
+
+
     # => END
-  
+
     def ordered_groups
       self.groups.sort_by {|g| g.human_name.to_s }
-    end  
-    
+    end
+
   def scribbler_group(name, &block)
     yield(self.get_group(name))
   end
-  
+
   def get_group(name)
     ScribblerGroup.where(:name => name, :container_id => self.id).first || ScribblerGroup.create(:name => name, :container_id => self.id)
-  end  
-  
+  end
+
   def description
     I18n.t(self.name, :scope => "scribbler.container_names", :default => self.name.humanize)
-  end  
-  
-    
-  
+  end
+
+
+
 end

data/app/models/scribbler_group.rb

@@ -1,10 +1,12 @@
 class ScribblerGroup < ActiveRecord::Base
 
   #= Configuration
+  attr_accessor :group_data
       #== Associations
       belongs_to :container, :class_name => "ScribblerContainer", :foreign_key => "container_id", :touch => true
 
       has_many :texts, :class_name => "ScribblerText", :foreign_key => "group_id"
+
       #== Plugins and modules
         #=== PlugIns
           # => Stuff in Here
@@ -29,6 +31,12 @@ class ScribblerGroup < ActiveRecord::Base
 
     # => END
 
+    def contents
+      contents = ELEMENTS.values.map do |cont_class|
+        cont_class.constantize.where(group_id: self.id).where(:released => true)
+      end.flatten
+    end
+
     # Display data
     def row(row_name, options = {})
       e = get_element(:row, row_name)
@@ -98,11 +106,9 @@ class ScribblerGroup < ActiveRecord::Base
       end
       element = element_class.where(options).first
       if element.nil?
-        element_class.create(options.merge(:released => !options[:released]))
         element = element_class.create(options)
       end
 
-
       return element
     end
 
@@ -122,6 +128,10 @@ class ScribblerGroup < ActiveRecord::Base
       self.elements.each {|e| e.destroy }
     end
 
+    def group_data=(data)
+      process_data!(data)
+    end
+
     # Save data
     def process_group_data(data = {})
       # Update realesed data
@@ -133,10 +143,11 @@ class ScribblerGroup < ActiveRecord::Base
 
     def process_data!(data)
       data.each do |key, content|
+        content.symbolize_keys!
         e_id    = content.delete(:id)
         e_type  = content.delete(:type)
         e_rel   = content.delete(:release)
-        element = ELEMENTS[e_type.to_sym].find(e_id)
+        element = ELEMENTS[e_type.to_sym].constantize.find(e_id)
         element.update_attributes(content)
 
         if e_rel == "1"
@@ -149,6 +160,10 @@ class ScribblerGroup < ActiveRecord::Base
       I18n.t(self.name, :scope => "scribbler.group_names", :default => self.name.humanize) rescue self.name
     end
 
+    def container_description
+      container.description
+    end
+
 
 
 

data/app/models/scribbler_image.rb

@@ -5,7 +5,6 @@ class ScribblerImage < ActiveRecord::Base
     after_assign{|i| i.name = sanitize_filename(image.name) }
   end
 
-
   def sanitize_filename(filename)
     [filename.split(".").first.parameterize, filename.split(".").last].join(".")
   end
@@ -18,8 +17,6 @@ class ScribblerImage < ActiveRecord::Base
     case_sensitive: false,
     message: I18n.t("not a valid image")
 
-
-
       #== Associations
 
       #== Plugins and modules

data/app/views/admin/_scribbler_group_form.html.erb

@@ -0,0 +1,18 @@
+<% element_ids = [] %>
+<%= form_for [:admin, resource] do |f| %>
+  <%= f.fields_for :group_data do |u| %>
+      <% f.object.released_elements.each do |e| %>
+        <div class="scribbler-element scribbler-<%= e.element_type %>" style="<%= 'background-color: #ffffdc;' if params[:active].to_i == e.id %> padding: 5px;">
+          <h3 class="scribbler-header"><%= e.human_name %></h3>
+          <% unless e.hint.blank? %>
+            <p class="scribbler-element-hint"><%= raw(e.hint) %></p>
+          <% end %>
+          <% element_ids << e.id %>
+          <div style="margin-bottom: 5px;"><%= scribbler_form_element(e,u) %></div>
+        </div>
+      <% end %>
+  <% end %>
+
+  <%= f.submit %>
+
+<% end %>

data/app/views/scribbler_content/forms/_text.html.erb

@@ -1,5 +1,5 @@
 <%= f.fields_for "#{element.element_type}_#{element.id}" do |e| %>
-  <%= e.text_area :content, :class => ScribbleCms.tiny_mce_css, :id => "tinymce_#{element.id}", :value => element.content %>
+  <%= e.text_area :content, :class => ScribbleCms.tiny_mce_css, :value => element.content, class: 'html_editor' %>
   <br />
   <%= e.hidden_field :type, :value => element.element_type %>
   <%= e.hidden_field :id, :value => element.id %>

data/config/locales/scribbler_defaults.de.yml

@@ -7,3 +7,17 @@ de:
       content-en: 'EN: 2. Text/Inhalt'
       subject-de: 'DE: 1. Betreff'
       content-de: 'DE: 2. Text/Inhalt'
+      content: Text/Inhalt
+      title: Name
+      header: Überschrift
+      intro: Einleitung
+
+  activerecord:
+    models:
+      scribbler_group: Textbausteine
+      scribbler_container: Textgruppe
+    attributes:
+      scribbler_group:
+        human_name: Name
+        container_description: Textgruppe
+

data/lib/admin/scribbler_groups.rb.template

@@ -0,0 +1,32 @@
+ActiveAdmin.register ScribblerGroup do
+
+  controller do
+    define_method :permitted_params do
+      params.to_hash
+    end
+  end
+
+  index do
+    column :human_name
+    column :container_description
+    actions
+  end
+
+  show do
+    h3 scribbler_group.human_name
+    scribbler_group.released_elements.each do |element|
+      panel element.human_name do
+        case element.element_type
+        when :row, :text
+          div do
+            element.content.html_safe
+          end
+        when :image
+        end
+      end
+    end
+  end
+
+  form partial: 'admin/scribbler_group_form'
+
+end

data/lib/scribble_cms/engine.rb

@@ -14,6 +14,26 @@ 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
+
+        ActiveAdmin.application.tap do |config|
+          js.each do |j|
+            config.register_javascript j
+          end
+
+          css.each do |s|
+            config.register_stylesheet s
+          end
+        end
+      end
+    end
+
   end
 end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scribble_cms
 version: !ruby/object:Gem::Version
-  version: '0.71'
+  version: '0.82'
 platform: ruby
 authors:
 - Florian Eck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-14 00:00:00.000000000 Z
+date: 2017-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: friendly_extensions
@@ -59,9 +59,22 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/fonts/tinymce-small.eot
+- app/assets/fonts/tinymce-small.json
+- app/assets/fonts/tinymce-small.svg
+- app/assets/fonts/tinymce-small.ttf
+- app/assets/fonts/tinymce-small.woff
+- app/assets/fonts/tinymce.eot
+- app/assets/fonts/tinymce.json
+- app/assets/fonts/tinymce.svg
+- app/assets/fonts/tinymce.ttf
+- app/assets/fonts/tinymce.woff
 - app/assets/javascripts/ext/jquery.Jcrop.min.js
+- app/assets/javascripts/ext/tinymce.min.js
 - app/assets/javascripts/scribbler.js
 - app/assets/stylesheets/ext/jquery.Jcrop.css
+- app/assets/stylesheets/ext/tinymce.content.min.css
+- app/assets/stylesheets/ext/tinymce.skin.scss
 - app/assets/stylesheets/scribbler.css.erb
 - app/assets/stylesheets/scribbler_layout.css.erb
 - app/controller/scribbler_pictures_controller.rb
@@ -73,6 +86,7 @@ files:
 - app/models/scribbler_link.rb
 - app/models/scribbler_text.rb
 - app/models/scribbler_var.rb
+- app/views/admin/_scribbler_group_form.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
@@ -89,6 +103,7 @@ files:
 - config/scribble_cms.rb
 - db/migrate/001_create_scribblers.rb
 - db/migrate/002_add_description_to_scribbler_containers.rb
+- lib/admin/scribbler_groups.rb.template
 - lib/scribble_cms.rb
 - lib/scribble_cms/engine.rb
 - lib/scribble_cms/scribbler_content_creator.rb