tkh_content 0.9.10 → 0.9.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a07b81f33459760971cfaaee1ccb390c2439c62d
-  data.tar.gz: 311e44c99984a7d609e12d085a52508fe4a22303
+  metadata.gz: fd689ef278c0e08bc119bbaa3b4fd1062d2d0759
+  data.tar.gz: b343283506cf28d3a44ef361bf99e80df6cf3d8f
 SHA512:
-  metadata.gz: 5ab9a39a8147ef5fd5b72734c6af2c464cf03273def8afb7c41df514d462ed4d876d51b04191bf3968dbb50a2f65a42ed1d3f1289673190be301048e4753dc37
-  data.tar.gz: c327e267dae0e50665e30768c3775387877b16d766627679d827d465f6308323a3349fb9e5747616849f4d4afaf63f34c5b8e47ee43960bc214ed572a1f92c82
+  metadata.gz: db73b8caf2e79c91f905d5b560aab3ac5cc22a8e4bad07e0b60e2139c55960461231a89f813421f354a7594d6b8234972da5b041a4a81d0f01efdf4c9fb16daa
+  data.tar.gz: 069a50532188e5cf3c9b0efa20eed6d8cd4cc98ba74011f92d98af3b4a7978bacac8a10a6c94f853333d82863565b6df90713985441c74458746e907255af7d3

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 
 
+## 0.9.11
+
+* Admins can delete tags which have no taggings
+* Fixed up the whole contact form routine.
+
+
 ## 0.9.10
 
 * Fixed up paginators

data/app/controllers/contacts_controller.rb

@@ -47,7 +47,7 @@ class ContactsController < ApplicationController
         ContactMailer.message_from_contact_form(contact).deliver
         return 'success'
       rescue Exception => e
-        AdminMailer.rescued_exceptions(e, "Some exception occurred while trying to send a student his confirmation for registering in a course. The email was never sent!").deliver
+        AdminMailer.rescued_exceptions(e, "Some exception occurred while trying to send to site admin a message from contact form").deliver
         @exception = e
         return 'exception'
       end

data/app/mailers/contact_mailer.rb

@@ -1,5 +1,5 @@
 class ContactMailer < ActionMailer::Base
-  
+
   # default :from => "info@yoga.lu"
 
   # Subject can be set in your I18n file at config/locales/en.yml
@@ -7,14 +7,14 @@ class ContactMailer < ActionMailer::Base
   #
   #   en.user_mailer.password_reset.subject
   #
-  def message_from_contact_form(contact)  
+  def message_from_contact_form(contact)
     @contact = contact
     # FIXME - only the email addresses show up. not the names :-(
     # TODO - what do to if contact_email is not set?
     recipient = "#{Setting.first.try(:company_name)} <#{Setting.first.try(:contact_email)}>"
     reply_to = "#{@contact.sender_name} <#{@contact.sender_email}>"
-    mail  to: recipient,  
-          from: "#{Setting.first.site_name} <deploy@ohlalaweb.pragmaticyoga.org>",
+    mail  to: recipient,
+          from: "#{Setting.first.site_name} <deploy@mailcenter.tenthousandhours.eu>",
           reply_to: reply_to,
           subject: "Message from #{@contact.sender_name} via #{Setting.first.try(:site_name)} web site"
   end

data/app/models/contact.rb

@@ -6,7 +6,8 @@
 class Contact < ActiveRecord::Base
 
   validates_presence_of :sender_name
-  validates :sender_email, :presence => true, :format => { :with => /\A([\A@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :on => :create }
+  validates_presence_of :sender_email
+  # validates :sender_email, :presence => true, :format => { :with => /\A([\A@\s]+)@((?:[-a-z0-9]+\.)+[a-z]{2,})\z/i, :on => :create }
   validates_presence_of :body
 
   scope :by_recent, -> { order('updated_at desc') }

data/app/views/tags/index.html.erb

@@ -12,7 +12,7 @@
 		<% @tags.each do |tag| %>
 		  <tr>
 		    <td><%= link_to ("#{tag.name} (#{tag.taggings.count})"), blog_by_tag_path(tag.name) %></td>
-		    <td><%= link_to t('edit'), edit_tag_path(tag), class: 'btn btn-xs btn-primary' %></td>
+		    <td><%= link_to t('edit'), edit_tag_path(tag), class: 'btn btn-xs btn-default' %><%= link_to( t('delete'), tag, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-xs btn-danger') if tag.taggings.count == 0 %></td>
 		  </tr>
 		<% end %>
 	</tbody>

data/lib/generators/tkh_content/create_or_update_locales/templates/fr.yml

@@ -24,8 +24,8 @@ fr:
         name: "nom"
 
       contacts:
-        sender_name: "nom de l'auteur"
-        sender_email: "email de l'auteur"
+        sender_name: "votre nom"
+        sender_email: "votre adresse email"
         body: 'contenu du message'
 
       comments:

data/lib/tkh_content/version.rb

@@ -1,3 +1,3 @@
 module TkhContent
-  VERSION = "0.9.10"
+  VERSION = "0.9.11"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkh_content
 version: !ruby/object:Gem::Version
-  version: 0.9.10
+  version: 0.9.11
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-11 00:00:00.000000000 Z
+date: 2014-03-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails