kuhsaft 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: eb1fd5cd01b12e0073bc958764ab539ee15cbb15
-  data.tar.gz: 5234c1898170292b3b0e58907ef2162438920206
+  metadata.gz: 420ce52f4407fce942156ea0cb2ebff39c6ccc1b
+  data.tar.gz: 638c7ee46c3c429930cf76115fc9a25a5b7726e1
 SHA512:
-  metadata.gz: 4615e27fd351dfbbb4574be8d1fa24548301dbc747658825d4e397f8033162b5549763e8a1af9131c1e0814f47b624be23c0ed84d4771db31f7c61d27cc24894
-  data.tar.gz: 03d92616ceefbfc8a7df1ab07322cfd7437bd5e518cc04338620ed126ff1c6fa11375c01ac6ff640d2418f240b14732f3a202bbf434cc5ed85100372ad9d1fa3
+  metadata.gz: d5a2c6ccce364f22c8b48ac97ee663a425f90bd62892b613e2c69ea81012bbbdaa1543075fa01fecf1617f781a279caa2e41ad1539d2c14510bb13d074f022e2
+  data.tar.gz: 51c333acbf3b3d8f0677b8212e0a9adbb71d7c23280b029157f479ba08f887f99ce6f569965c2fba0275bd4ecaf5071375babf9398a645845f4a356d5504923e

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

@@ -1,6 +1,7 @@
 module Kuhsaft
   module Cms
     class AdminController < ActionController::Base
+      inherit_resources
       respond_to :html
       layout 'kuhsaft/cms/application'
       before_filter :set_content_locale

data/app/models/kuhsaft/two_column_brick.rb

@@ -41,8 +41,7 @@ module Kuhsaft
     private
 
     def add_columns
-      bricks << Kuhsaft::ColumnBrick.new
-      bricks << Kuhsaft::ColumnBrick.new
+      bricks << 2.times.map { |p| Kuhsaft::ColumnBrick.new(position: p + 1) }
     end
   end
 end

data/app/views/kuhsaft/cms/assets/_form.html.haml

@@ -1,4 +1,4 @@
-= simple_form_for @asset, :url => url, :html => { :multipart => true } do |f|
+= simple_form_for @asset, :url => url, :html => { :multipart => true }, :wrapper => :bootstrap do |f|
   .lightened-box
     %h1= page_title
     = f.input :file, :as => :file
@@ -12,4 +12,4 @@
       - else
         = link_to @asset.name, @asset.file.url
   .lightened-box
-    = f.button :submit
+    = f.button :submit

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

@@ -1,5 +1,5 @@
 .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 } do |form|
+  = simple_form_for brick, :as => :brick, :url => kuhsaft.cms_brick_path(brick), :remote => !brick.uploader?, :html => { :id => nil }, :wrapper => :bootstrap do |form|
     = form.hidden_field :position, :class => 'position-field'
     .brick-item-header.clearfix
       .pull-left

data/app/views/kuhsaft/cms/pages/_form.html.haml

@@ -7,7 +7,7 @@
 
 .tab-content
   #page-metadata.tab-pane{ :class => metadata_tab_active(@page) }
-    = simple_form_for @page, :url => url, :html => { :class => 'form-horizontal' } do |form|
+    = simple_form_for @page, :url => url, :html => { :class => 'form-horizontal' }, :wrapper => :bootstrap do |form|
       = form.input :title, :required => false, :input_html => { :class => :span5 }
       = form.input :slug, :required => false, :input_html => { :class => :span5 }
       = form.input :page_title, :required => false, :input_html => { :class => :span5 }

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

@@ -8,4 +8,6 @@ de:
           add_specific_element: '%{name} hinzufügen'
         empty_state:
           empty: 'Hier ist bisher noch nichts...'
+        main_navigation:
+          logout: 'Abmelden'
 

data/lib/kuhsaft.rb

@@ -15,4 +15,5 @@ module Kuhsaft
   require 'bootstrap-sass'
   require 'haml'
   require 'ckeditor_rails'
+  require 'inherited_resources'
 end

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = "2.1.1"
+  VERSION = "2.1.2"
 end

data/spec/models/two_column_brick_spec.rb

@@ -69,4 +69,14 @@ describe Kuhsaft::TwoColumnBrick do
       Kuhsaft::TwoColumnBrick.new.to_style_class.should == 'kuhsaft-two-column-brick row-fluid'
     end
   end
+
+  describe '#add_columns' do
+    it 'sets the position of the first column brick to 1' do
+      Kuhsaft::TwoColumnBrick.new.send(:add_columns).to_a.first.position.should == 1
+    end
+
+    it 'sets the position of the second column brick to 2' do
+      Kuhsaft::TwoColumnBrick.new.send(:add_columns).to_a.second.position.should == 2
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuhsaft
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Immanuel Häussermann
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-09-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -342,14 +342,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: jquery-ui-rails
   requirement: !ruby/object:Gem::Requirement
@@ -378,6 +378,20 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: inherited_resources
+  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.
 email: developers@screenconcept.ch
 executables: []
@@ -505,7 +519,6 @@ files:
 - config/locales/views/kuhsaft/search/de.yml
 - config/locales/views/kuhsaft/search/en.yml
 - config/locales/views/kuhsaft/text_brick/de.yml
-- config/locales/views/layouts/de.yml
 - config/routes.rb
 - db/migrate/01_create_kuhsaft_pages.rb
 - db/migrate/02_create_kuhsaft_bricks.rb
@@ -635,7 +648,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: kuhsaft
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: A tool that helps you to manage your content within your app.

data/config/locales/views/layouts/de.yml

@@ -1,8 +0,0 @@
-en:
-  layouts:
-    kuhsaft:
-      cms:
-        application:
-          logout: 'Abmelden'
-        flash:
-          success: '%{subject} wurde erfolgreich gespeichert.'