effective_resources 0.7.11 → 0.7.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e44162d953de99661aac288c2e8669aa08a5087
-  data.tar.gz: 596ef36a05b5da9e203b63ca8d7238f07adc8d7f
+  metadata.gz: 9a6b2c73dd66b692135a690dc812d2dba68b4597
+  data.tar.gz: 16f8e2a01244f8b050a803199aec7133babfa717
 SHA512:
-  metadata.gz: 43c8affec3f9c374ce8b360ca99af890f4ae15396f2fa0c9a4a7129ac707056e56b21a121dbdea040721f1c5519821fe003b49c13570c102ca7dd476b16fffd3
-  data.tar.gz: c349c0453fb2839f3c38ccad102dc247cdac31dae701c1ed3c8359a02c13d784e3ce2d42b995bf62802d2eaca76003dcbe84668319390b1b7e65068b83b21ab7
+  metadata.gz: bb8cf1b6bf38f2e8bb5648ff8e7853236925f362631bfcea009839d5e2a8f32e849b1040a514fac477c08190791edbfb1db1aed53e317045927836905b4b1de1
+  data.tar.gz: f12eb117c2ed212cae9a7335c57d92100c1828dcee1f736e3fe0eb8a5151645b028d7240c84721588a0a061bdd9adc90cb1a25458d2304f4a6c81bc394f737a6

data/app/controllers/concerns/effective/crud_controller.rb

@@ -9,11 +9,15 @@ module Effective
         end
 
         def _default_member_actions
-          {
-            'Save' => { action: :save, data: { disable_with: 'Saving...' }},
-            'Continue' => { action: :save, data: { disable_with: 'Saving...' }},
-            'Add New' => { action: :save, data: { disable_with: 'Saving...' }}
-          }
+          if defined?(EffectiveBootstrap)
+            { 'Save': { action: :save }, 'Continue': { action: :save }, 'Add New': { action: :save } }
+          else
+            {
+              'Save' => { action: :save, data: { disable_with: 'Saving...' }},
+              'Continue' => { action: :save, data: { disable_with: 'Saving...' }},
+              'Add New' => { action: :save, data: { disable_with: 'Saving...' }}
+            }
+          end
         end
       end
 

data/app/helpers/effective_resources_helper.rb

@@ -1,17 +1,51 @@
 module EffectiveResourcesHelper
 
-  def simple_form_submit(form, options = {}, &block)
+  def effective_submit(form, options = {}, &block) # effective_bootstrap
     resource = (@_effective_resource || Effective::Resource.new(controller_path))
 
     # Apply btn-primary to the first item, only if the class isn't already present
     actions = if controller.respond_to?(:member_actions_for)
       controller.member_actions_for(form.object).transform_values.with_index do |opts, index|
-        if opts[:class].present?
-          opts
-        else
-          opts[:class] = "btn #{index == 0 ? 'btn-primary' : 'btn-default'}"
+        opts[:class] = "btn #{index == 0 ? 'btn-primary' : 'btn-secondary'}" if opts[:class].blank?
+        opts
+      end
+    else
+      {}.tap do |actions|
+        actions['Save'] = { class: 'btn btn-primary' }
+
+        if resource.action_path(:index) && EffectiveResources.authorized?(controller, :index, resource.klass)
+          actions['Continue'] = { class: 'btn btn-secondary' }
         end
 
+        if resource.action_path(:new) && EffectiveResources.authorized?(controller, :new, resource.klass)
+          actions['Add New'] = { class: 'btn btn-secondary' }
+        end
+      end
+    end
+
+    wrapper = (form.layout == :horizontal) ? { class: 'form-group form-actions row' } : { class: 'form-group form-actions' }
+
+    content_tag(:div, wrapper) do
+      buttons = actions.group_by { |_, opts| opts[:class] }.flat_map do |_, grouped|
+        grouped.map { |name, opts| form.save(name, opts) } + ['']
+      end
+
+      if block_given?
+        buttons = [capture(&block), ''] + buttons
+      end
+
+      ([icon('spinner'), '', ''] + buttons).join(' ').html_safe
+    end
+  end
+
+  # effective_form_inputs
+  def simple_form_submit(form, options = {}, &block)
+    resource = (@_effective_resource || Effective::Resource.new(controller_path))
+
+    # Apply btn-primary to the first item, only if the class isn't already present
+    actions = if controller.respond_to?(:member_actions_for)
+      controller.member_actions_for(form.object).transform_values.with_index do |opts, index|
+        opts[:class] = "btn #{index == 0 ? 'btn-primary' : 'btn-default'}" if opts[:class].blank?
         opts
       end
     else

data/app/views/application/edit.html.haml

@@ -3,9 +3,9 @@
 
 - if @resource
   .row
-    .col-xs-8
+    .col-8
       %h1= @page_title
-    .col-xs-4.text-right
+    .col-4.text-right
       - resource.member_post_actions.each do |action|
         - if EffectiveResources.authorized?(controller, action, @resource) && (path = resource.action_path(action, @resource)).present?
           = link_to action.to_s.titleize, path, class: 'btn btn-sm btn-primary', data: { confirm: "Really #{action} #{@resource}?", method: :post }

data/app/views/application/index.html.haml

@@ -1,9 +1,9 @@
 - resource = (@_effective_resource || Effective::Resource.new(controller_path))
 
 .row
-  .col-xs-8
+  .col-8
     %h1= @page_title
-  .col-xs-4.text-right
+  .col-4.text-right
     - if EffectiveResources.authorized?(controller, :new, resource.klass) && (path = resource.action_path(:new)).present?
       = link_to "New #{resource.human_name.titleize}", path, class: 'btn btn-primary'
 

data/app/views/application/new.html.haml

@@ -3,7 +3,7 @@
 
 - if @resource
   .row
-    .col-xs-8
+    .col-8
       %h1= @page_title
 
   = render_resource_form(resource)

data/app/views/application/show.html.haml

@@ -3,9 +3,9 @@
 
 - if @resource
   .row
-    .col-xs-8
+    .col-8
       %h1= @page_title
-    .col-xs-4.text-right
+    .col-4.text-right
       - resource.member_post_actions.each do |action|
         - if EffectiveResources.authorized?(controller, action, @resource) && (path = resource.action_path(action, @resource)).present?
           = link_to action.to_s.titleize, path, class: 'btn btn-sm btn-primary', data: { confirm: "Really #{action} #{@resource}?", method: :post }

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '0.7.11'.freeze
+  VERSION = '0.7.12'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 0.7.11
+  version: 0.7.12
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-20 00:00:00.000000000 Z
+date: 2018-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails