spina 0.10.0 → 0.11.0

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

@@ -2,7 +2,7 @@
   = f.object.title
 .horizontal-form-content
   = 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
+    .placeholder
       %span.button.button-small.button-round
         %i.icon.icon-dots
         =t 'spina.pages.photo_picker'

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

@@ -13,7 +13,7 @@
 
       = f.fields_for :page_partable do |ff|
         - ff.object.page_part = f.object
-        = link_to_add_fields ff, :structure_items do
+        = link_to_add_structure_item_fields ff, :structure_items do
           = icon('plus')
 
     .structure-form-content

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

@@ -1,4 +1,14 @@
-= form_for [spina, :admin, @page], multipart: true, html: {autocomplete: "off"} do |f|
+- if @page.errors.any?
+  - content_for :notifications do
+    .notification.notification-danger.animated.fadeInRight
+      = icon('exclamation')
+      .notification-message
+        =t 'spina.notifications.alert'
+        %small= @page.errors.full_messages.join('<br />').html_safe
+      = link_to '#', data: {close_notification: true} do
+        = icon('cross')
+
+= form_for [spina, :admin, @page], html: {id: 'page_form', autocomplete: "off", data: {remote: @page.persisted?}} do |f|
   %header#header
     .breadcrumbs= render_breadcrumbs separator: '<div class="divider"></div>'
     - unless @page.new_record?
@@ -14,7 +24,7 @@
                 = 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'}
+      %button.button.button-primary{type: 'submit', style: 'margin-right: 0', data: {disable_with: t('spina.pages.saving')}}
         = icon('check')
         =t 'spina.pages.save'
 
@@ -26,9 +36,6 @@
 
   = hidden_field_tag :locale, @locale
 
-  - content_for :notification_alert do
-    = error_explanation!(@page)
-
   - Globalize.with_locale(@locale) do
     - @tabs.each do |tab|
       = render "spina/admin/pages/form_#{tab}", f: f

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

@@ -1,20 +1,14 @@
-%li.dd-item{data: {id: page.id}}
-  %div.dd-item-inner
-    = link_to spina.edit_admin_page_path(page), class: 'button button-link button-small sortable-link' do
-      = page.menu_title
-      - if page.draft?
-        %small (#{t('spina.pages.concept')})
-      - elsif !page.show_in_menu?
-        %small (#{t('spina.pages.show_in_menu')})
+= link_to spina.edit_admin_page_path(page), class: 'button button-link button-small sortable-link' do
+  = page.menu_title
+  - if page.draft?
+    %small (#{t('spina.pages.concept')})
+  - elsif !page.show_in_menu?
+    %small (#{t('spina.pages.show_in_menu')})
 
-      - if page.skip_to_first_child
-        %small (#{raw t('spina.pages.skip_to_first_child')})
+  - if page.skip_to_first_child
+    %small (#{raw t('spina.pages.skip_to_first_child')})
 
-    %span.pull-right
-      = link_to spina.edit_admin_page_path(page), class: 'button button-small button-link dd-nodrag' do
-        = icon('pencil-outline')
-        = t('spina.edit')
-
-  - if page.children.active.present?
-    %ol.dd-list
-      = render partial: 'page', collection: page.children.active.sorted
+%span.pull-right
+  = link_to spina.edit_admin_page_path(page), class: 'button button-small button-link dd-nodrag' do
+    = icon('pencil-outline')
+    = t('spina.edit')

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

@@ -0,0 +1,7 @@
+%li.dd-item{data: {id: page_nested_list.id}}
+  %div.dd-item-inner
+    = render partial: 'page', object: page_nested_list
+
+  - if page_nested_list.children.active.present?
+    %ol.dd-list
+      = render partial: 'page_nested_list', collection: page_nested_list.children.active.sorted

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

@@ -1,53 +1,35 @@
-- content_for(:permanent_notice) do
-  - unless current_account.robots_allowed?
-    .permanent-notice.permanent-notice-info
-      = icon('search')
-      %p
-        =t 'spina.pages.invisible_to_search_engines'
-        %small=t 'spina.pages.invisible_to_search_engines_description'
-
-%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')
-
-    %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')
-
-      .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')
+- content_for(:header_actions) do
+  %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')
+
+    .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{class: ('active' if index == 0), id: "slide-#{template[1].parameterize}"}
-            %p= template[2]
+          .slide-title{class: ('active' if index == 0), data: {target: "#slide-#{template[0].parameterize}"}}= template[1]
 
-            %p.muted= template[3]
+        %a.next.icon-only{href: '#'}
+          = icon('chevron-right')
 
-            .slide-dots
-              - current_theme.new_page_templates.each_with_index do |template2, index2|
-                .slide-dot{class: ('active' if index2 == index)}
+      - current_theme.new_page_templates.each_with_index do |template, index|
+        .slide{class: ('active' if index == 0), id: "slide-#{template[0].parameterize}"}
+          %p= template[2]
 
-            = 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])
+          %p.muted= template[3]
 
-  .breadcrumbs= render_breadcrumbs seperator: '<div class="divider"></div>'
+          .slide-dots
+            - current_theme.new_page_templates.each_with_index do |template2, index2|
+              .slide-dot{class: ('active' if index2 == index)}
 
-.filters
-  
+          = 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])
 
 .well
   .dd#pages_list{data: {:"sort-url" => spina.sort_admin_pages_url }}
     %ol.dd-list
-      = render partial: 'page', collection: @pages.roots
+      = render partial: 'page_nested_list', collection: @pages.roots

data/app/views/spina/admin/pages/update.js.coffee

@@ -1,3 +1 @@
-button = $('form button[type=submit].button-saving')
-button.removeClass('button-saving')
-button.attr("data-icon", "o")
+$('#header .breadcrumbs').html("<%=j render_breadcrumbs separator: '<div class="divider"></div>' %>")

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

@@ -2,4 +2,6 @@
   .overlay
     = 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')
+  = radio_button_tag :photo_id, photo.id
+  = check_box_tag 'photo_ids[]', photo.id
   = image_tag photo.file.thumb.url, id: "photo_#{photo.id}"

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

@@ -4,7 +4,7 @@
       .item.item-small.item-uploader
         = 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}
+          = f.file_field :files, multiple: true, 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

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

@@ -4,7 +4,7 @@
       .item.item-small.item-uploader
         = 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}
+          = f.file_field :files, multiple: true, 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
@@ -12,5 +12,5 @@
         .infinite-scroll
           = render partial: 'spina/admin/photos/photo_single_picker', collection: @photos
 
-        .infinite-pagination= link_to_next_page @photos, 'Next', params: params.slice(:selected_photo_id), remote: true
+        .infinite-pagination= link_to_next_page @photos, 'Next', params: params.slice(:selected_photo_id).permit(:selected_photo_id), remote: true
 

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

@@ -4,7 +4,7 @@
       .item.item-uploader
         = 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}
+          = f.file_field :files, multiple: true, data: {customfileinput: true}
 
       = form_tag spina.wysihtml5_insert_admin_photos_path(params[:object_id]), remote: true, class: 'gallery-prepend-image' do
         .infinite-scroll

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

@@ -0,0 +1,4 @@
+<% @photos.each do |photo| %>
+  $item = $("<%=j render partial: 'spina/admin/photos/photo', object: photo %>");
+  $(".gallery-prepend-image .infinite-scroll").prepend($item);
+<% end %>

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

@@ -4,7 +4,7 @@
       = 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}
+        = f.file_field :files, multiple: true, data: {customfileinput: true}
 
     .gallery-prepend-image
       .infinite-scroll

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: params.slice(:selected_photo_id), remote: true %>").infiniteScroll()
+$('.infinite-pagination').html("<%= j link_to_next_page @photos, 'Next', params: params.slice(:selected_photo_id).permit(:selected_photo_id), remote: true %>").infiniteScroll()
 

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

@@ -1,9 +1,12 @@
 = form_tag spina.admin_sessions_path, id: "login_wrapper" do
-  = image_tag 'spina/admin/spina.png'
+  = image_tag 'spina/admin/spina.png', class: 'animated fadeInDown'
   - if flash[:alert].present?
-    .notification.notification-danger
+    .failed-to-login.animated.fadeInDown
       .icon.icon-cross
       = flash[:alert]
-  = text_field_tag :email, params[:email], placeholder: Spina::User.human_attribute_name(:email), autofocus: true
-  = password_field_tag :password, nil, placeholder: Spina::User.human_attribute_name(:password)
-  = button_tag t('spina.login'), class: 'button button-primary', data: {icon: '3'}
+
+  .login-fields
+    = text_field_tag :email, params[:email], placeholder: Spina::User.human_attribute_name(:email), autofocus: true, class: "animated fadeInDown"
+    = password_field_tag :password, nil, placeholder: Spina::User.human_attribute_name(:password), class: "animated fadeInDown"
+
+  = button_tag t('spina.login'), class: 'button button-primary animated fadeInDown', data: {icon: '3'}

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

@@ -24,4 +24,6 @@
         = flash[:success].html_safe
         %small= flash[:success_small].try(:html_safe)
       = link_to '#', data: {close_notification: true} do
-        = icon('cross')
+        = icon('cross')
+
+  = yield(:notifications) if content_for?(:notifications)

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

@@ -1,13 +1,13 @@
-%nav#primary.transformed
+%nav#primary.transformed{data: {turbolinks_permanent: true}}
   %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)}
+    %li{class: ('active' if (%w[pages photos attachments navigations] + 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'))}
+        %li{class: ('active' if current_admin_path.start_with?('/pages') || current_admin_path.start_with?('/navigations'))}
           = 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
@@ -57,3 +57,4 @@
     %li.bottom
       = link_to spina.admin_logout_path, data: {turbolinks: false} do
         = icon('power-off')
+        =t 'spina.logout'

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

@@ -1,34 +1,34 @@
 - 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" }}
+
+%trix-toolbar.clearfix{ id: "#{object_id}_toolbar", data: { trix_editor_id: "#{object_id}_editor" }}
   .button-groups
     .button-group.pull-left
-      %button.button.button-small{ type: 'button', tabindex: -1, title: 'Bold', data: { attribute: 'bold', key: 'b' }}
+      %button.button.button-small{ type: 'button', tabindex: -1, title: 'Bold', data: { trix_attribute: 'bold', trix_key: 'b' }}
         .icon.icon-bold
-      %button.button.button-small{ type: 'button', tabindex: -1, title: 'Italic', data: { attribute: 'italic', key: 'i' }}
+      %button.button.button-small{ type: 'button', tabindex: -1, title: 'Italic', data: { trix_attribute: 'italic', trix_key: 'i' }}
         .icon.icon-italic
-      %button.button.button-small{ type: 'button', tabindex: -1, title: 'Bullets', data: { attribute: 'bullet' }}
+      %button.button.button-small{ type: 'button', tabindex: -1, title: 'Bullets', data: { trix_attribute: 'bullet' }}
         .icon.icon-list-ul
-      %button.button.button-small{ type: 'button', tabindex: -1, title: 'Link', data: { action: 'link', attribute: 'href', key: 'k' }}
+      %button.button.button-small{ type: 'button', tabindex: -1, title: 'Link', data: { trix_action: 'link', trix_attribute: 'href', trix_key: 'k' }}
         .icon.icon-link
-      %button.button.button-small.js-trix-photo{ type: 'button', tabindex: -1, title: 'Photo', data: { action: 'photo', attribute: 'photo' }}
+      %button.button.button-small.js-trix-photo{ type: 'button', tabindex: -1, title: 'Photo', data: { trix_action: 'photo', trix_attribute: 'photo' }}
         .icon.icon-picture-o
 
     .button-group.pull-left
-      %button.button.button-small{ type: 'button', tabindex: -1, title: 'h1', data: { attribute: 'h1' }} H1
-      %button.button.button-small{ type: 'button', tabindex: -1, title: 'h2', data: { attribute: 'h2' }} H2
-      %button.button.button-small{ type: 'button', tabindex: -1, title: 'h3', data: { attribute: 'h3' }} H3
-      %button.button.button-small{ type: 'button', tabindex: -1, title: 'h4', data: { attribute: 'h4' }} H4
-
-      -# %button.button.button-small{ type: 'button', tabindex: -1, title: 'Numbers', data: { attribute: 'number' }}
-      -#   .icon.icon-list-ul
+      %button.button.button-small{ type: 'button', tabindex: -1, title: 'h1', data: { trix_attribute: 'heading1' }} H1
+      %button.button.button-small{ type: 'button', tabindex: -1, title: 'h1', data: { trix_attribute: 'heading2' }} H2
+      %button.button.button-small{ type: 'button', tabindex: -1, title: 'h2', data: { trix_attribute: 'heading3' }} H3
+      %button.button.button-small{ type: 'button', tabindex: -1, title: 'h3', data: { trix_attribute: 'heading4' }} H4
+      %button.button.button-small{ type: 'button', tabindex: -1, title: 'h4', data: { trix_attribute: 'heading5' }} H5
+      %button.button.button-small{ type: 'button', tabindex: -1, title: 'h5', data: { trix_attribute: 'heading6' }} H6
 
   .dialogs
-    .dialog.link_dialog{ data: { attribute: 'href', dialog: 'href'}}
+    .dialog.link_dialog{ data: { trix_attribute: 'href', trix_dialog: 'href'}}
       .link_url_fields
         %input{type: 'text', name: 'href', placeholder: 'Enter a URL…', required: true}
         .button-group
-          %input.button{type: 'button', tabindex: -1, value: 'Link', data: { method: 'setAttribute'}}
-          %input.button{type: 'button', tabindex: -1, value: 'Unlink', data: { method: 'removeAttribute'}}
+          %input.button{type: 'button', tabindex: -1, value: 'Link', data: { trix_method: 'setAttribute'}}
+          %input.button{type: 'button', tabindex: -1, value: 'Unlink', data: { trix_method: 'removeAttribute'}}
 
 %trix-editor.text-input{input: "#{object_id}_input", toolbar: "#{object_id}_toolbar", id: "#{object_id}_editor"}

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

@@ -1,16 +1,15 @@
 .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"
+  / Structure parts
+  = f.fields_for :structure_parts, build_structure_parts(f.object.structure.try(:page_part).try(:name), f.object) do |ff|
+    .structure-form-part
+      = render "spina/admin/structure_partables/#{ partable_type_partial_namespace(ff.object.structure_partable_type) }/form", f: ff
 
-  / 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
 
+  / Hidden field
+  = f.hidden_field :position, placeholder: "Position", class: "structure_form_pane_#{f.object.id}_position"
   = f.hidden_field :_destroy
-  = link_to t('spina.delete'), '#', class: 'remove-structure-item-fields button button-mini button-link pull-right'
-
+  = link_to t('spina.delete'), '#', class: 'remove_structure_item_fields button button-mini button-link pull-right'

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

@@ -0,0 +1,14 @@
+.horizontal-form-label
+  = f.object.title
+.horizontal-form-content
+  = f.fields_for :structure_partable, f.object.structure_partable do |ff|
+    = 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{data: {icon: 'U'}}=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/structure_partables/photos/_form.html.haml

@@ -1,5 +1,5 @@
 = 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
+  .placeholder
     %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?
     .image

data/app/views/spina/shared/_google_site_verification.html.haml

@@ -0,0 +1 @@
+%meta{ name: 'google-site-verification' , content: current_account.google_site_verification  }

data/config/fontcustom.yml

@@ -0,0 +1,95 @@
+# =============================================================================
+# Font Custom Configuration
+#   This file should live in the directory where you run `fontcustom compile`.
+#   For more info, visit <https://github.com/FontCustom/fontcustom>.
+# =============================================================================
+
+
+# -----------------------------------------------------------------------------
+# Project Info
+# -----------------------------------------------------------------------------
+
+# The font's name. Also determines the file names of generated templates.
+font_name: ics_spina
+
+# Format of CSS selectors. {{glyph}} is substituted for the glyph name.
+css_selector: .icon-{{glyph}}
+
+# Generate fonts without asset-busting hashes.
+no_hash: true
+
+# Encode WOFF fonts into the generated CSS.
+#base64: true
+
+# Forces compilation, even if inputs have not changed
+#force: true
+
+# Display (possibly useful) debugging messages.
+#debug: true
+
+# Hide status messages.
+#quiet: true
+
+
+# -----------------------------------------------------------------------------
+# Input / Output Locations
+#   You can save generated fonts, CSS, and other files to different locations
+#   here. Font Custom can also read input vectors and templates from different
+#   places.
+#
+#   NOTE:
+#   - Be sure to preserve the whitespace in these YAML hashes.
+#   - INPUT[:vectors] and OUTPUT[:fonts] are required. Everything else is
+#     optional.
+#   - Specify output locations for custom templates by including their file
+#     names as the key.
+# -----------------------------------------------------------------------------
+
+input:
+ vectors: app/assets/icons/spina
+ templates: lib/spina/fontcustom
+
+output:
+ fonts: app/assets/fonts/spina
+ css: app/assets/stylesheets/spina
+ preview: app/assets/icons/spina/preview
+
+
+# -----------------------------------------------------------------------------
+# Templates
+#   A YAML array of templates and files to generate alongside fonts. Custom
+#   templates should be saved in the INPUT[:templates] directory and referenced
+#   by their base file name.
+#
+#   For Rails and Compass templates, set `preprocessor_path` as the relative
+#   path from OUTPUT[:css] to OUTPUT[:fonts]. By default, these are the same
+#   directory.
+#
+#   Included in Font Custom: preview, css, scss, scss-rails
+#   Default: css, preview
+# -----------------------------------------------------------------------------
+
+templates:
+  - _ics_spina.scss
+  - preview
+#- my-custom-template.yml
+
+#preprocessor_path: ../fonts/
+
+
+# -----------------------------------------------------------------------------
+# Font Settings (defaults shown)
+# -----------------------------------------------------------------------------
+
+# Size (in pica points) for which your font is designed.
+font_design_size: 32
+
+# The em size. Setting this will scale the entire font to the given size.
+#font_em: 512
+
+# The font's ascent and descent. Used to calculate the baseline.
+#font_ascent: 448
+#font_descent: 64
+
+# Horizontally fit glyphs to their individual vector widths.
+#autowidth: false

data/config/locales/en.yml

@@ -4,6 +4,7 @@ en:
     close: Close
     choose_from_library: Choose from library
     edit: Edit
+    save: Save
     delete: Delete
     permanently_delete: Permanently delete
     delete_confirmation: "Are you sure you want to delete <strong>%{subject}</strong>?"
@@ -28,6 +29,7 @@ en:
     website:
       title: Your website
       pages: Pages
+      all_pages: All pages
       pages_description: "All pages on your website"
       media_library: Media library
       media_library_description: "Here's where you'll find all of your images and documents"
@@ -54,6 +56,7 @@ en:
       invisible_to_search_engines_description: Go to your preferences to activate search engines.
       rebuild_materialized_path: Rebuild materialized path
       materialize_path_confirmation: "Are you sure you want to rebuild the path for this page?"
+      saving: Saving...
 
     users:
       new: New user
@@ -68,6 +71,7 @@ en:
       insert_photo: Insert image
       link: "URL of your image:"
       cannot_be_created: "Image could not be processed:"
+      upload_image: "Upload an image"
 
     wysiwyg:
       paragraph: Paragraph
@@ -168,6 +172,13 @@ en:
         ancestry: Parent page
         no_parent: No parent
 
+      spina/navigation:
+        label: Label
+        auto_add_pages: Automatically add pages
+        auto_add_pages_description: New pages are added automatically to this navigation
+        pages: Pages
+        pages_description: Select the pages you want to use in this navigation
+
       spina/user:
         email: Email
         password: Password

data/config/locales/nl.yml

@@ -7,6 +7,7 @@ nl:
     close: Sluiten
     choose_from_library: Kies uit bibliotheek
     edit: Bewerken
+    save: Opslaan
     delete: Verwijderen
     permanently_delete: Definitief verwijderen
     delete_confirmation: "Weet je zeker dat je <strong>%{subject}</strong> wilt verwijderen?"
@@ -30,6 +31,7 @@ nl:
 
     website:
       title: Je website
+      all_pages: Alle pagina's
       pages: Pagina's
       pages_description: "Alle pagina's op je website"
       media_library: Mediabibliotheek
@@ -55,6 +57,7 @@ nl:
       skip_to_first_child: doorsturen naar 1<sup>e</sup> subpagina
       invisible_to_search_engines: Je website is niet zichtbaar voor zoekmachines
       invisible_to_search_engines_description: Bij voorkeuren voor Statistieken en zoekmachines kun je dit activeren.
+      saving: <i></i> Opslaan...
 
     users:
       new: Nieuwe gebruiker
@@ -90,7 +93,7 @@ nl:
       social_media: Social media
       social_media_description: Facebook en Twitter accounts
       social_media_save: Social media opslaan
-      analytics: Statistieken en zoekmachines
+      analytics: Google Analytics
       analytics_description: Koppel je account voor real-time statistieken
       analytics_save: Voorkeuren opslaan
       domain_name_settings: Eigen domein instellen
@@ -133,9 +136,9 @@ nl:
         vat_identifier_description: Het is verplicht je BTW-nummer te vermelden op je website
         theme: Layout website
         logo: Logo
-        google_analytics: Google Analytics
+        google_analytics: Universal Analytics Code
         google_site_verification: Google Site Verification
-        robots_allowed: Zichtbaar in zoekmachines
+        robots_allowed: Zichtbaar in Google
         facebook: Facebook
         twitter: Twitter
         google_plus: Google+
@@ -163,6 +166,13 @@ nl:
         menu_title_placeholder: Leeglaten om de titel van de pagina over te nemen
         view_template: Pagina template
 
+      spina/navigation:
+        label: Label
+        auto_add_pages: Automatisch aanvullen
+        auto_add_pages_description:  Nieuwe pagina's worden automatisch toegevoegd aan deze navigatie
+        pages: Pagina's
+        pages_description: Selecteer de pagina's die in deze navigatie getoond worden
+
       spina/user:
         email: Emailadres
         password: Wachtwoord