tkh_content 0.1.3 → 0.1.4

data/CHANGELOG.md

@@ -2,6 +2,15 @@
 
 
 
+## 0.1.4
+
+* Added pagination to the pages index method.
+* Added pagination to blog home page.
+* The user CANNOT delete the home page. For any reason whatsoever.
+* Minor improvements to blog
+* Translated German strings.
+
+
 ## 0.1.3
 
 * Debugged blog controller index method query. Now it's properly returning blog posts by most recently published and without offset. Still need to do the pagination.
@@ -9,7 +18,7 @@
 
 ## 0.1.2
 
-* Refactored generation of short_title attribute. Moved it ot the create_pages migration to avoid conflict in globalize3.
+* Refactored generation of short_title attribute. Moved it to the create_pages migration to avoid conflict in globalize3.
 
 
 ## 0.1.1

data/README.md

@@ -2,7 +2,7 @@
 
 This Rails engine puts the C in CMS. It provides the pages and the blog section. 
 
-Primarily developed for Ten Thousand Hours but we are happy to share if anybody finds it useful.
+Primarily developed for Ten Thousand Hours but we are happy to share if anybody finds it useful. It's meant primarily to be used with the tkh_cms gem suite but over time we want it to be used individually as well. The latter implementation will be accelerated if some issues and pull requests come in, denoting some interest out there.
 
 It's still embryonic but many improvements to come. The blog is now coming bit by bit.
 
@@ -46,7 +46,7 @@ Update the gem:
 
     $ bundle update tkh_content
 
-Update files, migrations, etc. This is only needed with a new minor version number ( second level from left )
+Update files, migrations, etc. This is not always needed.
 
 		$ rake tkh_content:update
 		

data/app/controllers/blog_controller.rb

@@ -1,7 +1,7 @@
 class BlogController < ApplicationController
   
   def index
-    @posts = Page.for_blog.published.order('published_at desc')
+    @posts = Page.for_blog.published.order('published_at desc').paginate(:page => params[:page], :per_page => 20)
     render :layout => 'blog'
   end
   

data/app/controllers/pages_controller.rb

@@ -4,7 +4,7 @@ class PagesController < ApplicationController
   before_filter :authenticate_with_admin, :except => 'show'
   
   def index
-    @pages = Page.by_recent
+    @pages = Page.by_recent.paginate(:page => params[:page], :per_page => 35)
     switch_to_admin_layout
   end
 
@@ -43,9 +43,14 @@ class PagesController < ApplicationController
   end
 
   def destroy
-    @page = Page.find(params[:id])
-    @page.destroy
-    redirect_to pages_url, notice: t('pages.destroy.notice')
+    unless params[:id].to_i == 1
+      @page = Page.find(params[:id])
+      @page.destroy
+      redirect_to pages_url, notice: t('pages.destroy.notice')
+    else # one should not be able to destroy the page #1 which is the site's home page
+      flash[:warning] = t('pages.destroy.root_warning')
+      redirect_to ( :back || pages_url )
+    end
   end
   
   def publish

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

@@ -1,16 +1,13 @@
-<% content_for :meta_title, 'Blog' %>
+<% content_for :meta_title, 'Home' %>
 
 <% unless @posts.blank? %>
   <% for post in @posts %>
-    <h1><%= link_to post.title, post %></h1>
-		<p><%= link_to 'edit post', edit_page_path(post) %></p>
-		<p>
-			by <%= post.author.name %> on <%= l post.published_at, format: :default %> | <%= link_to 'Permalink.', post %>
-		</p>
-		<%= raw post.body %>
+		<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 %>
 <% end %>
 
-
-
-
+<%= will_paginate @posts %>

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

@@ -36,6 +36,8 @@
 	</tbody>
 </table>
 
+<%= will_paginate @pages %>
+
 <%= link_to t('pages.create_new').capitalize, new_page_path, class: 'btn btn-primary' %>
 
 <%= render 'shared/admin_sidebar' %>

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

@@ -1,30 +1,31 @@
 de:
   
-  are_you_sure: 'are you sure?'
-  delete: 'delete'
-  edit: 'edit'
-  pages: 'pages'
-  sections: 'sections'
-  
+  are_you_sure: 'Bist Du sicher?'
+  delete: 'löschen'
+  edit: 'bearbeiten'
+  pages: 'Seiten'
+  sections: 'Abschnitte'
+
   activerecord: 
     attributes:
       pages:
-        title: "titre"
-        short_title: 'titre raccourci'
-        description: "description"
-        body: "texte principal"
-        for_the_blog: 'pour le blog'
-  
+        title: "Überschrift"
+        short_title: 'Kurzüberschrifti'
+        description: "Beschreibung"
+        body: "Haupttext"
+        for_the_blog: 'Für den Blog'
+
   pages:
-    author: 'author'
-    create_new: 'create new page'
-    published: 'published?'
-    
+    author: 'Autor'
+    create_new: 'Neue Seite anlegen'
+    published: 'veröffentlichen?'
+
     create:
-      notice: 'The page was successfully created.'
-      warning: 'There was a problem saving the page'
+      notice: 'Diese Seite wurde erfolgreich angelegt.'
+      warning: 'Beim Speichern dieser Seite ist ein Problem aufgetreten'
     update:
-      notice: 'The page was successfully updated.'
-      warning: 'There was a problem saving the page'
+      notice: 'Die Seite wurde erfolgreich aktualisiert.'
+      warning: 'Beim Speichern der Seite ist ein Problem aufgetreten'
     destroy:
-      notice: 'The page was deleted'
+      notice: 'Die Seite wurde gelöscht'
+      root_warning: "You cannot delete this page as this is the root page of the site. You should only modify it."

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

@@ -19,3 +19,4 @@ en:
       warning: 'There was a problem saving the page'
     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."

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

@@ -28,5 +28,6 @@ es:
       warning: 'Hubo un problema al guardar la página'
     destroy:
       notice: 'la página se ha eliminado'
+      root_warning: "No se puede eliminar la página, ya que es la bienvenida principal. Por favor, cámbialo."
           
   

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

@@ -27,4 +27,5 @@ fr:
       notice: 'Les changements de cette page ont été sauvegardés'
       warning: "Il y'a eu un probleme et les changements de cette page n'ont pas été sauvegardés"
     destroy:
-      notice: 'La page a été supprimée'
+      notice: 'La page a été supprimée'
+      root_warning: "Vous ne pouvez pas supprimer cette page parce que c'est la page principale de bienvenue. Veuillez la modifier."

data/lib/tkh_content.rb

@@ -3,6 +3,8 @@ require 'bootstrap-sass'
 require 'simple_form'
 require 'stringex'
 require 'globalize3'
+require 'will_paginate'
+require 'bootstrap-will_paginate'
 
 module TkhContent
   class Engine < ::Rails::Engine

data/lib/tkh_content/version.rb

@@ -1,3 +1,3 @@
 module TkhContent
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkh_content
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-04 00:00:00.000000000 Z
+date: 2012-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -91,6 +91,38 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: '0.2'
+- !ruby/object:Gem::Dependency
+  name: will_paginate
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: bootstrap-will_paginate
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -187,7 +219,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1251104337554282840
+      hash: -1172791185126554956
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -196,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1251104337554282840
+      hash: -1172791185126554956
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23