tkh_illustrations 0.1 → 0.2

data/CHANGELOG.md

@@ -2,6 +2,12 @@
 
 
 
+## 0.2
+
+* Added admin tab navigation to header and illustration sections
+* Set up many translations
+
+
 ## 0.1
 
 * Added header graphic section

data/app/controllers/headers_controller.rb

@@ -26,7 +26,7 @@ class HeadersController < ApplicationController
   def create
     @header = Header.new(params[:header])
     if @header.save
-      redirect_to @header, notice: 'Header was successfully created.'
+      redirect_to @header, notice: t('headers.create.notice')
     else
       render action: "new", layout: 'admin'
     end
@@ -35,7 +35,7 @@ class HeadersController < ApplicationController
   def update
     @header = Header.find(params[:id])
     if @header.update_attributes(params[:header])
-      redirect_to @header, notice: 'Header was successfully updated.'
+      redirect_to @header, notice: t('headers.update.notice')
     else
       render action: "edit", layout: 'admin'
     end

data/app/controllers/illustrations_controller.rb

@@ -26,7 +26,7 @@ class IllustrationsController < ApplicationController
   def create
     @illustration = Illustration.new(params[:illustration])
     if @illustration.save
-      redirect_to @illustration, notice: 'Illustration was successfully created.'
+      redirect_to @illustration, notice: t('illustrations.create.notice')
     else
       render action: "new", layout: 'admin'
     end
@@ -35,7 +35,7 @@ class IllustrationsController < ApplicationController
   def update
     @illustration = Illustration.find(params[:id])
     if @illustration.update_attributes(params[:illustration])
-      redirect_to @illustration, notice: 'Illustration was successfully updated.'
+      redirect_to @illustration, notice: t('illustrations.update.notice')
     else
       render action: "edit", layout: 'admin'
     end

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

@@ -2,12 +2,12 @@
   <%= f.error_notification %>
 
   <div class="form-inputs">
-    <%= f.input :photo, hint: "Ideally all header photos should have the following characteristics: 72 dpi; a width of at least 1,170 pixels; a ratio of 1170X273" %>
+    <%= f.input :photo, hint: t('headers.hint.photo') %>
     <%= f.input :name %>
   </div>
 
   <div class="form-actions">
     <%= f.button :submit, :class => 'btn btn-primary' %>
-    <%= link_to 'Cancel & Show all Headers', headers_path, :class => 'btn' %>
+    <%= link_to t('headers.cancel'), headers_path, :class => 'btn' %>
   </div>
 <% end %>

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

@@ -0,0 +1,6 @@
+<ul class="nav nav-tabs" id="admin-menu-tab">	
+	<%= content_tag :li, link_to(t('new'), new_header_path), ({ class: 'active' } if controller.action_name.to_s == 'new' ) %>
+	<%= content_tag :li, link_to(t('list'), headers_path), ({ class: 'active' } if controller.action_name.to_s == 'index' ) %>
+	<%= content_tag :li, link_to(t('view'), headers_path), ({ class: 'active' }) if controller.action_name.to_s == 'show' %>
+	<%= content_tag :li, link_to(t('edit'), headers_path), ({ class: 'active' }) if controller.action_name.to_s == 'edit' %>	
+</ul>

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

@@ -1,2 +1,6 @@
+<h1><%= t('activerecord.models.headers') %></h1>
+
+<%= render 'tab_admin_menu' %>
+
 <%= render 'form' %>
 <%= render 'shared/admin_sidebar' %>

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

@@ -1,11 +1,13 @@
-<h1>Site Header Graphics</h1>
+<h1><%= t('activerecord.models.headers') %></h1>
+
+<%= render 'tab_admin_menu' %>
 
 <table class='table table-striped'>
 	<thead>
   <tr>	
-			<th>Photo</th>
-	    <th>Name & Paths</th>
-	    <th>Actions</th>
+			<th><%= t('activerecord.attributes.header.photo') %></th>
+	    <th><%= t('name_and_paths') %></th>
+	    <th><%= t('actions') %></th>
 	  </tr>
 	</thead>
 	
@@ -14,12 +16,12 @@
 		  <tr>
 		    <td><%= link_to image_tag(header.photo.thumbnail), header %></td>
 		    <td>
-					<h3><%= header.name %> | <%= link_to(' See all resolutions', header) %></h3>
+					<h3><%= header.name %> | <%= link_to(t('see_all_resolutions'), header) %></h3>
 					<b>Thumbnail</b> path: <%= header.photo.thumbnail %><br />
 					<b>Large</b> path: <%= header.photo.large %><br />
 				</td>
-		    <td><%= link_to 'Edit', edit_header_path(header), class: 'btn btn-mini' %>
-					<%= link_to 'Destroy', header, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-mini btn-danger' %></td>
+		    <td><%= link_to t('edit'), edit_header_path(header), class: 'btn btn-mini' %>
+					<%= link_to 'Destroy', header, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-mini btn-danger' %></td>
 		  </tr>
 		<% end %>
 	</tbody>
@@ -27,6 +29,6 @@
 
 <%= will_paginate @headers %>
 
-<%= link_to 'Create New Header Graphic', new_header_path, class: 'btn btn-primary' %>
+<%= link_to t('headers.create.new'), new_header_path, class: 'btn btn-primary' %>
 
 <%= render 'shared/admin_sidebar' %>

data/app/views/headers/new.html.erb

@@ -1,2 +1,6 @@
+<h1><%= t('activerecord.models.headers') %></h1>
+
+<%= render 'tab_admin_menu' %>
+
 <%= render 'form' %>
 <%= render 'shared/admin_sidebar' %>

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

@@ -1,16 +1,18 @@
 <% content_for :meta_title, @header.name %>
 <% content_for :meta_description, @header.name %>
 
-<h1>View a Header Graphic</h1>
+<h1><%= t('activerecord.models.headers') %></h1>
 
-<h3>Name: <%= @header.name %></h3>
+<%= render 'tab_admin_menu' %>
+
+<h3><%= t('name')t('colon') %> <%= @header.name %></h3>
 <p>
 	<%= image_tag @header.photo.thumbnail %><br /><%= @header.photo.thumbnail %><br /><br />
 	<%= image_tag @header.photo.large %><br /><%= @header.photo.large %>
 </p>
 
-<%= link_to 'edit', edit_header_path(@header), :class => 'btn btn-mini' %> 
-<%= link_to 'all header graphics', headers_path, class: 'btn btn-mini' %> 
-<%= link_to 'upload new header grahpic', new_header_path, class: 'btn btn-mini' %>
+<%= link_to t('edit'), edit_header_path(@header), :class => 'btn btn-primary' %> 
+<%= link_to t('headers.all'), headers_path, class: 'btn' %> 
+<%= link_to t('headers.upload_new'), new_header_path, class: 'btn ' %>
 
 <%= render 'shared/admin_sidebar' %>

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

@@ -2,12 +2,12 @@
   <%= f.error_notification %>
 
   <div class="form-inputs">
-    <%= f.input :image %>
-    <%= f.input :name %>
+    <%= f.input :image, label: t('activerecord.attributes.illustration.image') %>
+    <%= f.input :name, label: t('activerecord.attributes.illustration.name') %>
   </div>
 
   <div class="form-actions">
     <%= f.button :submit, :class => 'btn btn-primary' %>
-    <%= link_to 'Cancel & List Illustrations', illustrations_path, :class => 'btn' %>
+    <%= link_to t('illustrations.cancel'), illustrations_path, :class => 'btn' %>
   </div>
 <% end %>

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

@@ -0,0 +1,6 @@
+<ul class="nav nav-tabs" id="admin-menu-tab">	
+	<%= content_tag :li, link_to(t('new'), new_illustration_path), ({ class: 'active' } if controller.action_name.to_s == 'new' ) %>
+	<%= content_tag :li, link_to(t('list'), illustrations_path), ({ class: 'active' } if controller.action_name.to_s == 'index' ) %>
+	<%= content_tag :li, link_to(t('view'), illustrations_path), ({ class: 'active' }) if controller.action_name.to_s == 'show' %>
+	<%= content_tag :li, link_to(t('edit'), illustrations_path), ({ class: 'active' }) if controller.action_name.to_s == 'edit' %>	
+</ul>

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

@@ -1,2 +1,6 @@
+<h1><%= t('activerecord.models.illustrations') %></h1>
+
+<%= render 'tab_admin_menu' %>
+
 <%= render 'form' %>
 <%= render 'shared/admin_sidebar' %>

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

@@ -1,11 +1,13 @@
-<h1>Listing Illustrations</h1>
+<h1><%= t('activerecord.models.illustrations') %></h1>
+
+<%= render 'tab_admin_menu' %>
 
 <table class='table table-striped'>
 	<thead>
   <tr>	
-			<th>Illustration</th>
-	    <th>Name & Paths</th>
-	    <th>Actions</th>
+			<th><%= t('activerecord.models.illustration') %></th>
+	    <th><%= t('name_and_paths') %></th>
+	    <th><%= t('actions') %></th>
 	  </tr>
 	</thead>
 	
@@ -14,15 +16,15 @@
 		  <tr>
 		    <td><%= link_to image_tag(illustration.image.thumbnail), illustration %></td>
 		    <td>
-					<h3><%= illustration.name %> | <%= link_to(' See all resolutions', illustration) %></h3>
+					<h3><%= illustration.name %> | <%= link_to(t('see_all_resolutions'), illustration) %></h3>
 					<b>Thumbnail</b> path: <%= illustration.image.thumbnail %><br />
 					<b>Small</b> path: <%= illustration.image.small %><br />
 					<b>Medium</b> path: <%= illustration.image.medium %><br />
 					<b>Large</b> path: <%= illustration.image.large %><br />
 					<b>XL</b> path: <%= illustration.image.xl %>
 				</td>
-		    <td><%= link_to 'Edit', edit_illustration_path(illustration), class: 'btn btn-mini' %>
-					<%= link_to 'Destroy', illustration, method: :delete, data: { confirm: 'Are you sure?' }, class: 'btn btn-mini btn-danger' %></td>
+		    <td><%= link_to t('edit'), edit_illustration_path(illustration), class: 'btn btn-mini' %>
+					<%= link_to t('delete'), illustration, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-mini btn-danger' %></td>
 		  </tr>
 		<% end %>
 	</tbody>
@@ -30,6 +32,6 @@
 
 <%= will_paginate @illustrations %>
 
-<%= link_to 'Create New Illustration', new_illustration_path, class: 'btn btn-primary' %>
+<%= link_to t('illustrations.create.new'), new_illustration_path, class: 'btn btn-primary' %>
 
 <%= render 'shared/admin_sidebar' %>

data/app/views/illustrations/new.html.erb

@@ -1,2 +1,6 @@
+<h1><%= t('activerecord.models.illustrations') %></h1>
+
+<%= render 'tab_admin_menu' %>
+
 <%= render 'form' %>
 <%= render 'shared/admin_sidebar' %>

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

@@ -1,7 +1,9 @@
 <% content_for :meta_title, @illustration.name %>
 <% content_for :meta_description, @illustration.name %>
 
-<h1>View an Illustration</h1>
+<h1><%= t('activerecord.models.illustrations') %></h1>
+
+<%= render 'tab_admin_menu' %>
 
 <h3>Name: <%= @illustration.name %></h3>
 <p>
@@ -12,8 +14,8 @@
 	<%= image_tag @illustration.image.xl %><br /><%= @illustration.image.xl %>
 </p>
 
-<%= link_to 'Edit', edit_illustration_path(@illustration), :class => 'btn btn-mini' %> 
-<%= link_to 'All illustrations', illustrations_path, class: 'btn btn-mini' %> 
-<%= link_to 'Upload New Illustration', new_illustration_path, class: 'btn btn-mini' %>
+<%= link_to t('edit'), edit_illustration_path(@illustration), :class => 'btn btn-primary' %> 
+<%= link_to t('illustrations.all'), illustrations_path, class: 'btn' %> 
+<%= link_to t('illustrations.upload_new'), new_illustration_path, class: 'btn' %>
 
 <%= render 'shared/admin_sidebar' %>

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

@@ -1,10 +1,53 @@
-de:
+en:
+  
+  activerecord:
+    models:
+      header: 'header graphic'
+      headers: 'header graphics'
+      illustration: 'illustration'
+      illustrations: 'illustrations'
   
-  activerecord: 
     attributes:
-      illustration:
-        image: 'Bild'
-        name: "Name"
       header:
-        photo: 'photo_de'
-        name: "Name"
+        photo: 'photo'
+        name: "name"
+      illustration:
+        image: 'image'
+        name: "name"
+
+ 
+  headers:
+    all: 'all header graphics'
+    cancel: 'cancel and view all header graphics'
+    upload_new: 'upload new header graphic'
+
+    hint:
+      photo: "Ideally all header photos should have the following characteristics: 72 dpi; a width of at least 1,170 pixels; a ratio of 1170X273"
+      
+    create:
+      new:  'create new header graphic'
+      notice: 'Header graphic was successfully created.'
+    update:
+      notice: 'Header graphic was successfully updated.'
+  
+  illustrations:
+    all: 'all illustrations'
+    cancel: 'cancel and view all illustrations'
+    upload_new: 'upload new illustration'
+    
+    create:
+      new:  'create new illustration'
+      notice: 'Illustration was successfully created.'
+    update:
+      notice: 'Illustration was successfully updated.'
+      
+      
+  
+  name_and_paths: 'name and paths'
+  see_all_resolutions: 'See all resolutions'
+      
+  errors:
+    messages:
+      carrierwave_processing_error: "Cannot resize image."
+      carrierwave_integrity_error: "Not an image."
+      carrierwave_download_error: "Couldn't download image."

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

@@ -1,11 +1,53 @@
 en:
   
-  activerecord: 
+  activerecord:
+    models:
+      header: 'header graphic'
+      headers: 'header graphics'
+      illustration: 'illustration'
+      illustrations: 'illustrations'
+  
     attributes:
-      illustration:
-        image: 'image'
-        name: "name"
       header:
         photo: 'photo'
         name: "name"
-          
+      illustration:
+        image: 'image'
+        name: "name"
+
+ 
+  headers:
+    all: 'all header graphics'
+    cancel: 'cancel and view all header graphics'
+    upload_new: 'upload new header graphic'
+
+    hint:
+      photo: "Ideally all header photos should have the following characteristics: 72 dpi; a width of at least 1,170 pixels; a ratio of 1170X273"
+      
+    create:
+      new:  'create new header graphic'
+      notice: 'Header graphic was successfully created.'
+    update:
+      notice: 'Header graphic was successfully updated.'
+  
+  illustrations:
+    all: 'all illustrations'
+    cancel: 'cancel and view all illustrations'
+    upload_new: 'upload new illustration'
+    
+    create:
+      new:  'create new illustration'
+      notice: 'Illustration was successfully created.'
+    update:
+      notice: 'Illustration was successfully updated.'
+      
+      
+  
+  name_and_paths: 'name and paths'
+  see_all_resolutions: 'See all resolutions'
+      
+  errors:
+    messages:
+      carrierwave_processing_error: "Cannot resize image."
+      carrierwave_integrity_error: "Not an image."
+      carrierwave_download_error: "Couldn't download image."

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

@@ -1,10 +1,54 @@
 es:
   
-  activerecord: 
+  activerecord:
+    models:
+      header: 'header graphic'
+      headers: 'header graphics'
+      illustration: 'illustration'
+      illustrations: 'illustrations'
+  
     attributes:
+      header:
+        photo: 'photo_es'
+        name: "nombre"
       illustration:
         image: 'imagen'
         name: "nombre"
-      header:
-        photo: 'photo_es'
-        name: "nombre"
+
+
+  headers:
+    all: 'all header graphics'
+    cancel: 'cancel and view all header graphics'
+    name_and_paths: 'name and paths'
+    upload_new: 'upload new header graphic'
+
+    hint:
+      photo: "Ideally all header photos should have the following characteristics: 72 dpi; a width of at least 1,170 pixels; a ratio of 1170X273"
+
+    create:
+      new:  'create new header graphic'
+      notice: 'Header graphic was successfully created.'
+    update:
+      notice: 'Header graphic was successfully updated.'
+      
+  illustrations:
+     all: 'all illustrations'
+     cancel: 'cancel and view all illustrations'
+     name_and_paths: 'name and paths'
+     upload_new: 'upload new illustration'
+
+     create:
+       new:  'create new illustration'
+       notice: 'Illustration was successfully created.'
+     update:
+       notice: 'Illustration was successfully updated.'
+
+
+   name_and_paths: 'name and paths'
+   see_all_resolutions: 'See all resolutions'
+
+   errors:
+     messages:
+       carrierwave_processing_error: "Cannot resize image."
+       carrierwave_integrity_error: "Not an image."
+       carrierwave_download_error: "Couldn't download image."

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

@@ -1,10 +1,52 @@
 fr:
   
-  activerecord: 
-      attributes:
-        illustration:
-          image: 'image'
-          name: "nom"
-        header:
-          photo: 'photo'
-          name: "nom"
+  activerecord:
+    models:
+      header: 'en-tête graphique'
+      headers: 'les en-tête graphiques'
+      illustration: 'illustration'
+      illustrations: 'les illustrations'
+  
+    attributes:
+      header:
+        photo: 'photo'
+        name: "nom"
+      illustration:
+        image: 'image'
+        name: "nom"
+
+
+  headers:
+    all: 'liste des en-tête graphiques'
+    cancel: 'annuler et aller à la liste des graphiques'
+    upload_new: 'télécharger un nouvel en-tête graphique'
+
+    hint:
+      photo: "Idéalement, les graphiques doivent avoir ces caractéristiques : 72 dpi; largeur d'au moins 1,170 pixels; un ratio de 1170x273"
+
+    create:
+      notice: 'Cet en-tête graphique a bien été créé.'
+    update:
+      notice: 'Cet en-tête graphique a bien été mis à jour.'
+
+  illustrations:
+    all: 'liste des illustrations'
+    cancel: 'annuler et aller à la liste des illustrations'
+    name_and_paths: 'nom et chemins des fichiers'
+    upload_new: 'télécharger une nouvelle illustration'
+    
+    create:
+      new:  'créer une nouvelle illustration'
+      notice: 'Cette illustration a bien été créée.'
+    update:
+      notice: 'Cette illustration a bien été mise à jour.'
+
+
+  name_and_paths: 'nom et chemins des fichiers'
+  see_all_resolutions: 'Voir toutes les résolutions'
+
+  errors:
+    messages:
+      carrierwave_processing_error: "l'image n'a pas pu être redimensionnée."
+      carrierwave_integrity_error: "Ce n'est pas une image."
+      carrierwave_download_error: "L'image n'a pu être téléchargée."

data/lib/generators/tkh_illustrations/create_or_update_locales/templates/it.yml

@@ -0,0 +1,55 @@
+it:
+  
+  activerecord:
+    models:
+      header: 'header graphic'
+      headers: 'header graphics'
+      illustration: 'illustration'
+      illustrations: 'illustrations'
+  
+    attributes:
+      header:
+        photo: 'photo'
+        name: "name"
+      illustration:
+        image: 'image'
+        name: "name"
+
+
+  headers:
+    all: 'all header graphics'
+    cancel: 'cancel and view all header graphics'
+    name_and_paths: 'name and paths'
+    upload_new: 'upload new header graphic'
+
+    hint:
+      photo: "Ideally all header photos should have the following characteristics: 72 dpi; a width of at least 1,170 pixels; a ratio of 1170X273"
+
+    create:
+      new:  'create new header graphic'
+      notice: 'Header graphic was successfully created.'
+    update:
+      notice: 'Header graphic was successfully updated.'
+
+
+  illustrations:
+     all: 'all illustrations'
+     cancel: 'cancel and view all illustrations'
+     name_and_paths: 'name and paths'
+     upload_new: 'upload new illustration'
+
+     create:
+       new:  'create new illustration'
+       notice: 'Illustration was successfully created.'
+     update:
+       notice: 'Illustration was successfully updated.'
+
+
+   name_and_paths: 'name and paths'
+   see_all_resolutions: 'See all resolutions'
+
+   errors:
+     messages:
+       carrierwave_processing_error: "Cannot resize image."
+       carrierwave_integrity_error: "Not an image."
+       carrierwave_download_error: "Couldn't download image."

data/lib/tkh_illustrations/version.rb

@@ -1,3 +1,3 @@
 module TkhIllustrations
-  VERSION = "0.1"
+  VERSION = "0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkh_illustrations
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-04 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -153,11 +153,13 @@ files:
 - app/uploaders/image_uploader.rb
 - app/uploaders/photo_uploader.rb
 - app/views/headers/_form.html.erb
+- app/views/headers/_tab_admin_menu.html.erb
 - app/views/headers/edit.html.erb
 - app/views/headers/index.html.erb
 - app/views/headers/new.html.erb
 - app/views/headers/show.html.erb
 - app/views/illustrations/_form.html.erb
+- app/views/illustrations/_tab_admin_menu.html.erb
 - app/views/illustrations/edit.html.erb
 - app/views/illustrations/index.html.erb
 - app/views/illustrations/new.html.erb
@@ -168,6 +170,7 @@ files:
 - lib/generators/tkh_illustrations/create_or_update_locales/templates/en.yml
 - lib/generators/tkh_illustrations/create_or_update_locales/templates/es.yml
 - lib/generators/tkh_illustrations/create_or_update_locales/templates/fr.yml
+- lib/generators/tkh_illustrations/create_or_update_locales/templates/it.yml
 - lib/generators/tkh_illustrations/create_or_update_migrations/create_or_update_migrations_generator.rb
 - lib/generators/tkh_illustrations/create_or_update_migrations/templates/add_translation_of_name_to_illustrations.rb
 - lib/generators/tkh_illustrations/create_or_update_migrations/templates/create_headers.rb
@@ -223,7 +226,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1324274835237882850
+      hash: -2837421847544288073
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -232,7 +235,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1324274835237882850
+      hash: -2837421847544288073
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23