qbrick 2.5.0.pre → 2.5.0

data/app/views/qbrick/cms/backend/_main_navigation.html.haml

@@ -0,0 +1,20 @@
+= link_to 'Qbrick CMS', qbrick.cms_root_path, :class => 'brand'
+
+%ul.nav.pull-right.language-navigation
+  - if render_language_switch?
+    - I18n.available_locales.each do |locale|
+      %li{ :class => (:active if I18n.locale.to_s == locale.to_s) }
+        = link_to_content_locale(locale)
+
+  %li.dropdown
+    = link_to '#', class: 'dropdown-toggle', data: { toggle: 'dropdown' } do
+      = t('.account')
+      %b.caret
+    %ul.dropdown-menu
+      %li= link_to t('.change_password'), qbrick.edit_cms_account_path
+      %li= link_to t('.logout'), qbrick.destroy_admin_session_path, :method => :delete
+
+%ul.nav
+  %li= link_to t('.settings'), qbrick.cms_settings_collections_path
+  %li= link_to Qbrick::Page.model_name.human(:count => 2), qbrick.cms_pages_path
+  %li= link_to Qbrick::Admin.model_name.human(:count => 2), qbrick.cms_admins_path

data/app/views/{kuhsaft → qbrick}/cms/bricks/_brick_header.html.haml

@@ -1,5 +1,5 @@
 .pull-left
-  - if brick_content.present?
+  - if brick_content.present? || brick.user_can_save?
     .resize-toggler.btn.btn-small{ 'data-toggle' => 'collapse', 'data-target' => "#brick-content-#{brick.id}" }
       %i.icon-resize-full
       %i.icon-resize-small
@@ -17,14 +17,14 @@
           = render('brick_type_dropdown', brick_list: brick)
 
       - # grid selection
-      - if brick.class.include? Kuhsaft::Gridded
+      - if brick.class.include? Qbrick::Gridded
         .btn-group
           %a.btn.btn-small.dropdown-toggle{ 'data-toggle' => 'dropdown', 'href' => '#' }
             %i.icon-th
             %span.caret
           %ul.dropdown-menu.pull-right
             %li
-              = form.input :col_count, collection: brick.class.available_grid_sizes, as: :radio_buttons, label_method: lambda { |col_count| t("kuhsaft.cms.bricks.columns", count: col_count) }
+              = form.input :col_count, collection: brick.class.available_grid_sizes, as: :radio_buttons, label_method: lambda { |col_count| t("qbrick.cms.bricks.columns", count: col_count) }
 
       - # possible styles
       - unless brick.available_display_styles.empty?
@@ -39,5 +39,5 @@
       -# delete button
       - if brick.user_can_delete?
         .btn-group
-          = link_to kuhsaft.cms_brick_path(brick), class: 'btn btn-small btn-danger', data: { confirm: t('kuhsaft.cms.bricks.brick_item.confirm') }, method: :delete, remote: true do
+          = link_to qbrick.cms_brick_path(brick), class: 'btn btn-small btn-danger', data: { confirm: t('qbrick.cms.bricks.brick_item.confirm') }, method: :delete, remote: true do
             %i.icon-trash.icon-white

data/app/views/{kuhsaft → qbrick}/cms/bricks/_brick_item.html.haml

@@ -1,14 +1,15 @@
 .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 }, wrapper: :bootstrap do |form|
+  = simple_form_for brick, as: :brick, url: qbrick.cms_brick_path(brick), remote: true, html: { id: nil }, wrapper: :bootstrap do |form|
     = form.hidden_field :position, class: 'position-field'
     - brick_content = render(brick.to_edit_partial_path, brick: brick, form: form)
 
     .brick-item-header.clearfix
-      = render('kuhsaft/cms/bricks/brick_header', brick: brick, brick_content: brick_content, form: form)
+      = render('qbrick/cms/bricks/brick_header', brick: brick, brick_content: brick_content, form: form)
 
-    - if brick_content.present?
+    - if brick_content.present? || brick.user_can_save?
       .brick-item-content.collapse.in{ id: "brick-content-#{brick.id}", 'data-toggle' => true }
-        = brick_content
+        - if brick_content.present?
+          = brick_content
         - if brick.user_can_save?
           - # save button
           .clearfix
@@ -22,4 +23,4 @@
   - else
     - if brick.respond_to?(:bricks)
       .brick-item-childs
-        = render('kuhsaft/cms/bricks/brick_list', brick_list: brick)
+        = render('qbrick/cms/bricks/brick_list', brick_list: brick)

data/app/views/{kuhsaft → qbrick}/cms/bricks/_brick_list.html.haml

@@ -1,4 +1,4 @@
 .brick-list{ :id => brick_list.to_brick_list_id }
   = render 'empty_state', :brick => brick_list
   - brick_list.bricks.each do |brick|
-    = render 'kuhsaft/cms/bricks/brick_item', :brick => brick
+    = render 'qbrick/cms/bricks/brick_item', :brick => brick

data/app/views/{kuhsaft → qbrick}/cms/bricks/_new.html.haml

@@ -3,7 +3,7 @@
     ×
   %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|
+= simple_form_for @brick, :as => :brick, :url => qbrick.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
@@ -21,14 +21,14 @@
           %li
             = form.input :display_styles, :collection => @brick.translated_available_display_styles, :as => :check_boxes
 
-    - if brick.class.include? Kuhsaft::Gridded
+    - if brick.class.include? Qbrick::Gridded
       .btn-group.pull-right
         %a.btn.btn-small.dropdown-toggle{ 'data-toggle' => 'dropdown', 'href' => '#' }
           %i.icon-th
           %span.caret
         %ul.dropdown-menu.pull-right
           %li
-            = form.input :col_count, collection: brick.class.available_grid_sizes, as: :radio_buttons, label_method: lambda { |col_count| t("kuhsaft.cms.bricks.columns", count: col_count) }
+            = form.input :col_count, collection: brick.class.available_grid_sizes, as: :radio_buttons, label_method: lambda { |col_count| t("qbrick.cms.bricks.columns", count: col_count) }
 
     - if brick_content.present?
       = brick_content

data/app/views/{kuhsaft → qbrick}/cms/bricks/create.js.erb

@@ -1,4 +1,4 @@
-<% brick_html = render('kuhsaft/cms/bricks/brick_item', :brick => @brick) %>
+<% brick_html = render('qbrick/cms/bricks/brick_item', :brick => @brick) %>
 $('#' + <%= @brick.brick_list.to_brick_list_id.to_json.html_safe %> + '.brick-list').append(<%= brick_html.to_json.html_safe %>).find("> .empty-state").remove();
 
 // need a reference to the new dom node, so a new query is needed here

data/app/views/{kuhsaft → qbrick}/cms/bricks/new.js.erb

@@ -4,7 +4,7 @@
 
 $("#brick-form").empty();
 
-$("#brick-form").append(<%= render('kuhsaft/cms/bricks/new', :brick => @brick, :format => :html).to_json.html_safe %>);
+$("#brick-form").append(<%= render('qbrick/cms/bricks/new', :brick => @brick, :format => :html).to_json.html_safe %>);
 
 $("#brick-form").find('textarea.ckeditor').each(function (index, elem) { initCKEditor(elem.id) });
 

data/app/views/{kuhsaft → qbrick}/cms/bricks/update.js.erb

@@ -1,4 +1,4 @@
-$("#" + <%= @brick.to_brick_item_id.to_json.html_safe %>).replaceWith(<%= render('kuhsaft/cms/bricks/brick_item', :brick => @brick).to_json.html_safe %>);
+$("#" + <%= @brick.to_brick_item_id.to_json.html_safe %>).replaceWith(<%= render('qbrick/cms/bricks/brick_item', :brick => @brick).to_json.html_safe %>);
 
 // need a reference to the new dom node, so a new query is needed here
 var newlyInsertedBrick = $("#" + <%= @brick.to_brick_item_id.to_json.html_safe %>);

data/app/views/{kuhsaft → qbrick}/cms/ckimages/index.html.haml

@@ -3,7 +3,7 @@
     .ckimage-thumb{ 'data-image-url' => image.file.url, 'data-func-num' => @func_num }
       = image_tag image.file.thumb.url
     .ckimage-delete
-      =link_to 'Delete', cms_ckimage_path(image), method: :delete, remote: true, data: { confirm: t('kuhsaft.cms.ckimages.confirm') }
+      =link_to 'Delete', cms_ckimage_path(image), method: :delete, remote: true, data: { confirm: t('qbrick.cms.ckimages.confirm') }
 
 :coffeescript
   $('.ckimage-thumb').click ->

data/app/views/{kuhsaft → qbrick}/cms/pages/_branch.html.haml

@@ -4,16 +4,16 @@
       %li.dd-item.dd3-item{ 'data-id' => page.id }
         .dd-handle.dd3-handle
         .dd3-content{ class: page.state_class }
-          = link_to page.title.presence, kuhsaft.edit_cms_page_path(page)
+          = link_to page.title.presence, qbrick.edit_cms_page_path(page)
 
           .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 qbrick.cms_page_path(page), confirm: t('qbrick.cms.backend.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 qbrick.new_cms_page_path(parent_id: page.id), class: 'btn btn-small' do
               %i.icon-plus-sign
-              = t('kuhsaft.cms.pages.index.add_page')
+              = t('qbrick.cms.pages.index.add_page')
 
         - unless page.children.empty?
           = render partial: 'branch', locals: { pages:  page.children }

data/app/views/{kuhsaft → qbrick}/cms/pages/_form.html.haml

@@ -5,17 +5,26 @@
     %li{ class: content_tab_active(@page) }
       = link_to t('.tab_content'), '#page-content', 'data-toggle' => :tab
 
+  - I18n.available_locales.reverse.each do |locale|
+    %li.pull-right{ :class => (:active if I18n.locale.to_s == locale.to_s) }
+      - if @page.translated_to?(locale)
+        = link_to_content_locale(locale)
+      - else
+        = link_to locale.to_s.upcase, url_for(:action => params[:action], :content_locale => locale), 'data-toggle' => 'tooltip', 'title' => t('.not_translated'), :class => 'not-translated'
+
 .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: 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 :parent_id, collection: Qbrick::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: Qbrick::PageType.all, prompt: false, default: Qbrick::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
+      - if @page == homepage
+        = form.input :google_verification_key
       = form.input :description, as: :text, input_html: { class: :span5, rows: 4 }, hint: t('.hint_description').html_safe
       = form.input :published, as: :boolean
 
@@ -37,9 +46,9 @@
                 %i.icon-resize-small
                 = t('.collapse_all')
 
-            .btn-group
-              = render 'brick_type_dropdown', brick_list: @page
+            = render 'brick_clone_menu'
+            = render 'brick_type_dropdown', :brick_list => @page
 
-        = render 'kuhsaft/cms/bricks/brick_list', brick_list: @page
+        = render 'qbrick/cms/bricks/brick_list', :brick_list => @page
 
-= render 'kuhsaft/cms/bricks/sort_form'
+= render 'qbrick/cms/bricks/sort_form'

data/app/views/qbrick/cms/pages/_mirror_modal.html.haml

@@ -0,0 +1,52 @@
+.modal-header
+  %button.close{ 'data-dismiss' => 'modal' }
+    ×
+  %h3 header
+
+- if page.bricks.empty?
+  .modal-body
+    .alert.alert-info
+      = t('.no_bricks_to_clone')
+
+  .modal-footer
+    .clearfix
+      .pull-right
+        .btn.btn-success{ 'data-dismiss' => 'modal'}
+          = t('.okay')
+
+- elsif params[:rutheless] != 'true'
+  .modal-body
+    .alert.alert-error
+      = t('.target_page_contains_bricks', :brick_count => page.bricks.unscoped.where(:locale => params[:target_locale], :brick_list_id => page.id).count ).html_safe
+
+  .modal-footer
+    .clearfix
+      .pull-right
+        .btn{ 'data-dismiss' => 'modal'}
+          = t('.abort')
+        = link_to cms_page_mirror_path(@page, :target_locale => params[:target_locale], :rutheless => true), :class => 'btn btn-warning has-spinner', :remote => true do
+          %span.spinner
+            %i.icon-refresh.icon-white
+          = t('.proceed_replace')
+
+- else
+  .modal-body
+    .alert.alert-info
+      = t('.bricks_cloned', :brick_count => (page.bricks.unscoped.where(:locale => params[:target_locale], :brick_list_id => page.id).count - params[:failed_bricks].count))
+    - if params[:failed_bricks].any?
+      .alert.alert-error
+        = t('.failed_to_clone_folowwing_bricks')
+        %ul
+          - params[:failed_bricks].each do |failed_brick|
+            %li
+              = failed_brick.caption
+              = failed_brick.type
+              = "(Position: #{failed_brick.position})"
+
+  .modal-footer
+    .clearfix
+      .pull-right
+        = link_to edit_cms_page_path(page, :content_locale => params[:target_locale]), :class => 'btn' do
+          = t('.edit_language', :language => params[:target_locale].upcase)
+        .btn.btn-success{ 'data-dismiss' => 'modal'}
+          = t('.okay')

data/app/views/qbrick/cms/pages/edit.html.haml

@@ -0,0 +1,16 @@
+%ul.breadcrumb
+  %li
+    = link_to Qbrick::Page.model_name.human(:count => 2), qbrick.cms_pages_path
+    %span.divider /
+  - @page.parent_pages.each do |parent_page|
+    %li
+      - if @page.parent_pages.last == parent_page
+        .active
+          = parent_page.title
+      - else
+        = link_to parent_page.title, qbrick.edit_cms_page_path(parent_page)
+        %span.divider /
+
+%h1= @page.title
+.box-container
+  = render :partial => 'form', :locals => { :url => qbrick.cms_page_path(@page), :page_title => t('.edit_html', :title => @page.title ) }

data/app/views/{kuhsaft → qbrick}/cms/pages/index.html.haml

@@ -2,7 +2,7 @@
 .actions.row
   .span5
   .span3
-    = link_to kuhsaft.new_cms_page_path, class: 'btn btn-primary' do
+    = link_to qbrick.new_cms_page_path, class: 'btn btn-primary' do
       %i.icon-plus-sign.icon-white
       = t('.add_page')
   .span4

data/app/views/qbrick/cms/pages/mirror.js.haml

@@ -0,0 +1,5 @@
+$("#brick-form").empty()
+
+$("#brick-form").append("#{j(render('qbrick/cms/pages/mirror_modal', :page => @page, :format => :html))}")
+
+$("#brick-form").modal('show')

data/app/views/qbrick/cms/pages/new.html.haml

@@ -0,0 +1 @@
+= render :partial => 'form', :locals => { :url => qbrick.cms_pages_path, :page_title => t('.new') }

data/app/views/qbrick/cms/settings_collections/_form.html.haml

@@ -0,0 +1,8 @@
+= simple_form_for settings, url: cms_settings_collection_path(settings), method: :patch, wrapper: :bootstrap, html: { class: 'form-horizontal' } do |f|
+
+  .form-inputs
+    = f.simple_fields_for :settings do |nf|
+      = nf.input :value, label: t(".#{nf.object.key}"), as: :string
+
+  .form-actions
+    = f.button :submit, t('.save')

data/app/views/qbrick/cms/settings_collections/index.html.haml

@@ -0,0 +1,6 @@
+- @settings_collections.each do |sc|
+  - if sc.present?
+    %h3= "#{sc.collection_type.capitalize} #{t('.title')}"
+    %hr
+
+    = render 'form', settings: sc

data/app/views/{kuhsaft → qbrick}/image_bricks/image_brick/_edit.html.haml

@@ -7,7 +7,7 @@
 
 = 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 :image_size, :collection => Qbrick::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 → qbrick}/link_bricks/link_brick/_edit.html.haml

@@ -1,4 +1,4 @@
 = form.input :href, :as => :string, :input_html => { :class => 'span6' }
 = form.input :caption, :as => :string, :input_html => { :class => 'span6' }
 = form.input :open_in_new_window
-= form.input :link_style, :collection => Kuhsaft::LinkBrick.styles
+= form.input :link_style, :collection => Qbrick::LinkBrick.styles

data/app/views/{kuhsaft → qbrick}/pages/index.html.haml

@@ -1,7 +1,7 @@
 .search.has-section-space-bottom
   .row-fluid
-    %h1=t 'kuhsaft.search.results.title'
+    %h1=t 'qbrick.search.results.title'
   .row-fluid
-    = render 'kuhsaft/search/results'
+    = render 'qbrick/search/results'
   .row-fluid
     = search_page_form

data/app/views/{kuhsaft → qbrick}/pages/show.html.haml

@@ -2,6 +2,8 @@
   %title= @page.page_title.present? ? @page.page_title : @page.title
   %meta{ name: 'keywords', content: @page.keywords }
   %meta{ name: 'description', content: @page.description }
+  - if @page.google_verification_key.present? && @page == homepage
+    %meta{ name: 'google-site-verification', content: @page.google_verification_key }
 
 - cache [@page, I18n.locale, @page.children, @page.bricks] do
   - unless @page.blank?

data/app/views/qbrick/placeholder_bricks/placeholder_brick/_edit.html.haml

@@ -0,0 +1 @@
+= form.input :template_name, :as => :select, :collection => Qbrick::PlaceholderBrick.available_partials, :include_blank => true

data/app/views/{kuhsaft → qbrick}/search/_results.html.haml

@@ -1,8 +1,8 @@
 - if @pages.present?
   %h2.success
-    = t('.number-of-results', :count => @pages.count)
+    = t('.number-of-results', :count => @pages.size)
   %ul.search-results.success
     - @pages.each do |page|
-      %li= render 'kuhsaft/search/results_entry', :page => page
+      %li= render 'qbrick/search/results_entry', :page => page
 - else
   %h2.no-results= t('.no-results')

data/app/views/{kuhsaft → qbrick}/search/_results_entry.html.haml

@@ -1,7 +1,7 @@
 .link
   = link_to page.link do
     %h4= page.title
-  %h5= kuhsaft.page_url(:url => page.url_without_locale)
+  %h5= qbrick.page_url(:url => page.url_without_locale)
 .summary
   -if page.excerpt.present?
     .excerpt!= page.excerpt

data/app/views/{kuhsaft → qbrick}/two_column_bricks/_two_column_brick.html.haml

@@ -1,3 +1,3 @@
 %div{ :class => two_column_brick.to_style_class }
   - two_column_brick.bricks.each_with_index do |column_brick, idx|
-    = render column_brick, :column_style => Kuhsaft::Partition.style_for_index(two_column_brick.partitioning, idx)
+    = render column_brick, :column_style => Qbrick::Partition.style_for_index(two_column_brick.partitioning, idx)

data/app/views/qbrick/two_column_bricks/two_column_brick/_childs.html.haml

@@ -0,0 +1,5 @@
+- if brick.respond_to?(:bricks)
+  .row-fluid
+    - brick.bricks.each_with_index do |b, idx|
+      %div{ :class => Qbrick::Partition.style_for_index(brick.partitioning, idx) }
+        = render 'qbrick/cms/bricks/brick_item', :brick => b