kuhsaft 2.3.2 → 2.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14bb5aeb1a5309483829aab10bf7bceac2e38b3c
-  data.tar.gz: 5dded00a1779710696198f876f92fb1ba42af761
+  metadata.gz: 23a7e481b85437904c69767c374fd47f697b8ac7
+  data.tar.gz: 1059cc4a31bc8d46d0fe0341221bb6cc469f5c47
 SHA512:
-  metadata.gz: 0daea3d88813548db540a8bc18c36cdc482caf6e18fc3b0f62946fa77ba9d092030d9f2866a51c4336c17c497ca159151106ce1f947d7b651f77ae4342b0092e
-  data.tar.gz: fdfd8ce2ab6565e7848e6ecb63faaac81cb362b5dd3245003dbb265797d94bd0e463d0d3e695c61f3141ec664c73e8bf4d49ccbcf9c69846e2d43e170058e110
+  metadata.gz: e530b6adab5c29963d6f4d95a52c0174b9a973e4ea3b2f31c9896695ef8085519570c80b5dc019ea9516b59eae822584f45404f4d6cd14cb3ed758d7950038c5
+  data.tar.gz: 7e28072b2f648c183bc78e9bdda0f67c9975a68e8e96ce61da26b755789fe247dad422f5b33faaa01d2bf7639200514f5958a52aef35108f3f3420ac71f58e68

data/README.md

@@ -183,6 +183,17 @@ de:
       style2: 'My Style 2'
 ```
 
+## Configuring Grid settings for Bricks
+
+Include the Kuhsaft::Gridded Module on every Brick you want to display in a grid. Default grid options are 1 to 12 (representing columns) wich can be configured via the class method `available_grid_sizes` (should return an array of integers).
+Each instance of a gridded class will have a method `gridded?` wich returns true if a column size is set.
+
+If the Gridded Module is added to a Custom Brick, it should provide a col_count integer field with default value 0.
+
+```
+add_column :your_awesome_brick, :col_count, :integer, default: 0
+```
+
 ## Adding custom templates with placeholder bricks
 
 * Save your partial in `views/kuhsaft/placeholder_bricks/partials/_your_partial.html.haml`

data/app/assets/stylesheets/kuhsaft/cms/application.css.sass

@@ -169,13 +169,13 @@ form
   .modal-body
     max-height: none
 
-  #display-styles
-    position: absolute
-    top: 7px
-    right: 15px
+  .btn-group
+    position: relative
+    top: -10px
+    padding-left: 10px
 
 .control-group.text
-  height: 310px
+  min-height: 310px
 
   textarea
     height: 263px

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

@@ -0,0 +1,43 @@
+.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
+    - if brick.persisted?
+
+      - # addable child dropdown menu
+      - if brick.respond_to?(:brick_list)
+        .btn-group
+          = render('brick_type_dropdown', brick_list: brick)
+
+      - # grid selection
+      - if brick.class.include? Kuhsaft::Gridded
+        .btn-group
+          %a.btn.btn-small.dropdown-toggle{ 'data-toggle' => 'dropdown', 'href' => '#' }
+            %i.icon-th
+            %span.caret
+          %ul.dropdown-menu.pull-right
+            %li
+              = form.input :col_count, collection: brick.class.available_grid_sizes, as: :radio_buttons, label_method: lambda { |col_count| t("kuhsaft.cms.bricks.columns", count: col_count) }
+
+      - # possible styles
+      - unless brick.available_display_styles.empty?
+        #display-styles.btn-group
+          %a.btn.btn-small.dropdown-toggle{ 'data-toggle' => 'dropdown', 'href' => '#' }
+            %i.icon-tint
+            %span.caret
+          %ul.dropdown-menu.pull-right
+            %li
+              = 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

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

@@ -1,57 +1,25 @@
-.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
-          - if brick.persisted?
-
-            - # possible styles
-            - unless brick.available_display_styles.empty?
-              #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.translated_available_display_styles, :as => :check_boxes
+.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)
 
-            -# 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-item-header.clearfix
+      = render('kuhsaft/cms/bricks/brick_header', brick: brick, brick_content: brick_content, form: form)
 
     - if brick_content.present?
-      .brick-item-content.collapse.in{ :id => "brick-content-#{brick.id}", 'data-toggle' => true }
+      .brick-item-content.collapse.in{ id: "brick-content-#{brick.id}", 'data-toggle' => true }
         = brick_content
         - if brick.user_can_save?
           - # save button
           .clearfix
             .pull-right
-              %a.submit{ :href => '#', :class => 'btn btn-success btn-small ', 'data-title' => '', 'data-content' => t('.saved') }
+              %a.submit{ href: '#', class: 'btn btn-success btn-small ', 'data-title' => '', 'data-content' => t('.saved') }
                 = t('.save')
 
   - if brick.renders_own_childs?
     .brick-item-childs
-      = render brick.to_edit_childs_partial_path, :brick => brick
+      = render(brick.to_edit_childs_partial_path, brick: brick)
   - else
     - if brick.respond_to?(:bricks)
       .brick-item-childs
-        = render 'kuhsaft/cms/bricks/brick_list', :brick_list => brick
+        = render('kuhsaft/cms/bricks/brick_list', brick_list: brick)

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

@@ -14,14 +14,22 @@
 
     - unless @brick.available_display_styles.empty?
       #display-styles.btn-group.pull-right
-        .btn.btn-small
-          %i.icon-tint
         %a.btn.btn-small.dropdown-toggle{ 'data-toggle' => 'dropdown', 'href' => '#' }
+          %i.icon-tint
           %span.caret
         %ul.dropdown-menu.pull-right
           %li
             = form.input :display_styles, :collection => @brick.translated_available_display_styles, :as => :check_boxes
 
+    - if brick.class.include? Kuhsaft::Gridded
+      .btn-group.pull-right
+        %a.btn.btn-small.dropdown-toggle{ 'data-toggle' => 'dropdown', 'href' => '#' }
+          %i.icon-th
+          %span.caret
+        %ul.dropdown-menu.pull-right
+          %li
+            = form.input :col_count, collection: brick.class.available_grid_sizes, as: :radio_buttons, label_method: lambda { |col_count| t("kuhsaft.cms.bricks.columns", count: col_count) }
+
     - if brick_content.present?
       = brick_content
     - else

data/config/locales/views/kuhsaft/cms/bricks/de.yml

@@ -8,7 +8,17 @@ de:
           confirm: 'Wirklich löschen?'
           empty: 'Hier ist noch nichts.'
 
+        columns:
+          zero: Nicht ins Grid integrieren
+          one: "%{count} Spalte"
+          other: "%{count} Spalten"
+
     image_bricks:
       image_brick:
         edit:
           image_preview: 'Vorschau'
+
+  activerecord:
+    attributes:
+      kuhsaft/brick:
+        col_count: 'Breite im Grid'

data/db/migrate/19_add_col_count_to_bricks.rb

@@ -0,0 +1,5 @@
+class AddColCountToBricks < ActiveRecord::Migration
+  def change
+    add_column :kuhsaft_bricks, :col_count, :integer, default: 0
+  end
+end

data/lib/kuhsaft.rb

@@ -4,6 +4,7 @@ module Kuhsaft
   require 'kuhsaft/image_uploader_mounting'
   require 'kuhsaft/translatable'
   require 'kuhsaft/searchable'
+  require 'kuhsaft/gridded'
   require 'kuhsaft/brick_list'
   require 'kuhsaft/partial_extractor'
   require 'kuhsaft/touch_placeholders'

data/lib/kuhsaft/gridded.rb

@@ -0,0 +1,20 @@
+module Kuhsaft
+  module Gridded
+    def self.included(base)
+      base.extend(ClassMethods)
+      base.send :include, InstanceMethods
+    end
+
+    module InstanceMethods
+      def gridded?
+        col_count != 0
+      end
+    end
+
+    module ClassMethods
+      def available_grid_sizes
+        (0..12).to_a
+      end
+    end
+  end
+end

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = '2.3.2'
+  VERSION = '2.3.3'
 end

data/spec/lib/gridded_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+
+describe Kuhsaft::Gridded do
+
+  context 'included gridded module' do
+    class GridClass
+      include Kuhsaft::Gridded
+    end
+
+    it 'returns an array for the gridded class' do
+      expect(GridClass.available_grid_sizes).to be_kind_of(Array)
+    end
+
+    it 'returns false on gridded? if no col count is set' do
+      expect_any_instance_of(GridClass).to receive(:col_count).at_least(:once).and_return(0)
+      expect(GridClass.new.gridded?).to be_false
+    end
+
+    it 'returns true on gridded? if a col count is set' do
+      expect_any_instance_of(GridClass).to receive(:col_count).at_least(:once).and_return(10)
+      expect(GridClass.new.gridded?).to be_true
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuhsaft
 version: !ruby/object:Gem::Version
-  version: 2.3.2
+  version: 2.3.3
 platform: ruby
 authors:
 - Immanuel Häussermann
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -539,6 +539,7 @@ files:
 - app/views/kuhsaft/cms/assets/edit.html.haml
 - app/views/kuhsaft/cms/assets/index.html.haml
 - app/views/kuhsaft/cms/assets/new.html.haml
+- app/views/kuhsaft/cms/bricks/_brick_header.html.haml
 - app/views/kuhsaft/cms/bricks/_brick_item.html.haml
 - app/views/kuhsaft/cms/bricks/_brick_list.html.haml
 - app/views/kuhsaft/cms/bricks/_new.html.haml
@@ -627,12 +628,14 @@ files:
 - db/migrate/15_add_alt_text_to_bricks.rb
 - db/migrate/16_update_default_value_for_page_type.rb
 - db/migrate/17_set_page_type_to_content_for_empty_fields.rb
-- db/migrate/20140327141200_add_identifier_to_kuhsaft_pages.rb
+- db/migrate/18_add_identifier_to_kuhsaft_pages.rb
+- db/migrate/19_add_col_count_to_bricks.rb
 - db/seeds.rb
 - lib/generators/kuhsaft/assets/install_generator.rb
 - lib/generators/kuhsaft/translations/add_generator.rb
 - lib/kuhsaft/brick_list.rb
 - lib/kuhsaft/engine.rb
+- lib/kuhsaft/gridded.rb
 - lib/kuhsaft/image_uploader_mounting.rb
 - lib/kuhsaft/orderable.rb
 - lib/kuhsaft/page_tree.rb
@@ -706,6 +709,7 @@ files:
 - spec/kuhsaft_spec.rb
 - spec/lib/brick_list_spec.rb
 - spec/lib/engine_spec.rb
+- spec/lib/gridded_spec.rb
 - spec/lib/image_uploader_mounting_spec.rb
 - spec/lib/page_tree_spec.rb
 - spec/lib/searchable_spec.rb
@@ -810,6 +814,7 @@ test_files:
 - spec/kuhsaft_spec.rb
 - spec/lib/brick_list_spec.rb
 - spec/lib/engine_spec.rb
+- spec/lib/gridded_spec.rb
 - spec/lib/image_uploader_mounting_spec.rb
 - spec/lib/page_tree_spec.rb
 - spec/lib/searchable_spec.rb