tkh_content 0.9.7 → 0.9.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b06a375c8b361ed9c4bf4dd7a10d3a3afb4df4fa
-  data.tar.gz: de9b8030ae290fbeb30fb88066dd953f5abb28bc
+  metadata.gz: 5aa776dd50acb59c951e8fd0506a2af67d60aa50
+  data.tar.gz: 3ecdb0062469aae86f29403e5fa710a8f36a8c5c
 SHA512:
-  metadata.gz: 93001b14073b528c19fcf91e058e5c9c664d051997783d127caa62eb4345cc6bbfc9fc1691477120d92b106fbbbf13e58cb71420700b21d0b7823fa38ce72afe
-  data.tar.gz: 92ae0346967036ef283091e13cc6cac875c009167a54b4e2c7f37d4a05d9d219c3ce99e63e3cc52ae74d38f5ca57fbe7946ddef2381fac5cad6249fbeb0357fe
+  metadata.gz: ccff788f856910f0b2b1b6478d5495917a0e72c9c082afd69c3a94cdd734dad97e6d7896a3ca43c26395e208635920c1bf3de3887017e179e5f43d61edb5a1c9
+  data.tar.gz: f3edf90b3b14d5b35314dd59119b7619236c320dded4c8416308f1bc19fa31adec1e3aad8acd2f9f0f8b317c124b727b1f4ebc83cdbd14b4f0231b5366e3f90c

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 
 
+## 0.9.8
+
+* Full implementation of blog tags
+
+
 ## 0.9.7
 
 * Aesthetic changes to play better with Bootstrap 3 and Rails 4

data/app/controllers/blog_controller.rb

@@ -1,102 +1,17 @@
 class BlogController < ApplicationController
-  
+
   def index
-    unless params[:tag]
-      @posts = Page.for_blog.published.order('published_at desc').paginate(:page => params[:page], :per_page => 20)
-    else
-      @posts = Page.for_blog.published.tagged_with(params[:tag]).order('published_at desc').paginate(:page => params[:page], :per_page => 20)
-    end
+    @posts = Page.for_blog.published.order('published_at desc').paginate(:page => params[:page], :per_page => 20)
     respond_to do |format|
       format.html { render :layout => 'blog' }
       format.atom
     end
   end
-  
-  # This is temporary and only to complete the import to SA's site.
-  def update_data
-    
-    @count = 0
-    @pages = Array.new
-    
-    Page.all.each do |page|
-      # determine whether page contains path
-      if page.body.match /src="\/system\/photos\/.*\.jpg/
-        # extract string to be changed
-        # match_data = page.body.match /src="\/system\/photos\/.*\.jpg/
-        # # extract an image name with jpg extension in the blog/2006 section
-        # extracted_image = match_data.to_s.sub("src=\"/images/photos/", '')
-        # # find the corresponding illustration
-        # illustration = Illustration.find_by_name(extracted_image)
-        # if illustration
-        #   # change the image path
-        #   page.body = page.body.sub("/images/blog/2007/", "/system/images/illustration/#{illustration.id}/large_")
-        #   # save the page with new path
-        #   page.save
-        # end  
-        @count += 1
-        @pages << page
-        
-      end
-    end
-    
-    # @list_of_files = Array.new
-    
-    # @count = 0
-    
-    # Illustration.all.each do |illustration|
-    #   
-    #   if illustration.name == 'No name given'
-    #     
-    #     illustration.destroy
-    #     @count += 1 
-    #     
-    #   end
-    #   
-    #   # # extract an image name with jpg extension in the blog/2006 section
-    #   # extracted_image = page.body.match(/src="\/images\/blog\/2006\/.*\.jpg/).to_s.sub("src=\"/images/blog/2006/", '')
-    #   # 
-    #   # if extracted_image
-    #   #   
-    #   #    # find the corresponding illustration
-    #   #     @illustration = Illustration.find_by_image(File.basename("/Users/swamiatma/Documents/railsapps/aya/public/images/blog/2006/#{extracted_image}"))
-    #   #     
-    #   #     if @illustration
-    #   #       # change the path of the image
-    #   #       page.body = page.body.sub("/images/blog/2006/", "/system/images/illustration/#{@illustration.id}/large_")
-    #   #       # save the page with new path
-    #   #       page.save
-    #   #     
-    #   #       count += 1
-    #   #       extracted_image = nil
-    #   #     end
-    #   #   
-    #   # end
-    #  
-    # end
-    
-    # # take a blog post as an example
-    # @page = Page.find(9)
 
-    
-    # redirect_to blog_path, notice: "#{count} wp images have been detected"
-    # 
-    # count = 0
-    #     
-    # Dir["/Users/swamiatma/Documents/railsapps/aya/public/images/photos/*.*"].each do |file|
-    #   
-    #   illustration = Illustration.new
-    #   illustration.image = File.open(file)
-    #   illustration.name = "photos-#{File.basename(file)}"
-    #   illustration.save
-    #   
-    #   count += 1
-    #   
-    # end
-    # 
-    # 
-    # redirect_to illustrations_path, notice: "#{count} new illustrations should be uploaded"
-    
-    
+  def by_tag
+    @tag = Tag.where('name = ?', params[:id]).first
+    @posts = @tag.pages.order('published_at desc').paginate(:page => params[:page], :per_page => 20)
+    render :layout => 'blog'
   end
-  
+
 end

data/app/models/tag.rb

@@ -18,4 +18,10 @@ class Tag < ActiveRecord::Base
     name ? "#{id}-#{name.to_url}" : id
   end
 
+  def self.with_taggings
+    taggings = Tagging.select("DISTINCT tag_id")
+    ids = taggings.map { |tagging| tagging.tag_id }
+    tags = Tag.order('name').find(ids)
+  end
+
 end

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

@@ -0,0 +1,13 @@
+<% if administrator? %>
+
+  <% content_for :admin_context_menu do %>
+
+    <h2><%= t('admin_section') %></h2>
+    <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 %>
+    </ul>
+
+  <% end -%>
+
+<% end -%>

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

@@ -0,0 +1,10 @@
+<% content_for :all_tags_list do %>
+  <h2>étiquettes</h2>
+  <% if Tag.count > 0 %>
+    <p class="all-tags-list">
+      <%= render :partial => 'blog/individual_tag', collection: Tag.with_taggings, as: :tag %>
+    </p>
+  <% else %>
+    <p>There are currently no tags to display</p>
+  <% end %>
+<% end %>

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

@@ -0,0 +1 @@
+<%= content_tag :span, link_to(tag.name, blog_by_tag_path(tag.name)), class: 'individual-tag' %>

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

@@ -0,0 +1,23 @@
+<% content_for :meta_title, Setting.first.try(:company_name) %>
+<% content_for :meta_description, "Blog posts with the '#{@tag.name}' tag." %>
+<% content_for :canonical_link, link_to('', blog_path, rel: 'canonical') %>
+
+<div class="panel panel-info">
+  <div class="panel-heading">
+    <h3 class="panel-title"><%= @tag.name %></h3>
+  </div>
+  <div class="panel-body">
+    Liste des articles avec cette étiquette
+  </div>
+</div>
+
+<% for post in @posts %>
+  <%= render '/pages/individual_blog_post_in_list', post: post %>
+<% end %>
+
+<%= will_paginate @posts %>
+
+<%= render 'all_tags_list' %>
+<%= render( 'admin_context_menu', page: @page) %>
+<%# partial in tkh_menus gem or has to be added in host app %>
+<%= render './shared/menus' %>

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

@@ -7,5 +7,9 @@
 	<%= render '/pages/individual_blog_post_in_list', post: post %>
 <% end %>
 
-
 <%= will_paginate @posts %>
+
+<%= render 'all_tags_list' %>
+<%= render( 'admin_context_menu', page: @page) %>
+<%# partial in tkh_menus gem or has to be added in host app %>
+<%= render './shared/menus' %>

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

@@ -1,9 +1,15 @@
-<p class="meta-info">
-	<%= 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}" %>
-	<% if administrator? %>
-    <br />
-    <%= link_to t('edit'), edit_page_path(post), class: 'btn btn-xs btn-primary' %>
+<p class="post-meta-info">
+	<%= content_tag :span, post.author.name, class: 'author-name' %>
+	<%= content_tag :span, (post.published_at ? link_to(l(post.published_at, format: :tkh_default), post) :  t('pages.not_published_yet')), class: 'published-date' %>
+	<%= content_tag :span, "#{t('activerecord.models.comments')}#{t('colon')} #{post.comments.showable.for_locale(I18n.locale.to_s).count}", class: 'comment-count' %>
+
+  <% if post.tags.count > 0 %>
+    <span class="tag-list">
+      <%= render :partial => 'blog/individual_tag', collection: post.tags.alphabetically, as: :tag %>
+    </span>
+  <% end %>
+
+  <% if administrator? %>
+    <%= content_tag :span, (link_to t('edit'), edit_page_path(post), class: 'btn btn-xs btn-primary'), class: 'edit-button' %>
   <% end %>
 </p>

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

@@ -1,10 +1,12 @@
 <%= simple_form_for @page, :html => { class: 'form-horizontal', role: 'form' } do |f| %>
 	<%= f.error_notification %>
 
-  <div class="form-inputs">
-		<%= f.input :title, label: t('activerecord.attributes.pages.title'), hint: t('pages.hint.title') %>
+		<%= f.input :title,
+								label: t('activerecord.attributes.pages.title'),
+								hint: t('pages.hint.title'),
+								input_html: { size: 45 } %>
 		<%= f.input :for_blog, label: t('activerecord.attributes.pages.for_the_blog') %>
-		<%= f.input :tag_list, hint: 'space separated', :wrapper_html => { :id => 'page-tag-list' } %>
+		<%= f.input :tag_list, hint: 'space separated', :wrapper_html => { :id => 'page-tag-list' }, input_html: { size: 45 } %>
 		<%= f.input :short_title, label: t('activerecord.attributes.pages.short_title'), hint: t('pages.hint.short_title'), :wrapper_html => { :id => 'page-short-title' } %>
 		<%= f.input :parent_page_title,
 								as: :string,
@@ -15,7 +17,7 @@
 																:data => { 	provide: 'typeahead',
 																	 					source: Page.not_for_blog.by_title.map(&:title).to_json }
 																	} %>
-	  <%= f.input :description, label: t('activerecord.attributes.pages.description'), :input_html => { :rows => 3 } %>
+	  <%= f.input :description, label: t('activerecord.attributes.pages.description'), :input_html => { cols: 45, rows: 3 } %>
 		<%= f.input :body, label: t('activerecord.attributes.pages.body'), :input_html => { :rows => 35, :class => 'ckeditor' } %>
 
 		<% if controller.action_name == 'edit' # the current_user is the page creator in create method %>
@@ -24,14 +26,13 @@
 									:wrapper_html => { :id => 'author-name' },
 									label: "author name",
 									:input_html => {
+																	size: 45,
 																	:autocomplete => 'off',
 																	:data => { 	source: User.administrators.alphabetically.map(&:formal_name).to_json }
 																		} %>
 		<% end -%>
-	</div>
 
-  <div class="form-actions">
+		<br />
     <%= f.button :submit, :class => 'btn btn-primary' %>
-  </div>
 
 <% end %>

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

@@ -13,9 +13,11 @@
 	<%= render '/pages/blog_post_meta', post: @page %>
 	<%= raw tkhed(@page.body) %>
 	<%= render 'comment_section' if Setting.first.enable_comments_in_blog? %>
+  <%= render 'blog/all_tags_list' %>
 
 <% end -%>
 
 <%= render( 'admin_context_menu', page: @page) %>
 <%# partial in tkh_menus gem or has to be added in host app %>
 <%= render './shared/menus' %>
+

data/config/routes.rb

@@ -6,13 +6,13 @@ Rails.application.routes.draw do
         post :unpublish
         post :toggle_for_blog
       end
-      collection do 
+      collection do
         post :sort
       end
     end
-    
+
     resources :contacts
-    
+
     resources :comments do
       collection do
         get :pending
@@ -26,7 +26,7 @@ Rails.application.routes.draw do
       end
     end
     get 'blog' => 'blog#index', as: :blog
-    get 'tags/:tag', to: 'blog#index', as: :tag
-    
+    get 'blog_by_tag/:id', :to => 'blog#by_tag', :as => 'blog_by_tag'
+
   end
-end
+end

data/lib/generators/tkh_content/create_or_update_files/templates/blog.html.erb

@@ -3,11 +3,11 @@
 	<head>
 	  <title>
 			<% if defined?(SETTINGS) && SETTINGS['site_name'] %>
-				<%= @meta_title ? "#{@meta_title} | #{SETTINGS['site_name']}" : SETTINGS['site_name'] %>	
+				<%= @meta_title ? "#{@meta_title} | #{SETTINGS['site_name']}" : SETTINGS['site_name'] %>
 			<% else %>
 				<%= @meta_title ? @meta_tile : 'A web site powered by tkh_cms' %>
 			<% end -%>
-		- The blog</title>	
+		- The blog</title>
 	  <meta name="description" content="<%= @meta_description -%>">
 	  <%= stylesheet_link_tag    "application", :media => "all" %>
 		<%= favicon_link_tag '/favicon.ico' %>
@@ -16,23 +16,23 @@
 	<body>
 
 		<div id="content">
-			
-			<article>				
+
+			<article>
 				<% flash.each do |name, msg| %>
 				  <%= content_tag :div, msg, :id => "flash_#{name}" %>
 				<% end %>
-				
+
 				<h1>The blog</h1>
-					
+
 				<%= yield %>
 			</article>
-			
+
 			<aside>
 				<%# = render 'shared/sidebar' %>
 			</aside>
-			
+
 		</div>
-		
+
 	  <%= javascript_include_tag "application" %>
 	</body>
 </html>

data/lib/tkh_content/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkh_content
 version: !ruby/object:Gem::Version
-  version: 0.9.7
+  version: 0.9.8
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2014-03-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -160,6 +160,10 @@ files:
 - app/models/page.rb
 - app/models/tag.rb
 - app/models/tagging.rb
+- app/views/blog/_admin_context_menu.html.erb
+- app/views/blog/_all_tags_list.html.erb
+- app/views/blog/_individual_tag.html.erb
+- app/views/blog/by_tag.html.erb
 - app/views/blog/index.atom.builder
 - app/views/blog/index.html.erb
 - app/views/comments/_form.html.erb