kuhsaft 2.4.3 → 2.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 816a54fafbdf7a0080bebfe502d28bc3766c53ae
-  data.tar.gz: 46ea21de733eabc2fe7286479edcfc611e107f15
+  metadata.gz: 8920995ecef8a16d6df914afecf6caf339d32f6d
+  data.tar.gz: 0e519f73346a072d9e036a8d9844a087f8f43a1a
 SHA512:
-  metadata.gz: b2ad4266fcd26ee4a9ba650bdeb7697d50404dd582ae9745528d561590db7453473e4d993e8ebb9ae31d79cf4a7711bee239a6c0d5112593e3aedec10e89453d
-  data.tar.gz: 516cfdb3e8dcea474fb9d45ae44075ddfcf65b5d7e9becc002154cefe1d999ae4644ebac717d434f4294ce010323f7ddb00c96a0f337817e7134a6384b25f520
+  metadata.gz: d3a07dd131ed1da0cdaf1693d3bcd00968a47a04e3812099408164149f82b4b688dc738423174db85072b47a8e9eccd22c24e469809d6277d97d149f8aade3df
+  data.tar.gz: b54269f660a18cf5bf0806dcc30912a2b5e8052b4a806503216ba731cc1d78f401757911081d7ad21578bbfb70f2de5fced30388d4072a2724099957a19c05d3

data/README.md

@@ -31,53 +31,67 @@ Kuhsaft requires:
 
 Add Kuhsaft to your Gemfile:
 
-    gem 'kuhsaft'
+```ruby
+gem 'kuhsaft'
+```
 
 And run
 
-    bundle install
+```bash
+bundle install
+```
 
 to get the gem
 
 Then install the assets and the migrations and run them:
 
-    rake kuhsaft:install:migrations
-    rake db:migrate
-    rake db:seed
-    rails generate kuhsaft:assets:install
+```bash
+rake kuhsaft:install:migrations
+rake db:migrate
+rake db:seed
+rails generate kuhsaft:assets:install
+```
 
 You might want to change the language suffixes on the fields inside the create_kuhsaft_pages migration, depending on your app's default_locale.
 
 Mount the kuhsaft engine in your routing file:
 
-    MyApp::Application.routes.draw do
-      # add your app routes here
-      mount Kuhsaft::Engine => "/"
-    end
+```ruby
+MyApp::Application.routes.draw do
+  # add your app routes here
+  mount Kuhsaft::Engine => '/'
+end
+```
 
 Load the Kuhsaft assets into your app, so you have working grids, widgets etc:
 
-    # application.css.sass
-    @import 'kuhsaft/application'
+```sass
+# application.css.sass
+@import 'kuhsaft/application'
+```
 
-    # application.js.coffee
-    //= require 'kuhsaft/application'
+```coffee
+# application.js.coffee
+//= require 'kuhsaft/application'
+```
 
 Finally, you need to define the image sizes for the image brick or use
 the defaults:
 
-    # your_app/config/initializers/kuhsaft.rb
-    Rails.application.config.to_prepare do
-      Kuhsaft::Engine.configure do
-        config.image_sizes.build_defaults! # creates 960x540 and 320x180 sizes
-      end
-    end
+```ruby
+# your_app/config/initializers/kuhsaft.rb
+Rails.application.config.to_prepare do
+  Kuhsaft::Engine.configure do
+    config.image_sizes.build_defaults! # creates 960x540 and 320x180 sizes
+  end
+end
+```
 
 See "Configuring the image brick" for more details.
 
 ## Authentication
 
-Kuhsaft itself does not ship with any form of authentication. However, it is fairly easy to add by plugging into the Kuhsaft::Cms::AdminController. An example with devise:
+Kuhsaft itself does not ship with any form of authentication. However, it is fairly easy to add by plugging into the Kuhsaft::Cms::AdminController. An example with [devise](https://github.com/plataformatec/devise):
 
 ```ruby
 # config/initializers/kuhsaft.rb
@@ -99,7 +113,7 @@ Make sure they are in the `config.assets.precompile` array in environments like
 
 There's a dummy app inside spec/dummy. Get it running by executing the following steps:
 
-```
+```bash
 rake setup
 rake start_dummy
 ```
@@ -110,56 +124,67 @@ rake start_dummy
 
 As defined in the rails docs, load the helpers from our isolated Kuhsaft engine inside your application controller:
 
-    class ApplicationController < ActionController::Base
-      helper Kuhsaft::Engine.helpers
-    end
+```ruby
+class ApplicationController < ActionController::Base
+  helper Kuhsaft::Engine.helpers
+end
+```
 
 ## Adding sublime video
 
 Create an initializer file in your app inside `config/initializers` and set the `sublime_video_token`:
 
-    Rails.application.config.to_prepare do
-      Kuhsaft::Engine.configure do
-        # Get the token from the MySites section on the sublime video site
-        config.sublime_video_token = '123abcd'
-      end
-    end
+```ruby
+Rails.application.config.to_prepare do
+  Kuhsaft::Engine.configure do
+    # Get the token from the MySites section on the sublime video site
+    config.sublime_video_token = '123abcd'
+  end
+end
+```
 
 Require the sublime javascript with the following helper:
 
-    # in your application layout in the head section
-    sublime_video_include_tag
-
+```ruby
+# in your application layout in the head section
+sublime_video_include_tag
+```
 
 ## Configuring the image brick
 
 The image brick can process uploaded images into specific sizes. These sizes can be configured inside the engine configuration. You can also use the built-in default sizes:
 
-    # your_app/config/initializers/kuhsaft.rb
-    Rails.application.config.to_prepare do
-      Kuhsaft::Engine.configure do
-        config.image_sizes.build_defaults! # creates 960x540 and 320x180 sizes
-      end
-    end
+```ruby
+# your_app/config/initializers/kuhsaft.rb
+Rails.application.config.to_prepare do
+  Kuhsaft::Engine.configure do
+    config.image_sizes.build_defaults! # creates 960x540 and 320x180 sizes
+  end
+end
+```
 
 You can also remove the default sizes:
 
-    # your_app/config/initializers/kuhsaft.rb
-    Rails.application.config.to_prepare do
-      Kuhsaft::Engine.configure do
-        config.image_sizes.clear! # .all is now empty
-      end
-    end
+```ruby
+# your_app/config/initializers/kuhsaft.rb
+Rails.application.config.to_prepare do
+  Kuhsaft::Engine.configure do
+    config.image_sizes.clear! # .all is now empty
+  end
+end
+```
 
 And most importantly, you can add custom sizes:
 
-    # your_app/config/initializers/kuhsaft.rb
-    Rails.application.config.to_prepare do
-      Kuhsaft::Engine.configure do
-        config.image_sizes.add(:side_box_vertical, 180, 460)
-        config.image_sizes.add(:footer_teaser, 320, 220)
-      end
-    end
+```ruby
+# your_app/config/initializers/kuhsaft.rb
+Rails.application.config.to_prepare do
+  Kuhsaft::Engine.configure do
+    config.image_sizes.add(:side_box_vertical, 180, 460)
+    config.image_sizes.add(:footer_teaser, 320, 220)
+  end
+end
+```
 
 The `name` option is a unique identifier, which is also used for translating the dropdown in the brick. You can add your translation by using the translation path:
 
@@ -169,13 +194,15 @@ The `name` option is a unique identifier, which is also used for translating the
 
 Implement the `available_display_styles` on a brick model and return an array of css classnames: `['module-big', 'module-small']`. These styles can be applied to a brick instance through the UI. In the frontend, use `to_style_class` to get the configured styles:
 
-    %my-brick{ :class => brick.to_style_class}
-      = brick.text # ... etc
+```haml
+%my-brick{ class: brick.to_style_class }
+  = brick.text # ... etc
+```
 
 After setting up display styles in specific model add your translations
 for the UI dropdown. E.g. you've added display styles to the TextBrick model:
 
-```
+```yaml
 de:
   text_brick:
     display_styles:
@@ -190,7 +217,7 @@ Each instance of a gridded class will have a method `gridded?` wich returns true
 
 If the Gridded Module is added to a Custom Brick, it should provide a col_count integer field with default value 0.
 
-```
+```ruby
 add_column :your_awesome_brick, :col_count, :integer, default: 0
 ```
 
@@ -199,11 +226,33 @@ add_column :your_awesome_brick, :col_count, :integer, default: 0
 * Save your partial in `views/kuhsaft/placeholder_bricks/partials/_your_partial.html.haml`
 * Add translations for your partial in `config/locales/models/kuhsaft/placeholder_brick/locale.yml`
 
-```
+```yaml
 de:
   your_partial: Your Partial
 ```
 
+## Mixing Custom Models/Views/Controllers with Kuhsaft Pages
+
+Use the custom page type:
+
+Custom pages behave almost like redirect pages except that they can have content and meta tags like normal pages. 
+
+What can you use this for: To redirect to a custom controller that does whatever you want and still have CMS content along side it. Example usage in a host app:
+
+In Custom Controller that page redirects to:
+```ruby
+  def index
+    # could also be extracted into before_action
+    @page = Kuhsaft::Page.find(session[:kuhsaft_referrer]) if session[:kuhsaft_referrer]
+    @somestuff = Somestuff.new
+  end
+```
+
+View:
+```
+= render file: 'kuhsaft/pages/show'
+```
+
 ## Invalidating placeholder bricks containing other models on model changes
 
 Include the TouchPlaceholders module if your model is used within a
@@ -220,95 +269,115 @@ end
 
 If you want to translate your pages into another language, generate a new translation migration:
 
-    # translate your pages into french
-    rails g kuhsaft:translations:add fr
+```bash
+# translate your pages into french
+rails g kuhsaft:translations:add fr
+```
 Or
 
-    # translate your pages into swiss german
-    rails g kuhsaft:translations:add de-CH
+```bash
+# translate your pages into swiss german
+rails g kuhsaft:translations:add de-CH
+```
 
 This creates a new migration file inside `db/migrate` of your app. Run the migration as you normally do:
 
-    rake db:migrate
+```bash
+rake db:migrate
+```
 
 Finally, add the new translation locale to your `available_locales` inside your apps `application.rb`:
 
-    config.available_locales = [:en, :fr]
+```ruby
+config.available_locales = [:en, :fr]
+```
 Or
 
-    config.available_locales = [:en, 'de-CH']
+```ruby
+config.available_locales = [:en, 'de-CH']
+```
 
 ## Adding a language switch
 
 Add scope around routes:
 
-    scope "(:locale)", locale: /de|en|fr/ do
-      root 'kuhsaft/pages#show'
-    end
+```ruby
+scope "(:locale)", locale: /de|en|fr/ do
+  root 'kuhsaft/pages#show'
+end
+```
 
 Set the locale in the ApplicationController in a before_action and set default url options:
 
-    before_action :set_locale
+```ruby
+before_action :set_locale
 
-    def set_locale
-      if I18n.available_locales.map{|sym| sym.to_s }.include?(params[:locale])
-        I18n.locale = params[:locale]
-      else
-        I18n.locale = I18n.default_locale
-      end
-    end
+def set_locale
+  if I18n.locale_available? params[:locale]
+    I18n.locale = params[:locale]
+  else
+    I18n.locale = I18n.default_locale
+  end
+end
 
-    def default_url_options(options={})
-      { locale: I18n.locale }
-    end
+def default_url_options(options = {})
+  { locale: I18n.locale }
+end
+```
 
 Add method to ApplicationHelper which redirects to homepage when current page is not translated.
 Make sure to have the homepage translated in every available language.
 
-    def localized_url(url, target_locale)
-      page = Kuhsaft::Page.find_by_url("#{I18n.locale}/#{url}")
-      I18n.with_locale target_locale do
-        translated_url = page.presence && page.url
-        if translated_url.present?
-          "/#{translated_url}"
-        else
-          root_path(locale: target_locale)
-        end
-      end
+```ruby
+def localized_url(url, target_locale)
+  page = Kuhsaft::Page.find_by_url("#{I18n.locale}/#{url}")
+  I18n.with_locale target_locale do
+    translated_url = page.try :url
+    if translated_url.present?
+      "/#{translated_url}"
+    else
+      root_path(locale: target_locale)
     end
+  end
+end
 
-    def language_link(url, locale)
-      localized_url(params[:url], locale)
-    end
+def language_link(url, locale)
+  localized_url(params[:url], locale)
+end
+```
 
 Add language switch to navigation:
 
-    SimpleNavigation::Configuration.run do |navigation|
-      I18n.available_locales.each do |locale|
-        primary.item locale, locale.to_s.upcase, language_link(params[:url], locale), highlights_on: Proc.new { I18n.locale == locale }
-      end
-    end
+```ruby
+SimpleNavigation::Configuration.run do |navigation|
+  I18n.available_locales.each do |locale|
+    primary.item locale, locale.to_s.upcase, language_link(params[:url], locale), highlights_on: Proc.new { I18n.locale == locale }
+  end
+end
+```
 
 Make sure to render only pages which are translated and published by using `published` and `translated` scope, so pages
 without translation and which are not published will not be displayed in the navigation.
 Here is an example of a possible navigation:
 
-    SimpleNavigation::Configuration.run do |navigation|
-      navigation.items do |primary|
-        primary.dom_class = 'right'
-        primary.selected_class = 'active'
-        Kuhsaft::Page.find_by(slug_de: 'meta-navigation').children.published.translated.each do |page|
-          primary.item page.id, page.title, page.link, class: 'contact icon'
-        end
+```ruby
+SimpleNavigation::Configuration.run do |navigation|
+  navigation.items do |primary|
+    primary.dom_class = 'right'
+    primary.selected_class = 'active'
+    Kuhsaft::Page.find_by(slug_de: 'meta-navigation').children.published.translated.each do |page|
+      primary.item page.id, page.title, page.link, class: 'contact icon'
+    end
 
-        primary.item '', 'Sprache', '#', class: 'language icon has-dropdown'do |language|
-          I18n.available_locales.each do |locale|
-            language.dom_class = 'dropdown'
-            language.item locale, language_text(locale), language_link(params[:url], locale), highlights_on: Proc.new { I18n.locale == locale }, class: "icon lang-#{locale}"
-          end
-        end
+    primary.item '', 'Sprache', '#', class: 'language icon has-dropdown'do |language|
+      I18n.available_locales.each do |locale|
+        language.dom_class = 'dropdown'
+        language.item locale, language_text(locale), language_link(params[:url], locale), highlights_on: Proc.new { I18n.locale == locale }, class: "icon lang-#{locale}"
       end
     end
+  end
+end
+```
 
 ## Styling the content
 
@@ -324,19 +393,21 @@ Or if your page is translated, using the `translated` scope and the `published`
 
 ### 2 level navigation example using simple-navigation
 
-    SimpleNavigation::Configuration.run do |navigation|
-      navigation.items do |primary|
-        # build first level
-        Kuhsaft::Page.roots.published.translated.each do |page|
-          primary.item page.id, page.title, page.link do |sub_item|
-            # build second level
-            page.children.published.translated.each do |subpage|
-              sub_item.item subpage.id, subpage.title, subpage.link
-            end
-          end
+```ruby
+SimpleNavigation::Configuration.run do |navigation|
+  navigation.items do |primary|
+    # build first level
+    Kuhsaft::Page.roots.published.translated.each do |page|
+      primary.item page.id, page.title, page.link do |sub_item|
+        # build second level
+        page.children.published.translated.each do |subpage|
+          sub_item.item subpage.id, subpage.title, subpage.link
         end
       end
     end
+  end
+end
+```
 
 ## Use the `page_title` attribute in your app
 
@@ -344,8 +415,10 @@ Kuhsaft::Pages will provide a `%title` tag containing its `page_title`
 (or the required `title`if no title is present). Simply yield for
 `:head` in your `application.html` to use it.
 
-    %head
-      = yield(:head)
+```haml
+%head
+  = yield(:head)
+```
 
 ## Modifying the backend navigation
 
@@ -369,10 +442,12 @@ Simply override the default partial for the main navigation in your app with you
 Kuhsaft has a module called `ImageUploaderMounting`. This module mounts the ImageBrickImageUploader
 and includes a callback method which handles that the image sizes will be updated after save.
 
-    class CustomBrick < Brick
-      include Kuhsaft::ImageUploaderMounting
-      ...
-    end
+```ruby
+class CustomBrick < Brick
+  include Kuhsaft::ImageUploaderMounting
+  ...
+end
+```
 
 If you do not include this module, then the images will not be changed when selecting one of your own image
 sizes. See "Configuring the image brick" for more details on creating your own image sizes.
@@ -385,8 +460,10 @@ LIKE fallback for any other ActiveRecord DB.
 Add a call to the `search_page_form` helper in your views. This renders
 the default search form. The query will be executed by kuhsaft.
 
-    # e.g. _footer.html.haml
-    = search_page_form
+```haml
+# e.g. _footer.html.haml
+= search_page_form
+```
 
 To customize the search and result views you can add your own partials
 to your rails app. The following partials are overridable.
@@ -410,7 +487,7 @@ Add the following lines to your `ck-config.js` file. The first line
 disables the standard link plugin. The second line enables the adv_link
 plugin, which we need for the CMS Page link dialogue in CKEditor.
 
-```
+```javascript
 config.removePlugins = 'link'
 config.extraPlugins = 'adv_link'
 ```
@@ -420,4 +497,4 @@ following to your existing array `ckeditor/adv_link/*`.
 
 # LICENSE
 
-See the file LICENSE.
+See the file [LICENSE](https://github.com/screenconcept/kuhsaft/blob/master/LICENSE).

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

@@ -23,24 +23,26 @@ CKEDITOR.config.customConfig = "<%= asset_path('kuhsaft/cms/ck-config.js') %>"
 loadTextEditor = ->
   CKEDITOR.replaceAll('ckeditor')
 
-updateInputsForRedirectPage = (redirect_url, keywords, description) ->
-  redirect_url.removeAttr('disabled')
-  keywords.attr('disabled', 'disabled')
-  description.attr('disabled', 'disabled')
-
-clearInputsFromRedirectPage = (redirect_url, keywords, description) ->
-  redirect_url.attr('disabled', 'disabled')
-  keywords.removeAttr('disabled')
-  description.removeAttr('disabled')
+pageType = ->
+  $('#page_page_type option:selected').val()
 
 checkPageType = ->
   redirect_url = $('#page_redirect_url')
   keywords = $('#page_keywords')
   description = $('#page_description')
-  if ($('#page_page_type option:selected').val() == 'redirect')
-    updateInputsForRedirectPage(redirect_url, keywords, description)
+  if (pageType() == 'redirect')
+    redirect_url.removeAttr('disabled')
+    keywords.attr('disabled', 'disabled')
+    description.attr('disabled', 'disabled')
+  else if (pageType() == 'custom')
+    redirect_url.removeAttr('disabled')
+    keywords.removeAttr('disabled')
+    description.removeAttr('disabled')
   else
-    clearInputsFromRedirectPage(redirect_url, keywords, description)
+    redirect_url.attr('disabled', 'disabled')
+    keywords.removeAttr('disabled')
+    description.removeAttr('disabled')
+
 
 sortableBrick = ->
   $(".brick-list").each (idx, elem) ->

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

@@ -10,7 +10,7 @@ module Kuhsaft
         I18n.locale = params[:content_locale]
       end
 
-      def url_options
+      def default_url_options
         { content_locale: I18n.locale }.merge(super)
       end
     end

data/app/controllers/kuhsaft/pages_controller.rb

@@ -12,6 +12,7 @@ module Kuhsaft
     def show
       if @page.present? && @page.redirect? && @page.redirect_url.present?
         redirect_url = @page.redirect_url.sub(/\A\/+/, '') # remove all preceding slashes
+        session[:kuhsaft_referrer] = @page.id
         redirect_to "/#{redirect_url}"
       elsif @page.present?
         respond_with @page

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

@@ -16,6 +16,57 @@ module Kuhsaft
         link_to locale.to_s.upcase, url_for(
           action: action, content_locale: locale)
       end
+
+      def model_attribute_field(resource, column_name, f)
+        if resource.class.respond_to?(:uploaders) && resource.class.uploaders.keys.include?(column_name.to_sym)
+          f.input column_name, as: :file
+        elsif association_class(resource, column_name) == Kuhsaft::Page
+          route_input f, column_name, page_routes
+        elsif column_name == :link_url || column_name == :link
+          route_input f, column_name, user_selectable_routes
+        elsif column_name.to_s.end_with? '_id'
+          f.association column_name.to_s.gsub(/_id$/, '').to_sym
+        elsif column_name == :body
+          f.input column_name, input_html: { class: 'ckeditor text required' }
+        else
+          f.input column_name
+        end
+      end
+
+      def route_input(form, column_name, selectable_routes)
+        list_name = "routes_#{column_name}"
+        haml_tag :datalist, id: list_name, name: list_name do
+          selectable_routes.each { |route| haml_tag :option, value: route }
+        end
+        form.input column_name, input_html: { list: list_name }, as: 'string'
+      end
+
+      def association_class(resource, column_name)
+        association = resource.class.reflect_on_all_associations.find { |r| r.name == column_name.to_sym }
+        association_class = association.try :class_name
+        association_class.present? ? association_class.constantize : nil
+      end
+
+      # here are some route helpers if you need them in your backend
+      def all_selectable_routes
+        (page_routes + rails_routes).uniq.sort
+      end
+
+      def page_routes
+        Kuhsaft::Page.all_urls
+      end
+
+      def rails_routes
+        routes = Rails.application.routes.routes
+        routes = routes.select do |r|
+          r.verb.match('GET') && !r.requirements.blank? &&
+            !r.requirements[:controller].to_s.start_with?('cms') &&
+            !r.required_parts.any? &&
+            !r.requirements[:controller].to_s.start_with?('rails/')
+        end
+
+        routes.map { |r| _routes.url_for(r.requirements.merge only_path: true).strip }.uniq.sort
+      end
     end
   end
 end

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

@@ -10,7 +10,7 @@ module Kuhsaft
       end
 
       def hide_content_tab?(page)
-        page.redirect? || !page.translated? || !page.persisted? || page.errors.present?
+        page.page_type == Kuhsaft::PageType::REDIRECT || !page.translated? || !page.persisted? || page.errors.present?
       end
     end
   end

data/app/helpers/pages_helper.rb

@@ -46,4 +46,8 @@ module PagesHelper
       end
     end
   end
+
+  def on_kuhsaft_page?
+    controller.is_a? Kuhsaft::PagesController
+  end
 end