kuhsaft 2.3.6 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2bfe7466915568a7ca7d9121acdc5296373b878a
-  data.tar.gz: c2902d30ef0a7ff6c06d496ffea3bc5c2623d872
+  metadata.gz: ddd2554a3f1acb218595a789763099fa2cf6230a
+  data.tar.gz: ac7de32212bd662844ab1d94a7cd29937cc8cad4
 SHA512:
-  metadata.gz: b3bac56f55872af465c0b9d2b4bcb6f4518cd5d031965ae79923dfbe37cca4b28f94b84d71ab2b2edf5fc82875699ea98aeccf40246687fd95048f7e0b380615
-  data.tar.gz: 3e6c39c36bba17505b1e84ce0fb22ae554c0721181641dff5a59f38dc3680fac1bb4de22944fabd7882cb56252f7b889018ba68552925b174a3169623020ae18
+  metadata.gz: a63478d1ef80b25f6d8095c7b76b45d8f59b47ee7673f1ddbf8475f8c556f009f1439f299c74a1557b705072391f1bcb94e70fb30cf31ae90654e8b5471e17f7
+  data.tar.gz: cc6fab5ebac35aed815296ac64c341cc9d3193671be67cb5085cbc87129de06dd8f9c29d8f3fc63d84705994343374fe98a25b82879ef27c2dd7d9752e2cfc21

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

@@ -14,6 +14,10 @@
 #= require ckeditor-jquery
 #= require jquery.nestable
 #= require_tree .
+#
+# Disable timestamp for ckeditor internal asset loading. This prevents issues with Asset Pipeline on production.
+root = exports ? this
+root.CKEDITOR.timestamp = null
 
 # As @ryabrody & @k-graefenhain found out there is obviously a bug which causes the asset_path_helper to return paths always without digest:
 # https://github.com/rails/sprockets-rails/issues/66

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

@@ -181,6 +181,24 @@ form
     height: 263px
     width: 98%
 
+.ckimage-wrapper
+  float: left
+  margin-left: 10px
+  margin-top: 10px
+  padding-bottom: 20px
+  position: relative
+
+.ckimage-thumb
+  width: 150px
+  height: 150px
+  border: 1px solid black
+
+.ckimage-delete
+  display: block
+  position: absolute
+  bottom: 0
+  height: 20px
+
 @import nestable
 @import bootstrap-responsive
 @import bootstrap_modal

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

@@ -0,0 +1,26 @@
+module Kuhsaft
+  module Cms
+    class CkimagesController < AdminController
+      layout 'kuhsaft/cms/ckimages'
+      skip_before_action :verify_authenticity_token
+      respond_to :html, :js
+
+      def create
+        @func_num = params['CKEditorFuncNum']
+        @ck_editor = params['CKEditor']
+        @ckimage = Kuhsaft::Ckimage.create(file: params[:upload])
+      end
+
+      def index
+        @func_num = params['CKEditorFuncNum']
+        @ck_editor = params['CKEditor']
+        @ckimages = Kuhsaft::Ckimage.all
+      end
+
+      def destroy
+        @ckimage = Kuhsaft::Ckimage.find(params[:id])
+        @ckimage.destroy
+      end
+    end
+  end
+end

data/app/models/kuhsaft/ckimage.rb

@@ -0,0 +1,5 @@
+module Kuhsaft
+  class Ckimage < ActiveRecord::Base
+    mount_uploader :file, CkimageUploader
+  end
+end

data/app/models/kuhsaft/page.rb

@@ -26,6 +26,7 @@ module Kuhsaft
     }
 
     before_validation :create_slug, :create_url
+    after_save :update_child_urls
 
     validates :title, presence: true
     validates :slug, presence: true
@@ -34,7 +35,7 @@ module Kuhsaft
     validates :identifier, uniqueness: true, allow_blank: true
 
     class << self
-      def flat_tree(pages = nil)
+      def flat_tree
         arrange_as_array
       end
 
@@ -114,8 +115,17 @@ module Kuhsaft
     end
 
     def create_slug
-      has_slug = title.present? && slug.blank?
-      self.slug = title.downcase.parameterize if has_slug
+      if title.present? && slug.blank?
+        self.slug = title.downcase.parameterize
+      elsif slug.present?
+        self.slug = slug.downcase
+      end
+    end
+
+    def update_child_urls
+      if children.any?
+        children.each { |child| child.update_attributes(url: child.create_url) }
+      end
     end
 
     def nesting_name
@@ -140,7 +150,7 @@ module Kuhsaft
       super + bricks.map(&:cache_key).join
     end
 
-    def as_json(options = {})
+    def as_json
       Hash.new.tap do |json|
         json['title'] = send("title_#{I18n.locale.to_s.underscore}")
         json['pretty_url'] = '/' + send("url_#{I18n.locale.to_s.underscore}")

data/app/uploaders/kuhsaft/ckimage_uploader.rb

@@ -0,0 +1,16 @@
+# encoding: utf-8
+
+module Kuhsaft
+  class CkimageUploader < CarrierWave::Uploader::Base
+    include CarrierWave::MiniMagick
+    storage :file
+
+    def store_dir
+      "uploads/#{model.class.to_s.underscore}/#{mounted_as}/#{model.id}"
+    end
+
+    version :thumb do
+      process resize_to_fit: [150, 150]
+    end
+  end
+end

data/app/views/kuhsaft/cms/ckimages/create.html.haml

@@ -0,0 +1,11 @@
+- if @ckimage
+  = image_tag @ckimage.file.url
+
+  :javascript
+    CKEditorFuncNum = #{@func_num};
+    function SetUrl( fileUrl )
+    {
+      window.parent.CKEDITOR.tools.callFunction(CKEditorFuncNum, fileUrl);
+    }
+
+    SetUrl("#{ @ckimage.file.url }");

data/app/views/kuhsaft/cms/ckimages/destroy.js.erb

@@ -0,0 +1,2 @@
+var ckimageId = "<%= "#ckimage_#{@ckimage.id}" %>";
+$(ckimageId).fadeOut();

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

@@ -0,0 +1,13 @@
+- @ckimages.each do |image|
+  .ckimage-wrapper{ id: "ckimage_#{image.id}" }
+    .ckimage-thumb{ 'data-image-url' => image.file.url, 'data-func-num' => @func_num }
+      = image_tag image.file.thumb.url
+    .ckimage-delete
+      =link_to 'Delete', cms_ckimage_path(image), method: :delete, remote: true, data: { confirm: t('kuhsaft.cms.ckimages.confirm') }
+
+:coffeescript
+  $('.ckimage-thumb').click ->
+    funcNum = $(this).data('func-num')
+    imageUrl = $(this).data('image-url')
+    window.opener.CKEDITOR.tools.callFunction(funcNum, imageUrl)
+    window.close()

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

@@ -0,0 +1,18 @@
+!!!
+%html
+  %head
+    %meta{ charset: "utf-8" }
+    %title Screen Concept CMS
+    = stylesheet_link_tag 'kuhsaft/cms/application.css', :media => 'screen, projection'
+    = stylesheet_link_tag 'kuhsaft/cms/customizations.css', :media => 'screen, projection'
+    = javascript_include_tag 'kuhsaft/cms/application.js'
+    = javascript_include_tag 'kuhsaft/cms/customizations.js'
+    = csrf_meta_tag
+
+  %body
+    .container.cms
+      .row
+        .span3
+        .span6
+          = yield
+        .span3

data/config/locales/kuhsaft.de.yml

@@ -19,6 +19,8 @@ de:
           create_new: '%{brick} erstellen'
           save: Speichern
           no_content: 'Dieser Brick hat keinen eigenen Inhalt. Nach dem Speichern können darin weitere Bricks erstellt werden.'
+      ckimages:
+        confirm: 'Sind Sie sicher?'
       pages:
         index:
           create: 'Neue Seite erstellen'

data/config/routes.rb

@@ -10,6 +10,7 @@ Kuhsaft::Engine.routes.draw do
     end
 
     resources :assets
+    resources :ckimages, only: [:create, :index, :destroy]
     root to: 'pages#index'
   end
 

data/db/migrate/20_create_kuhsaft_ckimages.rb

@@ -0,0 +1,9 @@
+class CreateKuhsaftCkimages < ActiveRecord::Migration
+  def change
+    create_table :kuhsaft_ckimages do |t|
+      t.string :file
+
+      t.timestamps
+    end
+  end
+end

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = '2.3.6'
+  VERSION = '2.4.0'
 end

data/lib/templates/kuhsaft/assets/ck-config.js.coffee

@@ -18,6 +18,17 @@ CKEDITOR.editorConfig = (config) ->
 
   true
 
+# Image Upload options:
+# ---------------------
+
+# enable theese two:
+  # config.filebrowserUploadUrl = '/cms/ckimages'
+  # config.filebrowserBrowseUrl = '/cms/ckimages'
+
+# and add this button:
+  # 'Image'
+
+
 # FULL OPTIONS:
 #[
 #['Source','-','Save','NewPage','Preview','-','Templates'],

data/spec/dummy/app/assets/javascripts/kuhsaft/cms/ck-config.js.coffee

@@ -18,6 +18,17 @@ CKEDITOR.editorConfig = (config) ->
 
   true
 
+# Image Upload options:
+# ---------------------
+
+# enable theese two:
+  # config.filebrowserUploadUrl = '/cms/ckimages'
+  # config.filebrowserBrowseUrl = '/cms/ckimages'
+
+# and add this button:
+  # 'Image'
+
+
 # FULL OPTIONS:
 #[
 #['Source','-','Save','NewPage','Preview','-','Templates'],

data/spec/models/page_spec.rb

@@ -367,6 +367,26 @@ describe Kuhsaft::Page do
     end
   end
 
+  describe '#after_save' do
+    context 'when updating a parents page type' do
+      it 'updates the child pages url if parent is changed to navigation' do
+        @parent_page = FactoryGirl.create(:page, slug: 'le_parent')
+        @child_page = FactoryGirl.create(:page, slug: 'le_child', parent: @parent_page)
+
+        @parent_page.update_attributes(page_type: Kuhsaft::PageType::NAVIGATION)
+        @child_page.reload.url.should eq("#{I18n.locale}/le_child")
+      end
+
+      it 'updates the child pages url if parent is changed to content' do
+        @parent_page = FactoryGirl.create(:page, slug: 'le_parent', page_type: Kuhsaft::PageType::NAVIGATION)
+        @child_page = FactoryGirl.create(:page, slug: 'le_child', parent: @parent_page)
+
+        @parent_page.update_attributes(page_type: Kuhsaft::PageType::CONTENT)
+        @child_page.reload.url.should eq("#{I18n.locale}/le_parent/le_child")
+      end
+    end
+  end
+
   describe '#url_without_locale' do
     let :page do
       create(:page, slug: 'page')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuhsaft
 version: !ruby/object:Gem::Version
-  version: 2.3.6
+  version: 2.4.0
 platform: ruby
 authors:
 - Immanuel Häussermann
@@ -12,230 +12,230 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-01 00:00:00.000000000 Z
+date: 2014-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.2
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 2.14.2
 - !ruby/object:Gem::Dependency
   name: factory_girl_rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: capybara
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: i18n-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: nyan-cat-formatter
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: coffee-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: remotipart
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: haml
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: 4.0.3
 - !ruby/object:Gem::Dependency
   name: carrierwave
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: mini_magick
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdiscount
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ancestry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
@@ -270,196 +270,196 @@ dependencies:
   name: pg_search
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-debugger
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: better_errors
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: binding_of_caller
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sass-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 4.0.2
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: 3.0.1
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: bourbon
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Kuhsaft is a Rails engine that offers a simple CMS.
@@ -468,15 +468,17 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
+- Rakefile
+- app/assets/javascripts/ckeditor/plugins/adv_link/LICENSE.txt
+- app/assets/javascripts/ckeditor/plugins/adv_link/README.md
 - app/assets/javascripts/ckeditor/plugins/adv_link/dialogs/anchor.js.coffee
 - app/assets/javascripts/ckeditor/plugins/adv_link/dialogs/link.js.coffee
 - app/assets/javascripts/ckeditor/plugins/adv_link/images/anchor.png
 - app/assets/javascripts/ckeditor/plugins/adv_link/images/hidpi/anchor.png
 - app/assets/javascripts/ckeditor/plugins/adv_link/lang/de.js
 - app/assets/javascripts/ckeditor/plugins/adv_link/lang/en.js
-- app/assets/javascripts/ckeditor/plugins/adv_link/LICENSE.txt
 - app/assets/javascripts/ckeditor/plugins/adv_link/plugin.js.coffee
-- app/assets/javascripts/ckeditor/plugins/adv_link/README.md
 - app/assets/javascripts/kuhsaft/application.js.coffee
 - app/assets/javascripts/kuhsaft/cms/application.js.coffee.erb
 - app/assets/javascripts/kuhsaft/views/read_more_view.js.coffee
@@ -487,6 +489,7 @@ files:
 - app/controllers/kuhsaft/cms/admin_controller.rb
 - app/controllers/kuhsaft/cms/assets_controller.rb
 - app/controllers/kuhsaft/cms/bricks_controller.rb
+- app/controllers/kuhsaft/cms/ckimages_controller.rb
 - app/controllers/kuhsaft/cms/pages_controller.rb
 - app/controllers/kuhsaft/pages_controller.rb
 - app/controllers/kuhsaft/sitemaps_controller.rb
@@ -504,6 +507,7 @@ files:
 - app/models/kuhsaft/brick.rb
 - app/models/kuhsaft/brick_type.rb
 - app/models/kuhsaft/brick_type_filter.rb
+- app/models/kuhsaft/ckimage.rb
 - app/models/kuhsaft/cms.rb
 - app/models/kuhsaft/column_brick.rb
 - app/models/kuhsaft/image_brick.rb
@@ -520,6 +524,7 @@ files:
 - app/models/kuhsaft/video_brick.rb
 - app/uploaders/kuhsaft/asset_brick_asset_uploader.rb
 - app/uploaders/kuhsaft/asset_uploader.rb
+- app/uploaders/kuhsaft/ckimage_uploader.rb
 - app/uploaders/kuhsaft/image_brick_image_uploader.rb
 - app/views/kuhsaft/accordion_bricks/_accordion_brick.html.haml
 - app/views/kuhsaft/accordion_bricks/accordion_brick/_edit.html.haml
@@ -548,6 +553,9 @@ files:
 - app/views/kuhsaft/cms/bricks/destroy.js.erb
 - app/views/kuhsaft/cms/bricks/new.js.erb
 - app/views/kuhsaft/cms/bricks/update.js.erb
+- app/views/kuhsaft/cms/ckimages/create.html.haml
+- app/views/kuhsaft/cms/ckimages/destroy.js.erb
+- app/views/kuhsaft/cms/ckimages/index.html.haml
 - app/views/kuhsaft/cms/pages/_branch.html.haml
 - app/views/kuhsaft/cms/pages/_form.html.haml
 - app/views/kuhsaft/cms/pages/edit.html.haml
@@ -579,6 +587,7 @@ files:
 - app/views/kuhsaft/video_bricks/_video_brick.html.haml
 - app/views/kuhsaft/video_bricks/video_brick/_edit.html.haml
 - app/views/layouts/kuhsaft/cms/application.html.haml
+- app/views/layouts/kuhsaft/cms/ckimages.html.haml
 - config/initializers/simple_form.rb
 - config/initializers/simple_form_bootstrap.rb
 - config/locales/de.yml
@@ -630,9 +639,11 @@ files:
 - db/migrate/17_set_page_type_to_content_for_empty_fields.rb
 - db/migrate/18_add_identifier_to_kuhsaft_pages.rb
 - db/migrate/19_add_col_count_to_bricks.rb
+- db/migrate/20_create_kuhsaft_ckimages.rb
 - db/seeds.rb
 - lib/generators/kuhsaft/assets/install_generator.rb
 - lib/generators/kuhsaft/translations/add_generator.rb
+- lib/kuhsaft.rb
 - lib/kuhsaft/brick_list.rb
 - lib/kuhsaft/engine.rb
 - lib/kuhsaft/gridded.rb
@@ -644,19 +655,11 @@ files:
 - lib/kuhsaft/touch_placeholders.rb
 - lib/kuhsaft/translatable.rb
 - lib/kuhsaft/version.rb
-- lib/kuhsaft.rb
 - lib/tasks/kuhsaft_tasks.rake
 - lib/templates/kuhsaft/assets/ck-config.js.coffee
 - lib/templates/kuhsaft/assets/customizations.css.sass
 - lib/templates/kuhsaft/assets/customizations.js.coffee
 - lib/templates/kuhsaft/translations/add_translation.html.erb
-- vendor/assets/javascripts/bootstrap-modal-v2.js
-- vendor/assets/javascripts/bootstrap-modalmanager.js
-- vendor/assets/javascripts/jquery.nestable.js
-- vendor/assets/stylesheets/bootstrap_modal.css
-- vendor/assets/stylesheets/nestable.css
-- Rakefile
-- README.md
 - spec/controllers/kuhsaft/api/pages_controller_spec.rb
 - spec/controllers/kuhsaft/pages_controller_spec.rb
 - spec/controllers/kuhsaft/sitemaps_controller_spec.rb
@@ -737,6 +740,11 @@ files:
 - spec/support/kuhsaft_spec_helper.rb
 - spec/support/write_expectation.rb
 - spec/views/kuhsaft/sitemaps/index.xml.haml_spec.rb
+- vendor/assets/javascripts/bootstrap-modal-v2.js
+- vendor/assets/javascripts/bootstrap-modalmanager.js
+- vendor/assets/javascripts/jquery.nestable.js
+- vendor/assets/stylesheets/bootstrap_modal.css
+- vendor/assets/stylesheets/nestable.css
 homepage: http://github.com/screenconcept/kuhsaft
 licenses:
 - MIT
@@ -747,17 +755,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: kuhsaft
-rubygems_version: 2.1.10
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A tool that helps you to manage your content within your app.