tkh_content 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aa776dd50acb59c951e8fd0506a2af67d60aa50
-  data.tar.gz: 3ecdb0062469aae86f29403e5fa710a8f36a8c5c
+  metadata.gz: f230ccfce698411234a73a0f7af063514073b454
+  data.tar.gz: 2cbf6a17b28cc3f33a9315d27c1d633ea968ae27
 SHA512:
-  metadata.gz: ccff788f856910f0b2b1b6478d5495917a0e72c9c082afd69c3a94cdd734dad97e6d7896a3ca43c26395e208635920c1bf3de3887017e179e5f43d61edb5a1c9
-  data.tar.gz: f3edf90b3b14d5b35314dd59119b7619236c320dded4c8416308f1bc19fa31adec1e3aad8acd2f9f0f8b317c124b727b1f4ebc83cdbd14b4f0231b5366e3f90c
+  metadata.gz: a0c01a592713676df2ba8e61823714c2177703d66e62023f7d974587289a3c940f23dc5fa9c8d1a8a9a7f33a872302cd58a519edb46b3a803a1dfbbf7dfa474e
+  data.tar.gz: 370e7f3ee81d01bc54b17a636534c3329cb763d3e848d506ca61f02f7791c8e93c880afe3c3f0cf355da95b1da0a908586dea3e43b91bfdd299bc29c490d1e9a

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 
 
+
+## 0.9.9
+
+* Added tag resource and tag section in admin panel
+
+
 ## 0.9.8
 
 * Full implementation of blog tags

data/app/controllers/tags_controller.rb

@@ -0,0 +1,32 @@
+class TagsController < ApplicationController
+
+  before_filter :authenticate
+  before_filter :authenticate_with_admin
+
+  def index
+    @tags = Tag.alphabetically
+    switch_to_admin_layout
+  end
+
+  def edit
+    @tag = Tag.find(params[:id])
+    switch_to_admin_layout
+  end
+
+  def update
+    @tag = Tag.find(params[:id])
+    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'
+    end
+  end
+
+  private
+
+  # Never trust parameters from the scary internet, only allow the white list through.
+  def tag_params
+    params.require(:tag).permit(:name)
+  end
+
+end

data/app/models/tag.rb

@@ -5,8 +5,6 @@
 
 class Tag < ActiveRecord::Base
 
-  # attr_accessible :name
-
   has_many :taggings
   has_many :pages, through: :taggings
 

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

@@ -4,7 +4,7 @@
 
 <div class="panel panel-info">
   <div class="panel-heading">
-    <h3 class="panel-title"><%= @tag.name %></h3>
+    <h3 class="panel-title"><%= "#{@tag.name} (#{@tag.taggings.count})" %></h3>
   </div>
   <div class="panel-body">
     Liste des articles avec cette étiquette

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

@@ -6,7 +6,11 @@
 								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' }, input_html: { size: 45 } %>
+		<%= f.input :tag_list,
+								label: t('tags.tag_list'),
+								hint: t('tags.hint.name'),
+								: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,

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

@@ -0,0 +1,12 @@
+<%= simple_form_for @tag, :html => { class: 'form-horizontal', role: 'form' } do |f| %>
+	<%= f.error_notification %>
+
+		<%= f.input :name,
+								label: t('activerecord.attributes.tags.name'),
+								hint: t('tags.hint.name'),
+								input_html: { size: 45 } %>
+
+		<br />
+    <%= f.button :submit, :class => 'btn btn-primary' %>
+
+<% end %>

data/app/views/tags/_tab_admin_menu.html.erb

@@ -0,0 +1,6 @@
+<h1><%= t 'activerecord.models.tags' %></h1>
+
+<ul class="nav nav-tabs" id="admin-menu-tab">
+	<%= content_tag :li, link_to(t('list'), tags_path), ({ class: 'active' } if controller.action_name.to_s == 'index' ) %>
+	<%= content_tag :li, link_to(t('edit'), '#'), ({ class: 'active' }) if controller.action_name.to_s == 'edit' %>
+</ul>

data/app/views/tags/edit.html.erb

@@ -0,0 +1,4 @@
+<%= render 'tab_admin_menu' %>
+
+<%= render 'form' %>
+<%= render 'shared/admin_sidebar' %>

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

@@ -0,0 +1,21 @@
+<%= render 'tab_admin_menu' %>
+
+<table class='table table-striped'>
+	<thead>
+  	<tr>
+	    <th><%= t 'activerecord.attributes.tags.name' %></th>
+	    <th><%= t('actions') %></th>
+	  </tr>
+	</thead>
+
+	<tbody>
+		<% @tags.each do |tag| %>
+		  <tr>
+		    <td><%= link_to ("#{tag.name} (#{tag.taggings.count})"), blog_by_tag_path(tag.name) %></td>
+		    <td><%= link_to t('edit'), edit_tag_path(tag), class: 'btn btn-xs btn-primary' %></td>
+		  </tr>
+		<% end %>
+	</tbody>
+</table>
+
+<%= render 'shared/admin_sidebar' %>

data/config/routes.rb

@@ -1,5 +1,6 @@
 Rails.application.routes.draw do
   scope "(:locale)", locale: /#{I18n.available_locales.join("|")}/ do
+
     resources :pages do
       member do
         post :publish
@@ -25,6 +26,9 @@ Rails.application.routes.draw do
         post :block
       end
     end
+
+    resources :tags
+
     get 'blog' => 'blog#index', as: :blog
     get 'blog_by_tag/:id', :to => 'blog#by_tag', :as => 'blog_by_tag'
 

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

@@ -10,7 +10,7 @@ de:
       pages: 'Seiten'
       tag: 'Tag'
       tags: 'Tags'
-    
+
     attributes:
       pages:
         title: "Überschrift"
@@ -19,12 +19,15 @@ de:
         body: "Haupttext"
         for_the_blog: 'Für den Blog'
         parent_title: 'Seitenüberschrift'
-        
+
+      tags:
+        name: "name"
+
       contacts:
         sender_name: "Absender-Name"
         sender_email: 'Absender-Email'
         body: 'Nachricht'
-        
+
       comments:
         author: 'Verfasser'
         body: "Haupttext"
@@ -41,7 +44,7 @@ de:
     published: 'veröffentlicht'
     unpublish: 'veröffentlichen zurücknehmen'
     reorder_root_menus: 'Neuanfordern der Root-Menü-Items'
-    
+
     create:
       notice: 'Diese Seite wurde erfolgreich angelegt.'
       warning: 'Beim Speichern dieser Seite ist ein Problem aufgetreten.'
@@ -60,10 +63,20 @@ de:
         unpublished: "Die Veröffentlichung der Seite wurde aufgehoben. Sie ist wieder Entwurf."
         toggled: "Der Blog-Status der Seite wurde geändert"
 
+  tags:
+    edit_this: 'edit this tag'
+    tag_list: 'tag list'
+
+    update:
+      notice: 'The tag was successfully updated.'
+      warning: 'There was a problem saving the tag'
+    hint:
+      name: 'Lower case only. Multiple words should be joined by a dash (-) and NOT spaces'
+
   contacts:
     messages_from_forms: 'Nachrichten vom Kontaktformular'
     send_message: 'Nachricht senden'
-    sent: 'Gesendet am'   
+    sent: 'Gesendet am'
     create:
       did_not_reach: 'Etwas ist schief gegangen. Deine Nachricht hat den gewünschten Adressaten nicht erreicht.'
       invalid_email: 'Deine Emai-Adresse scheint ungültig zu sein!'
@@ -74,12 +87,12 @@ de:
       sender_name: "Absendername:"
       sender_email: "Absender-Email:"
       message: 'Nachricht'
-            
+
   comments:
     login_needed: 'Du must angemeldet sein, um einen Kommentar zu verfassen'
     sorted_by_oldest: 'Dieser Abschnitt ist nach Datum sortiert, der älteste Kommentar zuerst, sodass sie von oben nach untern bearbeitet werden können.'
     what_do_you_think: 'Was denkst Du?'
-    
+
     create:
       notice: 'Der Kommentar wurde erfolgreich erstellt.'
       warning: 'Beim Speichern des Kommentars in der Database ist ein Problem aufgetreten'
@@ -102,7 +115,7 @@ de:
       pending: 'In Bearbeitung'
       accepted: 'Akzeptiert'
       blocked: 'Abgelehnt'
-      
+
   blog:
     itself: 'Blog'
     home: 'Home-Blog'

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

@@ -1,5 +1,5 @@
 en:
-  
+
   activerecord:
     models:
       comment: 'comment'
@@ -10,7 +10,7 @@ en:
       pages: 'pages'
       tag: 'tag'
       tags: 'tags'
-    
+
     attributes:
       pages:
         title: "title"
@@ -19,18 +19,21 @@ en:
         body: "body text"
         for_the_blog: 'for the blog'
         parent_title: 'page parent title'
-        
+
+      tags:
+        name: "name"
+
       contacts:
         sender_name: "sender name"
         sender_email: 'sender email'
         body: 'message'
-        
+
       comments:
         author: 'author'
         body: "body text"
         locale: 'language'
         status: 'status'
-  
+
   pages:
     author: 'author'
     create_new: 'create new page'
@@ -41,7 +44,7 @@ en:
     published: 'published?'
     unpublish: 'unpublish'
     reorder_root_menus: 'reorder root menu items'
-    
+
     create:
       notice: 'The page was successfully created.'
       warning: 'There was a problem saving the page'
@@ -59,7 +62,17 @@ en:
         published: 'The page has been published'
         unpublished: "The page has been unpublished. It's a draft again."
         toggled: "The blog status of the page has been changed"
-      
+
+  tags:
+    edit_this: 'edit this tag'
+    tag_list: 'tag list'
+
+    update:
+      notice: 'The tag was successfully updated.'
+      warning: 'There was a problem saving the tag'
+    hint:
+      name: 'Lower case only. Multiple words should be joined by a dash (-) and NOT spaces'
+
   contacts:
     messages_from_forms: 'messages from contact form'
     send_message: 'send message'
@@ -74,12 +87,12 @@ en:
       sender_name: "Sender's name:"
       sender_email: "Sender's email:"
       message: 'Message:'
-            
+
   comments:
     login_needed: 'You need to be logged in to leave a comment'
     sorted_by_oldest: 'This section is sorted by oldest comment first so that they can be moderated from top to bottom.'
     what_do_you_think: 'What do you think?'
-    
+
     create:
       notice: 'The comment was successfully created.'
       warning: 'There was a problem saving the comment to the database'
@@ -102,7 +115,7 @@ en:
       pending: 'pending'
       accepted: 'accepted'
       blocked: 'blocked'
-      
+
   blog:
     itself: 'blog'
     home: 'home blog'

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

@@ -1,5 +1,5 @@
 es:
-  
+
   activerecord:
     models:
       comment: 'comment'
@@ -10,7 +10,7 @@ es:
       pages: 'pages'
       tag: 'tag'
       tags: 'tags'
-    
+
     attributes:
       pages:
         title: "título"
@@ -19,12 +19,15 @@ es:
         body: "parte principal"
         for_the_blog: 'contraseña'
         parent_title: 'page parent title'
-        
+
+      tags:
+        name: "name"
+
       contacts:
         sender_name: "nombre del remitente"
         sender_email: 'correo electrónico del remitente'
         body: 'mensaje'
-        
+
       comments:
         author: 'author'
         body: "body text"
@@ -41,7 +44,7 @@ es:
     published: '¿publicado?'
     unpublish: 'unpublish'
     reorder_root_menus: 'reorder root menu items'
-    
+
     create:
       notice: 'La página se ha creado correctamente'
       warning: 'Hubo un problema al guardar la página'
@@ -59,7 +62,17 @@ es:
         published: 'The page has been published'
         unpublished: "The page has been unpublished. It's a draft again."
         toggled: "The blog status of the page has been changed"
-          
+
+  tags:
+    edit_this: 'edit this tag'
+    tag_list: 'tag list'
+
+    update:
+      notice: 'The tag was successfully updated.'
+      warning: 'There was a problem saving the tag'
+    hint:
+      name: 'Lower case only. Multiple words should be joined by a dash (-) and NOT spaces'
+
   contacts:
     messages_from_forms: 'mensajes del formulario de contacto'
     send_message: 'enviar el mensaje'
@@ -79,7 +92,7 @@ es:
     login_needed: 'You need to be logged in to leave a comment'
     sorted_by_oldest: 'This section is sorted by oldest comment first so that they can be moderated from top to bottom.'
     what_do_you_think: 'What do you think?'
-    
+
     create:
       notice: 'The comment was successfully created.'
       warning: 'There was a problem saving the comment to the database'
@@ -102,7 +115,7 @@ es:
       pending: 'pending'
       accepted: 'accepted'
       blocked: 'blocked'
-      
+
   blog:
     itself: 'blog'
     home: 'home blog'

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

@@ -1,5 +1,5 @@
 fr:
-  
+
   activerecord:
     models:
       comment: 'commentaire'
@@ -10,7 +10,7 @@ fr:
       pages: 'les pages'
       tag: 'étiquette'
       tags: 'les étiquettes'
-    
+
     attributes:
       pages:
         title: "titre"
@@ -20,17 +20,20 @@ fr:
         for_the_blog: 'pour le blog'
         parent_title: 'titre de la page maternelle'
 
+      tags:
+        name: "nom"
+
       contacts:
         sender_name: "nom de l'auteur"
         sender_email: "email de l'auteur"
         body: 'contenu du message'
-        
+
       comments:
         author: 'auteur'
         body: "texte"
         locale: 'langue'
         status: 'état'
-  
+
   pages:
     author: 'auteur'
     create_new: 'créer une nouvelle page'
@@ -41,7 +44,7 @@ fr:
     published: 'publiée ?'
     unpublish: 'la depublier'
     reorder_root_menus: 'réorganiser les menus racines'
-    
+
     create:
       notice: 'La page a été créée.'
       warning: "Il y'a eu un probleme et la page n'a pas été sauvegardée."
@@ -60,10 +63,20 @@ fr:
         unpublished: "La publication de la page a été annulée. Elle est a nouveau en mode brouillon."
         toggled: "Le status de blog ou non-blog a été modifié."
 
+  tags:
+    edit_this: 'modifier cette étiquette'
+    tag_list: 'liste des étiquettes'
+
+    update:
+      notice: 'Les changements de cette étiquette ont été sauvegardés.'
+      warning: "Il y'a eu un probleme et les changements de cette étiquette n'ont pas été sauvegardés."
+    hint:
+      name: 'Pas de majuscules, que des minuscules. Entre les mots multiples, utilisez un tiret ( - ), pas avec un espace.'
+
   contacts:
     messages_from_forms: 'messages du formulaire de contact'
     send_message: 'envoyez le message'
-    sent: 'Envoyé le'  
+    sent: 'Envoyé le'
     create:
       did_not_reach: "Il y a eu un problem. Le message n'a pas été acheminé a sa destination."
       invalid_email: 'Votre adresse courriel ne semble pas bonne !'
@@ -74,12 +87,12 @@ fr:
       sender_name: "Nom de l'auteur :"
       sender_email: "Adresse courriel de l'auteur :"
       message: 'Message :'
-      
+
   comments:
     login_needed: 'Vous devez être identifié pour fournir un commentaire'
     sorted_by_oldest: 'Cette section va du plus vieux au plus recent pour vous permettre de modérer les commentaires du haut en bas.'
     what_do_you_think: "Qu'en pensez vous ?"
-    
+
     create:
       notice: 'Le commentaire a bien été créé.'
       warning: "Il y a eu un problem et le commentaire n'a pas été sauvegardé"

data/lib/tkh_content/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkh_content
 version: !ruby/object:Gem::Version
-  version: 0.9.8
+  version: 0.9.9
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-07 00:00:00.000000000 Z
+date: 2014-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -152,6 +152,7 @@ files:
 - app/controllers/comments_controller.rb
 - app/controllers/contacts_controller.rb
 - app/controllers/pages_controller.rb
+- app/controllers/tags_controller.rb
 - app/helpers/blog_helper.rb
 - app/helpers/pages_helper.rb
 - app/mailers/contact_mailer.rb
@@ -194,6 +195,10 @@ files:
 - app/views/pages/new.html.erb
 - app/views/pages/show.html.erb
 - app/views/shared/_admin_sidebar.html.erb
+- app/views/tags/_form.html.erb
+- app/views/tags/_tab_admin_menu.html.erb
+- app/views/tags/edit.html.erb
+- app/views/tags/index.html.erb
 - config/routes.rb
 - lib/generators/tkh_content/create_or_update_files/create_or_update_files_generator.rb
 - lib/generators/tkh_content/create_or_update_files/templates/blog.html.erb