tkh_content 0.3.1 → 0.4.2

data/CHANGELOG.md

@@ -2,6 +2,31 @@
 
 
 
+## 0.4.2
+
+* In the admin section of the pages' sidebar, added links to admin panel and to the unmoderated comments when any
+* Pages sidebar admin section title is now capitalized to fit with the other sidebar sections
+* Fixed translations of comments section admin tabs
+* Removed justify button from CKEditor toolbar
+* Special CSS class for a comment by the page's author
+* Added generation of canonical link in pages show and in blog index views
+* Modified display of comments and their count in the blog meta info partial
+* Created a comments atom feed
+* Converted blog feed from RSS to atom
+
+
+## 0.4.1
+
+* Debugged blog post meta partial
+
+
+## 0.4
+
+* Added tab admin menu navigation in all sections
+* Set up many, many translations
+* Refactored contact mailer
+
+
 ## 0.3.1
 
 * CKEditor strips formatting from text during pasting

data/app/assets/javascripts/ckeditor/config.js.coffee

@@ -8,7 +8,7 @@ CKEDITOR.editorConfig = (config) ->
   config.toolbar_Pure = [
     { name: 'styles',      items: [ 'Format' ] },
     { name: 'basicstyles', items: [ 'Bold','Italic','Strike','-','RemoveFormat' ] },
-    { name: 'paragraph',   items: [ 'BulletedList','NumberedList','-','Outdent','Indent','-','Blockquote','-','JustifyLeft','JustifyCenter','JustifyRight','JustifyBlock' ] },
+    { name: 'paragraph',   items: [ 'BulletedList','NumberedList','-','Outdent','Indent','-','Blockquote','-','JustifyLeft','JustifyCenter','JustifyRight' ] },
     '/',
     { name: 'clipboard',   items: [ 'Undo','Redo' ] },
     { name: 'links',       items: [ 'Link','Unlink' ] },

data/app/controllers/blog_controller.rb

@@ -6,10 +6,13 @@ class BlogController < ApplicationController
     else
       @posts = Page.for_blog.published.tagged_with(params[:tag]).order('published_at desc').paginate(:page => params[:page], :per_page => 20)
     end
-    # respond_to  
-    render :layout => 'blog'
+    respond_to do |format|
+      format.html { render :layout => 'blog' }
+      format.atom
+    end
   end
   
+  # This is temporary and only to complete the import to SA's site.
   def update_data
     
     @count = 0

data/app/controllers/comments_controller.rb

@@ -1,10 +1,10 @@
 class CommentsController < ApplicationController
   
-  before_filter :authenticate
-  before_filter :authenticate_with_admin, :except => 'create'
+  before_filter :authenticate, :except => ['for_feed']
+  before_filter :authenticate_with_admin, :except => ['create', 'for_feed']
   
   def index
-    @comments = Comment.by_recent
+    @comments = Comment.by_recent.paginate(:page => params[:page], :per_page => 50)
     switch_to_admin_layout
   end
   
@@ -64,18 +64,26 @@ class CommentsController < ApplicationController
   end
   
   def pending
-    @comments = Comment.pending
+    @comments = Comment.pending.by_created.paginate(:page => params[:page], :per_page => 50)
     switch_to_admin_layout
   end
   
   def accepted
-    @comments = Comment.accepted.by_recent
+    @comments = Comment.accepted.by_recent.paginate(:page => params[:page], :per_page => 50)
     switch_to_admin_layout
   end
 
   def blocked
-    @comments = Comment.blocked.by_recent
+    @comments = Comment.blocked.by_recent.paginate(:page => params[:page], :per_page => 50)
     switch_to_admin_layout
   end
   
+  def for_feed
+    @comments = Comment.showable.for_locale(I18n.locale).by_recently_created.limit(50)
+    respond_to do |format|
+      format.html { redirect_to root_path }
+      format.atom
+    end
+  end
+  
 end

data/app/controllers/contacts_controller.rb

@@ -7,6 +7,11 @@ class ContactsController < ApplicationController
     @contacts = Contact.by_recent.paginate(:page => params[:page], :per_page => 35)
     switch_to_admin_layout
   end
+  
+  def show
+    @contact = Contact.find(params[:id])
+    switch_to_admin_layout
+  end
 
   def create
     @contact = Contact.new(params[:contact])
@@ -19,10 +24,10 @@ class ContactsController < ApplicationController
       flash[:error] = t("contacts.create.warning")
       redirect_to :back
     elsif saved && sent_email == 'invalid'
-      flash[:error] =  "#{t("contacts.create.warning")} Your email address does not seem to be valid!"
+      flash[:error] =  "#{t("contacts.create.warning")} #{t('contacts.create.invalid_email')}"
       redirect_to :back
     else
-      flash[:error] = 'Something went wrong. Your message did not reach the intended recipient.'
+      flash[:error] = t('contacts.create.did_not_reach')
       redirect_to :back
     end
   end

data/app/controllers/pages_controller.rb

@@ -57,21 +57,21 @@ class PagesController < ApplicationController
     page = Page.find(params[:id])
     page.published_at = Time.now
     page.save
-    redirect_to pages_path, notice: 'The page has been published'
+    redirect_to pages_path, notice: t('pages.status.changed.published')
   end
   
   def unpublish
     page = Page.find(params[:id])
     page.published_at = nil
     page.save
-    redirect_to pages_path, notice: "The page has been unpublished. It's a draft again."
+    redirect_to pages_path, notice: t('pages.status.changed.unpublished')
   end
   
   def toggle_for_blog
     page = Page.find(params[:id])
     page.for_blog? ? page.for_blog = false : page.for_blog = true
     page.save
-    redirect_to pages_path notice: "The blog status of the page has been changed"
+    redirect_to pages_path notice: t('pages.status.changed.toggled')
   end
   
   def sort

data/app/mailers/contact_mailer.rb

@@ -11,11 +11,11 @@ class ContactMailer < ActionMailer::Base
     @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.company_name} <#{Setting.first.contact_email}>"
+    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@pragmaticyoga.org>",
+          from: "#{Setting.first.site_name} <deploy@ohlalaweb.pragmaticyoga.org>",
           reply_to: reply_to,
-          subject: "Message from #{@contact.sender_name} via #{Setting.first.site_name} web site"
+          subject: "Message from #{@contact.sender_name} via #{Setting.first.try(:site_name)} web site"
   end
 end

data/app/models/page.rb

@@ -87,7 +87,6 @@ class Page < ActiveRecord::Base
   end
   
   ### autocomplete related instance methods
-  
   def parent_page_title
       parent.try(:title) unless self.orphan?
     end

data/app/views/blog/index.atom.builder

@@ -0,0 +1,14 @@
+atom_feed(:language => I18n.locale.to_s) do |feed|
+  feed.title Setting.first.blog_name || t('blog.itself')
+  feed.updated @posts.maximum(:updated_at)
+  
+  @posts.each do |post|
+    feed.entry post, published: post.published_at do |entry|
+      entry.title post.title
+      entry.content post.body, type: 'html'
+      entry.author do |author|
+        author.name post.author.name
+      end
+    end
+  end
+end

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

@@ -1,5 +1,6 @@
-<% content_for :meta_title, Setting.first.company_name %>
-<%= content_for :meta_description, "#{Setting.first.blog_tagline} - #{Setting.first.company_name}: the official blog" %>
+<% content_for :meta_title, Setting.first.try(:company_name) %>
+<% content_for :meta_description, "#{Setting.first.try(:blog_tagline)} - #{Setting.first.try(:company_name)}#{t('colon')} #{t('blog.official')}" %>
+<% content_for :canonical_link, link_to('', blog_path, rel: 'canonical') %>
 
 
 <% for post in @posts %>

data/app/views/comments/_list_of_comments.html.erb

@@ -1,10 +1,10 @@
 <% @page.comments.showable.for_locale(I18n.locale.to_s).by_created.each_with_index do |comment, index| %>
-<div id="comment-<%= comment.id %>" class="individual-comment">
-	<p>
-		<span class="comment-index"><%= index + 1 %></span>
-		<span class="comment-author-name"><%= comment.author.name %></span>
-		<span class="comment-created-date"><%= l comment.created_at, format: :tkh_default %></span>
-		<span class="comment-body"><%= sanitize comment.body.gsub(/\r\n?/, "<br>"), :tags => %w(br), :attributes => %w() %></span>
-	</p>
-</div>
+	<div id="comment-<%= comment.id %>" class="individual-comment<%= " by-page-author" if comment.author_id == comment.page.author_id %>">
+		<p>
+			<span class="comment-index"><%= index + 1 %></span>
+			<span class="comment-author-name"><%= comment.author.name %></span>
+			<span class="comment-created-date"><%= l comment.created_at, format: :tkh_default %></span>
+			<span class="comment-body"><%= sanitize comment.body.gsub(/\r\n?/, "<br>"), :tags => %w(br), :attributes => %w() %></span>
+		</p>
+	</div>
 <% end %>

data/app/views/comments/_status_buttons.html.erb

@@ -1,7 +1,7 @@
 <% if comment.status == 'pending' %>
-	<%= link_to t('comments.moderation.actions.accept'), accept_comment_path(comment), method: :post, class: 'btn btn-mini btn-primary' %><%= link_to t('comments.moderation.actions.block'), block_comment_path(comment), method: :post, class: 'btn btn-mini btn-danger' %>
+	<%= link_to t('comments.moderation.actions.accept'), accept_comment_path(comment), method: :post, class: 'btn btn-mini' %><%= link_to t('comments.moderation.actions.block'), block_comment_path(comment), method: :post, class: 'btn btn-mini' %>
 <% elsif comment.status == 'accepted' %>
-	<%= link_to t('comments.moderation.actions.block'), block_comment_path(comment), method: :post, class: 'btn btn-mini btn-danger' %>
+	<%= link_to t('comments.moderation.actions.block'), block_comment_path(comment), method: :post, class: 'btn btn-mini' %>
 <% elsif comment.status == 'blocked' %>
-	<%= link_to t('comments.moderation.actions.accept'), accept_comment_path(comment), method: :post, class: 'btn btn-mini btn-primary' %>
+	<%= link_to t('comments.moderation.actions.accept'), accept_comment_path(comment), method: :post, class: 'btn btn-mini' %>
 <% end -%>

data/app/views/comments/_tab_admin_menu.html.erb

@@ -0,0 +1,8 @@
+<ul class="nav nav-tabs" id="admin-menu-tab">
+	<%= content_tag :li, link_to(t('all'), comments_path), ({ class: 'active' } if controller.action_name.to_s == 'index' ) %>
+	<%= content_tag :li, link_to(t('comments.status.pending'), pending_comments_path), ({ class: 'active' } if controller.action_name.to_s == 'pending' ) %>
+	<%= content_tag :li, link_to(t('comments.status.accepted'), accepted_comments_path), ({ class: 'active' } if controller.action_name.to_s == 'accepted' ) %>
+	<%= content_tag :li, link_to(t('comments.status.blocked'), blocked_comments_path), ({ class: 'active' } if controller.action_name.to_s == 'blocked' ) %>
+	<%= content_tag :li, link_to(t('view'), comments_path), ({ class: 'active' }) if controller.action_name.to_s == 'show' %>
+	<%= content_tag :li, link_to(t('edit'), comments_path), ({ class: 'active' }) if controller.action_name.to_s == 'edit' %>	
+</ul>

data/app/views/comments/accepted.html.erb

@@ -0,0 +1,29 @@
+<h1><%= t('activerecord.models.comments') %></h1>
+
+<%= render 'tab_admin_menu' %>
+
+<table class='table table-striped'>
+	<thead>
+  	<tr>
+	    <th><%= t('activerecord.attributes.comments.author') %>, <%= t('activerecord.models.page') %>, <%= t('activerecord.attributes.comments.locale') %><br />
+					<%= t('activerecord.attributes.comments.body') %></th>
+			<th><%= t('activerecord.attributes.comments.status') %></th>
+	    <th><%= t('actions') %></th>
+	  </tr>
+	</thead>
+	
+	<tbody>
+		<% @comments.each do |comment| %>
+		  <tr>
+		    <td><%= comment.author.name %> - <%= link_to comment.page.title, comment.page %> | <%= comment.locale %><br /><br />
+						<%= sanitize comment.body.gsub(/\r\n?/, "<br>"), :tags => %w(br), :attributes => %w() %></td>
+				<td><%= t("comments.status.#{comment.status}") %><%= t 'colon' %><%= render 'comments/status_buttons', comment: comment %></td>
+		    <td><%= link_to t('edit'), edit_comment_path(comment), class: 'btn btn-mini' %><%= link_to t('delete'), comment, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-mini btn-danger' %></td>
+		  </tr>
+		<% end %>
+	</tbody>
+</table>
+
+<%= will_paginate @comments %>
+
+<%= render 'shared/admin_sidebar' %>

data/app/views/comments/blocked.html.erb

@@ -0,0 +1,29 @@
+<h1><%= t('activerecord.models.comments') %></h1>
+
+<%= render 'tab_admin_menu' %>
+
+<table class='table table-striped'>
+	<thead>
+  	<tr>
+	    <th><%= t('activerecord.attributes.comments.author') %>, <%= t('activerecord.models.page') %>, <%= t('activerecord.attributes.comments.locale') %><br />
+					<%= t('activerecord.attributes.comments.body') %></th>
+			<th><%= t('activerecord.attributes.comments.status') %></th>
+	    <th><%= t('actions') %></th>
+	  </tr>
+	</thead>
+	
+	<tbody>
+		<% @comments.each do |comment| %>
+		  <tr>
+		    <td><%= comment.author.name %> - <%= link_to comment.page.title, comment.page %> | <%= comment.locale %><br /><br />
+						<%= sanitize comment.body.gsub(/\r\n?/, "<br>"), :tags => %w(br), :attributes => %w() %></td>
+				<td><%= t("comments.status.#{comment.status}") %><%= t 'colon' %><%= render 'comments/status_buttons', comment: comment %></td>
+		    <td><%= link_to t('edit'), edit_comment_path(comment), class: 'btn btn-mini' %><%= link_to t('delete'), comment, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-mini btn-danger' %></td>
+		  </tr>
+		<% end %>
+	</tbody>
+</table>
+
+<%= will_paginate @comments %>
+
+<%= render 'shared/admin_sidebar' %>

data/app/views/comments/edit.html.erb

@@ -1,3 +1,6 @@
-<h1>Edit a Comment</h1>
+<h1><%= t('activerecord.models.comments') %></h1>
+
+
+
 <%= render 'form' %>
 <%= render 'shared/admin_sidebar' %>

data/app/views/comments/for_feed.atom.builder

@@ -0,0 +1,16 @@
+atom_feed(:language => I18n.locale.to_s) do |feed|
+  feed.title "#{Setting.first.site_name}. #{t('activerecord.models.comments').capitalize}"
+  feed.updated @comments.maximum(:updated_at)
+  feed.language I18n.locale.to_s
+  
+  @comments.each do |comment|
+    feed.entry comment, url: page_url(comment.page, anchor: "comment-#{comment.id}") do |entry|
+      entry.title truncate comment.body, length: 30, separator: ' ...'
+      entry.url page_url(comment.page, anchor: "comment-#{comment.id}")
+      entry.content comment.body
+      entry.author do |author|
+        author.name comment.author.name
+      end
+    end
+  end
+end

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

@@ -1,29 +1,30 @@
-<h1>List of Comments</h1>
+<h1><%= t('activerecord.models.comments') %></h1>
+
+<%= render 'tab_admin_menu' %>
 
 <table class='table table-striped'>
 	<thead>
-  <tr>
-	    <th><%= t 'activerecord.attributes.comments.author' %></th>
-	    <th><%= t 'activerecord.attributes.comments.page' %></th>
-			<th><%= t 'activerecord.attributes.comments.body' %></th>
-			<th><%= t 'activerecord.attributes.comments.status' %></th>
-			<th><%= t 'activerecord.attributes.comments.locale' %></th>
-	    <th>Actions</th>
+  	<tr>
+	    <th><%= t('activerecord.attributes.comments.author') %>, <%= t('activerecord.models.page') %>, <%= t('activerecord.attributes.comments.locale') %><br />
+					<%= t('activerecord.attributes.comments.body') %></th>
+			<th><%= t('activerecord.attributes.comments.status') %></th>
+	    <th><%= t('actions') %></th>
 	  </tr>
 	</thead>
 	
 	<tbody>
-		<% @comments.each do |comment| %>h
+		<% @comments.each do |comment| %>
 		  <tr>
-		    <td><%= comment.author.name %></td>
-				<td><%= link_to comment.page.title, comment.page %></td>
-		    <td><%= truncate comment.body, length: 75, separator: ' ...' %></td>
-				<td><%= comment.status %><%= t 'colon' %><%= render 'comments/status_buttons', comment: comment %></td>
-				<td><%= comment.locale %></td>
+		    <td><%= comment.author.name %> - <%= link_to comment.page.title, comment.page %> | <%= comment.locale %><br /><br />
+						<%= sanitize comment.body.gsub(/\r\n?/, "<br>"), :tags => %w(br), :attributes => %w() %></td>
+						
+				<td><%= t("comments.status.#{comment.status}") %><%= t 'colon' %><%= render 'comments/status_buttons', comment: comment %></td>
 		    <td><%= link_to t('edit'), edit_comment_path(comment), class: 'btn btn-mini' %><%= link_to t('delete'), comment, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-mini btn-danger' %></td>
 		  </tr>
 		<% end %>
 	</tbody>
 </table>
 
+<%= will_paginate @comments %>
+
 <%= render 'shared/admin_sidebar' %>

data/app/views/comments/pending.html.erb

@@ -0,0 +1,31 @@
+<h1><%= t('activerecord.models.comments') %></h1>
+
+<%= render 'tab_admin_menu' %>
+
+<p><span class="label label-info"><%= t('comments.sorted_by_oldest') %></span></p>
+
+<table class='table table-striped'>
+	<thead>
+  	<tr>
+	    <th><%= t('activerecord.attributes.comments.author') %>, <%= t('activerecord.models.page') %>, <%= t('activerecord.attributes.comments.locale') %><br />
+					<%= t('activerecord.attributes.comments.body') %></th>
+			<th><%= t('activerecord.attributes.comments.status') %></th>
+	    <th><%= t('actions') %></th>
+	  </tr>
+	</thead>
+	
+	<tbody>
+		<% @comments.each do |comment| %>
+		  <tr>
+		    <td><%= comment.author.name %> - <%= link_to comment.page.title, comment.page %> | <%= comment.locale %><br /><br />
+						<%= sanitize comment.body.gsub(/\r\n?/, "<br>"), :tags => %w(br), :attributes => %w() %></td>
+				<td><%= t("comments.status.#{comment.status}") %><%= t 'colon' %><%= render 'comments/status_buttons', comment: comment %></td>
+		    <td><%= link_to t('edit'), edit_comment_path(comment), class: 'btn btn-mini' %><%= link_to t('delete'), comment, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-mini btn-danger' %></td>
+		  </tr>
+		<% end %>
+	</tbody>
+</table>
+
+<%= will_paginate @comments %>
+
+<%= render 'shared/admin_sidebar' %>

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

@@ -1,13 +1,12 @@
-Here is the message sent via the contact form on the web site:
+<%= t('contacts.mailer.intro') %>
 
-- Sender's name: <%= @contact.sender_name %>
-- Sender's email: <%= @contact.sender_email %>
+- <%= t('contacts.mailer.sender_name') %> <%= @contact.sender_name %>
+- <%= t('contacts.mailer.sender_email') %> <%= @contact.sender_email %>
 
-Message:
+<%= t('contacts.mailer.message') %>
 
 -----------------------------------
 
 <%= @contact.body %>
 
 -----------------------------------
-

data/app/views/contacts/_tab_admin_menu.html.erb

@@ -0,0 +1,4 @@
+<ul class="nav nav-tabs" id="admin-menu-tab">
+	<%= content_tag :li, link_to(t('list'), contacts_path), ({ class: 'active' } if controller.action_name.to_s == 'index' ) %>
+	<%= content_tag :li, link_to(t('view'), contacts_path), ({ class: 'active' }) if controller.action_name.to_s == 'show' %>
+</ul>

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

@@ -1,4 +1,6 @@
-<h1><%= t 'contacts.index.title' %></h1>
+<h1><%= t 'activerecord.models.contacts' %></h1>
+
+<%= render 'tab_admin_menu' %>
 
 <table class='table table-striped'>
 	<thead>
@@ -7,7 +9,7 @@
 	    <th><%= t 'activerecord.attributes.contacts.sender_email' %></th>
 			<th><%= t 'activerecord.attributes.contacts.body' %></th>
 			<th><%= t 'contacts.sent' %></th>
-	    <th>Actions</th>
+	    <th><%= t('actions') %></th>
 	  </tr>
 	</thead>
 	
@@ -15,10 +17,10 @@
 		<% @contacts.each do |contact| %>
 		  <tr>
 		    <td><%= contact.sender_name %></td>
-				<td><%= mail_to contact.sender_email, contact.sender_name, subject: 'Response to your message' %></td>
-		    <td><%= truncate contact.body, length: 55, separator: ' ...' %></td>
-				<td><%= l contact.created_at, :format => :default %></td>
-		    <td>Reply to email: <%= mail_to contact.sender_email, contact.sender_name, subject: 'Response to your message' %></td>
+				<td><%= link_to contact.sender_email, "mailto:#{contact.sender_email}" %></td>
+		    <td><%= truncate contact.body, length: 85, separator: ' ...' %></td>
+				<td><%= l contact.created_at, :format => :tkh_default %></td>
+		    <td><%= link_to t('view'), contact %></td>
 		  </tr>
 		<% end %>
 	</tbody>