kuhsaft 2.2.6 → 2.3.0

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

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

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

@@ -60,12 +60,17 @@ form
   padding: 0.5em
 
   .btn
-    opacity: 0
-    @include transition(opacity, 0.2s)
-
-  &:hover
-    .btn
-      opacity: 1
+    &.resize-toggler
+      .icon-resize-small
+        display: block
+      .icon-resize-full
+        display: none
+
+      &.collapsed
+        .icon-resize-small
+          display: none
+        .icon-resize-full
+          display: block
 
 .btn-toolbar
   margin-top: 0
@@ -82,7 +87,9 @@ form
   > .brick-item-childs
     > .brick-list
       padding-left: 0
+
 #page-content
+  padding-bottom: 6em
   > .brick-list
     padding-left: 0
 
@@ -96,7 +103,7 @@ form
   margin: -1px
   background: #fff
 
-  .brick-item-content
+  .brick-item-content.in
     padding: 1em
 
 .empty-state
@@ -155,15 +162,23 @@ form
       .control-label
         font-weight: bold
 
+.modal
+  width: 900px
+  margin-left: -450px
+
+  .modal-body
+    max-height: none
+
+  #display-styles
+    position: absolute
+    top: 7px
+    right: 15px
+
 textarea.ckeditor
   height: 263px
   display: block !important
   visibility: show !important
   position: absolute
 
-.kuhsaft-text-brick
-  .controls
-    min-height: 271px
-
 @import nestable
 @import bootstrap-responsive

data/app/controllers/kuhsaft/api/pages_controller.rb

@@ -0,0 +1,14 @@
+module Kuhsaft
+  module Api
+    class PagesController < ActionController::Base
+      layout :false
+      respond_to :json
+
+      def index
+        I18n.locale = params[:locale]
+        @pages = Kuhsaft::Page.unscoped.published.content_page.translated.order(position: :asc)
+        render json: @pages.as_json
+      end
+    end
+  end
+end

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

@@ -3,7 +3,7 @@ module Kuhsaft
     class AdminController < ActionController::Base
       respond_to :html
       layout 'kuhsaft/cms/application'
-      before_filter :set_content_locale
+      before_action :set_content_locale
 
       def set_content_locale
         if params[:content_locale].present?

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

@@ -5,29 +5,29 @@ module Kuhsaft
         @assets = Kuhsaft::Asset.by_date
         respond_with @assets
       end
-    
+
       def new
         @asset = Kuhsaft::Asset.new
         respond_with @asset
       end
-    
+
       def create
         @asset = Kuhsaft::Asset.create params[:kuhsaft_asset]
         @asset.save
-        respond_with @asset, :location => cms_assets_path
+        respond_with @asset, location: cms_assets_path
       end
-    
+
       def edit
         @asset = Kuhsaft::Asset.find(params[:id])
         respond_with @asset
       end
-    
+
       def update
         @asset = Kuhsaft::Asset.find(params[:id])
         @asset.update_attributes(params[:kuhsaft_asset])
-        respond_with @asset, :location => cms_assets_path
+        respond_with @asset, location: cms_assets_path
       end
-    
+
       def destroy
         @asset = Kuhsaft::Asset.find(params[:id])
         @asset.destroy

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

@@ -1,13 +1,24 @@
 module Kuhsaft
   module Cms
     class BricksController < AdminController
-
       respond_to :html, :js
 
       def create
-        @brick = params[:brick][:type].constantize.new(brick_params)
+        @brick = params[:brick][:type].constantize.create(brick_params)
         @brick.image_size = ImageSize.all.first.name.to_s
-        @brick.save(:validate => false)
+
+        if @brick.valid?
+          respond_with @brick do |format|
+            format.js
+            format.html { redirect_to edit_cms_page_path(@brick.parents.first) }
+          end
+        else
+          render 'new'
+        end
+      end
+
+      def new
+        @brick = Kuhsaft::Brick.new(brick_params)
       end
 
       def update
@@ -37,7 +48,7 @@ module Kuhsaft
             Kuhsaft::Brick.find(id).update_attribute(:position, idx.to_i + 1)
           end
         end
-        render :nothing => true
+        render nothing: true
       end
 
       private

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

@@ -23,8 +23,8 @@ module Kuhsaft
         @page = Kuhsaft::Page.create(page_params)
 
         if @page.valid?
-          flash[:success] = t('layouts.kuhsaft.cms.flash.success', :subject => Kuhsaft::Page.model_name.human)
-          respond_with @page, :location => kuhsaft.edit_cms_page_path(@page)
+          flash[:success] = t('layouts.kuhsaft.cms.flash.success', subject: Kuhsaft::Page.model_name.human)
+          respond_with @page, location: kuhsaft.edit_cms_page_path(@page)
         else
           render 'new'
         end
@@ -40,8 +40,8 @@ module Kuhsaft
       def update
         @page = Kuhsaft::Page.find(params[:id])
         if @page.update_attributes(page_params)
-          flash[:success] = t('layouts.kuhsaft.cms.flash.success', :subject => Kuhsaft::Page.model_name.human)
-          respond_with @page, :location => kuhsaft.edit_cms_page_path(@page)
+          flash[:success] = t('layouts.kuhsaft.cms.flash.success', subject: Kuhsaft::Page.model_name.human)
+          respond_with @page, location: kuhsaft.edit_cms_page_path(@page)
         else
           render 'edit'
         end
@@ -60,17 +60,10 @@ module Kuhsaft
       private
 
       def page_params
-        safe_params = [:title,
-                       :page_title,
-                       :slug,
-                       :redirect_url,
-                       :url,
-                       :page_type,
-                       :parent_id,
-                       :keywords,
-                       :description,
-                       :published,
-                       :position]
+        safe_params = [
+          :title, :page_title, :slug, :redirect_url, :url, :page_type, :parent_id,
+          :keywords, :description, :published, :position
+        ]
         params.require(:page).permit(*safe_params)
       end
     end

data/app/controllers/kuhsaft/pages_controller.rb

@@ -1,6 +1,7 @@
 module Kuhsaft
   class PagesController < ::ApplicationController
     respond_to :html
+    before_action :find_page_by_url, only: :show
 
     def index
       @search = params[:search]
@@ -10,20 +11,29 @@ module Kuhsaft
     end
 
     def show
-      url = locale.to_s
-      url += "/#{params[:url]}" if params[:url].present?
-      @page = Kuhsaft::Page.find_by_url(url)
-
       if @page.present? && @page.redirect? && @page.redirect_url.present?
-        redirect_url = @page.redirect_url.sub(/\A\/+/,'') # remove all preceding slashes
+        redirect_url = @page.redirect_url.sub(/\A\/+/, '') # remove all preceding slashes
         redirect_to "/#{redirect_url}"
       elsif @page.present?
         respond_with @page
       elsif @page.blank? && respond_to?(:handle_404)
         handle_404
       else
-        raise ActionController::RoutingError.new('Not Found')
+        raise ActionController::RoutingError, 'Not Found'
       end
     end
+
+    def lookup_by_id
+      @page = Page.find(params[:id])
+      redirect_to "/#{@page.url}"
+    end
+
+    private
+
+    def find_page_by_url
+      url = locale.to_s
+      url += "/#{params[:url]}" if params[:url].present?
+      @page = Kuhsaft::Page.find_by_url(url)
+    end
   end
 end

data/app/controllers/kuhsaft/sitemaps_controller.rb

@@ -0,0 +1,13 @@
+module Kuhsaft
+  class SitemapsController < ::ApplicationController
+    def index
+      last_page = Kuhsaft::Page.published.last
+      if stale?(etag: last_page, last_modified: last_page.updated_at.utc)
+        respond_to do |format|
+          format.html
+          format.xml { @pages = Kuhsaft::Page.published }
+        end
+      end
+    end
+  end
+end

data/app/helpers/cms_helper.rb

@@ -1,15 +1,15 @@
 module CmsHelper
-  def admin_tab title, path
-    content_tag :li, link_to(title, path), :class => (:current if request.path.include?(path))
+  def admin_tab(title, path)
+    content_tag :li, link_to(title, path), class: (:current if request.path.include?(path))
   end
 
   def available_parent_pages
     pages = []
-    pages << { :title => t('kuhsaft.cms.pages.new.pages'), :link => kuhsaft.cms_pages_path(:locale => :en) }
+    pages << { title: t('kuhsaft.cms.pages.new.pages'), link: kuhsaft.cms_pages_path(locale: :en) }
     if params[:parent_id].present?
       parent_page = Kuhsaft::Page.find(params[:parent_id])
       pages += parent_page.parent_pages
     end
-    pages << { :title => t('kuhsaft.cms.pages.new.new_page'), :link => '#' }
+    pages << { title: t('kuhsaft.cms.pages.new.new_page'), link: '#' }
   end
 end

data/app/helpers/kuhsaft/admin_helper.rb

@@ -1,6 +1,5 @@
 module Kuhsaft
   module AdminHelper
-
     #
     # When rendering the layout of our host application,
     # the paths of the host application are not visible to the engine

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

@@ -1,7 +1,6 @@
 module Kuhsaft
   module Cms
     module AdminHelper
-
       def render_language_switch?
         I18n.available_locales.size > 1
       end
@@ -15,7 +14,7 @@ module Kuhsaft
         end
 
         link_to locale.to_s.upcase, url_for(
-          :action => action, :content_locale => locale)
+          action: action, content_locale: locale)
       end
     end
   end

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

@@ -1,17 +1,12 @@
 module Kuhsaft
   module Cms
     module PagesHelper
-
       def content_tab_active(page)
-        unless hide_content_tab?(page)
-          :active
-        end
+        :active unless hide_content_tab?(page)
       end
 
       def metadata_tab_active(page)
-        if hide_content_tab?(page)
-          :active
-        end
+        :active if hide_content_tab?(page)
       end
 
       def hide_content_tab?(page)

data/app/helpers/pages_helper.rb

@@ -1,73 +1,44 @@
 module PagesHelper
-  def current_page
-  #   page = @page
-  #   yield @page if block_given?
-  # rescue
-  end
-
-  def current_page_path(lang=nil)
-  #   if @page.present?
-  #     '/' + Kuhsaft::Page.find(@page.id).localized_pages.where('locale = ?', lang).first.url
-  #   else
-  #     root_path
-  #   end
-  # rescue
-  #   root_path
-  end
-
-  def asset_for id
+  def asset_for(id)
     Kuhsaft::Asset.find(id)
   end
 
-  def render_markdown text
+  def render_markdown(text)
     RDiscount.new(text).to_html if text.present?
   end
 
-  def navigation_for options
-    if options.is_a?(Hash) && slug = options.delete(:slug)
-      pages = Kuhsaft::LocalizedPage.navigation(slug).first.page.children.current_locale.published rescue []
-    elsif (options.is_a?(Fixnum) && id = options) ||  id = options.delete(:id)
-      pages = Kuhsaft::Page.published.where('parent_id = ?', id)
-    elsif options.nil?
-      pages = Kuhsaft::Page.published.roots
-    end
-    yield pages if block_given? && pages.length > 0
-    pages
-  end
-
   def homepage
     Kuhsaft::Page.roots.first
   end
 
-  def page_for_level num
+  def page_for_level(num)
     input = controller.current_url if controller.respond_to? :current_url
     input ||= params[:url].presence || ''
     url = input.split('/').take(num + 1).join('/') unless input.blank?
     page = Kuhsaft::Page.find_by_url(url)
     yield page if block_given?
     page
-  rescue
   end
 
-  def active_page_class page
+  def active_page_class(page)
     input = controller.current_url if controller.respond_to? :current_url
     input ||= params[:url].presence || ''
     input.include?(page.url.to_s) ? :active : nil
   end
 
-  def current_page_class page
+  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 => 'collapsed button button-read-more') do
-      @content = content_tag(:p, t('kuhsaft.text_bricks.text_brick.read_more'), :class => 'read-more-text')
-      @content << content_tag(:p, t('kuhsaft.text_bricks.text_brick.read_less'), :class => 'read-less-text')
+      @content = content_tag(:p, t('kuhsaft.text_bricks.text_brick.read_more'), class: 'read-more-text')
+      @content << content_tag(:p, t('kuhsaft.text_bricks.text_brick.read_less'), class: 'read-less-text')
     end
   end
 
   def search_page_form
-    form_tag kuhsaft.pages_path, :method => :get, :class => 'form-inline' do
+    form_tag kuhsaft.pages_path, method: :get, class: 'form-inline' do
       if block_given?
         yield
       else

data/app/helpers/sitemaps_helper.rb

@@ -0,0 +1,12 @@
+module SitemapsHelper
+  def locales_with_block(page)
+    I18n.available_locales.each do |locale|
+      I18n.with_locale locale do
+        if page.url.present?
+          url = "http://#{request.host_with_port}/#{page.url}"
+          yield(url)
+        end
+      end
+    end
+  end
+end

data/app/models/kuhsaft/accordion_item_brick.rb

@@ -1,6 +1,6 @@
 module Kuhsaft
   class AccordionItemBrick < ColumnBrick
-    validates :caption, :presence => true
+    validates :caption, presence: true
 
     def user_can_delete?
       true