spina 0.6.16 → 0.6.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 921a495803f0220e82838991263a22edf0e391c6
-  data.tar.gz: 78523bbac59d0fbb7250dba158fa4aa72e168b91
+  metadata.gz: 93a9f66ee903d30b1b01331c77e9d613641e0e2a
+  data.tar.gz: 01215c66d9fb6bdda7244a6c097e0713f242c4b7
 SHA512:
-  metadata.gz: 14c8593dd72c1c05d0a793a9433b3df2919457f07f5a5175c8553fc126d13a4b080161cc2cbeab1cf26ca193fd89aee2c3559dec62addd54184a58138542bfa2
-  data.tar.gz: 0540c12b678c8739b2d9b8fe999497bf71f372a05767ca25d3edabc7e0519d15a95ec269e1640a53899ef0b9ae8121293cd26ef9811ae5f4905aaf410c2e76e2
+  metadata.gz: c2e69c22f452d07b824a6934921db792d3714d3b45629202d4809695d2da70762aa436816ddde8cc14cfc60476ab53403a1b8706717c160ff73567220d6b2aae
+  data.tar.gz: 3182392e3123bfff9f7335e9cbc3f1ae37d041460f07bc31b2bbb3590515a6904d09c77a62276536b5daed9d1e23e011cf7864205b962ddffd8029652978eb78

data/app/assets/javascripts/spina/admin/pages.js.coffee

@@ -45,7 +45,7 @@ $(document).on 'click', 'form .add_structure', (event) ->
   time = new Date().getTime()
   regexp = new RegExp($(this).data('id'), 'g')
   $fields = $($(this).data('fields').replace(regexp, time))
-  $(this).before($fields)
+  $structureForm.find('.structure-form-content').append($fields)
 
   $link = $("<li><a href='#structure_form_pane_#{time}'><i data-icon='7'></i> </a></li>")
 
@@ -59,8 +59,11 @@ $(document).on 'click', 'form .add_structure', (event) ->
 $(document).on 'click', 'form .remove-structure-item-fields', (event) ->
   $(this).prev('input[type=hidden]').val('1')
   $pane = $(this).closest('.structure-form-pane')
-  console.log $pane.attr('id')
-  $("a[href='##{$pane.attr('id')}']").parents('li').hide()
+  $link = $("a[href='##{$pane.attr('id')}']").parents('li')
+  $previousLink = $link.siblings('li:visible')
+
+  $previousLink.find('a').trigger('click')
+  $link.hide()
   $pane.hide()
   event.preventDefault()
 

data/app/helpers/spina/admin/pages_helper.rb

@@ -5,26 +5,26 @@ module Spina
         new_object = f.object.send(association).klass.new
         id = new_object.object_id
         fields = f.fields_for(association, new_object, child_index: id) do |builder|
+          build_structure_parts(f.object.page_part.name, new_object) if structure_item?(new_object)
           render(association.to_s.singularize + "_fields", f: builder)
         end
-        link_to '#', class: "add_fields button", data: {id: id, fields: fields.gsub("\n", "")} do
+        link_to '#', class: "#{add_fields_class(new_object)} button button-link", data: {id: id, fields: fields.gsub("\n", "")} do
           block.yield
         end
       end
 
-      def link_to_add_structure(f, association, &block)
-        new_object = f.object.send(association).klass.new
-        id = new_object.object_id
-        fields = f.fields_for(association, new_object, child_index: id) do |builder|
-          current_theme.config.structures[f.object.page_part.name].each do |structure_part|
-            structure_part = new_object.structure_parts.build(structure_part)
-            structure_part.structure_partable = structure_part.structure_partable_type.constantize.new
-          end
+      def add_fields_class(object)
+        structure_item?(object) ? 'add_structure' : 'add_fields'
+      end
 
-          render(association.to_s.singularize + "_fields", f: builder)
-        end
-        link_to '#', class: "add_structure button button-link", data: {id: id, fields: fields.gsub("\n", "")} do
-          block.yield
+      def structure_item?(object)
+        object.class.name.demodulize == "StructureItem"
+      end
+
+      def build_structure_parts(name, item)
+        current_theme.config.structures[name].each do |part|
+          part = item.structure_parts.build(part)
+          part.structure_partable = part.structure_partable_type.constantize.new
         end
       end
     end

data/app/views/spina/admin/page_partables/_structure_form.html.haml

@@ -9,18 +9,19 @@
       %label= structure_form.object.title
 
       %ul
-        - structure_form.object.page_partable.structure_items.sorted_by_structure.each do |structure_item|
-          %li{data: {structure_item_id: structure_item.id}}
+        - structure_form.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.sortable-handle{data: {icon: '7'}}
               = structure_item.structure_parts.first.try(:structure_partable).try(:content)
 
-    .structure-form-content
+
       = structure_form.fields_for :page_partable do |form|
         - form.object.page_part = structure_form.object
+        = link_to_add_fields form, :structure_items do
+          %i{data: {icon: 't'}}
 
+    .structure-form-content
+      = structure_form.fields_for :page_partable do |form|
         = form.fields_for :structure_items, form.object.structure_items.sorted_by_structure do |structure_item_form|
           = render 'structure_item_fields', f: structure_item_form
-
-        = link_to_add_structure form, :structure_items do
-          %i{data: {icon: 't'}}

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

@@ -1,4 +1,4 @@
-.structure-form-pane{id: "structure_form_pane_#{f.object.id}"}
+.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"
 

data/config/locales/nl.yml

@@ -54,6 +54,7 @@ nl:
       photos_picker: Foto's kiezen
       photo_picker: Foto kiezen
       delete_confirmation: "Weet je zeker dat je de pagina <strong>%{subject}</strong> wilt verwijderen?"
+      delete_structure_item_confirmation: "Weet je zeker dat je dit item wilt verwijderen?"
       save: Pagina opslaan
       concept: concept
       show_in_menu: onzichtbaar

data/lib/spina/version.rb

@@ -1,3 +1,3 @@
 module Spina
-  VERSION = "0.6.16"
+  VERSION = "0.6.17"
 end