kuhsaft 2.2.6 → 2.3.0

data/app/models/kuhsaft/page_type.rb

@@ -2,7 +2,7 @@ module Kuhsaft
   class PageType
     REDIRECT = 'redirect'
     NAVIGATION = 'navigation'
-    CONTENT = ''
+    CONTENT = 'content'
 
     def self.all
       [CONTENT, REDIRECT, NAVIGATION]

data/app/models/kuhsaft/partition.rb

@@ -1,18 +1,18 @@
 module Kuhsaft
   class Partition
-      attr_reader :name, :id
+    attr_reader :name, :id
 
-      def initialize(name, id)
-        @name = name
-        @id = id
-      end
+    def initialize(name, id)
+      @name = name
+      @id = id
+    end
 
-      def self.style_for_index(style, idx)
-        [
-          ['span8', 'span4'],
-          ['span6', 'span6'],
-          ['span4', 'span8']
-        ][style][idx]
-      end
+    def self.style_for_index(style, idx)
+      [
+        %w(span8 span4),
+        %w(span6 span6),
+        %w(span4 span8)
+      ][style][idx]
     end
+  end
 end

data/app/models/kuhsaft/placeholder_brick.rb

@@ -9,5 +9,13 @@ module Kuhsaft
     def user_can_add_childs?
       false
     end
+
+    def partial_name
+      "kuhsaft/placeholder_bricks/partials/#{template_name}"
+    end
+
+    def cache_key
+      super + partial_digest(partial_name)
+    end
   end
 end

data/app/models/kuhsaft/publish_state.rb

@@ -1,25 +1,24 @@
 module Kuhsaft
   class PublishState
-    
     extend ActiveModel::Translation
-    
+
     UNPUBLISHED = 0
     PUBLISHED = 1
     PUBLISHED_AT = 2
-    
+
     attr_reader :name
     attr_reader :value
-    
-    def initialize options
-      options.each_pair { |k,v| instance_variable_set("@#{k}", v) if respond_to?(k) }
+
+    def initialize(options)
+      options.each_pair { |k, v| instance_variable_set("@#{k}", v) if respond_to?(k) }
     end
 
     def self.all
       @all ||= [
-        PublishState.new(:name => 'published', :value => PUBLISHED),
-        PublishState.new(:name => 'unpublished', :value => UNPUBLISHED),
-        PublishState.new(:name => 'published_at', :value => PUBLISHED_AT)
+        PublishState.new(name: 'published', value: PUBLISHED),
+        PublishState.new(name: 'unpublished', value: UNPUBLISHED),
+        PublishState.new(name: 'published_at', value: PUBLISHED_AT)
         ]
     end
   end
-end
+end

data/app/models/kuhsaft/slider_brick.rb

@@ -14,7 +14,5 @@ module Kuhsaft
     def allowed_brick_types
       %w(Kuhsaft::ImageBrick Kuhsaft::VideoBrick)
     end
-
   end
 end
-

data/app/models/kuhsaft/text_brick.rb

@@ -5,7 +5,7 @@ module Kuhsaft
     include ActionView::Helpers::SanitizeHelper
     HTML_ENTITIES = HTMLEntities.new
 
-    validates_presence_of :text
+    validates :text, presence: true
 
     def user_can_add_childs?
       false

data/app/models/kuhsaft/two_column_brick.rb

@@ -1,6 +1,5 @@
 module Kuhsaft
   class TwoColumnBrick < ColumnBrick
-
     before_create :add_columns
 
     #

data/app/models/kuhsaft/video_brick.rb

@@ -1,11 +1,10 @@
 module Kuhsaft
   class VideoBrick < Brick
-
     YOUTUBE = 'youtube'
     VIMEO = 'vimeo'
     EXTERNAL = 'external'
 
-    validates :any_source, :presence => true
+    validates :any_source, presence: true
 
     # a video id, an embed code or a link to a video is required
     def any_source

data/app/uploaders/kuhsaft/asset_brick_asset_uploader.rb

@@ -1,42 +1,43 @@
 # encoding: utf-8
 
-class Kuhsaft::AssetBrickAssetUploader < CarrierWave::Uploader::Base
-
-  # Include RMagick or ImageScience support:
-  # include CarrierWave::MiniMagick
-  #include CarrierWave::ImageScience
-
-  # Choose what kind of storage to use for this uploader:
-  storage :file
-  # storage :s3
-
-  # Override the directory where uploaded files will be stored.
-  # This is a sensible default for uploaders that are meant to be mounted:
-  def store_dir
-    "uploads/#{model.class.name.underscore.gsub(/^kuhsaft/,'cms')}/#{mounted_as}/#{model.id}"
+module Kuhsaft
+  class AssetBrickAssetUploader < CarrierWave::Uploader::Base
+    # Include RMagick or ImageScience support:
+    # include CarrierWave::MiniMagick
+    # include CarrierWave::ImageScience
+
+    # Choose what kind of storage to use for this uploader:
+    storage :file
+    # storage :s3
+
+    # Override the directory where uploaded files will be stored.
+    # This is a sensible default for uploaders that are meant to be mounted:
+    def store_dir
+      model_identifier = model.class.name.underscore.gsub(/^kuhsaft/, 'cms')
+      "uploads/#{model_identifier}/#{mounted_as}/#{model.id}"
+    end
+
+    # Provide a default URL as a default if there hasn't been a file uploaded:
+    # def default_url
+    #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+    # end
+
+    # Process files as they are uploaded:
+    # process :scale => [200, 300]
+    #
+    # def scale(width, height)
+    #   # do something
+    # end
+
+    # Add a white list of extensions which are allowed to be uploaded.
+    # For images you might use something like this:
+    def extension_white_list
+      %w(pdf doc docx xls xlsx ppt pptx)
+    end
+
+    # Override the filename of the uploaded files:
+    # def filename
+    #   "something.jpg" if original_filename
+    # end
   end
-
-  # Provide a default URL as a default if there hasn't been a file uploaded:
-  # def default_url
-  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
-  # end
-
-  # Process files as they are uploaded:
-  # process :scale => [200, 300]
-  #
-  # def scale(width, height)
-  #   # do something
-  # end
-
-  # Add a white list of extensions which are allowed to be uploaded.
-  # For images you might use something like this:
-  def extension_white_list
-    %w(pdf doc docx xls xlsx ppt pptx)
-  end
-
-  # Override the filename of the uploaded files:
-  # def filename
-  #   "something.jpg" if original_filename
-  # end
-
 end

data/app/uploaders/kuhsaft/asset_uploader.rb

@@ -1,50 +1,50 @@
 # encoding: utf-8
+module Kuhsaft
+  class AssetUploader < CarrierWave::Uploader::Base
+    # Include RMagick or ImageScience support:
+    include CarrierWave::MiniMagick
+    # include CarrierWave::ImageScience
+
+    # Choose what kind of storage to use for this uploader:
+    storage :file
+    # storage :s3
+
+    # Override the directory where uploaded files will be stored.
+    # This is a sensible default for uploaders that are meant to be mounted:
+    def store_dir
+      "uploads/#{mounted_as}/#{model.id}"
+    end
 
-class Kuhsaft::AssetUploader < CarrierWave::Uploader::Base
-
-  # Include RMagick or ImageScience support:
-  include CarrierWave::MiniMagick
-  #include CarrierWave::ImageScience
-
-  # Choose what kind of storage to use for this uploader:
-  storage :file
-  # storage :s3
-
-  # Override the directory where uploaded files will be stored.
-  # This is a sensible default for uploaders that are meant to be mounted:
-  def store_dir
-    "uploads/#{mounted_as}/#{model.id}"
-  end
-
-  # Provide a default URL as a default if there hasn't been a file uploaded:
-  # def default_url
-  #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
-  # end
-
-  # Process files as they are uploaded:
-  # process :scale => [200, 300]
-  #
-  # def scale(width, height)
-  #   # do something
-  # end
+    # Provide a default URL as a default if there hasn't been a file uploaded:
+    # def default_url
+    #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
+    # end
+
+    # Process files as they are uploaded:
+    # process :scale => [200, 300]
+    #
+    # def scale(width, height)
+    #   # do something
+    # end
+
+    # Create different versions of your uploaded files:
+    version :thumb do
+      process :resize_images
+      def resize_images
+        resize_to_fill(100, 100) if @file.present? && @file.content_type.present? &&
+                                      @file.content_type.include?('image')
+      end
+    end
 
-  # Create different versions of your uploaded files:
-  version :thumb do
-    process :resize_images
-    def resize_images
-      resize_to_fill(100, 100) if @file.present? && @file.content_type.present? && @file.content_type.include?('image')
+    # Add a white list of extensions which are allowed to be uploaded.
+    # For images you might use something like this:
+    def extension_white_list
+      %w(jpg jpeg png pdf)
     end
-  end
 
-  # Add a white list of extensions which are allowed to be uploaded.
-  # For images you might use something like this:
-  def extension_white_list
-    %w(jpg jpeg png pdf)
+    # Override the filename of the uploaded files:
+    # def filename
+    #   "something.jpg" if original_filename
+    # end
   end
-
-  # Override the filename of the uploaded files:
-  # def filename
-  #   "something.jpg" if original_filename
-  # end
-
 end

data/app/uploaders/kuhsaft/image_brick_image_uploader.rb

@@ -1,47 +1,27 @@
 # encoding: utf-8
 module Kuhsaft
   class ImageBrickImageUploader < CarrierWave::Uploader::Base
-    # include CarrierWave::RMagick
     include CarrierWave::MiniMagick
-    # Include the Sprockets helpers for Rails 3.1+ asset pipeline compatibility:
-    # include Sprockets::Helpers::RailsHelper
-    # include Sprockets::Helpers::IsolatedHelper
 
     storage :file
 
-    # Override the directory where uploaded files will be stored.
-    # This is a sensible default for uploaders that are meant to be mounted:
     def store_dir
-      "uploads/#{model.class.name.underscore.gsub(/^kuhsaft/,'cms')}/#{mounted_as}/#{model.id}"
+      model_identifier = model.class.name.underscore.gsub(/^kuhsaft/, 'cms')
+      "uploads/#{model_identifier}/#{mounted_as}/#{model.id}/#{version_name}"
     end
 
-    # Provide a default URL as a default if there hasn't been a file uploaded:
-    # def default_url
-    #   # For Rails 3.1+ asset pipeline compatibility:
-    #   # asset_path("fallback/" + [version_name, "default.png"].compact.join('_'))
-    #
-    #   "/images/fallback/" + [version_name, "default.png"].compact.join('_')
-    # end
-
-
-    # Process files as they are uploaded:
-    # process :scale => [200, 300]
-    #
-    # def scale(width, height)
-    #   # do something
-    # end
+    def full_filename(for_file)
+      File.basename for_file
+    end
 
-    # Create different versions of your uploaded files:
     version :converted do
       process :process_brick_image_size
     end
 
-    version :thumb, :from_version => :converted do
-      process :resize_to_fill => [160, 90]
+    version :thumb, from_version: :converted do
+      process resize_to_fill: [160, 90]
     end
 
-    # Add a white list of extensions which are allowed to be uploaded.
-    # For images you might use something like this:
     def extension_white_list
       %w(jpg jpeg gif png)
     end
@@ -52,12 +32,5 @@ module Kuhsaft
         resize_to_fill(image_size.width, image_size.height)
       end
     end
-
-    # Override the filename of the uploaded files:
-    # Avoid using model.id or version_name here, see uploader/store.rb for details.
-    # def filename
-    #   "something.jpg" if original_filename
-    # end
-
   end
 end

data/app/views/kuhsaft/asset_bricks/asset_brick/_edit.html.haml

@@ -1,7 +1,8 @@
-= form.input :caption, :as => :string, :input_html => { :class => 'span6' }
+= form.input :caption, as: :string, input_html: { :class => 'span6' }
 = form.input :asset
+= form.input :asset_cache, as: :hidden
 - if brick.asset.present?
   .countrol-group
     %label
       = link_to File.basename(brick.asset.url), brick.asset.url
-= form.input :link_style, :collection => Kuhsaft::AssetBrick.styles
+= form.input :link_style, collection: Kuhsaft::AssetBrick.styles

data/app/views/kuhsaft/cms/admin/_brick_type_dropdown.html.haml

@@ -7,8 +7,8 @@
       - brick_list.brick_types.allowed.group_by(&:group).each do |group, types|
         - types.each do |type|
           %li
-            = link_to type.class_name.constantize.model_name.human, kuhsaft.cms_bricks_path(:brick => { :type => type.class_name, :brick_list_id => brick_list.id, :brick_list_type => brick_list.brick_list_type }), :remote => true, :method => :post
+            = link_to type.class_name.constantize.model_name.human, kuhsaft.new_cms_brick_path(:brick => {:type => type.class_name, :brick_list_id => brick_list.id, :brick_list_type => brick_list.brick_list_type}), :remote => true
         .divider
   - else
     - brick_list.brick_types.allowed.each do |type|
-      = link_to t('.add_specific_element', :name => type.class_name.constantize.model_name.human), kuhsaft.cms_bricks_path(:brick => { :type => type.class_name, :brick_list_id => brick_list.id, :brick_list_type => brick_list.brick_list_type }), :remote => true, :method => :post, :class => 'btn btn-small btn-primary'
+      = link_to t('.add_specific_element', :name => type.class_name.constantize.model_name.human), kuhsaft.new_cms_brick_path(:brick => { :type => type.class_name, :brick_list_id => brick_list.id, :brick_list_type => brick_list.brick_list_type }), :remote => true, :class => 'btn btn-small btn-primary'

data/app/views/kuhsaft/cms/bricks/_brick_item.html.haml

@@ -1,38 +1,45 @@
 .brick-item{ :id => brick.to_brick_item_id, :class => brick.to_style_class, 'data-id' => brick.id }
   = simple_form_for brick, :as => :brick, :url => kuhsaft.cms_brick_path(brick), :remote => !brick.uploader?, :html => { :id => nil }, :wrapper => :bootstrap do |form|
     = form.hidden_field :position, :class => 'position-field'
+    - brick_content = render(brick.to_edit_partial_path, :brick => brick, :form => form)
     .brick-item-header.clearfix
       .pull-left
+        - if brick_content.present?
+          .resize-toggler.btn.btn-small{ 'data-toggle' => 'collapse', 'data-target' => "#brick-content-#{brick.id}" }
+            %i.icon-resize-full
+            %i.icon-resize-small
         - if brick.caption.present?
           = brick.caption
         %span.muted
           = brick.backend_label(:parenthesis => true)
       .pull-right
         .btn-toolbar
-          - # delete button
           - if brick.persisted?
-            - if brick.user_can_delete?
-              .btn-group
-                = link_to kuhsaft.cms_brick_path(brick), :class => 'btn btn-small btn-danger', :confirm => t('kuhsaft.cms.bricks.brick_item.confirm'), :method => :delete, :remote => true do
-                  %i.icon-trash.icon-white
 
             - # possible styles
             - unless brick.available_display_styles.empty?
-              .btn-group
-                %a.btn.btn-small.dropdown-toggle{ 'data-toggle' => 'dropdown', 'href' => '#' }
+              #display-styles.btn-group
+                .btn.btn-small
                   %i.icon-tint
+                %a.btn.btn-small.dropdown-toggle{ 'data-toggle' => 'dropdown', 'href' => '#' }
+                  %span.caret
                 %ul.dropdown-menu.pull-right
                   %li
-                    = form.input :display_styles, :collection => brick.available_display_styles, :as => :check_boxes
+                    = form.input :display_styles, :collection => brick.translated_available_display_styles, :as => :check_boxes
+
+            -# delete button
+            - if brick.user_can_delete?
+              .btn-group
+                = link_to kuhsaft.cms_brick_path(brick), :class => 'btn btn-small btn-danger', data: { confirm: t('kuhsaft.cms.bricks.brick_item.confirm') }, :method => :delete, :remote => true do
+                  %i.icon-trash.icon-white
 
             - # addable child dropdown menu
             - if brick.respond_to?(:brick_list)
               .btn-group
                 = render 'brick_type_dropdown', :brick_list => brick
 
-    - brick_content = render(brick.to_edit_partial_path, :brick => brick, :form => form)
     - if brick_content.present?
-      .brick-item-content
+      .brick-item-content.collapse.in{ :id => "brick-content-#{brick.id}", 'data-toggle' => true }
         = brick_content
         - if brick.user_can_save?
           - # save button