refinerycms-inquiries 0.9.9.7 → 0.9.9.8

data/app/controllers/admin/inquiries_controller.rb

@@ -1,19 +1,20 @@
 class Admin::InquiriesController < Admin::BaseController
 
   crudify :inquiry, :title_attribute => "name", :order => "created_at DESC"
+  helper_method :group_by_date
 
+  before_filter :find_all_ham, :only => [:ham]
+  before_filter :find_all_spam, :only => [:spam]
   before_filter :get_spam_count, :only => [:index, :spam]
 
   def index
-    @inquiries = Inquiry.ham.with_query(params[:search]) if searching?
-
-    @grouped_inquiries = group_by_date(Inquiry.ham)
+    @inquiries = @inquiries.with_query(params[:search]) if searching?
+    @inquiries = @inquiries.paginate({:page => params[:page]})
   end
 
   def spam
-    @inquiries = Inquiry.spam.with_query(params[:search]) if searching?
-
-    @grouped_inquiries = group_by_date(Inquiry.spam)
+    self.index
+    render :action => 'index'
   end
 
   def toggle_spam
@@ -25,6 +26,14 @@ class Admin::InquiriesController < Admin::BaseController
 
 protected
 
+  def find_all_ham
+    @inquiries = Inquiry.ham
+  end
+
+  def find_all_spam
+    @inquiries = Inquiry.spam
+  end
+
   def get_spam_count
     @spam_count = Inquiry.count(:conditions => {:spam => true})
   end

data/app/views/admin/inquiries/index.html.erb

@@ -3,23 +3,27 @@
   <% if searching? %>
     <h2><%= t('shared.admin.search.results_for', :query => params[:search]) %></h2>
     <% if @inquiries.any? %>
+      <%= will_paginate @inquiries %>
       <ul>
         <%= render :partial => "inquiry", :collection => @inquiries %>
       </ul>
+      <%= will_paginate @inquiries %>
     <% else %>
       <p><%= t('shared.admin.search.no_results') %></p>
     <% end %>
   <% else %>
-    <% if @grouped_inquiries.any? -%>
-      <% @grouped_inquiries.each do |container| %>
+    <% if @inquiries.any? -%>
+      <%= will_paginate @inquiries %>
+      <% group_by_date(@inquiries).each do |container| %>
         <h3><%= l((inquiry_group = container.last).first.created_at, :format => :short) %></h3>
         <ul>
           <%= render :partial => 'inquiry', :collection => inquiry_group %>
         </ul>
       <% end %>
+      <%= will_paginate @inquiries %>
     <% else -%>
       <p>
-        <strong><%= t('.no_inquiries') %></strong>
+        <strong><%= t(".no_#{action_name == 'index' ? 'inquiries' : 'spam'}") %></strong>
       </p>
     <% end -%>
   <% end %>

data/config/locales/de.yml

@@ -22,7 +22,6 @@ de:
         edit_confirmation_email: Bestätigungs-E-Mail bearbeiten
       index:
         no_inquiries: Sie haben noch keine Kontaktanfragen erhalten.
-      spam:
         no_spam: Juhu! Sie haben keinen Spam.
       show:
         details: Details

data/config/locales/en.yml

@@ -22,7 +22,6 @@ en:
         edit_confirmation_email: Edit confirmation email
       index:
         no_inquiries: You have not received any inquiries yet.
-      spam:
         no_spam: Hooray! You don't have any spam.
       show:
         details: Details

data/config/locales/fr.yml

@@ -22,7 +22,6 @@ fr:
         edit_confirmation_email: Modifier l'e-mail de confirmation
       index:
         no_inquiries: Vous n'avez reçu aucune requête.
-      spam:
         no_spam: Vous n'avez aucun spam.
       show:
         details: Détails

data/config/locales/it.yml

@@ -24,7 +24,6 @@ it:
         edit_confirmation_email: Modifica la mail di conferma
       index:
         no_inquiries: Non hai ancora ricevuto alcuna richiesta.
-      spam:
         no_spam: Evviva! Non hai alcuno spam
       show:
         details: Dettagli

data/config/locales/lolcat.yml

@@ -22,7 +22,6 @@ lolcat:
         edit_confirmation_email: EDIT CONFIRMASHUN EMAIL
       index:
         no_inquiries: U HAS NOT RECEIVD ANY INQUIRIEZ YET.
-      spam:
         no_spam: HOORAH! U DOAN HAS ANY SPAM.
       show:
         details: DETAILS

data/config/locales/lt.yml

@@ -22,7 +22,6 @@ lt:
         edit_confirmation_email: Redaguoti patvirtinimo laišką
       index:
         no_inquiries: Kol kas nėra jokių užklausų.
-      spam:
         no_spam: Valio! Jūs neturite jokio spamo.
       show:
         details: Smulkesnė informacija

data/config/locales/lv.yml

@@ -22,7 +22,6 @@ lv:
         edit_confirmation_email: Labot apstiprinājuma epastu
       index:
         no_inquiries: Nav saņemts neviens pieprasījums.
-      spam:
         no_spam: Urā! Jums nav neviens pieprasījums, kas būtu spams.
       show:
         details: Detaļas

data/config/locales/nb.yml

@@ -40,7 +40,6 @@ nb:
       index:
         search_results_for: Søkeresultater for %{query}
         no_inquiries: Du har ikke mottatt noen forespørsler enda.
-      spam:
         no_spam: Hurra! Du har ikke noen søppelpost.
       show:
         details: Detaljer

data/config/locales/nl.yml

@@ -21,7 +21,6 @@ nl:
         edit_confirmation_email: Bewerk bevestigings email
       index:
         no_inquiries: Je hebt nog geen vragen ontvangen.
-      spam:
         no_spam: Jeej! Je hebt geen spam.
       show:
         details: Details

data/config/locales/pl.yml

@@ -23,7 +23,6 @@ pl:
         edit_confirmation_email: Zmień email z potwierdzeniem
       index:
         no_inquiries: Nie ma jeszcze żadnych zapytań.
-      spam:
         no_spam: Hurra! Nie masz żadnego spamu.
       show:
         details: Szczegóły

data/config/locales/pt-BR.yml

@@ -22,7 +22,6 @@ pt-BR:
         edit_confirmation_email: Editar email de confirmação
       index:
         no_inquiries: "Não exitem mensagens."
-      spam:
         no_spam: Não existem mensagens de spam.
       show:
         details: Detalhes

data/config/locales/ru.yml

@@ -22,7 +22,6 @@ ru:
         edit_confirmation_email: Редактировать письмо-подтверждение
       index:
         no_inquiries: "Вы еще не получили ни одного запроса."
-      spam:
         no_spam: "Ура, спама нет!"
       show:
         details: Подробности

data/config/locales/sv.yml

@@ -22,7 +22,6 @@ sv:
         edit_confirmation_email: Redigera bekräftelse
       index:
         no_inquiries: Du har inte fått några förfrågningar ännu.
-      spam:
         no_spam: Hurra! Du har ingen skräppost.
       show:
         details: Detaljer

data/db/migrate/20101208082840_create_inquiries.rb

@@ -0,0 +1,37 @@
+class CreateInquiries < ActiveRecord::Migration
+  def self.up
+    unless ::Inquiry.table_exists?
+      create_table ::Inquiry.table_name, :force => true do |t|
+        t.string   "name"
+        t.string   "email"
+        t.string   "phone"
+        t.text     "message"
+        t.integer  "position"
+        t.boolean  "open",       :default => true
+        t.datetime "created_at"
+        t.datetime "updated_at"
+        t.boolean  "spam",       :default => false
+      end
+
+      add_index ::Inquiry.table_name, :id
+    end
+
+    # todo: remove at 1.0
+    create_table ::InquirySetting.table_name, :force => true do |t|
+      t.string   "name"
+      t.text     "value"
+      t.boolean  "destroyable"
+      t.datetime "created_at"
+      t.datetime "updated_at"
+    end unless ::InquirySetting.table_exists?
+
+    load(Rails.root.join('db', 'seeds', 'pages_for_inquiries.rb').to_s)
+  end
+
+  def self.down
+     drop_table ::Inquiry.table_name
+     # todo: remove at 1.0
+     drop_table ::InquirySetting.table_name
+     Page.delete_all({:link_url => ("/contact" || "/contact/thank_you")})
+  end
+end

data/db/migrate/20101208082841_remove_position_and_open_from_inquiries.rb

@@ -0,0 +1,11 @@
+class RemovePositionAndOpenFromInquiries < ActiveRecord::Migration
+  def self.up
+    remove_column :inquiries, :position
+    remove_column :inquiries, :open
+  end
+
+  def self.down
+    add_column :inquiries, :position, :integer
+    add_column :inquiries, :open,     :boolean, :default => true
+  end
+end

data/db/seeds/{inquiries.rb → pages_for_inquiries.rb}

@@ -1,3 +1,5 @@
+page_position = (Page.maximum(:position, :conditions => {:parent_id => nil}) || -1)
+
 contact_us_page = Page.create({
   :title => "Contact",
   :link_url => "/contact",

data/lib/gemspec.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-version = '0.9.9.7'
+version = '0.9.9.8'
 raise "Could not get version so gemspec can not be built" if version.nil?
 files = Dir.glob("**/*").flatten.reject do |file|
   file =~ /\.gem$/

data/readme.md

@@ -6,14 +6,24 @@
 
 Include the latest [gem](http://rubygems.org/gems/refinerycms-inquiries) into your Refinery CMS application's Gemfile:
 
-    gem "refinerycms-inquiries", '~> 0.9.9.7'
+    gem 'refinerycms-inquiries', '~> 0.9.9.8'
 
 Then type the following at command line inside your Refinery CMS application's root directory:
 
     bundle install
 
 You don't currently have to do any migrations because Refinery CMS never removed the inquiries tables by default.
-This may change in a future version.
+This will change in a future version - follow the instructions below if you are running the currently unreleased Refinery 0.9.9.
+
+#### Installation on Refinery 0.9.9
+
+The inquiries table has been removed from the base install of Refinery 0.9.9.  To install the migrations, run:
+
+    rails generate refinerycms_inquiries
+
+Next migrate your database and you're done:
+
+    rake db:migrate
 
 ## About
 

data/refinerycms-inquiries.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name              = %q{refinerycms-inquiries}
-  s.version           = %q{0.9.9.7}
-  s.date              = %q{2010-12-02}
+  s.version           = %q{0.9.9.8}
+  s.date              = %q{2010-12-29}
   s.summary           = %q{Inquiry handling functionality for the Refinery CMS project.}
   s.description       = %q{Inquiry handling functionality extracted from Refinery CMS to allow you to have a contact form and manage inquiries in the Refinery backend.}
   s.homepage          = %q{http://refinerycms.com}
@@ -30,7 +30,6 @@ Gem::Specification.new do |s|
     'app/views/admin/inquiries/_submenu.html.erb',
     'app/views/admin/inquiries/index.html.erb',
     'app/views/admin/inquiries/show.html.erb',
-    'app/views/admin/inquiries/spam.html.erb',
     'app/views/admin/inquiry_settings',
     'app/views/admin/inquiry_settings/_confirmation_email_form.html.erb',
     'app/views/admin/inquiry_settings/_notification_recipients_form.html.erb',
@@ -59,13 +58,13 @@ Gem::Specification.new do |s|
     'config/locales/ru.yml',
     'config/locales/sl.yml',
     'config/locales/sv.yml',
-    'config/locales/zh-CN.yml',
     'config/routes.rb',
     'db',
     'db/migrate',
-    'db/migrate/create_inquiries.rb',
+    'db/migrate/20101208082840_create_inquiries.rb',
+    'db/migrate/20101208082841_remove_position_and_open_from_inquiries.rb',
     'db/seeds',
-    'db/seeds/inquiries.rb',
+    'db/seeds/pages_for_inquiries.rb',
     'features',
     'features/create_inquiries.feature',
     'features/manage_inquiries.feature',

metadata

@@ -6,8 +6,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 9
   - 9
-  - 7
-  version: 0.9.9.7
+  - 8
+  version: 0.9.9.8
 platform: ruby
 authors: 
 - Resolve Digital
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-12-02 00:00:00 +13:00
+date: 2010-12-29 00:00:00 +13:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -52,7 +52,6 @@ files:
 - app/views/admin/inquiries/_submenu.html.erb
 - app/views/admin/inquiries/index.html.erb
 - app/views/admin/inquiries/show.html.erb
-- app/views/admin/inquiries/spam.html.erb
 - app/views/admin/inquiry_settings/_confirmation_email_form.html.erb
 - app/views/admin/inquiry_settings/_notification_recipients_form.html.erb
 - app/views/admin/inquiry_settings/edit.html.erb
@@ -76,10 +75,10 @@ files:
 - config/locales/ru.yml
 - config/locales/sl.yml
 - config/locales/sv.yml
-- config/locales/zh-CN.yml
 - config/routes.rb
-- db/migrate/create_inquiries.rb
-- db/seeds/inquiries.rb
+- db/migrate/20101208082840_create_inquiries.rb
+- db/migrate/20101208082841_remove_position_and_open_from_inquiries.rb
+- db/seeds/pages_for_inquiries.rb
 - features/create_inquiries.feature
 - features/manage_inquiries.feature
 - features/step_definitions/inquiry_steps.rb

data/app/views/admin/inquiries/spam.html.erb

@@ -1,26 +0,0 @@
-<%= render :partial => "submenu" %>
-<div id='records'>
-  <% if searching? %>
-    <h2><%= t('shared.admin.search.results_for', :query => params[:search]) %></h2>
-    <% if @inquiries.any? %>
-      <ul>
-        <%= render :partial => "inquiry", :collection => @inquiries %>
-      </ul>
-    <% else %>
-      <p><%= t('shared.admin.search.no_results') %></p>
-    <% end %>
-  <% else %>
-    <% if @grouped_inquiries.any? -%>
-      <% @grouped_inquiries.each do |container| %>
-        <h3><%= l((inquiry_group = container.last).first.created_at, :format => :short) %></h3>
-        <ul>
-          <%= render :partial => 'inquiry', :collection => inquiry_group %>
-        </ul>
-      <% end %>
-    <% else -%>
-      <p>
-        <strong><%= t('.no_spam') %></strong>
-      </p>
-    <% end -%>
-  <% end %>
-</div>

data/config/locales/zh-CN.yml

@@ -1,73 +0,0 @@
-zh-CN:
-  plugins:
-    refinery_inquiries:
-      title: Inquiries
-  inquiries:
-    new:
-      header_message: Whoops there was a small problem
-      message: "The following problems need to be corrected:"
-      send: Send message
-      privacy_policy: We value your privacy
-  admin:
-    inquiries:
-      inquiry:
-        read_inquiry: Read the inquiry
-        said: said
-        mark_as_spam: Mark as spam
-        mark_as_ham: Move to inbox
-      submenu:
-        inbox: Inbox
-        spam: Spam
-        update_notified: Update who gets notified
-        edit_confirmation_email: Edit confirmation email
-      index:
-        no_inquiries: You have not received any inquiries yet.
-      spam:
-        no_spam: Hooray! You don't have any spam.
-      show:
-        details: Details
-        age: Age
-        actions: Actions
-        back_to_all_inquiries: Back to all Inquiries
-        spam: Spam
-        spam_yes: 'yes'
-        inquiry: Inquiry
-        to: To
-        from: From
-        click_to_email: Click to email this address
-        phone: Phone
-        date: Date
-        message: Message
-    inquiry_settings:
-      update:
-        updated: "'%{setting}' was successfully updated."
-      notification_recipients_form:
-        inquiry_settings_value_name: Send notifications to
-        explanation: Every time someone contacts you on your website, Refinery sends out an email to say there is a new inquiry.
-        hint: When a new inquiry is submitted, Refinery will send an email notification to you.
-        example: "Enter your email address(es) like: jack@work.com, jill@office.com"
-      confirmation_email_form:
-        to: To
-        from: From
-        subject: Subject
-        click_to_edit_subject: Click here to edit the subject
-        explanation: Every time someone contacts you on your website, Refinery sends out an email to confirm the inquiry with the person who made it.
-        below_edit_email_sent: Below you can edit the email that is sent out.
-        the_customer_making_inquiry: The customer making the inquiry
-        message: Message
-        note: "Note: place the text %name% where you'd like the customer's name to appear in the email"
-  inquiry_mailer:
-    notification:
-      greeting: Hi there
-      you_recieved_new_inquiry: You just received a new inquiry on your website.
-      inquiry_starts: --- inquiry starts ---
-      inquiry_ends: --- inquiry ends ---
-      from: From
-      email: Email
-      phone: Phone
-      message: Message
-      closing_line: Kind Regards
-      ps: P.S. All your inquiries are stored in the "Inquiries" section of Refinery should you ever want to view it later there.
-  activerecord:
-    models:
-      inquiry: inquiry

data/db/migrate/create_inquiries.rb

@@ -1,32 +0,0 @@
-class CreateInquiries < ActiveRecord::Migration
-  def self.up
-    create_table ::Inquiry.table_name, :force => true do |t|
-      t.string   "name"
-      t.string   "email"
-      t.string   "phone"
-      t.text     "message"
-      t.integer  "position"
-      t.boolean  "open",       :default => true
-      t.datetime "created_at"
-      t.datetime "updated_at"
-      t.boolean  "spam",       :default => false
-    end
-
-    # todo: remove at 1.0
-    create_table ::InquirySetting.table_name, :force => true do |t|
-      t.string   "name"
-      t.text     "value"
-      t.boolean  "destroyable"
-      t.datetime "created_at"
-      t.datetime "updated_at"
-    end
-
-    add_index ::Inquiry.table_name, :id
-  end
-
-  def self.down
-     remove_table ::Inquiry.table_name
-     # todo: remove at 1.0
-     remove_table ::InquirySetting.table_name
-  end
-end