kuhsaft 1.3.1 → 1.4.0

data/README.md

@@ -189,7 +189,7 @@ Finally, add the new translation locale to your `available_locales` inside your
 
 By default, the text editor lets you add the following tags, for which you should supply some styles in your app:
 
-    p, h1, h2, h3, ul, ol, table, a, strong, em
+    p, h1, h2, h3, h4, table, a, strong, em
 
 ## Building a navigation
 

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

@@ -1,10 +1,14 @@
 module Kuhsaft
   module Cms
-    class AdminController < ApplicationController
+    class AdminController < ActionController::Base
       respond_to :html
       layout 'kuhsaft/cms/application'
       before_filter :set_content_locale
 
+      def url_options
+        { content_locale: I18n.locale }.merge(super)
+      end
+
       def set_content_locale
         if params[:content_locale].present?
           I18n.locale = params[:content_locale]

data/app/controllers/kuhsaft/pages_controller.rb

@@ -1,5 +1,5 @@
 module Kuhsaft
-  class PagesController < ApplicationController
+  class PagesController < ::ApplicationController
     respond_to :html
 
     def show

data/app/helpers/kuhsaft/application_helper.rb

@@ -1,5 +1,5 @@
 module Kuhsaft
-  module ApplicationHelper
+  module AdminHelper
 
     #
     # When rendering the layout of our host application,

data/app/helpers/kuhsaft/cms/{application_helper.rb → admin_helper.rb}

@@ -1,6 +1,6 @@
 module Kuhsaft
   module Cms
-    module ApplicationHelper
+    module AdminHelper
 
       def render_language_switch?
         I18n.available_locales.size > 1

data/app/helpers/kuhsaft/cms/pages_helper.rb

@@ -9,7 +9,7 @@ module Kuhsaft
       end
 
       def metadata_tab_active(page)
-        if page.errors.present? || !page.persisted?
+        if page.errors.present? || !page.persisted? || page.redirect?
           :active
         end
       end

data/app/models/kuhsaft/brick.rb

@@ -4,8 +4,8 @@ module Kuhsaft
 
     belongs_to :brick_list, :polymorphic => true, :touch => true
 
-    scope :localized, lambda { where(:locale => I18n.locale) }
-    default_scope order('position ASC').localized
+    scope :localized, -> { where(:locale => I18n.locale) }
+    default_scope -> { order('position ASC').localized }
 
     serialize :display_styles, Array
 
@@ -16,7 +16,6 @@ module Kuhsaft
                     :brick_list_type,
                     :display_styles
 
-    before_validation :set_locale
     before_validation :set_position
 
     validates :locale,
@@ -64,10 +63,6 @@ module Kuhsaft
       p.reverse
     end
 
-    def set_locale
-      self.locale = self.locale.presence || I18n.locale
-    end
-
     def set_position
       self.position = if self.position.present?
         self.position

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

@@ -1,8 +1,9 @@
 %ul.nav.nav-tabs.js-tabs
   %li{ :class => metadata_tab_active(@page) }
     = link_to t('.tab_metadata'), '#page-metadata', 'data-toggle' => :tab
-  %li{ :class => content_tab_active(@page) }
-    = link_to t('.tab_content'), '#page-content', 'data-toggle' => :tab
+  - unless @page.redirect?
+    %li{ :class => content_tab_active(@page) }
+      = link_to t('.tab_content'), '#page-content', 'data-toggle' => :tab
 
 .tab-content
   #page-metadata.tab-pane{ :class => metadata_tab_active(@page) }
@@ -19,12 +20,13 @@
       .form-actions
         = form.button :submit, :class => 'btn btn-primary'
 
-  #page-content.tab-pane{ :class => content_tab_active(@page) }
-    - if @page.persisted?
-      .clearfix
-        .actions
-          .btn-group
-            = render 'brick_type_dropdown', :brick_list => @page
-      = render 'kuhsaft/cms/bricks/brick_list', :brick_list => @page
+  - unless @page.redirect?
+    #page-content.tab-pane{ :class => content_tab_active(@page) }
+      - if @page.persisted?
+        .clearfix
+          .actions
+            .btn-group
+              = render 'brick_type_dropdown', :brick_list => @page
+        = render 'kuhsaft/cms/bricks/brick_list', :brick_list => @page
 
 = render 'kuhsaft/cms/bricks/sort_form'

data/lib/kuhsaft/version.rb

@@ -1,3 +1,3 @@
 module Kuhsaft
-  VERSION = "1.3.1"
+  VERSION = "1.4.0"
 end

data/spec/helpers/kuhsaft/cms/{application_helper_spec.rb → admin_helper_spec.rb}

@@ -1,6 +1,6 @@
 require 'spec_helper'
 
-describe Kuhsaft::Cms::ApplicationHelper do
+describe Kuhsaft::Cms::AdminHelper do
   describe '#render_language_switch?' do
     context 'when there is one language' do
       before do

data/spec/models/brick_spec.rb

@@ -6,11 +6,6 @@ describe Kuhsaft::Brick do
   end
 
   describe '#valid?' do
-    it 'sets a default locale' do
-      brick.should_receive(:set_locale)
-      brick.valid?
-    end
-
     it 'sets a default position' do
       brick.should_receive(:set_position)
       brick.valid?
@@ -33,22 +28,6 @@ describe Kuhsaft::Brick do
     end
   end
 
-  describe '#set_locale' do
-    context 'witout a locale' do
-      it 'sets a default' do
-        brick.set_locale
-        brick.locale.should == I18n.locale
-      end
-    end
-
-    context 'with a locale' do
-      it 'does not change' do
-        brick.locale = 'de'
-        expect { brick.set_locale }.to_not change(brick, :locale)
-      end
-    end
-  end
-
   describe '#brick_list_type' do
     it 'returns Kuhsaft::Brick' do
       brick.brick_list_type.should == 'Kuhsaft::Brick'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kuhsaft
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,10 +9,11 @@ authors:
 - Felipe Kaufmann
 - Phil Schilter
 - Donat Baier
+- Franca Rast
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-12 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -330,7 +331,6 @@ files:
 - app/assets/stylesheets/kuhsaft/application.css.sass
 - app/assets/stylesheets/kuhsaft/cms/application.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
 - app/controllers/kuhsaft/cms/bricks_controller.rb
@@ -338,7 +338,7 @@ files:
 - app/controllers/kuhsaft/pages_controller.rb
 - app/helpers/cms_helper.rb
 - app/helpers/kuhsaft/application_helper.rb
-- app/helpers/kuhsaft/cms/application_helper.rb
+- app/helpers/kuhsaft/cms/admin_helper.rb
 - app/helpers/kuhsaft/cms/pages_helper.rb
 - app/helpers/pages_helper.rb
 - app/models/kuhsaft/accordion_brick.rb
@@ -502,7 +502,7 @@ files:
 - spec/dummy/script/rails
 - spec/factories.rb
 - spec/features/cms_pages_spec.rb
-- spec/helpers/kuhsaft/cms/application_helper_spec.rb
+- spec/helpers/kuhsaft/cms/admin_helper_spec.rb
 - spec/kuhsaft_spec.rb
 - spec/lib/brick_list_spec.rb
 - spec/lib/engine_spec.rb
@@ -541,7 +541,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4323696798110964651
+      hash: 4093169498580563011
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -550,10 +550,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4323696798110964651
+      hash: 4093169498580563011
 requirements: []
 rubyforge_project: kuhsaft
-rubygems_version: 1.8.25
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: A tool that helps you to manage your content within your app.
@@ -593,7 +593,7 @@ test_files:
 - spec/dummy/script/rails
 - spec/factories.rb
 - spec/features/cms_pages_spec.rb
-- spec/helpers/kuhsaft/cms/application_helper_spec.rb
+- spec/helpers/kuhsaft/cms/admin_helper_spec.rb
 - spec/kuhsaft_spec.rb
 - spec/lib/brick_list_spec.rb
 - spec/lib/engine_spec.rb

data/app/controllers/kuhsaft/application_controller.rb

@@ -1,5 +0,0 @@
-module Kuhsaft
-  class ApplicationController < ActionController::Base
-    layout 'application'
-  end
-end