tkh_content 0.9.9 → 0.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f230ccfce698411234a73a0f7af063514073b454
-  data.tar.gz: 2cbf6a17b28cc3f33a9315d27c1d633ea968ae27
+  metadata.gz: a07b81f33459760971cfaaee1ccb390c2439c62d
+  data.tar.gz: 311e44c99984a7d609e12d085a52508fe4a22303
 SHA512:
-  metadata.gz: a0c01a592713676df2ba8e61823714c2177703d66e62023f7d974587289a3c940f23dc5fa9c8d1a8a9a7f33a872302cd58a519edb46b3a803a1dfbbf7dfa474e
-  data.tar.gz: 370e7f3ee81d01bc54b17a636534c3329cb763d3e848d506ca61f02f7791c8e93c880afe3c3f0cf355da95b1da0a908586dea3e43b91bfdd299bc29c490d1e9a
+  metadata.gz: 5ab9a39a8147ef5fd5b72734c6af2c464cf03273def8afb7c41df514d462ed4d876d51b04191bf3968dbb50a2f65a42ed1d3f1289673190be301048e4753dc37
+  data.tar.gz: c327e267dae0e50665e30768c3775387877b16d766627679d827d465f6308323a3349fb9e5747616849f4d4afaf63f34c5b8e47ee43960bc214ed572a1f92c82

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 
 
+## 0.9.10
+
+* Fixed up paginators
+* Replaced div with article tag for individual post partial. Semantically correct AND easier to style first_of_type
+* Fixed up controllers code for flash warnings
+
 
 ## 0.9.9
 

data/app/controllers/comments_controller.rb

@@ -24,7 +24,8 @@ class CommentsController < ApplicationController
     if @comment.save
       redirect_to @comment.page, notice: t('comments.create.notice')
     else
-      redirect_to @comment.page, warning: t('comments.create.warning')
+      flash[:warning] = t('comments.create.warning')
+      redirect_to @comment.page
     end
   end
 
@@ -33,6 +34,7 @@ class CommentsController < ApplicationController
     if @comment.update_attributes(comment_params)
       redirect_to comments_path, notice: t('comments.update.notice')
     else
+      flash[:warning] = t('comments.update.warning')
       render action: "edit", warning: t('comments.update.warning'), layout: 'admin'
     end
   end
@@ -49,7 +51,8 @@ class CommentsController < ApplicationController
     if @comment.save
       redirect_to :back, notice: t('comments.moderation.accept.notice')
     else
-      redirect_to comments_path, warning: t('comments.moderation.accept.warning')
+      flash[:warning] = t('comments.moderation.accept.warning')
+      redirect_to comments_path
     end
   end
 
@@ -59,7 +62,8 @@ class CommentsController < ApplicationController
     if @comment.save
       redirect_to :back, notice: t('comments.moderation.block.notice')
     else
-      redirect_to comments_path, warning: t('comments.moderation.block.warning')
+      flash[:warning] = t('commentns.moderation.block.warning')
+      redirect_to comments_path
     end
   end
 

data/app/controllers/pages_controller.rb

@@ -29,7 +29,8 @@ class PagesController < ApplicationController
     if @page.save
       redirect_to @page, notice: t('pages.create.notice')
     else
-      render action: "new", flash: { error: t('pages.create.warning') }, layout: 'admin'
+      flash[:warning] = t('pages.create.warning')
+      render action: "new", layout: 'admin'
     end
   end
 
@@ -38,7 +39,8 @@ class PagesController < ApplicationController
     if @page.update_attributes(page_params)
       redirect_to @page, notice: t('pages.update.notice')
     else
-      render action: "edit", warning: t('pages.update.warning'), layout: 'admin'
+      flash[:warning] = t('pages.update.warning')
+      render action: "edit", layout: 'admin'
     end
   end
 

data/app/controllers/tags_controller.rb

@@ -18,7 +18,8 @@ class TagsController < ApplicationController
     if @tag.update_attributes(tag_params)
       redirect_to tags_path, notice: t('tags.update.notice')
     else
-      render action: "edit", warning: t('tags.update.warning'), layout: 'admin'
+      flash[:warning] = t('tags.update.warning')
+      render action: "edit", layout: 'admin'
     end
   end
 

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

@@ -11,11 +11,13 @@
   </div>
 </div>
 
+<%= will_paginate @posts, inner_window: 2 %>
+
 <% for post in @posts %>
   <%= render '/pages/individual_blog_post_in_list', post: post %>
 <% end %>
 
-<%= will_paginate @posts %>
+<%= will_paginate @posts, inner_window: 2 %>
 
 <%= render 'all_tags_list' %>
 <%= render( 'admin_context_menu', page: @page) %>

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

@@ -2,12 +2,13 @@
 <% 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') %>
 
+<%= will_paginate @posts, inner_window: 2 %>
 
 <% for post in @posts %>
 	<%= render '/pages/individual_blog_post_in_list', post: post %>
 <% end %>
 
-<%= will_paginate @posts %>
+<%= will_paginate @posts, inner_window: 2 %>
 
 <%= render 'all_tags_list' %>
 <%= render( 'admin_context_menu', page: @page) %>

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

@@ -2,7 +2,7 @@
 
 <%= render 'tab_admin_menu' %>
 
-<%= will_paginate @comments %>
+<%= will_paginate @comments, inner_window: 2 %>
 
 <table class='table table-striped'>
 	<thead>
@@ -27,6 +27,6 @@
 	</tbody>
 </table>
 
-<%= will_paginate @comments %>
+<%= will_paginate @comments, inner_window: 2 %>
 
 <%= render 'shared/admin_sidebar' %>

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

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

data/lib/tkh_content.rb

@@ -1,7 +1,6 @@
 require "tkh_content/version"
 require 'rails'
 require 'bootstrap-sass'
-require 'bootstrap-will_paginate'
 require 'simple_form'
 require 'stringex'
 require 'globalize'

data/lib/tkh_content/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkh_content
 version: !ruby/object:Gem::Version
-  version: 0.9.9
+  version: 0.9.10
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: bootstrap-will_paginate
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: simple_form
   requirement: !ruby/object:Gem::Requirement