kuhsaft 1.2.2 → 1.2.3

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

@@ -0,0 +1,7 @@
+#= require bootstrap
+#= require_self
+#= require_tree ./views
+
+$ ->
+  $('.kuhsaft-text-brick').each ->
+    new ReadMoreView($(this))

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

@@ -35,6 +35,28 @@ sortableBrick = ->
             $(this).children('form').trigger('submit')
       )
 
+window.initSubmitLinks = (selector = null)->
+  selector ||= $('body')
+
+  selector.find('a.submit')
+    .click (e)->
+      form = $(this).closest('form')
+      form.submit()
+      e.preventDefault()
+
+window.initSavePopover = (selector) ->
+  link = selector.find('a.submit')
+  link.popover(placement: 'top', trigger: 'manual')
+
+  # initial delay
+  setTimeout ->
+    link.popover('show')
+    # fade out delay
+    setTimeout ->
+      link.popover('hide')
+    , 1500
+  , 50
+
 $(document).ajaxSuccess ->
   loadTextEditor($("body"))
   sortableBrick()
@@ -43,6 +65,7 @@ $(document).ready ->
   loadTextEditor($(document))
   checkPageType()
   sortableBrick()
+  initSubmitLinks()
   $('#page_page_type').change ->
     checkPageType()
 

data/app/assets/javascripts/kuhsaft/views/read_more_view.js.coffee

@@ -0,0 +1,17 @@
+class window.ReadMoreView
+
+  constructor: (readMoreElem)->
+    @readMoreElem = readMoreElem
+    @readMoreElem.on 'show', @handleShow
+    @readMoreElem.on 'hide', @handleClose
+    @readMoreElem.find('.button-read-more').on 'click', @handleClick
+
+  handleShow: (e) =>
+    @readMoreElem.addClass('is-open')
+
+  handleClose: (e) =>
+    @readMoreElem.removeClass('is-open')
+
+  handleClick: (e) =>
+    if e.preventDefault
+      e.preventDefault()

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

@@ -1,4 +1,4 @@
-// = require_self
+//= require_self
 
 @import bootstrap
-
+@import modules/*

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

@@ -88,6 +88,7 @@ form
   border: 1px solid #e3e3e3
   // collapse multiple borders
   margin: -1px
+  background: #fff
 
   .brick-item-content
     padding: 1em

data/app/assets/stylesheets/kuhsaft/modules/_text_brick.css.sass

@@ -0,0 +1,11 @@
+.kuhsaft-text-brick
+  .read-more-text
+    display: block
+  .read-less-text
+    display: none
+
+  &.is-open
+    .read-more-text
+      display: none
+    .read-less-text
+      display: block

data/app/helpers/pages_helper.rb

@@ -58,4 +58,11 @@ module PagesHelper
   def current_page_class page
     :current if active_page_class(page) == :active
   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')
+    end
+  end
 end

data/app/models/kuhsaft/anchor_brick.rb

@@ -0,0 +1,19 @@
+module Kuhsaft
+  class AnchorBrick < Brick
+    attr_accessible :caption
+
+    validates :caption, :presence => true
+
+    def user_can_add_childs?
+      false
+    end
+
+    def collect_fulltext
+      [super, caption].join(' ')
+    end
+
+    def to_id
+      "anchor-#{caption.parameterize}"
+    end
+  end
+end

data/app/views/kuhsaft/anchor_bricks/_anchor_brick.html.haml

@@ -0,0 +1 @@
+%div{ :class => anchor_brick.to_style_class, :id => anchor_brick.to_id }

data/app/views/kuhsaft/anchor_bricks/anchor_brick/_edit.html.haml

@@ -0,0 +1 @@
+= form.input :caption, :as => :string, :input_html => { :class => 'span6' }

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

@@ -27,7 +27,8 @@
           - # save button
           .clearfix
             .pull-right
-              = form.button :submit, :class => 'btn btn-success btn-small ', :value => t('.save')
+              %a.submit{ :href => '#', :class => 'btn btn-success btn-small ', 'data-title' => '', 'data-content' => t('.saved') }
+                = t('.save')
 
 
   - if brick.renders_own_childs?

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

@@ -1,2 +1,6 @@
 $("##{@brick.to_brick_item_id}").replaceWith("#{j(render('kuhsaft/cms/bricks/brick_item', :brick => @brick))}")
-$("##{@brick.to_brick_item_id}").addClass("saved")
+
+// 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/text_bricks/_text_brick.html.haml

@@ -1,12 +1,10 @@
 %div{ :class => text_brick.to_style_class }
   - if text_brick.read_more_text.present?
-    .expandable{ :id => text_brick.to_style_id }
-      = text_brick.text.html_safe
-      %a.more{ :href => '#' }
-        = t('.read_more')
-      .expandable-content.hidden
-        = text_brick.read_more_text.to_s.html_safe
-        %a.less{ :href => "##{text_brick.to_style_id}" }
-          = t('.read_less')
+    = text_brick.text.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
+
   - else
     = text_brick.text.to_s.html_safe

data/config/locales/models/kuhsaft/anchor_brick/de.yml

@@ -0,0 +1,7 @@
+de:
+  activerecord:
+    models:
+      kuhsaft/anchor_brick: 'Anker'
+    attributes:
+      kuhsaft/anchor_brick:
+        caption: 'Name'

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

@@ -3,6 +3,7 @@ de:
     cms:
       bricks:
         brick_item:
-          save: 'Speichern ✔'
+          save: 'Speichern ...'
+          saved: 'Gespeichert! ✔'
           confirm: 'Wirklich löschen?'
           empty: 'Hier ist noch nichts.'

data/db/migrate/02_create_kuhsaft_bricks.rb

@@ -8,7 +8,7 @@ class CreateKuhsaftBricks < ActiveRecord::Migration
       t.string :locale # all bricks
       t.text :text # TextBrick
       t.text :read_more_text # TextBrick
-      t.string :caption # LinkBrick, ImageBrick, #AccordionItemBrick
+      t.string :caption # LinkBrick, ImageBrick, AccordionItemBrick, AnchorBrick
       t.text :href # LinkBrick, ImageBrick, VideoBrick
       t.string :link_style # LinkBrick
       t.integer :partitioning # TwoColumnBrick

data/db/seeds.rb

@@ -9,3 +9,4 @@ Kuhsaft::BrickType.create(:class_name => 'Kuhsaft::TwoColumnBrick', :group => 'l
 Kuhsaft::BrickType.create(:class_name => 'Kuhsaft::SliderBrick', :group => 'elements')
 Kuhsaft::BrickType.create(:class_name => 'Kuhsaft::ImageBrick', :group => 'elements')
 Kuhsaft::BrickType.create(:class_name => 'Kuhsaft::PlaceholderBrick', :group => 'elements')
+Kuhsaft::BrickType.create(:class_name => 'Kuhsaft::AnchorBrick', :group => 'elements')

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = "1.2.2"
+  VERSION = "1.2.3"
 end

data/spec/models/anchor_brick_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+
+describe Kuhsaft::AnchorBrick do
+
+  let :anchor_brick do
+    Kuhsaft::AnchorBrick.new(:caption => 'test-anchor')
+  end
+
+  describe '#bricks' do
+    it 'can not have childs' do
+      anchor_brick.should_not respond_to(:bricks)
+    end
+  end
+
+  describe '#user_can_add_childs?' do
+    it 'returns false' do
+      anchor_brick.user_can_add_childs?.should be_false
+    end
+  end
+
+  describe '#to_id' do
+    it 'returns a parameterized id' do
+      anchor_brick.to_id.should == 'anchor-test-anchor'
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuhsaft
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.2.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -307,12 +307,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/javascripts/kuhsaft/application.js
+- app/assets/javascripts/kuhsaft/application.js.coffee
 - app/assets/javascripts/kuhsaft/cms/application.js.coffee
 - app/assets/javascripts/kuhsaft/cms/customizations.js
+- app/assets/javascripts/kuhsaft/views/read_more_view.js.coffee
 - app/assets/stylesheets/kuhsaft/application.css.sass
 - app/assets/stylesheets/kuhsaft/cms/application.css.sass
 - app/assets/stylesheets/kuhsaft/cms/customizations.css.sass
+- app/assets/stylesheets/kuhsaft/modules/_text_brick.css.sass
 - app/controllers/kuhsaft/application_controller.rb
 - app/controllers/kuhsaft/cms/admin_controller.rb
 - app/controllers/kuhsaft/cms/assets_controller.rb
@@ -326,6 +328,7 @@ files:
 - app/helpers/pages_helper.rb
 - app/models/kuhsaft/accordion_brick.rb
 - app/models/kuhsaft/accordion_item_brick.rb
+- app/models/kuhsaft/anchor_brick.rb
 - app/models/kuhsaft/asset.rb
 - app/models/kuhsaft/brick.rb
 - app/models/kuhsaft/brick_type.rb
@@ -350,6 +353,8 @@ files:
 - app/views/kuhsaft/accordion_bricks/accordion_brick/_edit.html.haml
 - app/views/kuhsaft/accordion_item_bricks/_accordion_item_brick.html.haml
 - app/views/kuhsaft/accordion_item_bricks/accordion_item_brick/_edit.html.haml
+- app/views/kuhsaft/anchor_bricks/_anchor_brick.html.haml
+- app/views/kuhsaft/anchor_bricks/anchor_brick/_edit.html.haml
 - app/views/kuhsaft/cms/admin/_brick_type_dropdown.html.haml
 - app/views/kuhsaft/cms/admin/_content_language_switch.html.haml
 - app/views/kuhsaft/cms/admin/_empty_state.html.haml
@@ -396,6 +401,7 @@ files:
 - config/locales/kuhsaft.en.yml
 - config/locales/models/kuhsaft/accordion_brick/de.yml
 - config/locales/models/kuhsaft/accordion_item_brick/de.yml
+- config/locales/models/kuhsaft/anchor_brick/de.yml
 - config/locales/models/kuhsaft/column_brick/de.yml
 - config/locales/models/kuhsaft/image_brick/de.yml
 - config/locales/models/kuhsaft/image_size/de.yml
@@ -477,6 +483,7 @@ files:
 - spec/lib/translatable_spec.rb
 - spec/models/accordion_brick_spec.rb
 - spec/models/accordion_item_brick_spec.rb
+- spec/models/anchor_brick_spec.rb
 - spec/models/asset_spec.rb
 - spec/models/brick_spec.rb
 - spec/models/brick_type_filter_spec.rb
@@ -507,7 +514,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 958653048592020401
+      hash: 615329233639926034
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -516,7 +523,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 958653048592020401
+      hash: 615329233639926034
 requirements: []
 rubyforge_project: kuhsaft
 rubygems_version: 1.8.24
@@ -565,6 +572,7 @@ test_files:
 - spec/lib/translatable_spec.rb
 - spec/models/accordion_brick_spec.rb
 - spec/models/accordion_item_brick_spec.rb
+- spec/models/anchor_brick_spec.rb
 - spec/models/asset_spec.rb
 - spec/models/brick_spec.rb
 - spec/models/brick_type_filter_spec.rb

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

@@ -1,2 +0,0 @@
-//= require bootstrap
-//= require_self