spina 0.8.3 → 0.9.0

data/app/views/layouts/spina/admin/website.html.haml

@@ -1,33 +1,26 @@
 - content_for :secondary_navigation do
   %nav#secondary
     %h1= t('spina.website.title')
-
     %ul
-      %li{class: ('active' if params[:controller] == "spina/admin/pages")}
+      %li{class: ('active' if current_admin_path.start_with?('/pages'))}
         = link_to spina.admin_pages_path do
           = icon('pages')
           = t('spina.website.pages')
           %small= t('spina.website.pages_description')
 
-      %li{class: ('active' if params[:controller] == "spina/admin/photos" || params[:controller] == "spina/admin/attachments")}
+      %li{class: ('active' if current_admin_path.start_with?('/photos', '/attachments'))}
         = link_to spina.admin_photos_path do
           = icon('image')
           = t('spina.website.media_library')
           %small= t('spina.website.media_library_description')
 
-      - Spina.plugins(:website_resource).each do |plugin|
-        - if current_theme.config.plugins.include? plugin.name.downcase
-          %li{class: ('active' if params[:controller] == "spina/admin/#{plugin.config.controller}")}
-            = link_to spina.send("admin_#{plugin.config.controller}_path") do
-              = icon(plugin.config.spina_icon)
-              = plugin.config.title
-              %small= plugin.config.description
+      - Spina::Plugin.all.each do |plugin|
+        - if current_theme.plugins.include? plugin.name
+          - if lookup_context.exists? "spina/admin/hooks/#{ plugin.namespace }/_website_secondary_navigation"
+            = render "spina/admin/hooks/#{ plugin.namespace }/website_secondary_navigation", plugin: plugin
 
-- content_for(:content) do
-  = content_for?(:website_content) ? yield(:website_content) : yield
+- content_for(:application) do
+  = content_for?(:website) ? yield(:website) : yield
 
-= render template: "layouts/spina/admin/application"
+= render template: 'layouts/spina/admin/application'
 
-- if content_for?(:plugin_stylesheets)
-  - content_for(:plugin_stylesheets) do
-    = yield(:plugin_stylesheets)

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

@@ -5,8 +5,8 @@
         %td
           = Spina::Account.human_attribute_name(:theme)
         %td
-          .select-dropdown.account-theme{data: {layout_parts: current_theme.config.layout_parts.map{|layout_part| layout_part[:name]}}}
-            - options = options_for_select(Spina.themes.map { |theme| [theme.to_s, theme.to_s, {'data-layout-parts' => theme.config.layout_parts.map{|layout_part| layout_part[:name] }}] }, current_account.theme)
+          .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
@@ -15,17 +15,17 @@
           = image_tag current_account.logo
           = f.file_field :logo
 
-      = f.fields_for :layout_parts do |layout_part_form|
-        %tr.layout-part{data: {name: layout_part_form.object.name}}
+      = f.fields_for :layout_parts do |ff|
+        %tr.layout-part{data: {name: ff.object.name}}
           %td
-            = layout_part_form.object.title
+            = ff.object.title
           %td
-            = layout_part_form.hidden_field :id
-            = layout_part_form.hidden_field :title
-            = layout_part_form.hidden_field :layout_partable_type
-            = layout_part_form.hidden_field :name
+            = ff.hidden_field :id
+            = ff.hidden_field :title
+            = ff.hidden_field :layout_partable_type
+            = ff.hidden_field :name
 
-            = render partial: "spina/admin/layout_partables/#{layout_part_form.object.layout_partable_type.demodulize.underscore}_form", object: layout_part_form
+            = 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')

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

@@ -1,8 +1,7 @@
 %tr
-  %td= attachment.name
+  %td= link_to attachment.name, attachment.file.try(:url), target: :blank
   %td.nowrap= number_to_human_size(attachment.file.size)
   %td.nowrap
     %small= l attachment.created_at, format: '%d %B %Y %H:%M'
-  %td= attachment.file.try(:url)
   %td.nowrap
     = link_to t('spina.delete'), admin_attachment_path(attachment), method: :delete, class: 'button button-link button-danger button-small', data: {confirm: t('spina.delete_confirmation', subject: attachment.name)}

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

@@ -1,19 +1,14 @@
 .table-container
-  .search-input.pull-right
-    = text_field_tag :search, nil, placeholder: t('spina.search'), class: 'input-search input-rounded'
-    .clear-input
-      = icon('times-circle')
-
   %table.table
     %thead
       %tr
         %th= Spina::Attachment.human_attribute_name(:name)
         %th= Spina::Attachment.human_attribute_name(:size)
         %th= Spina::Attachment.human_attribute_name(:created_at)
-        %th{colspan: 2}
+        %th
       %tr
         %td{colspan: 5}
-          = form_for [spina, :admin, @attachment], html: {multipart: true, class: "new_document"} do |f|
+          = form_for [spina, :admin, @attachment], html: {multipart: true, class: "new_document", style: 'margin-bottom: 0'} do |f|
             = f.file_field :file, data: {customfileinput: true}
 
     %tbody.table-prepend-document

data/app/views/spina/admin/layout_partables/colors/_form.html.haml

@@ -0,0 +1,4 @@
+= f.fields_for :layout_partable, f.object.layout_partable do |ff|
+  .colorpicker
+    = ff.text_field :content, placeholder: f.object.title
+    .colorpicker-container

data/app/views/spina/admin/layout_partables/lines/_form.html.haml

@@ -0,0 +1,2 @@
+= f.fields_for :layout_partable, f.object.layout_partable do |ff|
+  = ff.text_field :content, placeholder: f.object.title

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

@@ -0,0 +1,15 @@
+.horizontal-form-label
+  = 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
+
+      = ff.hidden_field :attachment_tokens, value: ff.object.attachment_ids.join(",")

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

@@ -0,0 +1,14 @@
+.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')
+
+      - 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/colors/_form.html.haml

@@ -0,0 +1,7 @@
+.horizontal-form-label
+  = f.object.title
+.horizontal-form-content
+  = f.fields_for :page_partable, f.object.page_partable do |ff|
+    .colorpicker
+      = ff.text_field :content, placeholder: f.object.title
+      .colorpicker-container

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

@@ -0,0 +1,5 @@
+.horizontal-form-label
+  = f.object.title
+.horizontal-form-content
+  = f.fields_for :page_partable, f.object.page_partable do |ff|
+    = ff.text_field :content, placeholder: "#{t 'spina.pages.page_part'} #{f.object.name.downcase}"

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

@@ -0,0 +1,17 @@
+.horizontal-form-label
+  = 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?)}
+        %span.button.button-small.button-round
+          %i.icon.icon-dots
+          =t 'spina.pages.photos_picker'
+
+    .photo-collection
+      - if ff.object.photos.sorted_by_photo_collection.any?
+        = render 'spina/admin/photos/photo_collection', photos: ff.object.photos.sorted_by_photo_collection
+      - elsif ff.object.photos.any?
+        = render 'spina/admin/photos/photo_collection', photos: ff.object.photos
+    = ff.hidden_field :photo_tokens, value: ff.object.photo_ids.join(",")
+    = ff.hidden_field :photo_positions, value: ff.object.photos.sorted_by_photo_collection.pluck(:photo_id).join(","), class: 'photo-positions'

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

@@ -0,0 +1,18 @@
+.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
+    - 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/page_partables/structures/_form.html.haml

@@ -0,0 +1,22 @@
+.horizontal-form-content
+  .structure-form
+    .structure-form-menu
+      %label= f.object.title
+
+      %ul
+        - unless f.object.page_partable.nil?
+          - f.object.page_partable.structure_items.sorted_by_structure.each_with_index do |structure_item, index|
+            %li{class: ('active' if index == 0), data: {structure_item_id: structure_item.id}}
+              = link_to "#structure_form_pane_#{structure_item.id}" do
+                %i.icon.icon-bars.sortable-handle
+                = structure_item.structure_parts.first.try(:structure_partable).try(:content)
+
+      = f.fields_for :page_partable do |ff|
+        - ff.object.page_part = f.object
+        = link_to_add_fields ff, :structure_items do
+          = icon('plus')
+
+    .structure-form-content
+      = f.fields_for :page_partable do |ff|
+        = ff.fields_for :structure_items, ff.object.structure_items.sorted_by_structure do |fff|
+          = render 'spina/admin/structure_items/fields', f: fff

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

@@ -0,0 +1,5 @@
+.horizontal-form-label
+  = f.object.title
+.horizontal-form-content
+  = f.fields_for :page_partable, f.object.page_partable do |ff|
+    = render 'spina/admin/shared/rich_text_field', f: ff, field: :content

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

@@ -1,15 +1,18 @@
 = form_for [spina, :admin, @page], multipart: true, html: {autocomplete: "off"} do |f|
+  = hidden_field_tag :locale, @locale
+
   - content_for :notification_alert do
     = error_explanation!(@page)
 
-  - @tabs.each do |tab|
-    = render "spina/admin/pages/form_#{tab}", f: f
+  - Globalize.with_locale(@locale) do
+    - @tabs.each do |tab|
+      = render "spina/admin/pages/form_#{tab}", f: f
 
-  %button.button.button-primary{type: 'submit'}
-    = icon('check')
-    =t 'spina.pages.save'
+    %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'
+    = 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'
+    - 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

@@ -29,14 +29,14 @@
         %td
           = Spina::Page.human_attribute_name :menu_title
         %td
-          = f.text_field :menu_title, placeholder: Spina::Page.human_attribute_name(:show_in_menu_placeholder)
+          = 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 :view_template
         %td
-          .select-dropdown.page-template{data: {page_parts: current_theme.config.view_templates[@page.view_template || "show"][:page_parts]}}
-            - options = options_for_select(current_theme.config.view_templates.map { |template| [template[1][:title], template[0], {'data-page-parts' => template[1][:page_parts]}] }, @page.view_template)
+          .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
 
       %tr{style: ('display: none' if @page.custom_page?)}

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

@@ -6,6 +6,11 @@
       .horizontal-form-content
         = f.text_field :title, placeholder: Spina::Page.human_attribute_name(:title_placeholder)
 
-    = f.fields_for :page_parts, @page_parts.sort { |a,b| a.position(current_theme) <=> b.position(current_theme) } do |page_part_form|
-      .horizontal-form-group.page-part{data: {name: page_part_form.object.name}}
-        = render partial: "spina/admin/page_partables/#{page_part_form.object.page_partable_type.demodulize.underscore}_form", object: page_part_form
+    = f.fields_for :page_parts, @page_parts.sort { |a,b| a.position(current_theme) <=> b.position(current_theme) } do |ff|
+      = ff.hidden_field :id
+      = ff.hidden_field :title
+      = ff.hidden_field :page_partable_type
+      = ff.hidden_field :name
+
+      .horizontal-form-group.page-part{data: {name: ff.object.name}}
+        = render "spina/admin/page_partables/#{ partable_type_partial_namespace(ff.object.page_partable_type) }/form", f: ff

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

@@ -4,7 +4,7 @@
       .horizontal-form-label
         = Spina::Page.human_attribute_name :seo_title
       .horizontal-form-content
-        = f.text_field :seo_title, placeholder: Spina::Page.human_attribute_name(:seo_title_placeholder)
+        = f.text_field :seo_title, placeholder: Spina::Page.human_attribute_name(:seo_title_placeholder), value: f.object.read_attribute(:seo_title)
 
     .horizontal-form-group
       .horizontal-form-label

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

@@ -1,4 +1,16 @@
-- content_for(:tertiary_navigation) do
+- 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|

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

@@ -1,7 +1,5 @@
 .item
   .overlay
-    = link_to admin_photo_path(photo), class: 'icon-only edit-photo-link', data: {aviary: true} do
-      =t('spina.photos.edit')
     = link_to spina.admin_photo_path(photo), method: :delete, class: 'icon-only delete-photo-link', data: {confirm: t('spina.photos.delete_confirmation')} do
       =t('spina.photos.delete')
-  = image_tag photo.file.thumb.url, id: "photo_#{photo.id}", data: {posturl: spina.enhance_admin_photo_path(photo), image: photo.file.url}
+  = image_tag photo.file.thumb.url, id: "photo_#{photo.id}"

data/app/views/spina/admin/photos/create.js.erb

@@ -1,7 +1,6 @@
 <% if @photo.new_record? %>
   alert("<%= I18n.t 'spina.photos.cannot_be_created' %> <%= j @photo.errors.full_messages.join(', ').html_safe %>");
 <% else %>
-  $item = $("<%=j render partial: 'spina/admin/photos/photo_uploaded', object: @photo %>");
+  $item = $("<%=j render partial: 'spina/admin/photos/photo', object: @photo %>");
   $(".gallery-prepend-image .infinite-scroll").prepend($item);
-  $(".gallery-prepend-image .infinite-scroll .item:first-child").click();
 <% end %>

data/app/views/spina/admin/photos/create_and_select.js.erb

@@ -0,0 +1,7 @@
+<% if @photo.new_record? %>
+  alert("<%= I18n.t 'spina.photos.cannot_be_created' %> <%= j @photo.errors.full_messages.join(', ').html_safe %>");
+<% else %>
+  $item = $("<%=j render partial: 'spina/admin/photos/photo_uploaded', object: @photo %>");
+  $(".gallery-prepend-image .infinite-scroll").prepend($item);
+  $(".gallery-prepend-image .infinite-scroll .item:first-child").click();
+<% end %>

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

@@ -1,11 +1,12 @@
 .gallery-container
   .gallery
-    -# .item
-    -#   = 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}
+    .item
+      = form_for [spina, :admin, @photo], html: {multipart: true} do |f|
+        = hidden_field_tag :media_library, value: true
+        = f.label :file, t('spina.photos.upload_image')
+        = f.file_field :file, data: {customfileinput: true}
 
-    .gallery-prepend-image.infinite-scroll
-      = render partial: 'spina/admin/photos/photo', collection: @photos
+    .gallery-prepend-image
+      .infinite-scroll= render partial: 'spina/admin/photos/photo', collection: @photos
 
     .infinite-pagination= link_to_next_page @photos, 'Next', remote: true

data/app/views/spina/admin/shared/_primary_navigation.html.haml

@@ -0,0 +1,19 @@
+%nav#primary
+  %ul
+    %li{class: ('active' if (%w[pages photos attachments] + Spina::Plugin.all.map { |plugin| plugin.namespace if current_theme.plugins.include?(plugin.name) }).include? controller_name)}
+      = link_to spina.admin_pages_path do
+        = icon('home')
+
+    - Spina::Plugin.all.each do |plugin|
+      - if current_theme.plugins.include? plugin.name
+        - if lookup_context.exists? "spina/admin/hooks/#{ plugin.namespace }/_primary_navigation"
+          = render "spina/admin/hooks/#{ plugin.namespace }/primary_navigation", plugin: plugin
+
+
+    %li{class: ('active' if %w[accounts users tenants].include? controller_name)}
+      = link_to spina.edit_admin_account_path do
+        = icon('cog')
+
+    %li.bottom
+      = link_to spina.admin_logout_path, data: {no_turbolink: true} do
+        = icon('power-off')

data/app/views/spina/admin/shared/_rich_text_field.html.haml

@@ -1,5 +1,5 @@
-- object_id = form.object.persisted? ? form.object.object_id : "new_association_#{form.object.object_id}"
-= form.hidden_field field, id: "#{object_id}_input"
+- object_id = f.object.persisted? ? f.object.object_id : "new_association_#{f.object.object_id}"
+= f.hidden_field field, id: "#{object_id}_input"
 %trix-toolbar.clearfix{ id: "#{object_id}_toolbar", data: { editor_id: "#{object_id}_editor" }}
   .button-groups
     .button-group.pull-left

data/app/views/spina/admin/structure_items/_fields.html.haml

@@ -0,0 +1,16 @@
+.structure-form-pane{class: ('active' if f.options[:child_index] == 0), id: "structure_form_pane_#{f.object.id}"}
+  / Hidden field
+  = f.hidden_field :position, placeholder: "Position", class: "structure_form_pane_#{f.object.id}_position"
+
+  / Strucure parts
+  = f.fields_for :structure_parts do |ff|
+    = ff.hidden_field :id
+    = ff.hidden_field :title
+    = ff.hidden_field :structure_partable_type
+    = ff.hidden_field :name
+    .structure-form-part
+      = render "spina/admin/structure_partables/#{ partable_type_partial_namespace(ff.object.structure_partable_type) }/form", f: ff
+
+  = f.hidden_field :_destroy
+  = link_to t('spina.delete'), '#', class: 'remove-structure-item-fields button button-mini button-link pull-right'
+

data/app/views/spina/admin/structure_partables/lines/_form.html.haml

@@ -0,0 +1,2 @@
+= f.fields_for :structure_partable do |ff|
+  = ff.text_field :content, placeholder: f.object.title

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

@@ -0,0 +1,11 @@
+= link_to spina.photo_select_admin_photos_path(f.object_name, selected_photo_id: (f.object.structure_partable.id if f.object.structure_partable.present?)), remote: true, class: "media_picker" do
+  - if f.object.structure_partable && f.object.structure_partable.file.present?
+    .placeholder.pull-right
+      %span.button.button-small.button-round{data: {icon: 'U'}}=t 'spina.pages.photo_picker'
+    .image
+      = image_tag f.object.structure_partable.file.thumb
+  - else
+    .placeholder
+      %span.button.button-small.button-round{data: {icon: 'U'}}=t 'spina.pages.photo_picker'
+
+  = f.hidden_field :structure_partable_id