spina 0.9.0 → 0.10.0

data/app/views/spina/admin/accounts/style.html.haml

@@ -1,32 +1,36 @@
 = form_for [spina, :admin, current_account] do |f|
-  .table-container
-    %table.table.table-form
-      %tr
-        %td
+  %header#header
+    = render partial: 'spina/admin/shared/breadcrumbs'
+
+    #header_actions
+      %button.button.button-primary{type: 'submit', data: {icon: 'o'}}
+        = icon('check')
+        = t('spina.preferences.style_save')
+        
+  .well
+    .horizontal-form
+      .horizontal-form-group
+        .horizontal-form-label
           = Spina::Account.human_attribute_name(:theme)
-        %td
+        .horizontal-form-content
           .select-dropdown.account-theme{data: {layout_parts: current_theme.layout_parts.map{|layout_part| layout_part[:name]}}}
             - options = options_for_select(::Spina::Theme.all.map { |theme| [theme.name, theme.name, {'data-layout-parts' => theme.layout_parts.map{|layout_part| layout_part[:name] }}] }, current_account.theme)
             = f.select :theme, options
-      %tr
-        %td
+      .horizontal-form-group
+        .horizontal-form-label
           = Spina::Account.human_attribute_name(:logo)
-        %td
+        .horizontal-form-content
           = image_tag current_account.logo
           = f.file_field :logo
 
       = f.fields_for :layout_parts do |ff|
-        %tr.layout-part{data: {name: ff.object.name}}
-          %td
+        .horizontal-form-group.layout-part{data: {name: ff.object.name}}
+          .horizontal-form-label
             = ff.object.title
-          %td
+          .horizontal-form-content
             = ff.hidden_field :id
             = ff.hidden_field :title
             = ff.hidden_field :layout_partable_type
             = ff.hidden_field :name
 
             = render "spina/admin/layout_partables/#{ partable_type_partial_namespace(ff.object.layout_partable_type) }/form", f: ff
-
-  %button.button.button-primary{type: 'submit', data: {icon: 'o'}}
-    = icon('check')
-    = t('spina.preferences.style_save')

data/app/views/spina/admin/attachments/_select.html.haml

@@ -17,7 +17,7 @@
           %tbody
             - @attachments.each do |attachment|
               %tr
-                %td= radio_button_tag :attachment_id, attachment.id
+                %td= radio_button_tag :attachment_id, attachment.id, attachment.id == @selected_attachment_id
                 %td= attachment.name
 
       %footer

data/app/views/spina/admin/attachments/_select_collection.html.haml

@@ -17,7 +17,7 @@
           %tbody
             - @attachments.each do |attachment|
               %tr
-                %td= check_box_tag 'attachment_ids[]', attachment.id
+                %td= check_box_tag 'attachment_ids[]', attachment.id, attachment.id.in?(@selected_attachment_ids)
                 %td= attachment.name
 
       %footer

data/app/views/spina/admin/attachments/insert.js.coffee

@@ -0,0 +1,5 @@
+hidden_input = $("input[name='<%= j params[:page_part_id] %>[page_partable_id]']")
+hidden_input.parents('.media_picker').find('.attachment').remove()
+hidden_input.parents('.media_picker').append("<div class='attachment'><%= @attachment.name %></div>")
+hidden_input.val("<%= @attachment.id %>")
+$.hideModal()

data/app/views/spina/admin/attachments/insert_collection.js.coffee

@@ -0,0 +1,7 @@
+hidden_input = $("input[name='<%= j params[:page_part_id] %>[attachment_tokens]']")
+attachment_collection = $("<%= j render partial: 'attachment_collection', locals: {attachments: @attachments} %>")
+
+hidden_input.parents('.media_picker').find('.attachment').remove()
+hidden_input.parents('.media_picker').append(attachment_collection)
+hidden_input.val("<%= @attachments.map(&:id).join(',') %>")
+$.hideModal()

data/app/views/spina/admin/page_partables/attachment_collections/_form.html.haml

@@ -2,14 +2,13 @@
   = f.object.title
 .horizontal-form-content
   = f.fields_for :page_partable, f.object.page_partable do |ff|
-    = link_to select_collection_admin_attachments_path(ff.object_name), remote: true, class: "media_picker" do
-      .clearfix
-        .placeholder.pull-right
-          %span.button.button-small.button-round
-            %i.icon.icon-dots
-            = t('spina.choose_from_library')
-        - if ff.object.attachments.any?
-          - ff.object.attachments.each do |attachment|
-            .attachment= attachment.name
+    = link_to select_collection_admin_attachments_path(ff.object_name, selected_attachment_ids: ff.object.attachment_ids), remote: true, class: 'media_picker clearfix' do
+      .placeholder.pull-right
+        %span.button.button-small.button-round
+          %i.icon.icon-dots
+          = t('spina.choose_from_library')
+      - if ff.object.attachments.any?
+        - ff.object.attachments.each do |attachment|
+          .attachment= attachment.name
 
       = ff.hidden_field :attachment_tokens, value: ff.object.attachment_ids.join(",")

data/app/views/spina/admin/page_partables/attachments/_form.html.haml

@@ -1,14 +1,13 @@
 .horizontal-form-label
   = f.object.title
 .horizontal-form-content
-  = link_to select_admin_attachments_path(f.object_name), remote: true, class: "media_picker" do
-    .clearfix
-      .placeholder.pull-right
-        %span.button.button-small.button-round
-          %i.icon.icon-dots
-          = t('spina.choose_from_library')
+  = link_to select_admin_attachments_path(f.object_name, selected_attachment_id: f.object.page_partable.try(:id)), remote: true, class: 'media_picker clearfix' do
+    .placeholder.pull-right
+      %span.button.button-small.button-round
+        %i.icon.icon-dots
+        = t('spina.choose_from_library')
 
-      - if f.object.page_partable && f.object.page_partable.file.present?
-        .attachment= f.object.page_partable.name
+    - if f.object.page_partable && f.object.page_partable.file.present?
+      .attachment= f.object.page_partable.name
 
     = f.hidden_field :page_partable_id

data/app/views/spina/admin/page_partables/photo_collections/_form.html.haml

@@ -2,8 +2,8 @@
   = f.object.title
 .horizontal-form-content
   = f.fields_for :page_partable, f.object.page_partable do |ff|
-    = link_to spina.photo_collection_select_admin_photos_path(ff.object_name, selected_photo_ids: (ff.object.photo_ids if ff.object.photos.any?)), remote: true, class: "media_picker" do
-      .placeholder{class: ('pull-right' if ff.object.photos.any?)}
+    = link_to spina.photo_collection_select_admin_photos_path(ff.object_name, selected_photo_ids: ff.object.photo_ids), remote: true, class: 'media_picker clearfix' do
+      .placeholder.pull-right
         %span.button.button-small.button-round
           %i.icon.icon-dots
           =t 'spina.pages.photos_picker'

data/app/views/spina/admin/page_partables/photos/_form.html.haml

@@ -1,18 +1,14 @@
 .horizontal-form-label
   = f.object.title
 .horizontal-form-content
-  = link_to spina.photo_select_admin_photos_path(f.object_name, selected_photo_id: (f.object.page_partable.id if f.object.page_partable.present?)), remote: true, class: "media_picker" do
+  = link_to spina.photo_select_admin_photos_path(f.object_name, selected_photo_id: f.object.page_partable.try(:id)), remote: true, class: 'media_picker clearfix' do
+    .placeholder.pull-right
+      %span.button.button-small.button-round
+        %i.icon.icon-dots
+        =t 'spina.pages.photo_picker'
+
     - if f.object.page_partable && f.object.page_partable.file.present?
-      .placeholder.pull-right
-        %span.button.button-small.button-round
-          %i.icon.icon-dots
-          =t 'spina.pages.photo_picker'
       .image
         = image_tag f.object.page_partable.file.thumb
-    - else
-      .placeholder
-        %span.button.button-small.button-round
-          %i.icon.icon-dots
-          =t 'spina.pages.photo_picker'
 
     = f.hidden_field :page_partable_id

data/app/views/spina/admin/pages/_form.html.haml

@@ -1,4 +1,29 @@
 = form_for [spina, :admin, @page], multipart: true, html: {autocomplete: "off"} do |f|
+  %header#header
+    .breadcrumbs= render_breadcrumbs separator: '<div class="divider"></div>'
+    - unless @page.new_record?
+      - if Spina.config.locales.size > 1
+        %div{style: 'display: inline-block; margin-left: 12px; top: -4px', data: {dropdown: true}}
+          = link_to '#', class: 'button button-link button-round button-small', data: {trigger: 'dropdown', target: '#locales'} do
+            = icon('comment')
+            = @locale.upcase
+
+          %ul#locales
+            - Spina.config.locales.each do |locale|
+              %li
+                = link_to t("languages.#{locale}"), "?locale=#{locale}", style: ('font-weight: 600' if @locale.to_s == locale.to_s)
+
+    #header_actions
+      %button.button.button-primary{type: 'submit', style: 'margin-right: 0'}
+        = icon('check')
+        =t 'spina.pages.save'
+
+    %nav#secondary.tabs
+      %ul
+        - @tabs.each_with_index do |tab, i|
+          %li{class: (i==0 ? 'active' : '')}
+            = link_to t("spina.pages.#{tab}"), "##{tab}"
+
   = hidden_field_tag :locale, @locale
 
   - content_for :notification_alert do
@@ -8,11 +33,5 @@
     - @tabs.each do |tab|
       = render "spina/admin/pages/form_#{tab}", f: f
 
-    %button.button.button-primary{type: 'submit'}
-      = icon('check')
-      =t 'spina.pages.save'
-
-    = link_to t('spina.cancel'), spina.admin_pages_path, class: 'button button-link'
-
     - unless @page.new_record? || !@page.deletable
       .pull-right= link_to t('spina.permanently_delete'), spina.admin_page_path(@page), method: :delete, data: {confirm: t('spina.pages.delete_confirmation', subject: @page.menu_title)}, class: 'button button-link button-danger'

data/app/views/spina/admin/pages/_form_advanced.html.haml

@@ -1,47 +1,47 @@
-#advanced.tab-content
-  .table-container
-    %table.table.table-form
-      %tr
-        %td
-          = Spina::Page.human_attribute_name :draft
-          %small= Spina::Page.human_attribute_name :draft_description
-        %td
-          = f.check_box :draft, data: {switch: true}
-      %tr
-        %td
-          = Spina::Page.human_attribute_name :skip_to_first_child
-          %small= Spina::Page.human_attribute_name :skip_to_first_child_description
-        %td
-          = f.check_box :skip_to_first_child, data: {switch: true}
-      %tr
-        %td
-          = Spina::Page.human_attribute_name :link_url
-          %small= Spina::Page.human_attribute_name :link_url_description
-        %td
-          = f.text_field :link_url, placeholder: Spina::Page.human_attribute_name(:link_url_placeholder)
-      %tr
-        %td
-          = Spina::Page.human_attribute_name :show_in_menu
-          %small= Spina::Page.human_attribute_name :show_in_menu_description
-        %td
-          = f.check_box :show_in_menu, data: {switch: true}
-      %tr{style: ('border-bottom: none' if @page.custom_page?)}
-        %td
-          = Spina::Page.human_attribute_name :menu_title
-        %td
-          = f.text_field :menu_title, placeholder: Spina::Page.human_attribute_name(:show_in_menu_placeholder), value: f.object.read_attribute(:menu_title)
+#advanced.tab-content.well
+  .horizontal-form
+    .horizontal-form-group
+      .horizontal-form-label
+        = Spina::Page.human_attribute_name :draft
+        %small= Spina::Page.human_attribute_name :draft_description
+      .horizontal-form-content
+        = f.check_box :draft, data: {switch: true}
 
-      %tr{style: ('display: none' if @page.custom_page?)}
-        %td
-          = Spina::Page.human_attribute_name :view_template
-        %td
-          .select-dropdown.page-template{data: {page_parts: @page.view_template_config(current_theme)[:page_parts]}}
-            - options = options_for_select(current_theme.view_templates.map { |template| [template[:title], template[:name], {'data-page-parts' => template[:page_parts]}] }, @page.view_template)
-            = f.select :view_template, options
+    .horizontal-form-group
+      .horizontal-form-label
+        = Spina::Page.human_attribute_name :skip_to_first_child
+        %small= Spina::Page.human_attribute_name :skip_to_first_child_description
+      .horizontal-form-content
+        = f.check_box :skip_to_first_child, data: {switch: true}
+    .horizontal-form-group
+      .horizontal-form-label
+        = Spina::Page.human_attribute_name :link_url
+        %small= Spina::Page.human_attribute_name :link_url_description
+      .horizontal-form-content
+        = f.text_field :link_url, placeholder: Spina::Page.human_attribute_name(:link_url_placeholder)
+    .horizontal-form-group
+      .horizontal-form-label
+        = Spina::Page.human_attribute_name :show_in_menu
+        %small= Spina::Page.human_attribute_name :show_in_menu_description
+      .horizontal-form-content
+        = f.check_box :show_in_menu, data: {switch: true}
+    .horizontal-form-group
+      .horizontal-form-label
+        = Spina::Page.human_attribute_name :menu_title
+      .horizontal-form-content
+        = f.text_field :menu_title, placeholder: Spina::Page.human_attribute_name(:show_in_menu_placeholder), value: f.object.read_attribute(:menu_title)
 
-      %tr{style: ('display: none' if @page.custom_page?)}
-        %td
-          = Spina::Page.human_attribute_name :ancestry
-        %td
-          .select-dropdown.ancestry
-            = f.select :ancestry, options_from_collection_for_select(Spina::Page.active.sorted.roots, 'id', 'menu_title', @page.ancestry.to_i), include_blank: Spina::Page.human_attribute_name(:no_parent)
+    .horizontal-form-group{style: ('display: none' if @page.custom_page?)}
+      .horizontal-form-label
+        = Spina::Page.human_attribute_name :view_template
+      .horizontal-form-content
+        .select-dropdown.page-template{data: {page_parts: @page.view_template_config(current_theme)[:page_parts]}}
+          - options = options_for_select(current_theme.view_templates.map { |template| [template[:title], template[:name], {'data-page-parts' => template[:page_parts]}] }, @page.view_template)
+          = f.select :view_template, options
+
+    .horizontal-form-group{style: ('display: none' if @page.custom_page?)}
+      .horizontal-form-label
+        = Spina::Page.human_attribute_name :ancestry
+      .horizontal-form-content
+        .select-dropdown.ancestry
+          = f.select :parent_id, page_ancestry_options(f.object), include_blank: Spina::Page.human_attribute_name(:no_parent)

data/app/views/spina/admin/pages/_form_page_content.html.haml

@@ -1,4 +1,4 @@
-#page_content.tab-content.active
+#page_content.tab-content.active.well
   .horizontal-form
     .horizontal-form-group
       .horizontal-form-label

data/app/views/spina/admin/pages/_form_page_seo.html.haml

@@ -1,4 +1,4 @@
-#page_seo.tab-content
+#page_seo.tab-content.well
   .horizontal-form
     .horizontal-form-group
       .horizontal-form-label

data/app/views/spina/admin/pages/edit.html.haml

@@ -1,20 +1 @@
-- content_for :header_actions do
-  - if Spina.config.locales.size > 1
-    .pull-right{data: {dropdown: true}}
-      = link_to '#', class: 'button button-round button-hollow button-small', data: {trigger: 'dropdown', target: '#locales'} do
-        = icon('comment')
-        = @locale.upcase
-
-      %ul#locales
-        - Spina.config.locales.each do |locale|
-          %li
-            = link_to t("languages.#{locale}"), "?locale=#{locale}", style: ('font-weight: 600' if @locale.to_s == locale.to_s)
-
-- content_for :tertiary_navigation do
-  %nav.tabs
-    %ul
-      - @tabs.each_with_index do |tab, i|
-        %li{class: (i==0 ? 'active' : '')}
-          = link_to t("spina.pages.#{tab}"), "##{tab}"
-
 = render 'form'

data/app/views/spina/admin/pages/index.html.haml

@@ -6,41 +6,48 @@
         =t 'spina.pages.invisible_to_search_engines'
         %small=t 'spina.pages.invisible_to_search_engines_description'
 
-.filters
-  %span{data: {dropdown: true}}
-    = link_to spina.new_admin_page_path(params: {view_template: 'show'}), class: 'button button-primary', data: {trigger: ('dropdown' if current_theme.new_page_templates.size > 1), target: '#create_page_dropdown'} do
-      = icon('plus')
-      = t('spina.pages.new')
+%header#header
+  #header_actions
+    = link_to '#pages_list', class: 'button sort-switch', data: {change_order: t('spina.pages.change_order'), done_changing_order: t('spina.pages.done_changing_order')} do
+      = icon('random')
+      = t('spina.pages.change_order')
 
-    .sliding-dropdown#create_page_dropdown
-      .slide-controls
-        %a.previous.muted.icon-only{href: '#'}
-          = icon('chevron-left')
+    %span{data: {dropdown: true}}
+      = link_to spina.new_admin_page_path(params: {view_template: 'show'}), class: 'button button-primary', style: 'margin-right: 0', data: {trigger: ('dropdown' if current_theme.new_page_templates.size > 1), target: '#create_page_dropdown'} do
+        = icon('plus')
+        = t('spina.pages.new')
 
-        - current_theme.new_page_templates.each_with_index do |template, index|
-          .slide-title{class: ('active' if index == 0), data: {target: "#slide-#{template[1].parameterize}"}}= template[1]
+      .sliding-dropdown#create_page_dropdown.align-right
+        .slide-controls
+          %a.previous.muted.icon-only{href: '#'}
+            = icon('chevron-left')
+
+          - current_theme.new_page_templates.each_with_index do |template, index|
+            .slide-title{class: ('active' if index == 0), data: {target: "#slide-#{template[1].parameterize}"}}= template[1]
 
-        %a.next.icon-only{href: '#'}
-          = icon('chevron-right')
+          %a.next.icon-only{href: '#'}
+            = icon('chevron-right')
 
-      - current_theme.new_page_templates.each_with_index do |template, index|
-        .slide{class: ('active' if index == 0), id: "slide-#{template[1].parameterize}"}
-          %p= template[2]
+        - current_theme.new_page_templates.each_with_index do |template, index|
+          .slide{class: ('active' if index == 0), id: "slide-#{template[1].parameterize}"}
+            %p= template[2]
+
+            %p.muted= template[3]
 
-          %p.muted= template[3]
+            .slide-dots
+              - current_theme.new_page_templates.each_with_index do |template2, index2|
+                .slide-dot{class: ('active' if index2 == index)}
 
-          .slide-dots
-            - current_theme.new_page_templates.each_with_index do |template2, index2|
-              .slide-dot{class: ('active' if index2 == index)}
+            = link_to spina.new_admin_page_path(params: {view_template: template[0]}), class: 'button button-primary' do
+              = icon('pencil-outline')
+              = t('spina.pages.create_page', template: template[1])
 
-          = link_to spina.new_admin_page_path(params: {view_template: template[0]}), class: 'button button-primary' do
-            = icon('pencil-outline')
-            = t('spina.pages.create_page', template: template[1])
+  .breadcrumbs= render_breadcrumbs seperator: '<div class="divider"></div>'
 
-  = link_to '#pages_list', class: 'button sort-switch', data: {change_order: t('spina.pages.change_order'), done_changing_order: t('spina.pages.done_changing_order')} do
-    = icon('random')
-    = t('spina.pages.change_order')
+.filters
+  
 
-.dd#pages_list{data: {:"sort-url" => spina.sort_admin_pages_url }}
-  %ol.dd-list
-    = render partial: 'page', collection: @pages.roots
+.well
+  .dd#pages_list{data: {:"sort-url" => spina.sort_admin_pages_url }}
+    %ol.dd-list
+      = render partial: 'page', collection: @pages.roots

data/app/views/spina/admin/pages/new.html.haml

@@ -1,11 +1 @@
-- content_for :tertiary_navigation do
-  %nav.tabs
-    %ul
-      %li.active
-        = link_to t('spina.pages.page_content'), "#page_content"
-      %li
-        = link_to t('spina.pages.page_seo'), "#page_seo"
-      %li
-        = link_to t('spina.pages.advanced'), "#advanced"
-
 = render 'form'

data/app/views/spina/admin/photos/_photo_collection_select.html.haml

@@ -5,12 +5,12 @@
         = form_for [spina, :admin, @photo], html: {multipart: true} do |f|
           = f.label :file, t('spina.photos.upload_image')
           = f.file_field :file, data: {customfileinput: true}
-          
+
       = form_tag spina.insert_photo_collection_admin_photos_path(params[:page_part_id]), remote: true, class: 'gallery-prepend-image' do
         .infinite-scroll
           = render partial: 'spina/admin/photos/photo_multi_picker', collection: @photos
 
-        .infinite-pagination= link_to_next_page @photos, 'Next', params: {selected_photo_ids: @selected_photos.ids}, remote: true
+        .infinite-pagination= link_to_next_page @photos, 'Next', params: params.slice(:selected_photo_ids), remote: true
 
         .gallery-select-action-bar
           .pull-right
@@ -19,5 +19,5 @@
               = icon('plus')
               = t('spina.photos.choose_images')
               %span.gallery-select-counter
-                - if @selected_photos.any?
-                  (#{@selected_photos.count})
+                - if @selected_photo_ids.any?
+                  (#{ @selected_photo_ids.count })