tkh_menus 0.9.1 → 0.9.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d2db02e4875f038bcec6574c3c5c1763bbd79ca
-  data.tar.gz: b6d887a2de36f34319d32850ea3f6d01618150f9
+  metadata.gz: e152ddfbb8fb6b47007b7b3dbe91c2fa456f8901
+  data.tar.gz: e4aa5e8dda6208c361cc133ed0660f6403e9d83a
 SHA512:
-  metadata.gz: 01a27b2b33ebad980aa99801fd7d526d9c641ca326d99502cc0e55d46f0a139c25a0dca5edb09b0ccc81db5d30d467acbabe0f457457f73831b9d0870463642c
-  data.tar.gz: 5f1bbd8980ac83fb2e1e02af6e9d9652a0dc7b03f50a49469eb21d62d652f5a68ba51ba25ca3e45707b5723869491e747e69eda1ac8c84eccef67de702857d64
+  metadata.gz: a3243401af3ca4ca725d875db5bf1295e3173a319e36aab70b816b7b69733d395feec8fa6d8b294177791dc33c8241c8d1777c917461ad2863a0f5e9cc26ee33
+  data.tar.gz: 4c5d63422012986418115bb408231a4622b70d9bf8874f1259d302e361c2e75d3ae988fc6ce591dee7c0b990857a170abe97bf8b4454fd0dec568bcf860ceb2b

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 
 
+## 0.9.2
+
+* Fixed up buttons in menus index view
+* Added drag and drop reorder tab in menu section
+
 
 ## 0.9.1
 

data/app/controllers/menus_controller.rb

@@ -42,6 +42,19 @@ class MenusController < ApplicationController
     redirect_to menus_url, notice: t('menus.destroy.notice')
   end
 
+  def reorder
+    menu = Menu.find(params[:id])
+    @menus = menu.self_and_siblings.ordered
+    switch_to_admin_layout
+  end
+
+  def sort
+    params[:menu].each_with_index do |id, index|
+      Menu.update(id, position: index+1)
+    end
+    render nothing: true
+  end
+
   private
 
   # Never trust parameters from the scary internet, only allow the white list through.

data/app/models/menu.rb

@@ -33,6 +33,10 @@ class Menu < ActiveRecord::Base
     Menu.with_parent_id(id)
   end
 
+  def has_parent?
+    !parent_id.nil?
+  end
+
   def parent
     Menu.find(parent_id)
   end
@@ -42,7 +46,15 @@ class Menu < ActiveRecord::Base
   end
 
   def siblings
-    Menu.with_parent_id(parent_id)
+    self_and_siblings - [self]
+  end
+
+  def self_and_siblings
+    if has_parent?
+      parent.children
+    else
+      Menu.orphans
+    end
   end
 
   ### autocomplete related instance methods

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

@@ -1,5 +1,6 @@
-<ul class="nav nav-tabs" id="admin-menu-tab">	
+<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'), '#'), ({ class: 'active' }) if controller.action_name.to_s == 'edit' %>	
+	<%= content_tag :li, link_to(t('edit'), '#'), ({ class: 'active' }) if controller.action_name.to_s == 'edit' %>
+  <%= content_tag :li, link_to(t('menus.reorder'), reorder_menu_path(Menu.orphans.first.id)), ({ class: 'active' } if controller.action_name.to_s == 'reorder' ) %>
 </ul>

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

@@ -11,15 +11,14 @@
 	    <th><%= t('actions') %></th>
 	  </tr>
 	</thead>
-	
+
 	<tbody>
 		<% @menus.each do |menu| %>
 		  <tr>
 		    <td><%= menu.name %></td>
 		    <td><%= menu.path %></td>
 				<td><%= "#{menu.parent.id} - #{menu.parent.name}" unless menu.orphan? %></td>
-		    <td><%= link_to t('edit'), edit_menu_path(menu), class: 'btn btn-mini' %>
-					<%= link_to t('delete'), menu, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-mini btn-danger' %></td>
+		    <td><%= link_to t('edit'), edit_menu_path(menu), class: 'btn btn-xs btn-default' %><%= link_to t('delete'), menu, method: :delete, data: { confirm: t('are_you_sure') }, class: 'btn btn-xs btn-danger' %></td>
 		  </tr>
 		<% end %>
 	</tbody>

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

@@ -0,0 +1,13 @@
+<%= render 'tab_admin_menu' %>
+
+<p>Please use this page to reorder menu items within one level and one section. For reorganizing the menu hierarchy you should edit the individual menu entry's 'parent id' field.</p>
+
+<p>To change the position of menu items in this list use the little handle to drag entries up or down.</p>
+
+<ul class="draggable" data-update-url="<%= sort_menus_path %>">
+  <% for menu in @menus %>
+    <%= content_tag_for :li, menu, class: 'handle' do %>
+      <%= image_tag 'admin/drag-handle.gif', :class => 'handle' %> <%= menu.id.to_s + ".  " + menu.name.to_s -%>
+    <% end %>
+  <% end %>
+</ul>

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

@@ -18,7 +18,7 @@
 			</ul>
 		<% end %>
 	<% end -%>
-	
+
 <% else # administrators can reorder menu pages %>
 
   <% if @page %>
@@ -27,7 +27,7 @@
 			<ul class="draggable" data-update-url="<%= sort_pages_path %>">
 			  <% for page in @page.children.by_menu_position %>
 					<%= content_tag :li, page, class: 'page', id: "page_#{page.id}" do %>
-						<%= image_tag 'drag-handle.gif', :class => 'handle silhouette' %> <%= link_to page.nickname, page -%>
+						<%= image_tag 'admin/drag-handle.gif', :class => 'handle silhouette' %> <%= link_to page.nickname, page -%>
 					<% end -%>
 			  <% end %>
 			</ul>
@@ -38,11 +38,11 @@
 			<ul class="draggable" data-update-url="<%= sort_pages_path %>">
 			  <% for page in @page.siblings.by_menu_position %>
 					<%= content_tag :li, page, class: 'page', id: "page_#{page.id}" do %>
-						<%= image_tag 'drag-handle.gif', :class => 'handle silhouette' %> <%= link_to page.nickname, page -%>
+						<%= image_tag 'admin/drag-handle.gif', :class => 'handle silhouette' %> <%= link_to page.nickname, page -%>
 					<% end -%>
 			  <% end %>
 			</ul>
 		<% end %>
 	<% end -%>
-	
+
 <% end -%>

data/config/routes.rb

@@ -1,5 +1,12 @@
 Rails.application.routes.draw do
   scope "(:locale)", locale: /#{I18n.available_locales.join("|")}/ do
-    resources :menus
+    resources :menus do
+      member do
+        get :reorder
+      end
+      collection do
+        post :sort
+      end
+    end
   end
-end
+end

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

@@ -1,5 +1,5 @@
 de:
-  
+
   menus: 'Menüs'
 
   activerecord:
@@ -28,3 +28,5 @@ de:
       warning: 'Beim Speichern des Menüs ist ein Fehler aufgetreten'
     destroy:
       notice: 'Das Menü wurde gelöscht'
+
+    reorder: 'reorder'

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

@@ -6,7 +6,7 @@ es:
     models:
       menu: 'menu'
       menus: 'menus'
-      
+
     attributes:
       menu:
         name: "name"
@@ -28,3 +28,6 @@ es:
       warning: 'There was a problem saving the menu'
     destroy:
       notice: 'The menu was deleted'
+
+
+    reorder: 'reorder'

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

@@ -1,25 +1,25 @@
 fr:
-  
+
   menus: 'menus'
-  
+
   activerecord:
     models:
       menu: 'menu'
       menus: 'les menus'
-      
+
     attributes:
       menu:
         name: "nom"
         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éé.'
       warning: "Il y'a eu un probleme et le menu n'a pas été sauvegardé"
@@ -28,3 +28,5 @@ fr:
       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é'
+
+    reorder: 'organiser'

data/lib/tkh_menus/version.rb

@@ -1,3 +1,3 @@
 module TkhMenus
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

data/test/dummy/config/locales/en.yml

@@ -2,4 +2,5 @@
 # See https://github.com/svenfuchs/rails-i18n/tree/master/rails%2Flocale for starting points.
 
 en:
-  hello: "Hello world"
+  menus:
+    reorder: 'reorder'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tkh_menus
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
 platform: ruby
 authors:
 - Swami Atma
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -87,7 +87,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- app/assets/images/drag-handle.gif
+- app/assets/images/admin/drag-handle.gif
 - app/assets/javascripts/drag-and-sort.js.coffee
 - app/controllers/menus_controller.rb
 - app/models/menu.rb
@@ -96,6 +96,7 @@ files:
 - app/views/menus/edit.html.erb
 - app/views/menus/index.html.erb
 - app/views/menus/new.html.erb
+- app/views/menus/reorder.html.erb
 - app/views/shared/_context_menu.html.erb
 - app/views/shared/_context_menu_for_levels.html.erb
 - app/views/shared/_context_menu_for_pages.html.erb