tkh_content 0.1.9.2 → 0.1.9.3

data/CHANGELOG.md

@@ -2,6 +2,16 @@
 
 
 
+## 0.1.9.3
+
+* Modified labels in contact_us form partial
+* Improved styling and display for the show view of content pages and blog posts
+* Added a new datetime locale format
+* Administrators get an 'edit' button in the meta info of blog posts
+* Added indices to page model
+* Pages have a menu_position attribute and can easily be reordered in combination with the tkh_menus gem
+
+
 ## 0.1.9.1 & 0.1.9.2
 
 * Debugging

data/app/controllers/pages_controller.rb

@@ -74,4 +74,11 @@ class PagesController < ApplicationController
     redirect_to pages_path notice: "The blog status of the page has been changed"
   end
   
+  def sort
+    params[:page].each_with_index do |id, index|
+      Page.update_all({ menu_position: index+1 }, { id: id })
+    end
+    render nothing: true
+  end
+  
 end

data/app/helpers/pages_helper.rb

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

data/app/models/page.rb

@@ -32,6 +32,7 @@ class Page < ActiveRecord::Base
   scope :orphans, where('parent_id IS ?', nil)
   scope :with_parent_id, lambda { |id| where('parent_id = ?', id) }
   scope :by_title, order('title')
+  scope :by_menu_position, order('menu_position')
   
   def nickname
     short_title || title

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

@@ -1,13 +1,10 @@
-<% content_for :meta_title, 'Home' %>
-
-<% unless @posts.blank? %>
-  <% for post in @posts %>
-		<div class="individual-post">
-	    <h1><%= link_to post.title, post %></h1>
-			<p class="meta-info">by <%= post.author.name %> on <%= l post.published_at, format: :default %> | <%= link_to 'Permalink.', post %></p>
-			<%= raw post.body %>
-		</div>
-  <% end %>
+<% content_for :meta_title, Setting.first.blog_name %>
+<%= content_for :meta_description, "#{Setting.first.blog_tagline} - #{Setting.first.company_name}: the official blog" %>
+
+
+<% for post in @posts %>
+	<%= render '/pages/individual_blog_post_in_list', post: post %>
 <% end %>
 
+
 <%= will_paginate @posts %>

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

@@ -2,9 +2,9 @@
 	<%= f.error_notification %>
 	
   <div class="form-inputs">
-		<%= f.input :sender_name %>
-		<%= f.input :sender_email %>
-		<%= f.input :body, :input_html => { :rows => 10 } %>
+		<%= f.input :sender_name, label: 'your name' %>
+		<%= f.input :sender_email, label: 'your email' %>
+		<%= f.input :body, label: 'your message', :input_html => { :rows => 10 } %>
 	</div>
 	
   <div class="form-actions">

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

@@ -0,0 +1,4 @@
+<p class="meta-info">
+	by <%= post.author.name %> on <%= l post.published_at, format: :tkh_default %> | <%= link_to 'Permalink', post %>
+	<%="| #{link_to 'edit', edit_page_path(post), class: 'btn btn-mini'}".html_safe if administrator? %>
+</p>

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

@@ -0,0 +1,5 @@
+<div class="individual-post">
+	<h1><%= link_to post.title, post %></h1>
+	<%= render '/pages/blog_post_meta', post: post %>
+	<%= raw post.body %>
+</div>

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

@@ -1,12 +1,17 @@
 <% content_for :meta_title, @page.title %>
 <% content_for :meta_description, @page.description %>
 
-<%= content_tag(:h1, @page.title) if @page.for_blog? %>
+<% unless @page.for_blog? %>
 
-<%= raw tkhed(@page.body) %>
+	<%= raw tkhed(@page.body) %>
 
-<!-- remove this once DSL has been created -->
-<%# = render 'contacts/form' if params[:id].to_i == 5 %>
+<% else %>
+  
+	<%= content_tag(:h1, @page.title) %>
+	<%= render '/pages/blog_post_meta', post: @page %>
+	<%= raw tkhed(@page.body) %>
+	
+<% end -%>
 
 <%# partial in tkh_menus gem or has to be added in host app %>
 <%= render './shared/menus' %>

data/config/routes.rb

@@ -6,6 +6,9 @@ Rails.application.routes.draw do
         post :unpublish
         post :toggle_for_blog
       end
+      collection do 
+        post :sort
+      end
     end
     get 'blog' => 'blog#index', as: :blog
     get 'tags/:tag', to: 'blog#index', as: :tag

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

@@ -1,5 +1,11 @@
 de:
   
+  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'

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

@@ -1,5 +1,11 @@
 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: 
     attributes:
       pages:

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

@@ -1,5 +1,11 @@
 es:
   
+  time:
+    formats:
+      # eventually this should be abstracted to a tkh_utilities gem together with all
+      # standard helpers and functionality
+      tkh_default: "%d de %B de %Y %H:%M"
+  
   are_you_sure: '¿estás seguro?'
   delete: 'borrar'
   edit: 'editar'

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

@@ -1,5 +1,11 @@
 fr:
   
+  time:
+    formats:
+      # eventually this should be abstracted to a tkh_utilities gem together with all
+      # standard helpers and functionality
+      tkh_default: "%d %b %Y à %H:%M"
+  
   are_you_sure: 'êtes vous sûr ?'
   delete: 'supprimer'
   edit: 'modifier'

data/lib/generators/tkh_content/create_or_update_migrations/create_or_update_migrations_generator.rb

@@ -23,6 +23,7 @@ module TkhContent
         migration_template "create_tags.rb", "db/migrate/create_tags.rb"
         migration_template "create_taggings.rb", "db/migrate/create_taggings.rb"
         migration_template "create_contacts.rb", "db/migrate/create_contacts.rb"
+        migration_template "add_various_indices_to_pages.rb", "db/migrate/add_various_indices_to_pages.rb"
       end
  
     end

data/lib/generators/tkh_content/create_or_update_migrations/templates/add_various_indices_to_pages.rb

@@ -0,0 +1,14 @@
+class AddVariousIndicesToPages < ActiveRecord::Migration
+  
+  def self.up
+    add_index :pages, :updated_at
+    add_index :pages, :for_blog
+    add_index :pages, :title
+  end
+  
+  def self.down
+    remove_index :pages, :updated_at
+    remove_index :pages, :for_blog
+    remove_index :pages, :title
+  end
+end

data/lib/tkh_content/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkh_content
 version: !ruby/object:Gem::Version
-  version: 0.1.9.2
+  version: 0.1.9.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-04 00:00:00.000000000 Z
+date: 2013-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -161,7 +161,9 @@ files:
 - app/views/contact_mailer/message_from_contact_form.text.erb
 - app/views/contacts/_form.html.erb
 - app/views/contacts/index.html.erb
+- app/views/pages/_blog_post_meta.html.erb
 - app/views/pages/_form.html.erb
+- app/views/pages/_individual_blog_post_in_list.html.erb
 - app/views/pages/edit.html.erb
 - app/views/pages/index.html.erb
 - app/views/pages/new.html.erb
@@ -178,6 +180,7 @@ files:
 - lib/generators/tkh_content/create_or_update_migrations/create_or_update_migrations_generator.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/add_author_to_pages.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/add_parent_id_to_pages.rb
+- lib/generators/tkh_content/create_or_update_migrations/templates/add_various_indices_to_pages.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/create_contacts.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/create_pages.rb
 - lib/generators/tkh_content/create_or_update_migrations/templates/create_taggings.rb
@@ -233,7 +236,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1015600408546556615
+      hash: -3837185877085223117
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -242,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1015600408546556615
+      hash: -3837185877085223117
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23