kuhsaft 2.6.0 → 2.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f6610c85076199dc2cffcb24437ede0ef6e6d07
-  data.tar.gz: 56d5e2ed22b7ec384a1fa15731888bfd85699d5c
+  metadata.gz: f48c54fc9835d1c425f143c773aa93b85c94eab2
+  data.tar.gz: 6e54f3e91d24a7f7705c92b189b8c59fd49f72b9
 SHA512:
-  metadata.gz: dd6ac9bd19452a2d1e117619c9ead75d8721f108606764ad3f2acc24aba98e5fc08347bc1f9377ab246672f4e4e11d8a15c2a7496b271730e4d0d697d522511b
-  data.tar.gz: 1570c92b8e110fe146f381fba81142a452e64d84e34ae4b6c3a9d14d074a14f59e6e1a6b0baec201fa6206d00f30d9f04c10b274b81018840ce61085ca51aa79
+  metadata.gz: de22955455630cabe26e8ae610dbcca4419b422c1cc0179c98211e2a1e7864790b8c06ae7c82b95ee6a0d1fb90e6f92add3526a6bb2959f5ac3983c6f2a24cd3
+  data.tar.gz: fb6a08a93a30f74f5a12f9282492e150ea0088492203ef32e07cd90e5e7de4c6e7fcf5c85655cd3c38f4d64e715b81a40363ceb212cb22799efee0728505b058

data/README.md

@@ -1,6 +1,6 @@
-Kuhsaft has been replaced by
+**Kuhsaft has been replaced by
 [qBrick](http://github.com/screenconcept/qbrick). Please switch as soon
-as possible.
+as possible.**
 
 # Kuhsaft. A CMS as simple as it could be
 

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

@@ -23,6 +23,20 @@ CKEDITOR.config.customConfig = "<%= asset_path('kuhsaft/cms/ck-config.js') %>"
 loadTextEditor = ->
   CKEDITOR.replaceAll('ckeditor')
 
+reloadTextEditor = (ui) ->
+  editor_ids = ui.item.find('.ckeditor').map ->
+    @id
+
+  for editor in editor_ids
+    CKEDITOR.replace editor
+
+destroyTextEditor = (ui)->
+  editor_ids = ui.item.find('.ckeditor').map ->
+    @id
+
+  for editor in editor_ids
+    CKEDITOR.instances[editor].destroy(true)
+
 pageType = ->
   $('#page_page_type option:selected').val()
 
@@ -59,7 +73,11 @@ sortableBrick = ->
         sortForm = $('#bricks-sort-form form')
         sortForm.find('input[name="bricks[ids]"]').val(idList.toArray().join(','))
         sortForm.trigger('submit')
-      )
+      stop: (event, ui) ->
+        reloadTextEditor(ui)
+      start: (event, ui) ->
+        destroyTextEditor(ui)
+    ).disableSelection()
 
 window.initSubmitLinks = (selector = null)->
   selector ||= $('body')

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

@@ -23,8 +23,9 @@ module Kuhsaft
 
       def update
         @brick = Kuhsaft::Brick.find(params[:id])
+        @brick.image_size ||= ImageSize.all.first.name.to_s
+        params['brick'].delete('image_cache') if params['brick']['image']
         @brick.update_attributes(brick_params)
-
         #
         # rails will fall back to html if ajax can't be used
         # this is the case with the image brick, because ajax does not

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

@@ -1,5 +1,5 @@
 .pull-left
-  - if brick_content.present?
+  - if brick_content.present? || brick.user_can_save?
     .resize-toggler.btn.btn-small{ 'data-toggle' => 'collapse', 'data-target' => "#brick-content-#{brick.id}" }
       %i.icon-resize-full
       %i.icon-resize-small

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

@@ -1,14 +1,15 @@
 .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|
+  = simple_form_for brick, as: :brick, url: kuhsaft.cms_brick_path(brick), remote: true, 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
       = render('kuhsaft/cms/bricks/brick_header', brick: brick, brick_content: brick_content, form: form)
 
-    - if brick_content.present?
+    - if brick_content.present? || brick.user_can_save?
       .brick-item-content.collapse.in{ id: "brick-content-#{brick.id}", 'data-toggle' => true }
-        = brick_content
+        - if brick_content.present?
+          = brick_content
         - if brick.user_can_save?
           - # save button
           .clearfix

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

@@ -5,7 +5,7 @@
   - if @page.google_verification_key.present? && @page == homepage
     %meta{ name: 'google-site-verification', content: @page.google_verification_key }
 
-- cache [@page, I18n.locale, @page.children, @page.bricks] do
+- cache [@page, I18n.locale, "relatedhash-#{(@page.children + @page.bricks).map(&:cache_key).join.hash}"] do
   - unless @page.blank?
     .page-content
       -# TODO: refactor into scopes or simplify otherwise:

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = '2.6.0'
+  VERSION = '2.6.1'
 end

data/spec/spec_helper.rb

@@ -26,6 +26,7 @@ Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require_relative f }
 ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
 
 RSpec.configure do |config|
+  config.infer_spec_type_from_file_location!
 
   # Remove this line if you don't want RSpec's should and should_not
   # methods or matchers

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuhsaft
 version: !ruby/object:Gem::Version
-  version: 2.6.0
+  version: 2.6.1
 platform: ruby
 authors:
 - Immanuel Häussermann
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-28 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec-rails
@@ -777,7 +777,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: kuhsaft
-rubygems_version: 2.1.10
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A tool that helps you to manage your content within your app.