tkh_menus 0.2.2 → 0.3.2

data/CHANGELOG.md

@@ -2,6 +2,24 @@
 
 
 
+## 0.3.2
+
+* Refactored the language switchers
+
+
+## 0.3.1
+
+* Fixed typo bug in 3 locale files
+
+
+## 0.3
+
+* Added tab admin menu navigation.
+* Set up many translations
+* Autocomplete of the parent menu in form
+* Added Italian to the full name hash
+
+
 ## 0.2.2
 
 * Removed automatic blog link from menu navbar partial.

data/app/models/menu.rb

@@ -5,7 +5,7 @@ end
 
 class Menu < ActiveRecord::Base
   
-  attr_accessible :name, :path, :position, :parent_id
+  attr_accessible :name, :path, :position, :parent_id, :parent_menu_name
   
   validates_presence_of :name, :path
   
@@ -15,6 +15,7 @@ class Menu < ActiveRecord::Base
     name ? "#{id}-#{name.to_url}" : id
   end
   
+  scope :alphabetical, order('name')
   scope :ordered, order('position, id')
   # tree scopes
   scope :orphans, where('parent_id IS ?', nil)
@@ -44,4 +45,17 @@ class Menu < ActiveRecord::Base
     Menu.with_parent_id(parent_id)
   end
   
+  ### autocomplete related instance methods
+  def parent_menu_name
+      parent.try(:name) unless self.orphan?
+    end
+
+  def parent_menu_name=(name)
+    if name.present? && Menu.find_by_name(name)
+      self.parent_id = Menu.find_by_name(name).id
+    else
+      self.parent_id = nil
+    end
+  end
+  
 end

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

@@ -2,9 +2,17 @@
 	<%= f.error_notification %>
 	
 	<div class="form-inputs">
-		<%= f.input :name, hint: 'should be rather short as it will figure in navbar and space there is at a premium' %>
-		<%= f.input :path, hint: 'the url the menu is pointing to' %>
-		<%= f.input :parent_id, hint: 'for nested menu items' %>
+		<%= f.input :name, label: t('activerecord.attributes.menu.name'), hint: t('menus.hint.name') %>
+		<%= f.input :path, label: t('activerecord.attributes.menu.path'), hint: t('menus.hint.path') %>
+		<%# = f.input :parent_id, label: t('activerecord.attributes.menu.parent'), hint: t('menus.hint.parent') %>
+		<%= f.input :parent_menu_name,
+								as: :string,
+								:wrapper_html => { :id => 'parent-menu-name' },
+								label: t('activerecord.attributes.menu.parent'),
+								:input_html => { 
+																:data => { 	provide: 'typeahead',
+																	 					source: Menu.orphans.alphabetical.map(&:name).to_json } 
+																	} %>
 	</div>
 	
   <div class="form-actions">

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

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

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

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

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

@@ -1,12 +1,14 @@
-<h1>Listing Menus</h1>
+<h1><%= t('activerecord.models.menus') %></h1>
+
+<%= render 'tab_admin_menu' %>
 
 <table class='table table-striped'>
 	<thead>
   <tr>
-	    <th><%= t( 'activerecord.attributes.menus.name').capitalize %></th>
-			<th><%= t( 'activerecord.attributes.menus.path').capitalize %></th>
-			<th><%= t( 'activerecord.attributes.menus.parent').capitalize %></th>
-	    <th>Actions</th>
+	    <th><%= t('activerecord.attributes.menu.name') %></th>
+			<th><%= t('activerecord.attributes.menu.path') %></th>
+			<th><%= t('activerecord.attributes.menu.parent') %></th>
+	    <th><%= t('actions') %></th>
 	  </tr>
 	</thead>
 	
@@ -23,6 +25,6 @@
 	</tbody>
 </table>
 
-<%= link_to t('menus.create_new').capitalize, new_menu_path, class: 'btn btn-primary' %>
+<%= link_to t('menus.create_new'), new_menu_path, class: 'btn btn-primary' %>
 
 <%= render 'shared/admin_sidebar' %>

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

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

data/app/views/shared/_language_switcher.html.erb

@@ -1,23 +1,11 @@
-<% def full_language_name( lang = :en) %>  
-	<% list = { :en => 'English', 
-							:fr => 'Français', 
-							:es => 'Español',
-							:de => 'Deutsch'
-						}
-	%>
-  <% list[lang] %>
-<% end %>
-
 <% if I18n.available_locales.size > 1 %>
 
 	<div class="btn-group">
-	  <a class="btn btn-medium btn-primary btn-success dropdown-toggle" data-toggle="dropdown" href="#">
-		  <%= full_language_name(I18n.locale) %>
-	  <span class="caret"></span>
+	  <a class="btn btn-medium btn-primary btn-success dropdown-toggle" data-toggle="dropdown" href="#"><%= t('full_name') %>&nbsp;<span class="caret"></span>
 	  </a>
 	  <ul class="dropdown-menu">
 	  	<% for loc in I18n.available_locales %>
-	    	<%= content_tag( :li, link_to( full_language_name(loc), :locale => loc ))  unless loc.to_s == I18n.locale.to_s %>
+	    	<%= content_tag( :li, link_to( t('full_name', locale: loc), :locale => loc ))  unless loc.to_s == I18n.locale.to_s %>
 	  	<% end %>
 	  </ul>
   </div>

data/app/views/shared/_language_switcher_for_navbar.html.erb

@@ -1,20 +1,10 @@
 <% if I18n.available_locales.size > 1 %>
 
-	<% def full_language_name( lang = :en) %>  
-		<% list = { :en => 'English', 
-								:fr => 'Français', 
-								:es => 'Español',
-								:de => 'Deutsch'
-							}
-		%>
-	  <% list[lang] %>
-	<% end %>
-
 	<li class="dropdown active">
-	  <a class="dropdown-toggle" data-toggle="dropdown" href="#"><%= full_language_name(I18n.locale) %><span class="caret"></span></a>
+	  <a class="dropdown-toggle" data-toggle="dropdown" href="#"><%= t('full_name') %>&nbsp;<span class="caret"></span></a>
 	  <ul class="dropdown-menu">
 	  	<% for loc in I18n.available_locales %>
-	    	<%= content_tag( :li, link_to( full_language_name(loc), :locale => loc ))  unless loc.to_s == I18n.locale.to_s %>
+	    	<%= content_tag( :li, link_to(t('full_name', locale: loc), :locale => loc))  unless loc.to_s == I18n.locale.to_s %>
 	  	<% end %>
 	  </ul>
   </li>

data/app/views/shared/_menu_for_navbar.html.erb

@@ -22,7 +22,7 @@
 		<% Menu.orphans.ordered.each do |menu| %>
 			<% if menu.has_children? %>
 				<li class='dropdown'>
-					<a href="#" class="dropdown-toggle" data-toggle="dropdown">menu.name <b class="caret"></b></a>
+					<a href="#" class="dropdown-toggle" data-toggle="dropdown"><%= menu.name %> <b class="caret"></b></a>
 					<ul class="dropdown-menu">
 						<%= content_tag :li, link_to(menu.name, menu.path) %>
 						<li class="divider"></li>

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

@@ -1,19 +1,24 @@
 de:
   
-  are_you_sure: 'Bist Du sicher?'
-  delete: 'löschen'
-  edit: 'bearbeiten'
   menus: 'Menüs'
 
-  activerecord: 
+  activerecord:
+    models:
+      menu: 'Menü'
+      menus: 'Menüs'
+
     attributes:
-      menus:
+      menu:
         name: "Name"
         path: 'Pfad'
         parent: 'Haupmenü'
 
   menus:
-    create_new: 'erstelle neues Menü'
+    create_new: 'Erstelle neues Menü'
+    hint:
+      name: 'Sollte eher kurz sein, da er in die Navigationsleiste kommt und der Platz dort kostbar ist'
+      path: 'Die Url zu der das Menü hinführt. Beispiel: /blog oder http://tenthousandhours.eu'
+      parent: 'Für die zweite Ebene der Untermenüs'
 
     create:
       notice: 'Das Menü wurde erfolgreich erstellt.'
@@ -22,4 +27,4 @@ de:
       notice: 'Das Menü wurde erfolgreich aktualisiert.'
       warning: 'Beim Speichern des Menüs ist ein Fehler aufgetreten'
     destroy:
-      notice: 'Das Menü wurde gelöscht'
+      notice: 'Das Menü wurde gelöscht'

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

@@ -1,20 +1,24 @@
 en:
   
-  are_you_sure: 'are you sure?'
-  delete: 'delete'
-  edit: 'edit'
-  menus: 'menus'
+  menus: 'menus' # legacy. needed?
   
-  
-  activerecord: 
+  activerecord:
+    models:
+      menu: 'menu'
+      menus: 'menus'
+      
     attributes:
-      menus:
+      menu:
         name: "name"
         path: 'path'
         parent: 'parent menu'
   
   menus:
     create_new: 'create new menu'
+    hint:
+     name: 'should be rather short as it will figure in navigation bar and space there is at a premium'
+     path: 'the url the menu is pointing to. Example: /blog ou http://tenthousandhours.eu'
+     parent: 'for second level sub-menu items'
     
     create:
       notice: 'The menu was successfully created.'
@@ -23,4 +27,4 @@ en:
       notice: 'The menu was successfully updated.'
       warning: 'There was a problem saving the menu'
     destroy:
-      notice: 'The menu was deleted'
+      notice: 'The menu was deleted'

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

@@ -1,20 +1,24 @@
 es:
 
-  are_you_sure: 'are you sure?'
-  delete: 'delete'
-  edit: 'edit'
   menus: 'menus'
 
-
-  activerecord: 
+  activerecord:
+    models:
+      menu: 'menu'
+      menus: 'menus'
+      
     attributes:
-      menus:
+      menu:
         name: "name"
         path: 'path'
         parent: 'parent menu'
 
   menus:
     create_new: 'create new menu'
+    hint:
+      name: 'should be rather short as it will figure in navigation bar and space there is at a premium'
+      path: 'the url the menu is pointing to. Example: /blog ou http://tenthousandhours.eu'
+      parent: 'for second level sub-menu items'
 
     create:
       notice: 'The menu was successfully created.'
@@ -23,4 +27,4 @@ es:
       notice: 'The menu was successfully updated.'
       warning: 'There was a problem saving the menu'
     destroy:
-      notice: 'The menu was deleted'
+      notice: 'The menu was deleted'

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

@@ -1,19 +1,24 @@
 fr:
   
-  are_you_sure: 'êtes vous sûr ?'
-  delete: 'supprimer'
-  edit: 'modifier'
   menus: 'menus'
   
-  activerecord: 
+  activerecord:
+    models:
+      menu: 'menu'
+      menus: 'les menus'
+      
     attributes:
-      menus:
+      menu:
         name: "nom"
-        path: 'adresse'
-        parent: 'menu parent'
+        path: 'chemin'
+        parent: 'parent du menu'
   
   menus:
     create_new: 'créer un nouveau menu'
+    hint:
+      name: 'doit être assez court pour se placer sur la barre de navigation sans encombre'
+      path: "l'URL de la page web qui correspond a ce menu. Par exemple /blog ou http://tenthousandhours.eu"
+      parent: 'pour les sous-menus de deuxième niveau'
     
     create:
       notice: 'Le menu a été créé.'
@@ -22,4 +27,4 @@ fr:
       notice: 'Les changements de ce menu ont été sauvegardés'
       warning: "Il y'a eu un probleme et les changements de ce menu n'ont pas été sauvegardés"
     destroy:
-      notice: 'Le menu a été supprimé'
+      notice: 'Le menu a été supprimé'

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

@@ -0,0 +1,30 @@
+it:
+
+  menus: 'menus'
+
+  activerecord:
+    models:
+      menu: 'menu'
+      menus: 'menus'
+    
+    attributes:
+      menu:
+        name: "name"
+        path: 'path'
+        parent: 'parent menu'
+
+  menus:
+    create_new: 'create new menu'
+    hint:
+      name: 'should be rather short as it will figure in navigation bar and space there is at a premium'
+      path: 'the url the menu is pointing to. Example: /blog ou http://tenthousandhours.eu'
+      parent: 'for second level sub-menu items'
+
+    create:
+      notice: 'The menu was successfully created.'
+      warning: 'There was a problem saving the menu'
+    update:
+      notice: 'The menu was successfully updated.'
+      warning: 'There was a problem saving the menu'
+    destroy:
+      notice: 'The menu was deleted'

data/lib/tkh_menus/version.rb

@@ -1,3 +1,3 @@
 module TkhMenus
-  VERSION = "0.2.2"
+  VERSION = "0.3.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tkh_menus
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -103,6 +103,7 @@ files:
 - app/controllers/menus_controller.rb
 - app/models/menu.rb
 - app/views/menus/_form.html.erb
+- app/views/menus/_tab_admin_menu.html.erb
 - app/views/menus/edit.html.erb
 - app/views/menus/index.html.erb
 - app/views/menus/new.html.erb
@@ -117,6 +118,7 @@ files:
 - lib/generators/tkh_menus/create_or_update_locales/templates/en.yml
 - lib/generators/tkh_menus/create_or_update_locales/templates/es.yml
 - lib/generators/tkh_menus/create_or_update_locales/templates/fr.yml
+- lib/generators/tkh_menus/create_or_update_locales/templates/it.yml
 - lib/generators/tkh_menus/create_or_update_migrations/create_or_update_migrations_generator.rb
 - lib/generators/tkh_menus/create_or_update_migrations/templates/add_menu_position_to_pages.rb
 - lib/generators/tkh_menus/create_or_update_migrations/templates/create_menus.rb
@@ -171,7 +173,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3342123741814739327
+      hash: 3984902534821179842
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -180,7 +182,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3342123741814739327
+      hash: 3984902534821179842
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23