adminsite 2.1.0 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4414c6e5ddcff6f365d1067c1dfffea46d58f5d3
-  data.tar.gz: f0a4d9e59cfdbf84a31854a32aefab5cb9695a99
+  metadata.gz: 7b3d294a019111f15b80a047d93e7150220447b1
+  data.tar.gz: 95b04287bc58eb4fad54eb2f4089da3c64faed6f
 SHA512:
-  metadata.gz: 2ed4ef7c1e9687290832b4a1419b386bdf22e9e18f4fdde288733fdb8acf812b3344d6e706c520f132e0c881d8799f0d79a7dc69c82d0918774c67100d2eebd8
-  data.tar.gz: ac586ac03e34133c5f7d537a946c8a7cd79ca1d9ed5244d483f587d05aa946755dbd1cf9e9cd63af372c227d5bad39f4b2505b9d3d6fdb952aaa1dca37929847
+  metadata.gz: 1756e777130a3f963ebf05ee01a24e4d5d269ba01560584ffd1d97573185471d94e3600718936b00013bb3e8ccb91c9fc2a9d9102b60ba30e48126bc1ce7a78f
+  data.tar.gz: f3a2157f68c0be9af4d100d5fa83a6a2f047aa552d6bda05e6528a2324f55a54d663263c98d5e89809c36e2a7d99c76d972fd7ff1b88ef4891287757ba4dbeb9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    adminsite (2.1.0)
+    adminsite (2.1.1)
       actionpack-page_caching
       codemirror-rails (>= 4.8)
       devise (~> 3.4)

data/app/assets/javascripts/adminsite/admin/inputs/multi_select_box_input.js.coffee

@@ -0,0 +1,53 @@
+class window.Adminsite.Inputs
+
+Adminsite.Inputs.prepareMultiSelectBoxSubmit = ->
+  form = $(this)
+  deselectAllOptions form.find('select.source')
+  selectAllOptions form.find('select.target')
+  return
+
+Adminsite.Inputs.addToTarget = (wrapper_id) ->
+  wrapper = $(wrapper_id)
+  source = wrapper.find('select.source')
+  target = wrapper.find('select.target')
+  SelectMoveRows(source, target)
+  return
+
+Adminsite.Inputs.removeFromTarget = (wrapper_id) ->
+  wrapper = $(wrapper_id)
+  source = wrapper.find('select.source')
+  target = wrapper.find('select.target')
+  SelectMoveRows(target, source)
+  return
+
+Adminsite.Inputs.moveUp = (select_id) ->
+  select = $(select_id)
+  $op = select.find('option:selected')
+  $op.first().prev().before($op) if $op.length
+  return
+
+Adminsite.Inputs.moveDown = (select_id) ->
+  select = $(select_id)
+  $op = select.find('option:selected')
+  $op.last().next().after($op) if $op.length
+  return
+
+deselectAllOptions = (select) ->
+  select.find('option').prop('selected', false);
+  return
+
+selectAllOptions = (select) ->
+  select.find('option').prop('selected', true);
+  return
+
+SelectMoveRows = (source, target) ->
+  $op = source.find('option:selected')
+  target.append($op)
+  return
+
+Adminsite.Inputs.initInputs =  ->
+  $('form').on('submit', Adminsite.Inputs.prepareMultiSelectBoxSubmit)
+  return
+
+$(document).on('page:change', Adminsite.Inputs.initInputs)
+

data/app/assets/stylesheets/adminsite/admin/base.scss

@@ -26,6 +26,12 @@ body.adminsite {
       background: #fff;
     }
   }
+  .left {
+    float: left;
+  }
+  .right {
+    float: right;
+  }
   #error {
     width: 340px;
     border: #990000 solid 1px;

data/app/assets/stylesheets/adminsite/admin/inputs/multi_select_box_input.scss

@@ -0,0 +1,24 @@
+li.multi_select_box.input {
+  > div {
+    float: left;
+  }
+  .operators {
+    padding: 10px;
+    .data-ops {
+      padding: 20px 0;
+      width: 100px;
+      border-bottom: 1px solid #ccc;
+      button {
+        width: 100%;
+      }
+    }
+    .order-ops {
+      padding: 20px 0;
+      width: 40px;
+      float: right;
+      button {
+        width: 100%;
+      }
+    }
+  }
+}

data/app/helpers/admin/adminsite_application_helper.rb

@@ -157,7 +157,7 @@ module Admin::AdminsiteApplicationHelper
   end
 
   def link_to_destroy(resource)
-    link_to image_tag('adminsite/admin/cross.png', :size => '16x16'), admin_resource_path(resource.id), :confirm => 'Are you sure?', :method => :delete
+    link_to image_tag('adminsite/admin/cross.png', :size => '16x16'), admin_resource_path(resource.id), data: { :confirm => 'Are you sure?'} , :method => :delete
   end
 
   def display_resource_value(resource, attr)
@@ -171,4 +171,15 @@ module Admin::AdminsiteApplicationHelper
     link_to resource.title, send("edit_admin_#{resource.class.name.underscore.gsub('/','_')}_path", resource.id, admin_menu: params[:admin_menu])
   end
 
+  def publish_form_input(form, form_input)
+    options = {}
+    if form_input.is_a?(Hash)
+      attr_name = form_input.keys.first
+      options = form_input[attr_name]
+    else
+      attr_name = form_input
+    end
+    form.input(attr_name, options).html_safe
+  end
+
 end

data/app/inputs/adminsite/multi_select_box_input.rb

@@ -0,0 +1,37 @@
+class Adminsite::MultiSelectBoxInput < Formtastic::Inputs::SelectInput
+  include ActionView::Helpers::FormTagHelper
+  include ActionView::Helpers::FormOptionsHelper
+  def to_html
+    # super
+    puts "this is my own version of Adminsite::MultiSelectBoxInput"
+    diff_collection = collection.reject{|k,v| builder.object.send(input_name).include?(k) }
+    input_wrapping do
+      label_html <<
+      raw("<div><span>Available #{(localized_label || humanized_method_name)}:</span><br/>") <<
+      select_tag(:collection, options_for_select(diff_collection), input_html_options.merge(:class => 'source', :name=> "#{object_name}[collection][]", :id=> collection_id)) <<
+      raw('</div>') <<
+      operators_html <<
+      raw("<div><span>Selected #{label_text}:</span><br/>") <<
+      builder.select(input_name, builder.object.send(input_name), input_options, input_html_options.merge(:class => 'target') ) <<
+      raw('</div>')
+    end.html_safe
+  end
+
+  def operators_html
+    raw('<div class="operators"><div class="data-ops">') <<
+    button_tag('Add',    type: 'button', onClick: "Adminsite.Inputs.addToTarget('##{wrapper_dom_id}'); false;" ) <<
+    button_tag('Remove', type: 'button', onClick: "Adminsite.Inputs.removeFromTarget('##{wrapper_dom_id}'); false;" ) <<
+    raw('</div><div class="order-ops">') <<
+    button_tag('&#8679;'.html_safe, type: 'button', onClick: "Adminsite.Inputs.moveUp('##{dom_id}'); false;" ) <<
+    button_tag('&#8681;'.html_safe, type: 'button', onClick: "Adminsite.Inputs.moveDown('##{dom_id}'); false;" ) <<
+    raw('</div></div>')
+  end
+
+  def collection_id
+    @collection_id ||= "#{object_name}_collection"
+  end
+
+  def multiple?
+    true
+  end
+end

data/app/views/adminsite/admin/resources/_form.haml

@@ -1,6 +1,3 @@
 = f.inputs do
-  - resource_admin_config.attributes_edit(@resource).each do |attr|
-    - if attr.is_a?(Hash)
-      = f.input attr.keys.first, attr.values.first
-    - else
-      = f.input attr
+  - resource_admin_config.attributes_edit(@resource).each do |form_input|
+    = publish_form_input(f, form_input)

data/lib/adminsite/version.rb

@@ -1,3 +1,3 @@
 module Adminsite
-  VERSION = "2.1.0" unless defined?(Adminsite::VERSION)
+  VERSION = "2.1.1" unless defined?(Adminsite::VERSION)
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: adminsite
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
 platform: ruby
 authors:
 - Robin Wunderlin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-16 00:00:00.000000000 Z
+date: 2015-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -257,9 +257,11 @@ files:
 - app/assets/javascripts/adminsite/admin.js.coffee
 - app/assets/javascripts/adminsite/admin/code_editor.js.coffee
 - app/assets/javascripts/adminsite/admin/hide_and_show.js.coffee
+- app/assets/javascripts/adminsite/admin/inputs/multi_select_box_input.js.coffee
 - app/assets/stylesheets/adminsite/admin.scss
 - app/assets/stylesheets/adminsite/admin/base.scss
 - app/assets/stylesheets/adminsite/admin/code_editor.scss
+- app/assets/stylesheets/adminsite/admin/inputs/multi_select_box_input.scss
 - app/assets/stylesheets/adminsite/admin/pagination.scss
 - app/controllers/adminsite/admin/adminsite_admin_users_controller.rb
 - app/controllers/adminsite/admin/adminsite_file_assets_controller.rb
@@ -274,6 +276,7 @@ files:
 - app/controllers/adminsite/contents_controller.rb
 - app/helpers/admin/adminsite_application_helper.rb
 - app/helpers/admin_application_helper.rb
+- app/inputs/adminsite/multi_select_box_input.rb
 - app/models/adminsite/admin_config/base.rb
 - app/models/adminsite/admin_user.rb
 - app/models/adminsite/file_asset.rb