spina 0.9.0 → 0.10.0

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

@@ -1,3 +1,3 @@
-.item{class: ('selected' if @selected_photos.include?(photo_multi_picker))}
-  = check_box_tag 'photo_ids[]', photo_multi_picker.id, @selected_photos.include?(photo_multi_picker)
+.item{class: ('selected' if photo_multi_picker.id.in?(@selected_photo_ids)) }
+  = check_box_tag 'photo_ids[]', photo_multi_picker.id, photo_multi_picker.id.in?(@selected_photo_ids)
   = image_tag photo_multi_picker.file.thumb.url, id: "photo_#{photo_multi_picker.id}"

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

@@ -7,7 +7,10 @@
           = f.file_field :file, data: {customfileinput: true}
 
       = form_tag spina.insert_photo_admin_photos_path(params[:page_part_id]), remote: true, class: 'gallery-prepend-image' do
+        = hidden_field_tag :hidden_field_id, @hidden_field_id
+
         .infinite-scroll
           = render partial: 'spina/admin/photos/photo_single_picker', collection: @photos
 
-        .infinite-pagination= link_to_next_page @photos, 'Next', params: {selected_photo_id: @selected_photo.try(:id)}, remote: true
+        .infinite-pagination= link_to_next_page @photos, 'Next', params: params.slice(:selected_photo_id), remote: true
+

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

@@ -1,3 +1,3 @@
-.item{class: ('selected' if @selected_photo == photo_single_picker)}
-  = radio_button_tag :photo_id, photo_single_picker.id, photo_single_picker == @selected_photo
+.item{ class: ('selected' if photo_single_picker.id == @selected_photo_id) }
+  = radio_button_tag :photo_id, photo_single_picker.id, photo_single_picker.id == @selected_photo_id
   = image_tag photo_single_picker.file.thumb.url, id: "photo_#{photo_single_picker.id}"

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

@@ -7,6 +7,7 @@
         = f.file_field :file, data: {customfileinput: true}
 
     .gallery-prepend-image
-      .infinite-scroll= render partial: 'spina/admin/photos/photo', collection: @photos
+      .infinite-scroll
+        = render partial: 'spina/admin/photos/photo', collection: @photos
 
-    .infinite-pagination= link_to_next_page @photos, 'Next', remote: true
+      .infinite-pagination= link_to_next_page @photos, 'Next', remote: true

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

@@ -1,10 +1,10 @@
-var hidden_input = $("input[name='<%= j params[:page_part_id] %>[page_partable_id]'], input[name='<%= j params[:page_part_id] %>[structure_partable_id]']");
-hidden_input.parents('.media_picker').find('.image, .placeholder').remove();
+var hidden_input = $("input[name='<%= j params[:page_part_id] %>[page_partable_id]'], input[name='<%= j params[:page_part_id] %>[structure_partable_id]'], input[data-hidden-field-id='<%= j params[:hidden_field_id] %>']");
+hidden_input.parents('.media_picker').find('.image').remove();
+
 <% if @photo.present? %>
-  hidden_input.parents('.media_picker').prepend("<div class='placeholder pull-right'><span class='button button-small button-round' data-icon='U'><%= I18n.t('spina.pages.photo_picker') %></span></div><div class='image'><img src='<%= @photo.file.thumb %>' /></div>");
+  hidden_input.parents('.media_picker').append("<div class='image'><img src='<%= @photo.file.thumb %>' /></div>");
   hidden_input.val("<%= @photo.id %>");
 <% else %>
-  hidden_input.parents('.media_picker').prepend("<div class='placeholder'><span class='button button-small button-round' data-icon='U'><%= I18n.t('spina.pages.photo_picker') %></span></div>");
   hidden_input.parents('.media_picker').append("<input type='hidden' type='checkbox' name='<%= j params[:page_part_id] %>[_destroy]' value='1' />")
 <% end %>
 $.hideModal();

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

@@ -1,13 +1,16 @@
-var hidden_input = $("input[name='<%= j params[:page_part_id] %>[photo_tokens]']");
+var photo_token_inputs = [
+  "input[name='<%= j params[:page_part_id] %>[photo_collection_attributes][photo_tokens]']",
+  "input[name='<%= j params[:page_part_id] %>[photo_tokens]']"
+]
+var hidden_input = $(photo_token_inputs.join(", "))
 
 <% if @photos.present? %>
   var photo_collection = $("<%= j render partial: 'photo_collection', locals: {photos: @photos} %>");
   hidden_input.parents('.horizontal-form-content').find('.photo-collection').html(photo_collection);
-  hidden_input.parents('.horizontal-form-content').find('a .placeholder').addClass('pull-right');
   hidden_input.val("<%= @photos.map(&:id).join(',') %>");
 <% else %>
-  hidden_input.parents('.horizontal-form-content').find('a .placeholder').removeClass('pull-right');
   hidden_input.val("");
+  hidden_input.parents('.horizontal-form-content').find('.photo-collection').empty()
 <% end %>
 
 $('.sortable-grid').sortable().bind('sortupdate', function(e) {

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

@@ -2,5 +2,5 @@
 $("<%=j render partial: 'spina/admin/photos/photo_multi_picker', collection: @photos %>").appendTo($(".infinite-scroll"));
 
 // Update pagination link
-$('.infinite-pagination').html("<%= j link_to_next_page @photos, 'Next', params: {selected_photo_ids: @selected_photos.ids}, remote: true %>").infiniteScroll()
+$('.infinite-pagination').html("<%= j link_to_next_page @photos, 'Next', params: params.slice(:selected_photo_ids), remote: true %>").infiniteScroll()
 

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

@@ -2,5 +2,5 @@
 $("<%=j render partial: 'spina/admin/photos/photo_single_picker', collection: @photos %>").appendTo($(".infinite-scroll"));
 
 // Update pagination link
-$('.infinite-pagination').html("<%= j link_to_next_page @photos, 'Next', params: {selected_photo_id: @selected_photo.try(:id)}, remote: true %>").infiniteScroll()
+$('.infinite-pagination').html("<%= j link_to_next_page @photos, 'Next', params: params.slice(:selected_photo_id), remote: true %>").infiniteScroll()
 

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

@@ -0,0 +1 @@
+.breadcrumbs= render_breadcrumbs separator: '<div class="divider"></div>'

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

@@ -1,16 +1,27 @@
 %aside#notifications
   - if flash[:notice]
-    .notification{data: {icon: 'L'}}
-      %p
-        =t 'spina.notifications.information'
-        %small= flash[:notice]
+    .notification.animated.fadeInRight
+      = icon('info')
+      .notification-message
+        = flash[:notice].html_safe
+        %small= flash[:notice_small].try(:html_safe)
+      = link_to '#', data: {close_notification: true} do
+        = icon('cross')
 
-  - if content_for?(:notification_alert)
-    = yield(:notification_alert)
+  - if flash[:alert]
+    .notification.notification-danger.animated.fadeInRight
+      = icon('exclamation')
+      .notification-message
+        = flash[:alert].html_safe
+        %small= flash[:alert_small].try(:html_safe)
+      = link_to '#', data: {close_notification: true} do
+        = icon('cross')
 
-  - else
-    - if flash[:alert]
-      .notification.notification-error{data: {icon: 'm'}}
-        %p 
-          =t 'spina.notifications.alert'
-          %small= flash[:alert]
+  - if flash[:success]
+    .notification.notification-success.animated.fadeInRight
+      = icon('large-check')
+      .notification-message
+        = flash[:success].html_safe
+        %small= flash[:success_small].try(:html_safe)
+      = link_to '#', data: {close_notification: true} do
+        = icon('cross')

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

@@ -1,19 +1,59 @@
-%nav#primary
+%nav#primary.transformed
   %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')
+        = t('spina.website.title')
+        = icon('caret-right')
+
+      %ul
+        %li{class: ('active' if current_admin_path.start_with?('/pages'))}
+          = link_to t('spina.website.pages'), spina.admin_pages_path
+        %li{class: ('active' if current_admin_path.start_with?('/photos', '/attachments'))}
+          = link_to t('spina.website.media_library'), spina.admin_photos_path
+        - 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
+        %li
+          = link_to '#', class: 'back-to-main-menu' do
+            = icon('caret-left')
+            =t 'spina.main_menu'
 
     - 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')
+        = t('spina.preferences.title')
+        = icon('caret-right')
+
+      %ul
+        %li{class: ('active' if params[:action] == 'edit' && params[:controller] == 'spina/admin/accounts')}
+          = link_to t('spina.preferences.account'), spina.edit_admin_account_path
+        %li{class: ('active' if params[:action] == 'style')}
+          = link_to t('spina.preferences.style'), spina.style_admin_account_path
+        - if can? :manage, Spina::User
+          %li{class: ('active' if %w[users].include? controller_name)}
+            = link_to t('spina.preferences.users'), spina.admin_users_path
+        %li{class: ('active' if params[:action] == 'social')}
+          = link_to t('spina.preferences.social_media'), spina.social_admin_account_path
+        %li{class: ('active' if params[:action] == 'analytics')}
+          = link_to t('spina.preferences.analytics'), spina.analytics_admin_account_path
+
+        - Spina::Plugin.all.each do |plugin|
+          - if current_theme.plugins.include? plugin.name
+            - if lookup_context.exists? "spina/admin/hooks/#{ plugin.namespace }/_settings_secondary_navigation"
+              = render "spina/admin/hooks/#{ plugin.namespace }/settings_secondary_navigation", plugin: plugin
+
+        %li
+          = link_to '#', class: 'back-to-main-menu' do
+            = icon('caret-left')
+            =t 'spina.main_menu'
 
     %li.bottom
-      = link_to spina.admin_logout_path, data: {no_turbolink: true} do
+      = link_to spina.admin_logout_path, data: {turbolinks: false} do
         = icon('power-off')

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

@@ -1,11 +1,8 @@
-= 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
+= link_to spina.photo_select_admin_photos_path(f.object_name, selected_photo_id: f.object.structure_partable.try(:id)), remote: true, class: "media_picker" do
+  .placeholder.pull-right
+    %span.button.button-small.button-round{data: {icon: 'U'}}=t 'spina.pages.photo_picker'
   - 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

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

@@ -1,54 +1,58 @@
-- if @user.errors.any?
-  - content_for :notification_alert do
-    .notification.notification-error{data: {icon: 'm'}}
-      %p 
-        = Spina::User.human_attribute_name :cannot_be_created
-        %small
-          - @user.errors.full_messages.each do |msg|
-            = msg
-            %br/
-
 = form_for [spina, :admin, @user] 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'}
+        = icon('check')
+        =t('spina.users.save')
+
+      = link_to t('spina.cancel'), spina.admin_users_path, class: 'button'
+
+  - if @user.errors.any?
+    - content_for :notification_alert do
+      .notification.notification-error{data: {icon: 'm'}}
+        %p 
+          = Spina::User.human_attribute_name :cannot_be_created
+          %small
+            - @user.errors.full_messages.each do |msg|
+              = msg
+              %br/
+
+  .well
+    .horizontal-form
+      .horizontal-form-group
+        .horizontal-form-label
           = Spina::User.human_attribute_name :name
-        %td
+        .horizontal-form-content
           = f.text_field :name, placeholder: Spina::User.human_attribute_name(:name_placeholder), class: 'large'
 
-      %tr
-        %td
+      .horizontal-form-group
+        .horizontal-form-label
           = Spina::User.human_attribute_name :email
           %small= Spina::User.human_attribute_name :email_description
-        %td
+        .horizontal-form-content
           = f.text_field :email, placeholder: Spina::User.human_attribute_name(:email)
 
-      %tr
-        %td
+      .horizontal-form-group
+        .horizontal-form-label
           = Spina::User.human_attribute_name :password
           %small= Spina::User.human_attribute_name :password_description
-        %td
+        .horizontal-form-content
           = f.password_field :password, placeholder: Spina::User.human_attribute_name(:password)
 
-      %tr
-        %td
+      .horizontal-form-group
+        .horizontal-form-label
           = Spina::User.human_attribute_name :password_confirmation
-        %td
+        .horizontal-form-content
           = f.password_field :password_confirmation, placeholder: Spina::User.human_attribute_name(:password_confirmation)
 
-      %tr
-        %td
+      .horizontal-form-group
+        .horizontal-form-label
           #{Spina::User.human_attribute_name :admin}?
           %small= Spina::User.human_attribute_name :admin_description
-        %td
+        .horizontal-form-content
           = f.check_box :admin, data: {switch: 'true'}
 
-  %button.button.button-primary{type: 'submit'}
-    = icon('check')
-    =t('spina.users.save')
-
-  = link_to t('spina.cancel'), spina.admin_users_path, class: 'button button-link'
-
   - unless @user.new_record? || @user == current_user
     .pull-right= link_to t('spina.permanently_delete'), spina.admin_user_path(@user), method: :delete, data: {confirm: t('spina.users.delete_confirmation', user: @user)}, class: 'button button-link button-danger'

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

@@ -1,26 +1,30 @@
-.filters
-  = link_to spina.new_admin_user_path, class: 'button button-primary' do
-    = icon('plus')
-    = t('spina.users.new')
+%header#header
+  = render partial: 'spina/admin/shared/breadcrumbs'
 
-.table-container
-  %table.table
-    %thead
-      %tr
-        %th= Spina::User.human_attribute_name :name
-        %th= Spina::User.human_attribute_name :role
-        %th= Spina::User.human_attribute_name :last_logged_in
-        %th
+  #header_actions
+    = link_to spina.new_admin_user_path, class: 'button button-primary' do
+      = icon('plus')
+      = t('spina.users.new')
 
-    %tbody
-      - @users.each do |user|
+.well
+  .table-container
+    %table.table
+      %thead
         %tr
-          %td= link_to user, spina.edit_admin_user_path(user)
-          %td= user.admin? ? Spina::User.human_attribute_name(:admin) : Spina::User.human_attribute_name(:user)
-          %td
-            - if user.last_logged_in.present?
-              = time_ago_in_words(user.last_logged_in) + " #{t('spina.ago')}"
-          %td
-            = link_to spina.edit_admin_user_path(user), class: 'button button-small' do
-              = icon('pencil-outline')
-              = t('spina.edit')
+          %th= Spina::User.human_attribute_name :name
+          %th= Spina::User.human_attribute_name :role
+          %th= Spina::User.human_attribute_name :last_logged_in
+          %th
+
+      %tbody
+        - @users.each do |user|
+          %tr
+            %td= link_to user, spina.edit_admin_user_path(user)
+            %td= user.admin? ? Spina::User.human_attribute_name(:admin) : Spina::User.human_attribute_name(:user)
+            %td
+              - if user.last_logged_in.present?
+                = time_ago_in_words(user.last_logged_in) + " #{t('spina.ago')}"
+            %td.align-right
+              = link_to spina.edit_admin_user_path(user), class: 'button button-small button-link' do
+                = icon('pencil-outline')
+                = t('spina.edit')

data/config/initializers/assets.rb

@@ -1 +1 @@
-Rails.application.config.assets.precompile += %w(spina/spina.png spina/admin/spina.png)
+Rails.application.config.assets.precompile += %w(spina/spina.png spina/admin/spina.png spina/spina_small.png)

data/config/locales/de.yml

@@ -96,6 +96,10 @@ de:
       insert: 'Dokument einfügen'
       insert_multiple: 'Dokumente einfügen'
 
+    media_library:
+      photos: Bilder
+      attachments: Dokumente
+
   activerecord:
     models:
       spina/page:

data/config/locales/en.yml

@@ -13,6 +13,7 @@ en:
     ago: ago
     edit_website: Edit your website
     logout: Logout
+    main_menu: Main menu
 
     modal:
       agree: "Yes, I'm sure"
@@ -89,7 +90,7 @@ en:
       social_media: Social media
       social_media_description: Facebook and Twitter accounts
       social_media_save: Save social media
-      analytics: Analytics and search engines
+      analytics: Analytics and search
       analytics_description: Link your account with for real-time analytics
       analytics_save: Save preferences
       domain_name_settings: Domain settings
@@ -99,6 +100,10 @@ en:
       insert: 'Insert document'
       insert_multiple: 'Insert documents'
 
+    media_library:
+      photos: Images
+      attachments: Documents
+
   activerecord:
     models:
       spina/page:

data/config/locales/es.yml

@@ -96,6 +96,10 @@ es:
       insert: 'Insertar documento'
       insert_multiple: 'Insertar documentos'
 
+    media_library:
+      photos: Imágenes
+      attachments: Documentos
+
   activerecord:
     models:
       spina/page:

data/config/locales/fr.yml

@@ -92,6 +92,10 @@ fr:
       insert: 'Insérer un document'
       insert_multiple: 'Insérer des documents'
 
+    media_library:
+      photos: Images
+      attachments: Documents
+
   activerecord:
     models:
       spina/page:

data/config/locales/it.yml

@@ -96,6 +96,10 @@ it:
       insert: 'Inserisci documento'
       insert_multiple: 'Inserisci documenti'
 
+    media_library:
+      photos: Immagini
+      attachments: Documenti
+
   activerecord:
     models:
       spina/page:

data/config/locales/nl.yml

@@ -1,4 +1,7 @@
 nl:
+  languages:
+    nl: Nederlands
+    en: Engels
   spina:
     cancel: Annuleren
     close: Sluiten
@@ -13,6 +16,7 @@ nl:
     ago: geleden
     edit_website: Bewerk je website
     logout: Uitloggen
+    main_menu: Hoofdmenu
 
     modal:
       agree: "Ja, dat weet ik zeker"
@@ -96,6 +100,10 @@ nl:
       insert: 'Document toevoegen'
       insert_multiple: 'Documenten toevoegen'
 
+    media_library:
+      photos: Afbeeldingen
+      attachments: Documenten
+
   activerecord:
     models:
       spina/page: