ecm_contact2 1.2.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c23440fc43b67bc00dd39c3e0a60f67f5acb0fc3
-  data.tar.gz: 4e47b62549a121316d6517d10ce38af3aaa90b5e
+  metadata.gz: dbf4d3c03f8d9a8a628f7d1012859df59db32fd2
+  data.tar.gz: 4fb86a3cf6cac2af75b278f1001ba1b3921ebd92
 SHA512:
-  metadata.gz: 23fc92a4af8b89d07a854844271be2c3d070d277c7879a9bddd9c93ce8ef03e43e571d5c17d648b9bc442dfbf9dcce82905d29afc79528aabab734924c368b7a
-  data.tar.gz: 073f60bbe95f05de9c2cb686accceb9246d75ba7f16ab94602861e8cedb3a1c6fbfc36023dade968c486638fe317c5dbea4e2c159ed4d8314deec50ea509f876
+  metadata.gz: 80334f65c183a690bb4be09be1ee00fd608508bdf57e717ac07c374386eab92fc93a5118de1ee4b07d163eaea3365ece66fa3f504986acc8e12dc2ed275d0888
+  data.tar.gz: be9688352831f45a3628b7c5999fac53ba775be0904a602c816e2f4729f031ae0555dbefb466580f85f08d0ddd9d9ca34ef1ae1811a97d6969e079ff6f8e35e8

data/app/controllers/ecm/contact/requests_controller.rb

@@ -9,9 +9,15 @@ class Ecm::Contact::RequestsController < Ecm::Contact::Configuration.base_contro
     @contact_request = Ecm::Contact::Request.new(params[:ecm_contact_request])
 
     if @contact_request.deliver
-      redirect_to({ action: 'index' }, notice: -> { I18n.t('ecm.contact.form.messages.delivered') }.call)
+      redirect_to(after_create_url, notice: -> { I18n.t('ecm.contact.form.messages.delivered') }.call)
     else
       render :index
     end
   end
+
+  private
+
+  def after_create_url
+    Ecm::Contact::Configuration.after_create_url.call(self)
+  end
 end

data/app/helpers/ecm/contact_helper.rb

@@ -0,0 +1,19 @@
+module Ecm
+  module ContactHelper
+    def contact_form(options = {})
+      options.reverse_merge(form_target_url: nil)
+      form_target_url = options[:form_target_url]
+
+      form_tag_options = {}
+      form_tag_options[:url] = form_target_url if form_target_url.present?
+
+      @contact_request = Ecm::Contact::Request.new(params[:ecm_contact_request])
+
+      if params[:ecm_contact_request].present? && @contact_request.deliver
+        render 'ecm/contact/requests/form', form_tag_options: form_tag_options, notice: I18n.t('ecm.contact.form.messages.delivered')
+      else
+        render 'ecm/contact/requests/form', form_tag_options: form_tag_options
+      end
+    end
+  end
+end

data/app/views/ecm/contact/requests/_form.erb

@@ -1,4 +1,12 @@
-<%= simple_form_for(@contact_request) do |f| %>
+<% if notice %>
+  <div class="alert alert-success alert-dismissible">
+    <button type="button" class="close" data-dismiss="alert" aria-label="Close">
+      <span aria-hidden="true">&times;</span>
+    </button>
+    <%= notice %>
+  </div>
+<% end %>
+<%= simple_form_for(@contact_request, form_tag_options) do |f| %>
   <%= f.input :nickname, :input_html => { :style => 'display:none' }, :label_html => { :style => 'display:none' } %>
   <%= f.input :name, :input_html => { :class => Ecm::Contact::Configuration.input_name_css_classes } %>
   <%= f.input :email, :input_html => { :class => Ecm::Contact::Configuration.input_email_css_classes } %>
@@ -6,10 +14,10 @@
   <%= f.input :message, :as => :text, :input_html => { :class => Ecm::Contact::Configuration.input_message_css_classes } %>
   <%= f.input :terms_of_service, :as => :boolean, :required => true, :input_html => { :class => Ecm::Contact::Configuration.input_terms_of_service_css_classes } %>
 
-  <div class="controls form-actions well">
+  <div class="<%= Ecm::Contact::Configuration.form_actions_wrapper_css_classes %>">
     <%= button_tag(:type => 'submit', :class => 'input btn btn-primary', :id => 'ecm_contact_request_submit') do %>
       <span class="glyphicon glyphicon-ok" aria-hidden="true"></span>
-      <%= t('helpers.submit.create', :model => f.object.class.model_name.human) %>
+      <%= t('.submit', :model => f.object.class.model_name.human) %>
     <% end %>
   </div>
 <% end %>

data/config/locales/ecm.contact.de.yml

@@ -10,6 +10,9 @@ de:
           meta_description: Kontaktieren Sie uns über unser Kontaktformular
           title: Kontaktanfrage
         subject: "[%{application_name}] Neue Kontaktanfrage"
+      requests:
+        form:
+          submit: Abschicken
       views:
         actions:
           back: 'Zurück'
@@ -21,3 +24,9 @@ de:
     required:
       text: 'Pflichtfeld'
       mark: '*'
+    placeholders:
+      ecm_contact_request:
+        name: "Max Mustermann"
+        email: "max.mustermann@example.com"
+        message: "Hi Dave..."
+        phone: "+49 69 12345678"

data/config/locales/ecm.contact.en.yml

@@ -10,6 +10,9 @@ en:
           meta_description: Contact us
           title: Contact request
         subject: "[%{application_name}] New contact request"
+      requests:
+        form:
+          submit: Submit
       views:
         actions:
           back: 'Back'
@@ -21,4 +24,9 @@ en:
     required:
       text: 'required'
       mark: '*'
-
+    placeholders:
+      ecm_contact_request:
+        name: "John Doe"
+        email: "john.doe@example.com"
+        message: "Hi Dave..."
+        phone: "+1-541-754-3010"

data/config/routes.rb

@@ -0,0 +1,3 @@
+Ecm::Contact::Engine.routes.draw do
+  resources :contact_requests, only: [:create, :new]
+end

data/lib/ecm/contact/configuration.rb

@@ -28,6 +28,10 @@ module Ecm
         ''
       end
 
+      mattr_accessor :form_actions_wrapper_css_classes do
+        'controls form-actions well'
+      end
+
       mattr_accessor :recipients do
         {}
       end
@@ -40,6 +44,10 @@ module Ecm
         nil
       end
 
+      mattr_accessor :after_create_url do
+        ->(controller) { controller.url_for(action: index) }
+      end
+
       def recipients=(recipients)
         @@recipients = HashWithIndifferentAccess.new(recipients)
       end

data/lib/ecm/contact/version.rb

@@ -1,5 +1,5 @@
 module Ecm
   module Contact
-    VERSION = '1.2.2'.freeze
+    VERSION = '2.0.0'.freeze
   end
 end

data/lib/generators/ecm/contact/install/templates/initializer.rb

@@ -47,6 +47,12 @@ Ecm::Contact.configure do |config|
   #
   config.input_terms_of_service_css_classes = ''
 
+  # Configure your form action wrapper div css classes here.
+  #
+  # Default: config.form_actions_wrapper_css_classes = 'controls form-actions well'
+  #
+  config.form_actions_wrapper_css_classes = 'controls form-actions well'
+
   # set the base controller for the contact form
   #
   # Default: config.base_controller = 'ApplicationController'
@@ -62,4 +68,10 @@ Ecm::Contact.configure do |config|
   # Default: config.additional_contact_information = nil
   #
   config.additional_contact_information = nil
+
+  # url to redirect to after successful contact request.
+  # 
+  # default: config.after_create_url = ->(controller) { controller.url_for(action: index) }
+  # 
+  config.after_create_url = ->(controller) { controller.url_for(action: index) }
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ecm_contact2
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 2.0.0
 platform: ruby
 authors:
 - Roberto Vasquez Angel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-21 00:00:00.000000000 Z
+date: 2016-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -266,6 +266,7 @@ files:
 - Rakefile
 - app/assets/stylesheets/ecm_contact.css
 - app/controllers/ecm/contact/requests_controller.rb
+- app/helpers/ecm/contact_helper.rb
 - app/mail_forms/ecm/contact/request.rb
 - app/views/ecm/contact/requests/_form.erb
 - app/views/ecm/contact/requests/_request.erb
@@ -275,6 +276,7 @@ files:
 - config/locales/ecm.contact.en.yml
 - config/locales/ecm.contact.request.de.yml
 - config/locales/ecm.contact.request.en.yml
+- config/routes.rb
 - lib/ecm/contact/configuration.rb
 - lib/ecm/contact/engine.rb
 - lib/ecm/contact/routing.rb