tkh_content 0.3.1 → 0.4.2

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

@@ -0,0 +1,18 @@
+<h1><%= t('activerecord.models.contacts') %></h1>
+
+<%= render 'tab_admin_menu' %>
+
+<h2><%= "#{t('contacts.sent')}#{t('colon')} #{ l(@contact.created_at, :format => :tkh_default) }" %></h2>
+
+<p>
+	<%= "#{t('activerecord.attributes.contacts.sender_name').capitalize}#{t('colon')} #{@contact.sender_name}" %><br />
+	<%= "#{t('activerecord.attributes.contacts.sender_email')}#{t('colon')} #{link_to(@contact.sender_email, "mailto:#{@contact.sender_email}")}".capitalize.html_safe %>
+</p>
+<h3><%= t('activerecord.attributes.contacts.body').capitalize %></h3>
+<p><%= sanitize @contact.body.gsub(/\r\n?/, "<br>"), :tags => %w(br), :attributes => %w() %></p>
+
+<hr>
+
+<p><%= link_to t('list'), contacts_path, class: 'btn' %></p>
+
+<%= render 'shared/admin_sidebar' %>

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

@@ -1,14 +1,25 @@
-<% content_for :admin_context_menu do %>
-	<h2>admin section</h2>
-	<%= link_to 'edit this page', edit_page_path(page), class: 'btn' %>
-	<% if Page.not_for_blog.orphans.published.any? %>
-		<h3>Reorder Root Page Menu Items</h3>
-		<ul class="draggable" data-update-url="<%= sort_pages_path %>">
-		  <% for page in Page.not_for_blog.orphans.published.by_menu_position %>
-				<%= content_tag :li, page, class: 'page', id: "page_#{page.id}" do %>
-					<%= image_tag 'drag-handle.gif', :class => 'handle silhouette' %> <%= page.nickname -%>
-				<% end -%>
-		  <% end %>
+<% if administrator? %>
+
+	<% content_for :admin_context_menu do %>
+
+		<h2><%= t('admin_section') %></h2>
+		<ul>
+			<li><%= link_to t('admin_panel'), pages_path %></li>
+			<%= content_tag :li, link_to("#{t('activerecord.models.comments').capitalize} #{"(#{Comment.pending.count})"}", pending_comments_path) if Comment.pending.count > 0 %>
+			<li><%= link_to t('pages.edit_this').capitalize, edit_page_path(page) %></li>	
 		</ul>
-	<% end %>
+	
+		<% if Page.not_for_blog.orphans.published.any? %>
+			<h3><%= t('pages.reorder_root_menus') %></h3>
+			<ul class="draggable" data-update-url="<%= sort_pages_path %>">
+			  <% for page in Page.not_for_blog.orphans.published.by_menu_position %>
+					<%= content_tag :li, page, class: 'page', id: "page_#{page.id}" do %>
+						<%= image_tag 'drag-handle.gif', :class => 'handle silhouette' %> <%= page.nickname -%>
+					<% end -%>
+			  <% end %>
+			</ul>
+		<% end %>
+	
+	<% end -%>
+
 <% end -%>

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

@@ -1,4 +1,6 @@
 <p class="meta-info">
-	by <%= post.author.name %> <%= post.published_at ? "on #{l(post.published_at, format: :tkh_default)}" : "- not published yet" %> | <%= link_to 'Permalink', post %> | <%= pluralize post.comments.showable.for_locale(I18n.locale.to_s).count, 'comments' %>
-	<%="| #{link_to 'edit', edit_page_path(post), class: 'btn btn-mini'}".html_safe if administrator? %>
+	<%= post.author.name %> | 
+	<%= post.published_at ? link_to(l(post.published_at, format: :tkh_default), post) :  t('pages.not_published_yet') %> |
+	<%= "#{t('activerecord.models.comments')}#{t('colon')} #{post.comments.showable.for_locale(I18n.locale.to_s).count}" %>
+	<%= link_to t('edit'), edit_page_path(post), class: 'btn btn-mini' if administrator? %>
 </p>

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

@@ -1,7 +1,5 @@
 <div id="comment-section">
-	<h2><%= pluralize @page.comments.showable.for_locale(I18n.locale.to_s).count, 'Comment' %></h2>
+	<h2><%= pluralize @page.comments.showable.for_locale(I18n.locale.to_s).count, t('activerecord.models.comment') %></h2>
 	<%= render 'comments/list_of_comments' %>
 	<%= render 'new_comment_section' %>
 </div>
-
-<%= render( 'admin_context_menu', page: @page) if administrator? %>

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

@@ -2,20 +2,20 @@
 	<%= f.error_notification %>
 	
   <div class="form-inputs">
-		<%= f.input :title, hint: 'nice and descriptive' %>
-		<%= f.input :for_blog %>
+		<%= f.input :title, label: t('activerecord.attributes.pages.title'), hint: t('pages.hint.title') %>
+		<%= f.input :for_blog, label: t('activerecord.attributes.pages.for_the_blog') %>
 		<%= f.input :tag_list, hint: 'space separated', :wrapper_html => { :id => 'page-tag-list' } %>
-		<%= f.input :short_title, hint: 'ideally one word only, used for the menu', :wrapper_html => { :id => 'page-short-title' } %>
+		<%= f.input :short_title, label: t('activerecord.attributes.pages.short_title'), hint: t('pages.hint.short_title'), :wrapper_html => { :id => 'page-short-title' } %>
 		<%= f.input :parent_page_title,
 								as: :string,
 								:wrapper_html => { :id => 'parent-page-title' },
-								label: 'parent page title',
+								label: t('activerecord.attributes.pages.parent_title'),
 								:input_html => { 
 																:data => { 	provide: 'typeahead',
 																	 					source: Page.not_for_blog.by_title.map(&:title).to_json } 
 																	} %>
-	  <%= f.input :description, :input_html => { :rows => 3 } %>
-		<%= f.input :body, :input_html => { :rows => 35, :class => 'ckeditor' } %>
+	  <%= f.input :description, label: t('activerecord.attributes.pages.description'), :input_html => { :rows => 3 } %>
+		<%= f.input :body, label: t('activerecord.attributes.pages.body'), :input_html => { :rows => 35, :class => 'ckeditor' } %>
 	</div>
 	
   <div class="form-actions">

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

@@ -1,9 +1,9 @@
 <div id="new-comment-section">
-	<h3>What do you think?</h3>
+	<h3><%= t('comments.what_do_you_think') %></h3>
 	<% if current_user %>
 		<%= render 'comments/form_in_page' %>
 	<% else %>
-		<p><label class="label label-info">You need to be logged in to leave a comment</label></p>
+		<p><label class="label label-info"><%= t('comments.login_needed') %></label></p>
 		<%= render 'shared/embedded_login_module' %>
 	<% end -%>
 </div>

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

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

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

@@ -1,3 +1,6 @@
-<h1>Edit a Page</h1>
+<h1><%= t 'activerecord.models.pages' %></h1>
+
+<%= render 'tab_admin_menu' %>
+
 <%= render 'form' %>
 <%= render 'shared/admin_sidebar' %>

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

@@ -1,16 +1,16 @@
-<h1>List of Pages</h1>
+<h1><%= t 'activerecord.models.pages' %></h1>
 
-<%= link_to t('pages.create_new').capitalize, new_page_path, class: 'btn btn-primary' if @pages.size >= 5 %>
+<%= render 'tab_admin_menu' %>
 
 <table class='table table-striped'>
 	<thead>
   	<tr>
 	    <th><%= t 'activerecord.attributes.pages.title' %></th>
 	    <th><%= t 'activerecord.attributes.pages.description' %></th>
-			<th><%= t 'pages.author'.capitalize %></th>
-			<th><%= t 'activerecord.attributes.pages.for_blog' %>?</th>
-			<th><%= t 'pages.published'.capitalize %></th>
-	    <th>Actions</th>
+			<th><%= t 'pages.author' %></th>
+			<th><%= t 'activerecord.attributes.pages.for_the_blog' %>?</th>
+			<th><%= t 'pages.published' %></th>
+	    <th><%= t('actions') %></th>
 	  </tr>
 	</thead>
 	
@@ -22,13 +22,13 @@
 				<td><%= page.author.name %></td>
 				<td>
 					<%= page.for_blog? ? "<span class=\"label label-success\">✓</span>".html_safe : "<span class=\"label label-important\">X</span>".html_safe %>
-					<%= link_to 'toggle', toggle_for_blog_page_path(page), class: 'btn btn-mini', method: :post %>
+					<%= link_to t('toggle'), toggle_for_blog_page_path(page), class: 'btn btn-mini', method: :post %>
 				</td>
 				<td>
 					<% if page.published_at %>
-						<span class="label label-success">✓</span> <%= link_to 'unpublish', unpublish_page_path(page), class: 'btn btn-mini', method: :post %>
+						<span class="label label-success">✓</span> <%= link_to t('pages.unpublish'), unpublish_page_path(page), class: 'btn btn-mini', method: :post %>
 					<% else %>
-					  <span class="label label-important">X</span> <%= link_to 'publish', publish_page_path(page), class: 'btn btn-mini btn-primary', method: :post %>
+					  <span class="label label-important">X</span> <%= link_to t('pages.publish'), publish_page_path(page), class: 'btn btn-mini btn-primary', method: :post %>
 					<% end -%>
 				</td>
 		    <td><%= link_to t('edit'), edit_page_path(page), class: 'btn btn-mini' %>

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

@@ -1,3 +1,6 @@
-<h1>Create a New Page</h1>
+<h1><%= t 'activerecord.models.pages' %></h1>
+
+<%= render 'tab_admin_menu' %>
+
 <%= render 'form' %>
 <%= render 'shared/admin_sidebar' %>

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

@@ -1,5 +1,6 @@
 <% content_for :meta_title, @page.title %>
 <% content_for :meta_description, @page.description %>
+<% content_for :canonical_link, link_to('', @page, rel: 'canonical') %>
 
 <% unless @page.for_blog? %>
 	<%= raw tkhed(@page.body) %>
@@ -13,5 +14,6 @@
 	
 <% end -%>
 
+<%= render( 'admin_context_menu', page: @page) %>
 <%# partial in tkh_menus gem or has to be added in host app %>
 <%= render './shared/menus' %>

data/app/views/shared/_admin_sidebar.html.erb

@@ -1,5 +1,5 @@
 <% content_for :admin_sidebar do %>
-	<h2><%= t 'sections'.capitalize %></h2>
+	<h2><%= t 'sections' %></h2>
 	<ul>
 		<li><%= link_to t 'pages', pages_path %></li>
 	</ul>

data/config/routes.rb

@@ -18,6 +18,7 @@ Rails.application.routes.draw do
         get :pending
         get :accepted
         get :blocked
+        get :for_feed
       end
       member do
         post :accept

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

@@ -1,43 +1,47 @@
 de:
 
-  are_you_sure: 'Bist Du sicher?'
-  colon: ':'
-  delete: 'löschen'
-  edit: 'bearbeiten'
-  pages: 'Seiten'
-  sections: 'Abschnitte'
-  
-  time:
-    formats:
-      # eventually this should be abstracted to a tkh_utilities gem together with all
-      # standard helpers and functionality
-      tkh_default: '%A, %d. %B %Y, %H:%M Uhr'
-  
-  are_you_sure: 'Bist Du sicher?'
-  delete: 'löschen'
-  edit: 'bearbeiten'
-  pages: 'Seiten'
-  sections: 'Abschnitte'
-
-  activerecord: 
+  activerecord:
+    models:
+      comment: 'Kommentar'
+      comments: 'Kommentare'
+      contact: 'Kontakt'
+      contacts: 'Kontakte'
+      page: 'Seite'
+      pages: 'Seiten'
+      tag: 'Tag'
+      tags: 'Tags'
+    
     attributes:
       pages:
         title: "Überschrift"
-        short_title: 'Kurzüberschrifti'
+        short_title: 'Kurzüberschrift'
         description: "Beschreibung"
         body: "Haupttext"
         for_the_blog: 'Für den Blog'
-      
+        parent_title: 'Seitenüberschrift'
+        
       contacts:
         sender_name: "Absender-Name"
         sender_email: 'Absender-Email'
         body: 'Nachricht'
+        
+      comments:
+        author: 'Verfasser'
+        body: "Haupttext"
+        locale: 'Sprache'
+        status: 'Status'
 
   pages:
     author: 'Autor'
     create_new: 'Neue Seite anlegen'
-    published: 'veröffentlichen?'
-
+    edit_this: 'Diese Seite bearbeiten'
+    home: 'Hauptseite'
+    not_published_yet: 'Noch nicht veröffentlicht'
+    publish: 'veröffentlichen'
+    published: 'veröffentlicht'
+    unpublish: 'veröffentlichen zurücknehmen'
+    reorder_root_menus: 'Neuanfordern der Root-Menü-Items'
+    
     create:
       notice: 'Diese Seite wurde erfolgreich angelegt.'
       warning: 'Beim Speichern dieser Seite ist ein Problem aufgetreten.'
@@ -47,12 +51,59 @@ de:
     destroy:
       notice: 'Die Seite wurde gelöscht.'
       root_warning: "Du kannst diese Seite nicht löschen, da es die Root-Seite ist. Du kannst sie nur bearbeiten."
+    hint:
+      title: 'Schön und beschreibend'
+      short_title: 'Idealerweise nur ein Wort, wird für das Menü verwendet'
+    status:
+      changed:
+        published: 'Die Seite wurde veröffentlicht'
+        unpublished: "Die Veröffentlichung der Seite wurde aufgehoben. Sie ist wieder Entwurf."
+        toggled: "Der Blog-Status der Seite wurde geändert"
 
   contacts:
-    messages_from_forms: 'messages from contact form'
+    messages_from_forms: 'Nachrichten vom Kontaktformular'
     send_message: 'Nachricht senden'
-    sent: 'Gesendet am'
-    
+    sent: 'Gesendet am'   
     create:
+      did_not_reach: 'Etwas ist schief gegangen. Deine Nachricht hat den gewünschten Adressaten nicht erreicht.'
+      invalid_email: 'Deine Emai-Adresse scheint ungültig zu sein!'
       notice: 'Die Nachricht wurde gesendet.'
       warning: 'Beim Versenden der Nachricht gab es ein Problem.'
+    mailer:
+      intro: 'Hier ist die Nachricht vom Kontaktformular der Webseite:'
+      sender_name: "Absendername:"
+      sender_email: "Absender-Email:"
+      message: 'Nachricht'
+            
+  comments:
+    login_needed: 'Du must angemeldet sein, um einen Kommentar zu verfassen'
+    sorted_by_oldest: 'Dieser Abschnitt ist nach Datum sortiert, der älteste Kommentar zuerst, sodass sie von oben nach untern bearbeitet werden können.'
+    what_do_you_think: 'Was denkst Du?'
+    
+    create:
+      notice: 'Der Kommentar wurde erfolgreich erstellt.'
+      warning: 'Beim Speichern des Kommentars in der Database ist ein Problem aufgetreten'
+    update:
+      notice: 'Der Kommentar wurde erfolgreich aktualisiert.'
+      warning: 'Beim Speichern des Kommentars ist ein Problem aufgetreten'
+    destroy:
+      notice: 'Der Kommentar wurde gelöscht'
+    moderation:
+      accept:
+        notice: "Dieser Kommentar wurde angenommen"
+        warning: "Ein Fehler ist aufgetreten und der Kommentar konnte nicht bearbeitet und angenommen werden"
+      block:
+        notice: "Dieser Kommentar wurde abgelehnt"
+        warning: "Ein Fehler ist aufgetreten und der Kommentar konnte nicht bearbeitet und abgelehnt werden"
+      actions:
+        accept: "Akzeptieren!"
+        block: "Ablehnen!"
+    status:
+      pending: 'In Bearbeitung'
+      accepted: 'Akzeptiert'
+      blocked: 'Abgelehnt'
+      
+  blog:
+    itself: 'Blog'
+    home: 'Home-Blog'
+    official: 'Der offizielle Blog'

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

@@ -1,12 +1,16 @@
 en:
   
-  time:
-    formats:
-      # eventually this should be abstracted to a tkh_utilities gem together with all
-      # standard helpers and functionality
-      tkh_default: "%b. %-d, '%y at %l:%M %P"
-  
-  activerecord: 
+  activerecord:
+    models:
+      comment: 'comment'
+      comments: 'comments'
+      contact: 'contact'
+      contacts: 'contacts'
+      page: 'page'
+      pages: 'pages'
+      tag: 'tag'
+      tags: 'tags'
+    
     attributes:
       pages:
         title: "title"
@@ -14,6 +18,7 @@ en:
         description: "description"
         body: "body text"
         for_the_blog: 'for the blog'
+        parent_title: 'page parent title'
         
       contacts:
         sender_name: "sender name"
@@ -26,17 +31,16 @@ en:
         locale: 'language'
         status: 'status'
   
-  are_you_sure: 'are you sure?'
-  colon: ':'
-  delete: 'delete'
-  edit: 'edit'
-  pages: 'pages'
-  sections: 'sections'
-  
   pages:
     author: 'author'
     create_new: 'create new page'
+    edit_this: 'edit this page'
+    home: 'home page'
+    not_published_yet: 'Not published yet'
+    publish: 'publish'
     published: 'published?'
+    unpublish: 'unpublish'
+    reorder_root_menus: 'reorder root menu items'
     
     create:
       notice: 'The page was successfully created.'
@@ -47,17 +51,35 @@ en:
     destroy:
       notice: 'The page was deleted'
       root_warning: "You cannot delete this page as this is the root page of the site. You should only modify it."
+    hint:
+      title: 'nice and descriptive'
+      short_title: 'ideally one word only, used for the menu'
+    status:
+      changed:
+        published: 'The page has been published'
+        unpublished: "The page has been unpublished. It's a draft again."
+        toggled: "The blog status of the page has been changed"
       
   contacts:
     messages_from_forms: 'messages from contact form'
     send_message: 'send message'
     sent: 'Sent at'
-
     create:
+      did_not_reach: 'Something went wrong. Your message did not reach the intended recipient.'
+      invalid_email: 'Your email address does not seem to be valid!'
       notice: 'Your message has been sent'
       warning: 'There was a problem sending your message.'
+    mailer:
+      intro: 'Here is the message sent via the contact form on the web site:'
+      sender_name: "Sender's name:"
+      sender_email: "Sender's email:"
+      message: 'Message:'
             
   comments:
+    login_needed: 'You need to be logged in to leave a comment'
+    sorted_by_oldest: 'This section is sorted by oldest comment first so that they can be moderated from top to bottom.'
+    what_do_you_think: 'What do you think?'
+    
     create:
       notice: 'The comment was successfully created.'
       warning: 'There was a problem saving the comment to the database'
@@ -79,4 +101,9 @@ en:
     status:
       pending: 'pending'
       accepted: 'accepted'
-      blocked: 'blocked'
+      blocked: 'blocked'
+      
+  blog:
+    itself: 'blog'
+    home: 'home blog'
+    official: 'the official blog'