kuhsaft 2.2.6 → 2.3.0

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

@@ -0,0 +1,34 @@
+#brick-form.modal.hide.fade{ :tabindex => '-1', :role => 'dialog' }
+  .modal-header
+    %button.close{ 'data-dismiss' => 'modal' }
+      ×
+    %h3= t('.create_new', :brick => @brick.backend_label)
+
+  = simple_form_for @brick, :as => :brick, :url => kuhsaft.cms_bricks_path, :method => :post, :remote => true, :html => { :id => nil }, :wrapper => :bootstrap do |form|
+    .modal-body
+      = form.hidden_field :position, :class => 'position-field'
+      = form.hidden_field :type
+      = form.hidden_field :brick_list_id
+      = form.hidden_field :brick_list_type
+
+      - brick_content = render(@brick.to_edit_partial_path, :brick => @brick, :form => form)
+
+      - unless @brick.available_display_styles.empty?
+        #display-styles.btn-group.pull-right
+          .btn.btn-small
+            %i.icon-tint
+          %a.btn.btn-small.dropdown-toggle{ 'data-toggle' => 'dropdown', 'href' => '#' }
+            %span.caret
+          %ul.dropdown-menu.pull-right
+            %li
+              = form.input :display_styles, :collection => @brick.translated_available_display_styles, :as => :check_boxes
+
+      - if brick_content.present?
+        = brick_content
+      - else
+        = t('.no_content')
+
+    .modal-footer
+      .clearfix
+        .pull-right
+          = form.button :submit, t('.save'), :class => 'btn-success'

data/app/views/kuhsaft/cms/bricks/create.js.haml

@@ -6,3 +6,9 @@ initSavePopover(newlyInsertedBrick)
 initSubmitLinks(newlyInsertedBrick)
 
 $(newlyInsertedBrick).find('textarea.ckeditor').each(function (index, elem) { initCKEditor(elem.id) })
+
+$("#form-container #brick-form").modal('hide')
+
+-# Toggle collapse-bricks-nav
+var showCollapseBricksNav = "#{@brick.brick_list.bricks.present?}" == 'true'
+toggleCollapseBricksNav(showCollapseBricksNav)

data/app/views/kuhsaft/cms/bricks/destroy.js.haml

@@ -5,3 +5,7 @@ brick.remove()
 if(brickList.children().length == 0){
 brickList.html("#{j(render('empty_state', :brick => @parent_brick))}")
 }
+
+-# Toggle collapse-bricks-nav
+var showCollapseBricksNav = "#{@brick.brick_list.bricks.present?}" == 'true'
+toggleCollapseBricksNav(showCollapseBricksNav)

data/app/views/kuhsaft/cms/bricks/new.js.haml

@@ -0,0 +1,11 @@
+$("#form-container #brick-form").modal('hide')
+$("#form-container #brick-form").remove()
+
+$("#form-container").append("#{j(render('kuhsaft/cms/bricks/new', :brick => @brick, :format => :html))}")
+
+$("#form-container").find('textarea.ckeditor').each(function (index, elem) { initCKEditor(elem.id) })
+
+-# Stop propagation of display styles dropdown
+stopPropagationOfDisplayStyles($('#display-styles ul'))
+
+$("#brick-form").modal()

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

@@ -8,10 +8,10 @@
 
           .button-group
             - if page.children.empty?
-              = link_to kuhsaft.cms_page_path(page), :confirm => t('kuhsaft.cms.admin.confirm_delete', :name => page.title), :method => :delete, :class => 'btn btn-small btn-danger' do
+              = link_to kuhsaft.cms_page_path(page), confirm: t('kuhsaft.cms.admin.confirm_delete', name: page.title), method: :delete, class: 'btn btn-small btn-danger' do
                 %i.icon-trash.icon-white
 
-            = link_to kuhsaft.new_cms_page_path(:parent_id => page.id), :class => 'btn btn-small' do
+            = link_to kuhsaft.new_cms_page_path(parent_id: page.id), class: 'btn btn-small' do
               %i.icon-plus-sign
               = t('kuhsaft.cms.pages.index.add_page')
 

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

@@ -1,34 +1,45 @@
 %ul.nav.nav-tabs.js-tabs
-  %li{ :class => metadata_tab_active(@page) }
+  %li{ class: metadata_tab_active(@page) }
     = link_to t('.tab_metadata'), '#page-metadata', 'data-toggle' => :tab
   - unless hide_content_tab?(@page)
-    %li{ :class => content_tab_active(@page) }
+    %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) }
-    = 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 }
-      = form.input :parent_id, :collection => Kuhsaft::Page.flat_tree, :label_method => :nesting_name, :selected => params[:parent_id].presence || @page.parent_id.presence, :prompt => 'None', :input_html => { :class => :span3 }
-      = form.input :page_type, :collection => Kuhsaft::PageType.all, :prompt => false, :input_html => { :class => :span3 }
-      = form.input :redirect_url, :as => :string
-      = form.input :url, :as => :string, :input_html => { :disabled => 'disabled' }
-      = form.input :keywords, :input_html => { :class => :span5 }, hint: t('.hint_keywords')
-      = form.input :description, :as => :text, :input_html => { :class => :span5, :rows => 4 }, hint: t('.hint_description')
-      = form.input :published, :as => :boolean
+  #page-metadata.tab-pane{ class: metadata_tab_active(@page) }
+    = 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 }
+      = form.input :parent_id, collection: Kuhsaft::Page.flat_tree, label_method: :nesting_name, selected: params[:parent_id].presence || @page.parent_id.presence, prompt: t('.none'), input_html: { class: :span3 }
+      = form.input :page_type, collection: Kuhsaft::PageType.all, prompt: false, default: Kuhsaft::PageType::CONTENT, input_html: { class: :span3 }
+      = form.input :redirect_url, as: :string
+      = form.input :url, as: :string, input_html: { disabled: 'disabled' }
+      = form.input :keywords, input_html: { class: :span5 }, hint: t('.hint_keywords').html_safe
+      = form.input :description, as: :text, input_html: { class: :span5, rows: 4 }, hint: t('.hint_description').html_safe
+      = form.input :published, as: :boolean
 
       .form-actions
-        = form.button :submit, :class => 'btn btn-primary'
+        = form.button :submit, class: 'btn btn-primary'
 
   - unless hide_content_tab?(@page)
-    #page-content.tab-pane{ :class => content_tab_active(@page) }
+    #form-container
+    #page-content.tab-pane{ class: content_tab_active(@page) }
       - if @page.persisted?
         .clearfix
           .actions
+            .btn-group.pull-left#collapse-bricks-nav{ class: @page.bricks.present? ? '' : 'hidden' }
+              .btn.btn-small#expand-all
+                %i.icon-resize-full
+                = t('.expand_all')
+
+              .btn.btn-small#collapse-all
+                %i.icon-resize-small
+                = t('.collapse_all')
+
             .btn-group
-              = render 'brick_type_dropdown', :brick_list => @page
-        = render 'kuhsaft/cms/bricks/brick_list', :brick_list => @page
+              = render 'brick_type_dropdown', brick_list: @page
+
+        = render 'kuhsaft/cms/bricks/brick_list', brick_list: @page
 
 = render 'kuhsaft/cms/bricks/sort_form'

data/app/views/kuhsaft/image_bricks/_image_brick.html.haml

@@ -1,9 +1,11 @@
 %div{ :class => image_brick.to_style_class }
-  = image_tag image_brick.image.converted.url if image_brick.image_present?
-  - if image_brick.caption.present?
-    .image-caption
-      - if image_brick.href.present?
-        = link_to image_brick.href do
+  - if image_brick.image.present?
+    = image_tag(image_brick.image.converted.url, :alt => image_brick.alt_text.present? ? image_brick.alt_text : image_alt(image_brick.image.path) )
+
+    - if image_brick.caption.present?
+      .image-caption
+        - if image_brick.href.present?
+          = link_to image_brick.href do
+            = image_brick.caption
+        - else
           = image_brick.caption
-      - else
-        = image_brick.caption

data/app/views/kuhsaft/image_bricks/image_brick/_edit.html.haml

@@ -4,7 +4,10 @@
     .controls
       = link_to brick.image.converted.url do
         = image_tag brick.image.thumb
+
 = form.input :image, :as => :file, :input_html => { :class => 'span3' }
+= form.input :image_cache, as: :hidden
 = form.input :image_size, :collection => Kuhsaft::ImageSize.all, :label_method => :label, :value_method => :name, :input_html => { :class => 'span3' }, :include_blank => false
+= form.input :alt_text, :as => :string, :input_html => { :class => 'span6' }
 = form.input :caption, :as => :string, :input_html => { :class => 'span6' }
 = form.input :href, :as => :string, :input_html => { :class => 'span6' }

data/app/views/kuhsaft/pages/show.html.haml

@@ -3,17 +3,9 @@
   %meta{ name: 'keywords', content: @page.keywords }
   %meta{ name: 'description', content: @page.description }
 
-- if @page.bricks.map(&:type).include? "Kuhsaft::PlaceholderBrick"
+- cache [@page, I18n.locale, @page.children, @page.bricks] do
   - unless @page.blank?
     .page-content
       -# TODO: refactor into scopes or simplify otherwise:
       - @page.bricks.localized.select(&:valid?).each do |brick|
         = render brick
-
-- else
-  - cache [@page, I18n.locale, @page.children] do
-    - unless @page.blank?
-      .page-content
-        -# TODO: refactor into scopes or simplify otherwise:
-        - @page.bricks.localized.select(&:valid?).each do |brick|
-          = render brick

data/app/views/kuhsaft/placeholder_bricks/_placeholder_brick.html.haml

@@ -1,2 +1,2 @@
 %div{ :class => placeholder_brick.to_style_class }
-  = render "kuhsaft/placeholder_bricks/partials/#{placeholder_brick.template_name}" if placeholder_brick.template_name.present?
+  = render placeholder_brick.partial_name if placeholder_brick.template_name.present?

data/app/views/kuhsaft/sitemaps/index.xml.haml

@@ -0,0 +1,9 @@
+!!! XML
+%urlset{xmlns: "http://www.sitemaps.org/schemas/sitemap/0.9"}
+  - for page in @pages
+    - locales_with_block page do |url|
+      %url
+        %loc= url
+        %lastmod= page.updated_at.utc
+        %changefreq monthly
+        %priority 0.5

data/app/views/kuhsaft/video_bricks/_video_brick.html.haml

@@ -1,9 +1,9 @@
-%div{ :class => video_brick.to_style_class }
+%div{ class: video_brick.to_style_class }
   - if video_brick.video == Kuhsaft::VideoBrick::YOUTUBE
-    %video.sublime{ 'data-youtube-id' => video_brick.href, 'data-settings' => 'autoresize:fit', :preload => 'none' }
+    %video.sublime{ 'data-youtube-id' => video_brick.href, 'data-settings' => 'autoresize:fit', preload: 'none' }
   - elsif video_brick.video == Kuhsaft::VideoBrick::VIMEO || video_brick.video == Kuhsaft::VideoBrick::EXTERNAL
-    %video.sublime{ 'data-settings' => 'autoresize:fit', :preload => 'none' }
-      %source{ :src => video_brick.href }
+    %video.sublime{ 'data-settings' => 'autoresize:fit', preload: 'none' }
+      %source{ src: video_brick.href }
   - else
     - if video_brick.embed_src.present?
       = video_brick.embed_src.html_safe

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

@@ -1,10 +1,10 @@
 !!!
 %html
   %head
-    %meta{ charset: "utf-8" }
+    %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'
+    = stylesheet_link_tag 'kuhsaft/cms/application.css', media: 'screen, projection'
+    = stylesheet_link_tag 'kuhsaft/cms/customizations.css', media: 'screen, projection'
     = csrf_meta_tag
 
   %body{ :class => "#{controller_name}" }
@@ -20,5 +20,6 @@
           = render 'content_language_switch'
           = render 'flash', :flash => flash
           = yield
+
     = javascript_include_tag 'kuhsaft/cms/application.js'
     = javascript_include_tag 'kuhsaft/cms/customizations.js'

data/config/initializers/simple_form.rb

@@ -5,8 +5,8 @@ SimpleForm.setup do |config|
   # wrapper, change the order or even add your own to the
   # stack. The options given below are used to wrap the
   # whole input.
-  config.wrappers :default, :class => :input,
-    :hint_class => :field_with_hint, :error_class => :field_with_errors do |b|
+  config.wrappers :default, class: :input,
+                            hint_class: :field_with_hint, error_class: :field_with_errors do |b|
     ## Extensions enabled by default
     # Any of these extensions can be disabled for a
     # given input by passing: `f.input EXTENSION_NAME => false`.
@@ -41,8 +41,8 @@ SimpleForm.setup do |config|
 
     ## Inputs
     b.use :label_input
-    b.use :hint,  :wrap_with => { :tag => :span, :class => :hint }
-    b.use :error, :wrap_with => { :tag => :span, :class => :error }
+    b.use :hint,  wrap_with: { tag: :span, class: :hint }
+    b.use :error, wrap_with: { tag: :span, class: :error }
   end
 
   # The default wrapper to be used by the FormBuilder.

data/config/initializers/simple_form_bootstrap.rb

@@ -1,39 +1,39 @@
 # Use this setup block to configure all options available in SimpleForm.
 SimpleForm.setup do |config|
-  config.wrappers :bootstrap, :tag => 'div', :class => 'control-group', :error_class => 'error' do |b|
+  config.wrappers :bootstrap, tag: 'div', class: 'control-group', error_class: 'error' do |b|
     b.use :html5
     b.use :placeholder
     b.use :label
-    b.wrapper :tag => 'div', :class => 'controls' do |ba|
+    b.wrapper tag: 'div', class: 'controls' do |ba|
       ba.use :input
-      ba.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
-      ba.use :hint,  :wrap_with => { :tag => 'p', :class => 'help-block' }
+      ba.use :error, wrap_with: { tag: 'span', class: 'help-inline' }
+      ba.use :hint,  wrap_with: { tag: 'p', class: 'help-block' }
     end
   end
 
-  config.wrappers :prepend, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
+  config.wrappers :prepend, tag: 'div', class: 'control-group', error_class: 'error' do |b|
     b.use :html5
     b.use :placeholder
     b.use :label
-    b.wrapper :tag => 'div', :class => 'controls' do |input|
-      input.wrapper :tag => 'div', :class => 'input-prepend' do |prepend|
+    b.wrapper tag: 'div', class: 'controls' do |input|
+      input.wrapper tag: 'div', class: 'input-prepend' do |prepend|
         prepend.use :input
       end
-      input.use :hint,  :wrap_with => { :tag => 'span', :class => 'help-block' }
-      input.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
+      input.use :hint,  wrap_with: { tag: 'span', class: 'help-block' }
+      input.use :error, wrap_with: { tag: 'span', class: 'help-inline' }
     end
   end
 
-  config.wrappers :append, :tag => 'div', :class => "control-group", :error_class => 'error' do |b|
+  config.wrappers :append, tag: 'div', class: 'control-group', error_class: 'error' do |b|
     b.use :html5
     b.use :placeholder
     b.use :label
-    b.wrapper :tag => 'div', :class => 'controls' do |input|
-      input.wrapper :tag => 'div', :class => 'input-append' do |append|
+    b.wrapper tag: 'div', class: 'controls' do |input|
+      input.wrapper tag: 'div', class: 'input-append' do |append|
         append.use :input
       end
-      input.use :hint,  :wrap_with => { :tag => 'span', :class => 'help-block' }
-      input.use :error, :wrap_with => { :tag => 'span', :class => 'help-inline' }
+      input.use :hint,  wrap_with: { tag: 'span', class: 'help-block' }
+      input.use :error, wrap_with: { tag: 'span', class: 'help-inline' }
     end
   end
 

data/config/locales/de.yml

@@ -0,0 +1,203 @@
+de:
+  date:
+    abbr_day_names:
+    - So
+    - Mo
+    - Di
+    - Mi
+    - Do
+    - Fr
+    - Sa
+    abbr_month_names:
+    -
+    - Jan
+    - Feb
+    - Mär
+    - Apr
+    - Mai
+    - Jun
+    - Jul
+    - Aug
+    - Sep
+    - Okt
+    - Nov
+    - Dez
+    day_names:
+    - Sonntag
+    - Montag
+    - Dienstag
+    - Mittwoch
+    - Donnerstag
+    - Freitag
+    - Samstag
+    formats:
+      default: '%d.%m.%Y'
+      long: '%e. %B %Y'
+      short: '%e. %b'
+    month_names:
+    -
+    - Januar
+    - Februar
+    - März
+    - April
+    - Mai
+    - Juni
+    - Juli
+    - August
+    - September
+    - Oktober
+    - November
+    - Dezember
+    order:
+    - :day
+    - :month
+    - :year
+  datetime:
+    distance_in_words:
+      about_x_hours:
+        one: etwa eine Stunde
+        other: etwa %{count} Stunden
+      about_x_months:
+        one: etwa ein Monat
+        other: etwa %{count} Monate
+      about_x_years:
+        one: etwa ein Jahr
+        other: etwa %{count} Jahre
+      almost_x_years:
+        one: fast ein Jahr
+        other: fast %{count} Jahre
+      half_a_minute: eine halbe Minute
+      less_than_x_minutes:
+        one: weniger als eine Minute
+        other: weniger als %{count} Minuten
+      less_than_x_seconds:
+        one: weniger als eine Sekunde
+        other: weniger als %{count} Sekunden
+      over_x_years:
+        one: mehr als ein Jahr
+        other: mehr als %{count} Jahre
+      x_days:
+        one: ein Tag
+        other: '%{count} Tage'
+      x_minutes:
+        one: eine Minute
+        other: '%{count} Minuten'
+      x_months:
+        one: ein Monat
+        other: '%{count} Monate'
+      x_seconds:
+        one: eine Sekunde
+        other: '%{count} Sekunden'
+    prompts:
+      day: Tag
+      hour: Stunden
+      minute: Minuten
+      month: Monat
+      second: Sekunden
+      year: Jahr
+  errors: &errors
+    format: '%{attribute} %{message}'
+    messages:
+      accepted: muss akzeptiert werden
+      blank: muss ausgefüllt werden
+      confirmation: stimmt nicht mit der Bestätigung überein
+      empty: muss ausgefüllt werden
+      equal_to: muss genau %{count} sein
+      even: muss gerade sein
+      exclusion: ist nicht verfügbar
+      greater_than: muss grösser als %{count} sein
+      greater_than_or_equal_to: muss grösser oder gleich %{count} sein
+      inclusion: ist kein gültiger Wert
+      invalid: ist nicht gültig
+      less_than: muss kleiner als %{count} sein
+      less_than_or_equal_to: muss kleiner oder gleich %{count} sein
+      not_a_number: ist keine Zahl
+      not_an_integer: muss ganzzahlig sein
+      odd: muss ungerade sein
+      record_invalid: 'Gültigkeitsprüfung ist fehlgeschlagen: %{errors}'
+      taken: ist bereits vergeben
+      too_long: ist zu lang (mehr als %{count} Zeichen)
+      too_short: ist zu kurz (weniger als %{count} Zeichen)
+      wrong_length: hat die falsche Länge (muss genau %{count} Zeichen haben)
+    template:
+      body: 'Bitte überprüfen Sie die folgenden Felder:'
+      header:
+        one: 'Konnte %{model} nicht speichern: ein Fehler.'
+        other: 'Konnte %{model} nicht speichern: %{count} Fehler.'
+  helpers:
+    select:
+      prompt: Bitte wählen
+    submit:
+      create: '%{model} erstellen'
+      submit: '%{model} speichern'
+      update: '%{model} aktualisieren'
+  number:
+    currency:
+      format:
+        delimiter: .
+        format: '%n %u'
+        precision: 2
+        separator: ','
+        significant: false
+        strip_insignificant_zeros: false
+        unit: €
+    format:
+      delimiter: .
+      precision: 2
+      separator: ','
+      significant: false
+      strip_insignificant_zeros: false
+    human:
+      decimal_units:
+        format: '%n %u'
+        units:
+          billion:
+            one: Milliarde
+            other: Milliarden
+          million: Millionen
+          quadrillion:
+            one: Billiarde
+            other: Billiarden
+          thousand: Tausend
+          trillion: Billionen
+          unit: ''
+      format:
+        delimiter: ''
+        precision: 1
+        significant: true
+        strip_insignificant_zeros: true
+      storage_units:
+        format: '%n %u'
+        units:
+          byte:
+            one: Byte
+            other: Bytes
+          gb: GB
+          kb: KB
+          mb: MB
+          tb: TB
+    percentage:
+      format:
+        delimiter: ''
+    precision:
+      format:
+        delimiter: ''
+  support:
+    array:
+      last_word_connector: ' und '
+      two_words_connector: ' und '
+      words_connector: ', '
+  time:
+    am: vormittags
+    formats:
+      default: '%A, %d. %B %Y, %H:%M Uhr'
+      long: '%A, %d. %B %Y, %H:%M Uhr'
+      short: '%d. %B, %H:%M Uhr'
+    pm: nachmittags
+  # remove these aliases after 'activemodel' and 'activerecord' namespaces are removed from Rails repository
+  activemodel:
+    errors:
+      <<: *errors
+  activerecord:
+    errors:
+      <<: *errors