refinerycms-inquiries 2.1.0 → 3.0.0

data/app/views/refinery/inquiries/admin/inquiries/_submenu.html.erb

@@ -1,8 +1,6 @@
 <div id='actions'>
   <ul>
-    <li>
-      <%= render "/refinery/admin/search", :url => request.path.gsub("//", "/") %>
-    </li>
+    <li><%= render "/refinery/admin/search", :url => request.path.gsub("//", "/") %></li>
     <li <%= "class='selected'" if params[:action] == "index" %>>
       <%= link_to t('.inbox'), refinery.inquiries_admin_inquiries_path, :class => "email_icon" %>
     </li>
@@ -15,13 +13,15 @@
     </li>
     <li>
       <%= link_to t('.update_notified'),
-                    refinery.edit_inquiries_admin_setting_path(:inquiry_notification_recipients, :dialog => true, :height => 300),
-                    :class => "user_comment_icon" %>
+                    refinery.edit_inquiries_admin_setting_path(:inquiry_notification_recipients, dialog: true, height: 300),
+                    class: "user_comment_icon",
+                    id: "update_notified" %>
     </li>
     <li>
       <%= link_to t('.edit_confirmation_email'),
-                  refinery.edit_inquiries_admin_setting_path(:inquiry_confirmation_body, :dialog => true),
-                  :class => "edit_email_icon" %>
+                  refinery.edit_inquiries_admin_setting_path(:inquiry_confirmation_body, dialog: true),
+                  class: "edit_email_icon",
+                  id: "edit_confirmation_email" %>
     </li>
   </ul>
 </div>

data/app/views/refinery/inquiries/admin/settings/_confirmation_email_form.html.erb

@@ -29,7 +29,7 @@
           <label class='stripped'><%= t('.subject') %> (<%= locale.to_s %>)</label>
         </td>
         <td>
-          <%= text_field_tag "subject[][#{locale.to_s}]", Refinery::Inquiries::Setting.confirmation_subject(locale),
+          <%= text_field_tag "setting[subject[#{locale.to_s}]]", Refinery::Inquiries::Setting.confirmation_subject(locale),
                              :class => 'widest' %>
         </td>
       </tr>
@@ -39,7 +39,7 @@
                       :class => 'stripped' %> (<%= locale.to_s %>)
         </td>
         <td>
-          <%= text_area_tag "message[][#{locale.to_s}]", Refinery::Inquiries::Setting.confirmation_message(locale), # required, we can't use :value
+          <%= text_area_tag "setting[message[#{locale.to_s}]]", Refinery::Inquiries::Setting.confirmation_message(locale), # required, we can't use :value
                           :rows => "5",
                           :class => 'widest' %>
           <br/>

data/app/views/refinery/inquiries/inquiries/_form.html.erb

@@ -0,0 +1,35 @@
+<%= form_for [refinery, :inquiries, inquiry] do |f| %>
+  <%= render :partial => "/refinery/admin/error_messages",
+             :locals => {
+               :object => inquiry,
+               :include_object_name => true
+             } %>
+  <div class="field">
+    <%= f.label :name, :class => 'placeholder-fallback required' %>
+    <%= f.text_field :name, :class => 'text', :required => 'required',
+      :placeholder => (t('name', :scope => 'activerecord.attributes.refinery/inquiries/inquiry') if Refinery::Inquiries.show_placeholders) %>
+  </div>
+  <div class="field">
+    <%= f.label :email, :class => 'placeholder-fallback required' %>
+    <%= f.email_field :email, :class => 'text email', :required => 'required',
+      :placeholder => (t('email', :scope => 'activerecord.attributes.refinery/inquiries/inquiry') if Refinery::Inquiries.show_placeholders) %>
+  </div>
+
+  <% if Refinery::Inquiries.show_phone_number_field %>
+    <div class="field">
+      <%= f.label :phone, :class => 'placeholder-fallback' %>
+      <%= f.text_field :phone, :class => 'text phone',
+        :placeholder => (t('phone', :scope => 'activerecord.attributes.refinery/inquiries/inquiry') if Refinery::Inquiries.show_placeholders) %>
+    </div>
+  <% end %>
+
+  <div class='field message_field'>
+    <%= f.label :message, :class => 'placeholder-fallback required' %>
+    <%= f.text_area :message, :rows => 8, :required => 'required',
+      :placeholder => (t('message', :scope => 'activerecord.attributes.refinery/inquiries/inquiry') if Refinery::Inquiries.show_placeholders) %>
+  </div>
+  <div class="actions">
+    <%= f.submit t('.send') %>
+    <%= link_to t('.privacy_policy'), "/pages/privacy-policy", :id => "privacy_link" if Refinery::Inquiries.show_contact_privacy_link %>
+  </div>
+<% end %>

data/app/views/refinery/inquiries/inquiries/new.html.erb

@@ -1,42 +1,8 @@
 <% content_for :body do %>
-  <%= raw @page.content_for(Refinery::Pages.default_parts.first.to_sym) if Refinery::Pages.default_parts.any? %>
-  
-  <div class='inquiries'>
-    <%= form_for [refinery, :inquiries, @inquiry] do |f| %>
-      <%= render :partial => "/refinery/admin/error_messages",
-                 :locals => {
-                   :object => @inquiry,
-                   :include_object_name => true
-                 } %>
-      <div class="field">
-        <%= f.required_label :name, :class => 'placeholder-fallback' %>
-        <%= f.text_field :name, :class => 'text', :required => 'required',
-          :placeholder => t('name', :scope => 'activerecord.attributes.refinery/inquiries/inquiry') if Refinery::Inquiries.show_placeholders %>
-      </div>
-      <div class="field">
-        <%= f.required_label :email, :class => 'placeholder-fallback' %>
-        <%= f.email_field :email, :class => 'text email', :required => 'required',
-          :placeholder => t('email', :scope => 'activerecord.attributes.refinery/inquiries/inquiry') if Refinery::Inquiries.show_placeholders %>
-      </div>
-
-      <% if Refinery::Inquiries.show_phone_number_field %>
-        <div class="field">
-          <%= f.label :phone, :class => 'placeholder-fallback' %>
-          <%= f.text_field :phone, :class => 'text phone',
-            :placeholder => t('phone', :scope => 'activerecord.attributes.refinery/inquiries/inquiry') if Refinery::Inquiries.show_placeholders %>
-        </div>
-      <% end %>
+  <%= raw @page.content_for(Refinery::Pages.default_parts.first[:slug].to_sym) if Refinery::Pages.default_parts.any? %>
 
-      <div class='field message_field'>
-        <%= f.required_label :message, :class => 'placeholder-fallback' %>
-        <%= f.text_area :message, :rows => 8, :required => 'required',
-          :placeholder => t('message', :scope => 'activerecord.attributes.refinery/inquiries/inquiry') if Refinery::Inquiries.show_placeholders %>
-      </div>
-      <div class="actions">
-        <%= f.submit t('.send') %>
-        <%= link_to t('.privacy_policy'), "/pages/privacy-policy", :id => "privacy_link" if Refinery::Inquiries.show_contact_privacy_link %>
-      </div>
-    <% end %>
+  <div class='inquiries'>
+    <%= render "/refinery/inquiries/inquiries/form", inquiry: @inquiry %>
   </div>
 <% end %>
-<%= render "/refinery/content_page" %>
+<%= render "/refinery/content_page" %>

data/bin/rails

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+# This command will automatically be run when you run "rails" with Rails 3 gems installed from the root of your application.
+
+ENGINE_PATH = File.expand_path('../..',  __FILE__)
+load File.expand_path('../../spec/dummy/bin/rails',  __FILE__)

data/bin/rake

@@ -0,0 +1,21 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rake' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+begin
+  if Dir.exist?(File.expand_path('../../spec/dummy', __FILE__))
+    load File.expand_path("../spring", __FILE__)
+  end
+rescue LoadError
+end
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rake', 'rake')

data/bin/rspec

@@ -0,0 +1,22 @@
+#!/usr/bin/env ruby
+#
+# This file was generated by Bundler.
+#
+# The application 'rspec' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+begin
+  if Dir.exist?(File.expand_path('../../spec/dummy', __FILE__))
+    load File.expand_path("../spring", __FILE__)
+  end
+rescue LoadError
+end
+require 'pathname'
+ENV['BUNDLE_GEMFILE'] ||= File.expand_path("../../Gemfile",
+  Pathname.new(__FILE__).realpath)
+
+require 'rubygems'
+require 'bundler/setup'
+
+load Gem.bin_path('rspec-core', 'rspec')

data/bin/spring

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+
+# This file loads spring without using Bundler, in order to be fast
+# It gets overwritten when you run the `spring binstub` command
+
+unless defined?(Spring)
+  require "rubygems"
+  require "bundler"
+
+  if match = Bundler.default_lockfile.read.match(/^GEM$.*?^    (?:  )*spring \((.*?)\)$.*?^$/m)
+    ENV["GEM_PATH"] = ([Bundler.bundle_path.to_s] + Gem.path).join(File::PATH_SEPARATOR)
+    ENV["GEM_HOME"] = ""
+    Gem.paths = ENV
+
+    gem "spring", match[1]
+    require "spring/binstub"
+  end
+end

data/config/locales/bg.yml

@@ -6,9 +6,9 @@ bg:
         description: Осигурява форма за контакт и съхранение на запитвания
     inquiries:
       config:
-        from_name: "%{name} [%{site_name}]"
+        from_name: "%{name} - %{site_name}"
       inquiries:
-        new:
+        form:
           send: Изпращане на съобщение
           privacy_policy: Високо ценим Вашите лични данни
       admin:

data/config/locales/cs.yml

@@ -6,9 +6,9 @@ cs:
         description: Zajišťuje kontaktní formulář a uchovává zaslané dotazy.
     inquiries:
       config:
-        from_name: "%{name} [%{site_name}]"
+        from_name: "%{name} - %{site_name}"
       inquiries:
-        new:
+        form:
           send: Odeslat zprávu
           privacy_policy: Vážíme si Vaše soukromí
       admin:

data/config/locales/da.yml

@@ -5,9 +5,9 @@ da:
         title: Henvendelser
     inquiries:
       config:
-        from_name: "%{name} [%{site_name}]"
+        from_name: "%{name} - %{site_name}"
       inquiries:
-        new:
+        form:
           header_message: "Der er et mindre problem"
           message: "Følgende skal rettes:"
           send: Send besked

data/config/locales/de.yml

@@ -6,9 +6,9 @@ de:
         description: Stellt ein Kontaktformular zur Verfügung und speichert Kontaktanfragen
     inquiries:
       config:
-        from_name: "%{name} [%{site_name}]"
+        from_name: "%{name} - %{site_name}"
       inquiries:
-        new:
+        form:
           send: Nachricht senden
           privacy_policy: Ihre Privatsphäre ist uns wichtig
       admin:

data/config/locales/en-GB.yml

@@ -6,9 +6,9 @@ en-GB:
         description: Provides a contact form and stores enquiries
     inquiries:
       config:
-        from_name: "%{name} [%{site_name}]"
+        from_name: "%{name} - %{site_name}"
       inquiries:
-        new:
+        form:
           send: Send message
           privacy_policy: We value your privacy
       admin:

data/config/locales/en.yml

@@ -6,9 +6,9 @@ en:
         description: Provides a contact form and stores inquiries
     inquiries:
       config:
-        from_name: "%{name} [%{site_name}]"
+        from_name: "%{name} - %{site_name}"
       inquiries:
-        new:
+        form:
           send: Send message
           privacy_policy: We value your privacy
       admin:

data/config/locales/es.yml

@@ -5,9 +5,9 @@ es:
         title: Consultas
     inquiries:
       config:
-        from_name: "%{name} [%{site_name}]"
+        from_name: "%{name} - %{site_name}"
       inquiries:
-        new:
+        form:
           send: Enviar mensaje
           privacy_policy: "Nosotros valoramos tu privacidad"
       admin:

data/config/locales/fr.yml

@@ -6,9 +6,9 @@ fr:
         description: Fournit un formulaire de contact et gère les demandes de contacts.
     inquiries:
       config:
-        from_name: "%{name} [%{site_name}]"
+        from_name: "%{name} - %{site_name}"
       inquiries:
-        new:
+        form:
           send: Envoyer un message
           privacy_policy: Nous respectons votre vie privée
       admin:

data/config/locales/it.yml

@@ -6,7 +6,7 @@ it:
         description: Fornisce un modulo di contatto e memorizza le richieste
     inquiries:
       config:
-        from_name: "%{name} [%{site_name}]"
+        from_name: "%{name} - %{site_name}"
       inquiries:
         new:
           header_message: si è verificato un problema

data/config/locales/lt.yml

@@ -6,9 +6,9 @@ lt:
         description: Suteikia kontaktų formą ir saugo užklausas
     inquiries:
       config:
-        from_name: "%{name} [%{site_name}]"
+        from_name: "%{name} - %{site_name}"
       inquiries:
-        new:
+        form:
           send: Siųsti žinutę
           privacy_policy: Mes vertiname jūsų privatumą
       admin:

data/config/locales/lv.yml

@@ -6,9 +6,9 @@ lv:
         description: Nodrošina kontaktformu un glabā pieprasījumus
     inquiries:
       config:
-        from_name: "%{name} [%{site_name}]"
+        from_name: "%{name} - %{site_name}"
       inquiries:
-        new:
+        form:
           send: Sūtīt ziņu
           privacy_policy: Mēs cienam Jūsu privātumu
       admin:

data/config/locales/nb.yml

@@ -6,9 +6,9 @@ nb:
         description: Legger til et kontaktskjema og lagrer forespørsler
     inquiries:
       config:
-        from_name: "%{name} [%{site_name}]"
+        from_name: "%{name} - %{site_name}"
       inquiries:
-        new:
+        form:
           send: Send melding
           privacy_policy: "Vi respekterer ditt privatliv"
       admin:

data/config/locales/nl.yml

@@ -6,9 +6,9 @@ nl:
         description: Contactformulier en beheer van vragen
     inquiries:
       config:
-        from_name: "%{name} [%{site_name}]"
+        from_name: "%{name} - %{site_name}"
       inquiries:
-        new:
+        form:
           send: Verstuur uw vraag
           privacy_policy: Wij respecteren uw privacy
       admin:

data/config/locales/pl.yml

@@ -7,9 +7,9 @@ pl:
         article: neutral
     inquiries:
       config:
-        from_name: "%{name} [%{site_name}]"
+        from_name: "%{name} - %{site_name}"
       inquiries:
-        new:
+        form:
           send: Wyślij wiadomość
           privacy_policy: Cenimy Twoją prywatność
       admin:

data/config/locales/pt-BR.yml

@@ -6,9 +6,9 @@ pt-BR:
         description: Gerenciar contatos
     inquiries:
       config:
-        from_name: "%{name} [%{site_name}]"
+        from_name: "%{name} - %{site_name}"
       inquiries:
-        new:
+        form:
           send: Enviar mensagem
           privacy_policy: "Nós valorizamos sua privacidade"
       admin:

data/config/locales/ru.yml

@@ -6,9 +6,9 @@ ru:
         description: Предоставляет форму обратной связи и хранит запросы
     inquiries:
       config:
-        from_name: "%{name} [%{site_name}]"
+        from_name: "%{name} - %{site_name}"
       inquiries:
-        new:
+        form:
           send: Отправить сообщение
           privacy_policy: Мы относимся с уважением к вашим личным данным
       admin:

data/config/locales/sk.yml

@@ -6,9 +6,9 @@ sk:
         description: Zabezpečuje kontaktný formulár a uchováva zaslané otázky.
     inquiries:
       config:
-        from_name: "%{name} [%{site_name}]"
+        from_name: "%{name} - %{site_name}"
       inquiries:
-        new:
+        form:
           send: Odoslať správu
           privacy_policy: Vážime si Vaše súkromie
       admin:

data/config/locales/sl.yml

@@ -6,9 +6,9 @@ sl:
         description: Priskrbi kontaktni obrazec in shrani povpraševanja
     inquiries:
       config:
-        from_name: "%{name} [%{site_name}]"
+        from_name: "%{name} - %{site_name}"
       inquiries:
-        new:
+        form:
           send: Pošlji sporočilo
           privacy_policy: "Cenimo vašo zasebnost"
       admin:

data/config/locales/sv.yml

@@ -6,9 +6,9 @@ sv:
         description: Tillhandahåller ett formulär och sparar förfrågningar
     inquiries:
       config:
-        from_name: "%{name} [%{site_name}]"
+        from_name: "%{name} - %{site_name}"
       inquiries:
-        new:
+        form:
           send: Skicka meddelande
           privacy_policy: Vi respekterar ditt privatliv
       admin: