kuhsaft 1.2.6 → 1.2.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -65,6 +65,10 @@ form
65
65
  .btn
66
66
  +opacity(1)
67
67
 
68
+ .btn-toolbar
69
+ margin-top: 0
70
+ margin-bottom: 0
71
+
68
72
  .brick-list
69
73
  padding-left: 2em
70
74
 
@@ -8,24 +8,27 @@
8
8
  %span.muted
9
9
  = brick.backend_label(:parenthesis => true)
10
10
  .pull-right
11
- .btn-group
11
+ .btn-toolbar
12
12
  - # delete button
13
13
  - if brick.persisted?
14
14
  - if brick.user_can_delete?
15
- = 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
16
- %i.icon-trash.icon-white
15
+ .btn-group
16
+ = 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
17
+ %i.icon-trash.icon-white
17
18
 
18
19
  - # possible styles
19
20
  - unless brick.available_display_styles.empty?
20
- %a.btn.btn-small.dropdown-toggle{ 'data-toggle' => 'dropdown', 'href' => '#' }
21
- %i.icon-tint
22
- %ul.dropdown-menu.pull-right
23
- %li
24
- = form.input :display_styles, :collection => brick.available_display_styles, :as => :check_boxes
21
+ .btn-group
22
+ %a.btn.btn-small.dropdown-toggle{ 'data-toggle' => 'dropdown', 'href' => '#' }
23
+ %i.icon-tint
24
+ %ul.dropdown-menu.pull-right
25
+ %li
26
+ = form.input :display_styles, :collection => brick.available_display_styles, :as => :check_boxes
25
27
 
26
28
  - # addable child dropdown menu
27
29
  - if brick.respond_to?(:brick_list)
28
- = render 'brick_type_dropdown', :brick_list => brick
30
+ .btn-group
31
+ = render 'brick_type_dropdown', :brick_list => brick
29
32
 
30
33
  - brick_content = render(brick.to_edit_partial_path, :brick => brick, :form => form)
31
34
  - if brick_content.present?
@@ -1,5 +1,12 @@
1
- - cache @page do
1
+ - if @page.bricks.map(&:type).include? "Kuhsaft::PlaceholderBrick"
2
2
  - unless @page.blank?
3
3
  .page-content
4
4
  - @page.bricks.localized.each do |brick|
5
5
  = render brick
6
+
7
+ - else
8
+ - cache @page do
9
+ - unless @page.blank?
10
+ .page-content
11
+ - @page.bricks.localized.each do |brick|
12
+ = render brick
@@ -1,10 +1,11 @@
1
1
  %div{ :class => text_brick.to_style_class }
2
2
  - if text_brick.read_more_text.present?
3
- = text_brick.text.html_safe
3
+ = text_brick.text.to_s.html_safe
4
4
 
5
- = read_more_link("##{text_brick.to_style_id}")
6
5
  %div.collapse{ :id => text_brick.to_style_id }
7
6
  = text_brick.read_more_text.to_s.html_safe
8
7
 
8
+ = read_more_link("##{text_brick.to_style_id}")
9
+
9
10
  - else
10
11
  = text_brick.text.to_s.html_safe
@@ -1,3 +1,3 @@
1
1
  module Kuhsaft
2
- VERSION = "1.2.6"
2
+ VERSION = "1.2.7"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: kuhsaft
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.2.6
4
+ version: 1.2.7
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -11,7 +11,7 @@ authors:
11
11
  autorequire:
12
12
  bindir: bin
13
13
  cert_chain: []
14
- date: 2013-03-04 00:00:00.000000000 Z
14
+ date: 2013-03-06 00:00:00.000000000 Z
15
15
  dependencies:
16
16
  - !ruby/object:Gem::Dependency
17
17
  name: rspec
@@ -517,7 +517,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
517
517
  version: '0'
518
518
  segments:
519
519
  - 0
520
- hash: -1782342829090588371
520
+ hash: 3038808456210980787
521
521
  required_rubygems_version: !ruby/object:Gem::Requirement
522
522
  none: false
523
523
  requirements:
@@ -526,7 +526,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
526
526
  version: '0'
527
527
  segments:
528
528
  - 0
529
- hash: -1782342829090588371
529
+ hash: 3038808456210980787
530
530
  requirements: []
531
531
  rubyforge_project: kuhsaft
532
532
  rubygems_version: 1.8.24