kuhsaft 1.2.4 → 1.2.5

data/README.md

@@ -152,6 +152,14 @@ The `name` option is a unique identifier, which is also used for translating the
 
     activerecord.attributes.kuhsaft/image_size.sizes.#{name}
 
+## Configuring custom styles for bricks
+
+Implement the `available_display_styles` on a brick model and return an array of css classnames: `['module-big', 'module-small']`. These styles can be applied to a brick instance through the UI. In the frontend, use `to_style_class` to get the configured styles:
+
+    %my-brick{ :class => brick.to_style_class}
+      = brick.text # ... etc
+
+
 ## Adding custom templates with placeholder bricks
 
 * Save your partial in `views/kuhsaft/placeholder_bricks/partials/_your_partial.html.haml`

data/app/assets/javascripts/kuhsaft/cms/application.js.coffee

@@ -30,9 +30,15 @@ sortableBrick = ->
       handle: '.brick-item-header',
       axis: "y",
       update: (event, ui) ->
-         $(this).find(".brick-item").each (idx, elem) ->
+        idList = $(this).find("> .brick-item")
+          .each (idx, elem) ->
             $(this).find("input.position-field").val(idx+1)
-            $(this).children('form').trigger('submit')
+          .map ->
+            $(this).data('id')
+
+        sortForm = $('#bricks-sort-form form')
+        sortForm.find('input[name="bricks[ids]"]').val(idList.toArray().join(','))
+        sortForm.trigger('submit')
       )
 
 window.initSubmitLinks = (selector = null)->

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

@@ -120,6 +120,12 @@ form
   a
     color: #666
 
+.pages-list
+  > .branch-group
+    > .branch
+      .branch-title
+        font-weight: bold
+
 .branch-group
   .branch-group
     .branch-title
@@ -137,4 +143,12 @@ form
   p
     margin: 0
 
+.dropdown-menu
+  > li
+    > .control-group
+      padding: 3px 20px
+
+      .control-label
+        font-weight: bold
+
 @import bootstrap-responsive

data/app/controllers/kuhsaft/cms/bricks_controller.rb

@@ -30,6 +30,15 @@ module Kuhsaft
         @brick.destroy
       end
 
+      def sort
+        if params[:bricks].present?
+          params[:bricks][:ids].split(',').each_with_index do |id, idx|
+            Kuhsaft::Brick.find(id).update_attribute(:position, idx.to_i + 1)
+          end
+        end
+        render :nothing => true
+      end
+
     end
   end
 end

data/app/helpers/pages_helper.rb

@@ -60,9 +60,9 @@ module PagesHelper
   end
 
   def read_more_link(id)
-    link_to(id, :'data-toggle' => 'collapse', :'data-target' => id, :class => 'button button-read-more') do
-      @content = content_tag(:p, t('.read_more'), :class => 'read-more-text')
-      @content << content_tag(:p, t('.read_less'), :class => 'read-less-text')
+    link_to(id, :'data-toggle' => 'collapse', :'data-target' => id, :class => 'collapsed button button-read-more') do
+      @content = content_tag(:p, t('kuhsaft.text_bricks.text_brick.read_more'), :class => 'read-more-text')
+      @content << content_tag(:p, t('kuhsaft.text_bricks.text_brick.read_less'), :class => 'read-less-text')
     end
   end
 end

data/app/models/kuhsaft/brick.rb

@@ -7,11 +7,14 @@ module Kuhsaft
     scope :localized, lambda { where(:locale => I18n.locale) }
     default_scope order('position ASC').localized
 
+    serialize :display_styles, Array
+
     attr_accessible :locale,
                     :position,
                     :type,
                     :brick_list_id,
-                    :brick_list_type
+                    :brick_list_type,
+                    :display_styles
 
     before_validation :set_locale
     before_validation :set_position
@@ -81,7 +84,7 @@ module Kuhsaft
 
     # Returns a css classname suitable for use in the frontend
     def to_style_class
-      self.class.to_s.underscore.dasherize.gsub('/', '-')
+      ([self.class.to_s.underscore.dasherize.gsub('/', '-')] + self.display_styles).join(' ')
     end
 
     # Returns a unique DOM id suitable for use in the frontend
@@ -89,6 +92,11 @@ module Kuhsaft
       "#{self.class.to_s.underscore.dasherize.gsub('/', '-')}-#{id}"
     end
 
+    # return a list of css classnames that can be applied to the brick
+    def available_display_styles
+      []
+    end
+
     def backend_label(options = {})
       label = self.class.model_name.human
       if options[:parenthesis] == true

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

@@ -1,5 +1,5 @@
-.brick-item{ :id => brick.to_brick_item_id, :class => brick.to_style_class }
-  = simple_form_for brick, :as => :brick, :url => kuhsaft.cms_brick_path(brick), :remote => true, :html => { :id => nil } do |form|
+.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 } do |form|
     = form.hidden_field :position, :class => 'position-field'
     .brick-item-header.clearfix
       .pull-left
@@ -15,6 +15,14 @@
               = 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?
+              %a.btn.btn-small.dropdown-toggle{ 'data-toggle' => 'dropdown', 'href' => '#' }
+                %i.icon-tint
+              %ul.dropdown-menu.pull-right
+                %li
+                  = form.input :display_styles, :collection => brick.available_display_styles, :as => :check_boxes
+
             - # addable child dropdown menu
             - if brick.respond_to?(:brick_list)
               = render 'brick_type_dropdown', :brick_list => brick
@@ -30,7 +38,6 @@
               %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

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

@@ -0,0 +1,3 @@
+#bricks-sort-form
+  = form_for :bricks, :url => sort_cms_bricks_path, :remote => true do |f|
+    = f.hidden_field :ids

data/app/views/kuhsaft/cms/bricks/create.js.haml

@@ -1 +1,6 @@
 $("##{@brick.brick_list.to_brick_list_id}.brick-list").append("#{j(render('kuhsaft/cms/bricks/brick_item', :brick => @brick))}").find("> .empty-state").remove()
+
+- # need a reference to the new dom node, so a new query is needed here
+var newlyInsertedBrick = $("##{@brick.to_brick_item_id}")
+initSavePopover(newlyInsertedBrick)
+initSubmitLinks(newlyInsertedBrick)

data/app/views/kuhsaft/cms/bricks/update.js.haml

@@ -1,6 +1,6 @@
 $("##{@brick.to_brick_item_id}").replaceWith("#{j(render('kuhsaft/cms/bricks/brick_item', :brick => @brick))}")
 
-// need a reference to the new dom node, so a new query is needed here
+- # need a reference to the new dom node, so a new query is needed here
 var newlyInsertedBrick = $("##{@brick.to_brick_item_id}")
 initSavePopover(newlyInsertedBrick)
 initSubmitLinks(newlyInsertedBrick)

data/app/views/kuhsaft/cms/pages/_form.html.haml

@@ -26,3 +26,5 @@
           .btn-group
             = render 'brick_type_dropdown', :brick_list => @page
       = render 'kuhsaft/cms/bricks/brick_list', :brick_list => @page
+
+= render 'kuhsaft/cms/bricks/sort_form'

data/app/views/kuhsaft/cms/pages/index.html.haml

@@ -1,8 +1,13 @@
 %h1= controller.request.host
 .actions.row
-  .span9
+  .span5
   .span3
     = link_to kuhsaft.new_cms_page_path, :class => 'btn btn-primary' do
       %i.icon-plus-sign.icon-white
       = t('.add_page')
-= render :partial => 'branch', :locals => { :pages => @pages }
+  .span4
+
+.row
+  .span8.pages-list
+    = render :partial => 'branch', :locals => { :pages => @pages }
+  .span4

data/app/views/layouts/kuhsaft/cms/application.html.haml

@@ -14,8 +14,8 @@
 
       #toolbar
     .container.cms
-      .row-fluid
-        .span-12
+      .row
+        .span12
           = render 'content_language_switch'
           = render 'flash', :flash => flash
           = yield

data/config/routes.rb

@@ -1,7 +1,10 @@
 Kuhsaft::Engine.routes.draw do
   namespace :cms do
     resources :pages, :except => :show
-    resources :bricks, :except => [:new, :edit, :index]
+    resources :bricks, :except => [:new, :edit, :index] do
+      post :sort, :on => :collection
+    end
+
     resources :assets
     root :to => 'pages#index'
   end

data/db/migrate/8_add_display_styles_to_bricks.rb

@@ -0,0 +1,5 @@
+class AddDisplayStylesToBricks < ActiveRecord::Migration
+  def change
+    add_column :kuhsaft_bricks, :display_styles, :text
+  end
+end

data/lib/kuhsaft/brick_list.rb

@@ -82,5 +82,9 @@ module Kuhsaft
       @brick_types ||= Kuhsaft::BrickTypeFilter.new(self)
     end
 
+    def uploader?
+      self.class.ancestors.include? CarrierWave::Mount::Extension
+    end
+
   end
 end

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = "1.2.4"
+  VERSION = "1.2.5"
 end

data/spec/dummy/config/application.rb

@@ -60,6 +60,12 @@ module Dummy
 
     # Version of your assets, change this if you want to expire all your assets
     config.assets.version = '1.0'
+
+    config.to_prepare do
+      Kuhsaft::Engine.configure do
+        config.image_sizes.build_defaults! # creates 960x540 and 320x180 sizes
+      end
+    end
   end
 end
 

data/spec/models/brick_spec.rb

@@ -122,4 +122,10 @@ describe Kuhsaft::Brick do
       brick.backend_label(:parenthesis => true).should == '(Text)'
     end
   end
+
+  describe '#uploader?' do
+    it 'returns false' do
+      brick.uploader?.should be_false
+    end
+  end
 end

data/spec/models/image_brick_spec.rb

@@ -39,4 +39,10 @@ describe Kuhsaft::ImageBrick do
       image_brick.user_can_add_childs?.should be_false
     end
   end
+
+  describe '#uploader?' do
+    it 'returns true' do
+      image_brick.uploader?.should be_true
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuhsaft
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.5
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-27 00:00:00.000000000 Z
+date: 2013-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -367,6 +367,7 @@ files:
 - app/views/kuhsaft/cms/assets/new.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/_sort_form.html.haml
 - app/views/kuhsaft/cms/bricks/create.js.haml
 - app/views/kuhsaft/cms/bricks/destroy.js.haml
 - app/views/kuhsaft/cms/bricks/update.js.haml
@@ -427,6 +428,7 @@ files:
 - db/migrate/06_add_template_name_to_kuhsaft_bricks.rb
 - db/migrate/07_add_default_value_to_brick_type_enabled.rb
 - db/migrate/20130206141601_remove_cms_admin.rb
+- db/migrate/8_add_display_styles_to_bricks.rb
 - db/seeds.rb
 - lib/generators/kuhsaft/translations/add_generator.rb
 - lib/kuhsaft/brick_list.rb
@@ -514,7 +516,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 414492348047311349
+      hash: 2608277375441050996
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -523,7 +525,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 414492348047311349
+      hash: 2608277375441050996
 requirements: []
 rubyforge_project: kuhsaft
 rubygems_version: 1.8.24