kuhsaft 1.2.6 → 1.2.7

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

@@ -65,6 +65,10 @@ form
     .btn
       +opacity(1)
 
+.btn-toolbar
+  margin-top: 0
+  margin-bottom: 0
+
 .brick-list
   padding-left: 2em
 

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

@@ -8,24 +8,27 @@
         %span.muted
           = brick.backend_label(:parenthesis => true)
       .pull-right
-        .btn-group
+        .btn-toolbar
           - # delete button
           - if brick.persisted?
             - if brick.user_can_delete?
-              = 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
+              .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?
-              %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
+              .btn-group
+                %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
+              .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?

data/app/views/kuhsaft/pages/show.html.haml

@@ -1,5 +1,12 @@
-- cache @page do
+- if @page.bricks.map(&:type).include? "Kuhsaft::PlaceholderBrick"
   - unless @page.blank?
     .page-content
       - @page.bricks.localized.each do |brick|
         = render brick
+
+- else
+  - cache @page do
+    - unless @page.blank?
+      .page-content
+        - @page.bricks.localized.each do |brick|
+          = render brick

data/app/views/kuhsaft/text_bricks/_text_brick.html.haml

@@ -1,10 +1,11 @@
 %div{ :class => text_brick.to_style_class }
   - if text_brick.read_more_text.present?
-    = text_brick.text.html_safe
+    = text_brick.text.to_s.html_safe
 
-    = read_more_link("##{text_brick.to_style_id}")
     %div.collapse{ :id => text_brick.to_style_id }
       = text_brick.read_more_text.to_s.html_safe
 
+    = read_more_link("##{text_brick.to_style_id}")
+
   - else
     = text_brick.text.to_s.html_safe

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = "1.2.6"
+  VERSION = "1.2.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuhsaft
 version: !ruby/object:Gem::Version
-  version: 1.2.6
+  version: 1.2.7
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-04 00:00:00.000000000 Z
+date: 2013-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -517,7 +517,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1782342829090588371
+      hash: 3038808456210980787
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -526,7 +526,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1782342829090588371
+      hash: 3038808456210980787
 requirements: []
 rubyforge_project: kuhsaft
 rubygems_version: 1.8.24