tkh_content 0.9.6 → 0.9.7

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/CHANGELOG.md +5 -0
  3. data/app/views/blog/index.html.erb +1 -1
  4. data/app/views/pages/_admin_context_menu.html.erb +7 -7
  5. data/app/views/pages/_blog_post_meta.html.erb +6 -3
  6. data/app/views/pages/show.html.erb +4 -2
  7. data/lib/tkh_content/version.rb +1 -1
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 696381a8bd6d33c376230576651f4005a9436bc0
4
- data.tar.gz: 83a018e3c21fedc8ee8660e3123953976fe3025e
3
+ metadata.gz: b06a375c8b361ed9c4bf4dd7a10d3a3afb4df4fa
4
+ data.tar.gz: de9b8030ae290fbeb30fb88066dd953f5abb28bc
5
5
  SHA512:
6
- metadata.gz: ca41ac50bfc656554c26b96ae38d5a158471a9e5e65a1f1eb1d8a82a5d786591f5e6b4f73d73c92d3b8662adcffa095db4b13a8096cb45ee0e7a3bc422df8b50
7
- data.tar.gz: f78a19845ea6522dbfde48b37aa667c94219543aff68a04979dc3d8cf0f6b8b45a611b6128a548a143992e474e92dfbef8da72ac8dc6e63c3ac06c7becfc37dc
6
+ metadata.gz: 93001b14073b528c19fcf91e058e5c9c664d051997783d127caa62eb4345cc6bbfc9fc1691477120d92b106fbbbf13e58cb71420700b21d0b7823fa38ce72afe
7
+ data.tar.gz: 92ae0346967036ef283091e13cc6cac875c009167a54b4e2c7f37d4a05d9d219c3ce99e63e3cc52ae74d38f5ca57fbe7946ddef2381fac5cad6249fbeb0357fe
data/CHANGELOG.md CHANGED
@@ -2,6 +2,11 @@
2
2
 
3
3
 
4
4
 
5
+ ## 0.9.7
6
+
7
+ * Aesthetic changes to play better with Bootstrap 3 and Rails 4
8
+
9
+
5
10
  ## 0.9.6
6
11
 
7
12
  * Removed the pages js coffee file and moved code to tkh_admin_panel gem under admin folder
data/app/views/blog/index.html.erb CHANGED
@@ -8,4 +8,4 @@
8
8
  <% end %>
9
9
 
10
10
 
11
- <%= will_paginate @posts %>
11
+ <%= will_paginate @posts %>
data/app/views/pages/_admin_context_menu.html.erb CHANGED
@@ -3,18 +3,18 @@
3
3
  <% content_for :admin_context_menu do %>
4
4
 
5
5
  <h2><%= t('admin_section') %></h2>
6
- <ul>
7
- <li><%= link_to t('admin_panel'), pages_path %></li>
8
- <%= content_tag :li, link_to("#{t('activerecord.models.comments').capitalize} #{"(#{Comment.pending.count})"}", pending_comments_path) if Comment.pending.count > 0 %>
9
- <li><%= link_to t('pages.edit_this').capitalize, edit_page_path(page) %></li>
6
+ <ul class="list-group">
7
+ <li class="list-group-item"><%= link_to t('admin_panel'), pages_path %></li>
8
+ <%= 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 %>
9
+ <li class="list-group-item"><%= link_to t('pages.edit_this').capitalize, edit_page_path(page) %></li>
10
10
  </ul>
11
11
 
12
12
  <% if Page.not_for_blog.orphans.published.any? %>
13
13
  <h3><%= t('pages.reorder_root_menus') %></h3>
14
- <ul class="draggable" data-update-url="<%= sort_pages_path %>">
14
+ <ul class="draggable list-group" data-update-url="<%= sort_pages_path %>">
15
15
  <% for page in Page.not_for_blog.orphans.published.by_menu_position %>
16
- <%= content_tag :li, page, class: 'page', id: "page_#{page.id}" do %>
17
- <%= image_tag 'admin/drag-handle.gif', :class => 'handle silhouette' %> <%= page.nickname -%>
16
+ <%= content_tag :li, page, class: 'page list-group-item', id: "page_#{page.id}" do %>
17
+ <%= image_tag 'admin/drag-handle.gif', class: 'handle' %> <%= page.nickname -%>
18
18
  <% end -%>
19
19
  <% end %>
20
20
  </ul>
data/app/views/pages/_blog_post_meta.html.erb CHANGED
@@ -1,6 +1,9 @@
1
1
  <p class="meta-info">
2
- <%= post.author.name %> |
2
+ <%= post.author.name %> |
3
3
  <%= post.published_at ? link_to(l(post.published_at, format: :tkh_default), post) : t('pages.not_published_yet') %> |
4
4
  <%= "#{t('activerecord.models.comments')}#{t('colon')} #{post.comments.showable.for_locale(I18n.locale.to_s).count}" %>
5
- <%= link_to t('edit'), edit_page_path(post), class: 'btn btn-mini' if administrator? %>
6
- </p>
5
+ <% if administrator? %>
6
+ <br />
7
+ <%= link_to t('edit'), edit_page_path(post), class: 'btn btn-xs btn-primary' %>
8
+ <% end %>
9
+ </p>
data/app/views/pages/show.html.erb CHANGED
@@ -3,15 +3,17 @@
3
3
  <% content_for :canonical_link, link_to('', @page, rel: 'canonical') %>
4
4
 
5
5
  <% unless @page.for_blog? %>
6
+
6
7
  <%= raw tkhed(@page.body) %>
7
8
  <%= render 'comment_section' if Setting.first.enable_comments_in_pages? %>
9
+
8
10
  <% else %>
9
-
11
+
10
12
  <%= content_tag(:h1, @page.title) %>
11
13
  <%= render '/pages/blog_post_meta', post: @page %>
12
14
  <%= raw tkhed(@page.body) %>
13
15
  <%= render 'comment_section' if Setting.first.enable_comments_in_blog? %>
14
-
16
+
15
17
  <% end -%>
16
18
 
17
19
  <%= render( 'admin_context_menu', page: @page) %>
data/lib/tkh_content/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module TkhContent
2
- VERSION = "0.9.6"
2
+ VERSION = "0.9.7"
3
3
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tkh_content
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.9.6
4
+ version: 0.9.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Swami Atma
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-03-03 00:00:00.000000000 Z
11
+ date: 2014-03-04 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: rails