tkh_content 0.1.9.1 → 0.1.9.2

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 
 
+## 0.1.9.1 & 0.1.9.2
+
+* Debugging
+* Enable admin user to embed contact form in any page using happy DSL
+
+
 ## 0.1.9
 
 * Removed inline editor. Will add another one soon

data/app/helpers/pages_helper.rb

@@ -0,0 +1,6 @@
+module PagesHelper
+  def tkhed(content)
+    content = content.gsub /\(-: contact_us_form :-\)/, render('contacts/form') if content.match(/(-: contact_us_form :-)/)
+    content
+  end
+end

data/app/mailers/contact_mailer.rb

@@ -12,7 +12,10 @@ class ContactMailer < ActionMailer::Base
     # FIXME - only the email addresses show up. not the names :-(
     # TODO - what do to if contact_email is not set?
     recipient = "#{Setting.first.company_name} <#{Setting.first.contact_email}>"
-    from = "#{@contact.sender_name} <#{@contact.sender_email}>"
-    mail to: recipient,  from: from , subject: 'Message from the contact form'
+    reply_to = "#{@contact.sender_name} <#{@contact.sender_email}>"
+    mail  to: recipient,  
+          from: "#{Setting.first.site_name} <deploy@pragmaticyoga.org>",
+          reply_to: reply_to,
+          subject: "Message from #{@contact.sender_name} via #{Setting.first.site_name} web site"
   end
 end

data/app/views/contact_mailer/message_from_contact_form.text.erb

@@ -1,4 +1,9 @@
-Here is the message <%= @contact.sender_name %> sent via the contact form on the web site:
+Here is the message sent via the contact form on the web site:
+
+- Sender's name: <%= @contact.sender_name %>
+- Sender's email: <%= @contact.sender_email %>
+
+Message:
 
 -----------------------------------
 
@@ -6,4 +11,3 @@ Here is the message <%= @contact.sender_name %> sent via the contact form on the
 
 -----------------------------------
 
-Their email address is: <%= @contact.sender_email %>

data/app/views/pages/show.html.erb

@@ -3,10 +3,10 @@
 
 <%= content_tag(:h1, @page.title) if @page.for_blog? %>
 
-<%= raw @page.body %>
+<%= raw tkhed(@page.body) %>
 
 <!-- remove this once DSL has been created -->
-<%= render 'contacts/form' if params[:id].to_i == 5 %>
+<%# = render 'contacts/form' if params[:id].to_i == 5 %>
 
 <%# partial in tkh_menus gem or has to be added in host app %>
 <%= render './shared/menus' %>

data/lib/tkh_content/version.rb

@@ -1,3 +1,3 @@
 module TkhContent
-  VERSION = "0.1.9.1"
+  VERSION = "0.1.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkh_content
 version: !ruby/object:Gem::Version
-  version: 0.1.9.1
+  version: 0.1.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -150,6 +150,7 @@ files:
 - app/controllers/contacts_controller.rb
 - app/controllers/pages_controller.rb
 - app/helpers/blog_helper.rb
+- app/helpers/pages_helper.rb
 - app/mailers/contact_mailer.rb
 - app/models/contact.rb
 - app/models/page.rb
@@ -232,7 +233,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2060717003927025802
+      hash: -1015600408546556615
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -241,7 +242,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2060717003927025802
+      hash: -1015600408546556615
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23