tkh_content 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 696381a8bd6d33c376230576651f4005a9436bc0
-  data.tar.gz: 83a018e3c21fedc8ee8660e3123953976fe3025e
+  metadata.gz: b06a375c8b361ed9c4bf4dd7a10d3a3afb4df4fa
+  data.tar.gz: de9b8030ae290fbeb30fb88066dd953f5abb28bc
 SHA512:
-  metadata.gz: ca41ac50bfc656554c26b96ae38d5a158471a9e5e65a1f1eb1d8a82a5d786591f5e6b4f73d73c92d3b8662adcffa095db4b13a8096cb45ee0e7a3bc422df8b50
-  data.tar.gz: f78a19845ea6522dbfde48b37aa667c94219543aff68a04979dc3d8cf0f6b8b45a611b6128a548a143992e474e92dfbef8da72ac8dc6e63c3ac06c7becfc37dc
+  metadata.gz: 93001b14073b528c19fcf91e058e5c9c664d051997783d127caa62eb4345cc6bbfc9fc1691477120d92b106fbbbf13e58cb71420700b21d0b7823fa38ce72afe
+  data.tar.gz: 92ae0346967036ef283091e13cc6cac875c009167a54b4e2c7f37d4a05d9d219c3ce99e63e3cc52ae74d38f5ca57fbe7946ddef2381fac5cad6249fbeb0357fe

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 
 
+## 0.9.7
+
+* Aesthetic changes to play better with Bootstrap 3 and Rails 4
+
+
 ## 0.9.6
 
 * Removed the pages js coffee file and moved code to tkh_admin_panel gem under admin folder

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

@@ -8,4 +8,4 @@
 <% end %>
 
 
-<%= will_paginate @posts %>
+<%= will_paginate @posts %>

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

@@ -3,18 +3,18 @@
 	<% 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 class="list-group">
+			<li class="list-group-item"><%= link_to t('admin_panel'), pages_path %></li>
+			<%= content_tag :li, link_to( "#{t('activerecord.models.comments').capitalize} <span class='badge'>#{Comment.pending.count}</span>".html_safe, pending_comments_path ), class: 'list-group-item' if Comment.pending.count > 0 %>
+			<li class="list-group-item"><%= link_to t('pages.edit_this').capitalize, edit_page_path(page) %></li>
 		</ul>
 
 		<% if Page.not_for_blog.orphans.published.any? %>
 			<h3><%= t('pages.reorder_root_menus') %></h3>
-			<ul class="draggable" data-update-url="<%= sort_pages_path %>">
+			<ul class="draggable list-group" 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 'admin/drag-handle.gif', :class => 'handle silhouette' %> <%= page.nickname -%>
+					<%= content_tag :li, page, class: 'page list-group-item', id: "page_#{page.id}" do %>
+						<%= image_tag 'admin/drag-handle.gif', class: 'handle' %> <%= page.nickname -%>
 					<% end -%>
 			  <% end %>
 			</ul>

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

@@ -1,6 +1,9 @@
 <p class="meta-info">
-	<%= post.author.name %> | 
+	<%= 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>
+	<% if administrator? %>
+    <br />
+    <%= link_to t('edit'), edit_page_path(post), class: 'btn btn-xs btn-primary' %>
+  <% end %>
+</p>

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

@@ -3,15 +3,17 @@
 <% content_for :canonical_link, link_to('', @page, rel: 'canonical') %>
 
 <% unless @page.for_blog? %>
+
 	<%= raw tkhed(@page.body) %>
 	<%= render 'comment_section' if Setting.first.enable_comments_in_pages? %>
+
 <% else %>
-  
+
 	<%= content_tag(:h1, @page.title) %>
 	<%= render '/pages/blog_post_meta', post: @page %>
 	<%= raw tkhed(@page.body) %>
 	<%= render 'comment_section' if Setting.first.enable_comments_in_blog? %>
-	
+
 <% end -%>
 
 <%= render( 'admin_context_menu', page: @page) %>

data/lib/tkh_content/version.rb

@@ -1,3 +1,3 @@
 module TkhContent
-  VERSION = "0.9.6"
+  VERSION = "0.9.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkh_content
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-03 00:00:00.000000000 Z
+date: 2014-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails