scribble_cms 0.5 → 0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3e706ebc8a03c8b726759571b427213eb4d8ea32
-  data.tar.gz: 10483fa6ec2cfe7828d673a247c9debc595120fc
+  metadata.gz: 417706a2e5c1f05f6907232662bea318abcf0981
+  data.tar.gz: c18425befd5a6f054e79f47f6945128ade015d34
 SHA512:
-  metadata.gz: af9d8f97bcc4552ec0daa73ae054266b1108c53cba23465388e78ef0ac127a8c1fbbc078f4b39abbc2510b625378aa94cbc2be56c9f5b949b0c7995daf8ad4b2
-  data.tar.gz: 406fec9bc5750bb74ab314d1d379fb65641b00cb77c902e8d47987f8f3e6917afb27f001c4bbba409181a0a1367ec7f75b385b7c6fb48db7f5c75592420f5447
+  metadata.gz: db9640381f3dc7cc5d578502e5c22ca0d62d17b8174aa948a003025732b531767c1c80de84343428c93c0fdae5fe04f5157fb8caba8e6bf4075728ad8ba6c28c
+  data.tar.gz: 18a3a823e58b39d3d80e22bef44a023da2f3873ed9bf2374c9fe7a32bc8d28284467110b237ebc178f8355829295115aad658cf6a79eac0dd32eb98919948c12

data/app/models/scribbler_group.rb

@@ -2,32 +2,32 @@ class ScribblerGroup < ActiveRecord::Base
 
   #= Configuration
       #== Associations
-      belongs_to :container, :class_name => "ScribblerContainer", :foreign_key => "container_id", :touch => true 
-     
+      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        
-  
+          # => Stuff in Here
+
         #=== include Modules
           # => Stuff in Here
-  
+
       #== Konstanten
-      ELEMENTS = {:row => ScribblerText, 
+      ELEMENTS = {:row => ScribblerText,
                   :text => ScribblerText,
                   :link => ScribblerLink,
                   :image => ScribblerImage,
                   :var => ScribblerVar}
-  
+
       #== Validation and Callbacks
         #=== Validation
         validates_uniqueness_of :name, :scope => :container_id
-          
+
         #=== Callbacks
         after_destroy :destroy_elements
-         
+
     # => END
-    
+
     # Display data
     def row(row_name, options = {})
       e = get_element(:row, row_name)
@@ -36,44 +36,44 @@ class ScribblerGroup < ActiveRecord::Base
       end
       return e.content.to_s.html_safe
     end
-    
+
     def text(text_name, options = {})
       e = get_element(:text, text_name)
       if e.content.blank? && options[:default]
         e.update_attributes(:content => options[:default])
       end
       return e.content.to_s.html_safe
-    end  
-    
+    end
+
     def link(link_name, options = {})
       link = get_element(:link, link_name)
       options.merge!(:target => "_blank") if link.external
       ActionController::Base.helpers.link_to(link.title, link.url, options)
     end
-    
+
     def image(image_name, options = {})
       e = get_element(:image, image_name, options)
       if e.image
         e.image.url
       else
         ""
-      end    
+      end
     end
-    
+
     def var(name, options = {})
       get_element :var, name
-    end  
-    
+    end
+
     def clone!(new_name)
       group = self.class.new(:name => new_name, :container_id => self.container_id)
       if group.save
         self.elements.each do |el|
           el.class.create(el.attributes.except("id").merge(:group_id => group.id))
-        end  
-      end  
-    end  
-    
-    
+        end
+      end
+    end
+
+
     # Helpers
     def get_element(type, name, options = {:released => true})
       options[:released] ||= true
@@ -86,48 +86,48 @@ class ScribblerGroup < ActiveRecord::Base
       when :link
         # ...
       when :image
-          
-      end    
-      
+
+      end
+
       options.merge!(:name => name, :group_id => self.id)
-      
+
       element_class = ELEMENTS[type]
-      
+
       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  
-    
+
+
+      return element
+    end
+
     def elements(options = {:released => true})
-      ELEMENTS.values.uniq.map {|c| c.where(:group_id => self.id, :released => options[:released] == true)}.flatten.sort_by {|e| e.name}
+      ELEMENTS.values.uniq.map {|c| c.where(:group_id => self.id, :released => options[:released] == true)}.flatten.sort_by {|e| e.human_name}
     end
-    
+
     def released_elements
       self.elements(:released => true)
     end
-    
+
     def unreleased_elements
       self.elements(:released => false)
-    end    
-    
+    end
+
     def destroy_elements
       self.elements.each {|e| e.destroy }
-    end  
-    
+    end
+
     # Save data
     def process_group_data(data = {})
       # Update realesed data
       self.process_data!(data[:released])
-      
+
       # Update unrealesed data
       self.process_data!(data[:unreleased]) if data[:unreleased]
-    end 
-    
+    end
+
     def process_data!(data)
       data.each do |key, content|
         e_id    = content.delete(:id)
@@ -135,18 +135,18 @@ class ScribblerGroup < ActiveRecord::Base
         e_rel   = content.delete(:release)
         element = ELEMENTS[e_type.to_sym].find(e_id)
         element.update_attributes(content)
-        
+
         if e_rel == "1"
           element.release!
-        end  
-      end  
+        end
+      end
     end
-    
+
     def human_name
       I18n.t(self.name, :scope => "scribbler.group_names", :default => self.name.humanize) rescue self.name
-    end  
-    
-    
-       
-    
+    end
+
+
+
+
 end

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

@@ -1,6 +1,6 @@
 <% element_ids = [] %>
 <%= scribbler_layout do %>
-  
+
   <%= form_for @group, :url => {:action => "group_update", :id => @group.id}, :html => {:class => "section", :method => :post} do |f| %>
   <table id="scribbler-group-edit-table" cellspacing="5">
     <% if !controller.hide_scribbler_edit_status %>
@@ -9,14 +9,14 @@
         <b><%= link_to_function("Aktueller Zustand", "toggleCol('released')") %></b><br />
         <i>Klicken um Bereich ein- bzw auszublenden</i>
       </td>
-      
+
       <td>
         <b><%= link_to_function("In Bearbeitung", "toggleCol('unreleased')") %></b><br />
         <i>Klicken um Bereich ein- bzw auszublenden</i>
       </td>
     </tr>
     <% end %>
-    
+
     <tr>
       <td id="released" class="">
         <%= f.fields_for :released do |u| %>
@@ -28,7 +28,7 @@
                 <% end %>
                 <% element_ids << e.id %>
                 <div style="margin-bottom: 5px;"><%= scribbler_form_element(e,u) %></div>
-              </div>  
+              </div>
             <% end %>
         <% end %>
       </td>
@@ -44,14 +44,14 @@
       <% end %>
     </tr>
   </table>
-  
+
   <%= f.submit "Änderungen speichern" %>
-  
+
   <% if @group.container.scaleable %>
-    <%= link_to "Dieses Element löschen", {:action => "group_destroy", :id => @group.id}, 
+    <%= link_to "Dieses Element löschen", {:action => "group_destroy", :id => @group.id},
       :confirm => "Soll dieses Element gelöscht werden? Dies kann nicht rückgängig gemacht werden.", :class => "icon-minus" %>
-  <% end %>  
-  
+  <% end %>
+
   <% end %>
 
 <% end %>

data/config/locales/scribbler_defaults.de.yml

@@ -0,0 +1,9 @@
+de:
+  scribbler:
+    element_names_default:
+      subject: Betreff
+      text: Text/Inhalt
+      subject-en: 'EN: 1. Betreff'
+      content-en: 'EN: 2. Text/Inhalt'
+      subject-de: 'DE: 1. Betreff'
+      content-de: 'DE: 2. Text/Inhalt'

data/lib/scribble_cms/scribbler_element_setup.rb

@@ -47,7 +47,13 @@ module ScribbleCms
     end
 
     def human_name
-      I18n.t(self.name, :scope => "scribbler.element_names.#{self.group.name}", :default => self.name.to_s.humanize)
+      s = "scribbler.element_names.#{self.group.name}.#{self.name}"
+
+      if I18n.exists?(s)
+        I18n.t(s)
+      else
+        I18n.t(self.name, scope: "scribbler.element_names_default")
+      end
     end
 
     def hint

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: scribble_cms
 version: !ruby/object:Gem::Version
-  version: '0.5'
+  version: '0.6'
 platform: ruby
 authors:
 - Florian Eck
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2016-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: friendly_extensions
@@ -54,7 +54,7 @@ dependencies:
         version: 0.0.78
 description: Easy-to-use tool for placing user-editable content in your pages
 email:
-- it-support@friends-systems.de
+- florian.eck@el-digital.de
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -84,13 +84,14 @@ files:
 - app/views/scribbler_content/forms/_link.html.erb
 - app/views/scribbler_content/forms/_row.html.erb
 - app/views/scribbler_content/forms/_text.html.erb
+- config/locales/scribbler_defaults.de.yml
 - config/routes.rb
 - db/migrate/20140313012637_create_scribblers.rb
 - lib/scribble_cms.rb
 - lib/scribble_cms/engine.rb
 - lib/scribble_cms/scribbler_controller_plugin.rb
 - lib/scribble_cms/scribbler_element_setup.rb
-homepage: http://www.friends-systems.de
+homepage: http://www.el-digital.de
 licenses: []
 metadata: {}
 post_install_message: