refinerycms-page-menus 2.0.4 → 2.0.5

data/app/assets/javascripts/refinery/backend.js.coffee

@@ -10,6 +10,19 @@ jQuery =>
 	$('#page_menu_form').submit (e) ->
 		save_structure($(this))
 
+	reset_custom_link_form()
+
+reset_link_forms = () ->
+	reset_custom_link_form()
+	reset_resource_link_forms()
+
+reset_custom_link_form = () ->
+	$('#menu_link_custom_url').val('http://')
+	$('#menu_link_label').val('')
+
+reset_resource_link_forms = () ->
+	$('.resource-pp-add-box').find('input[type="checkbox"]').attr('checked', false)
+
 save_structure = (form) ->
 	list_reorder.sortable_list.nestedSortable("disable")
 
@@ -21,4 +34,6 @@ save_structure = (form) ->
 		for elem in serialized_lists.split('&')
 			if elem.length
 				input = $("<input>").attr("type", "hidden").attr("name", elem.split('=')[0]).val(elem.split('=')[1])
-				form.append(input)
+				form.append(input)
+
+window.reset_link_forms = reset_link_forms

data/app/controllers/refinery/admin/{page_positions_controller.rb → menu_links_controller.rb}

@@ -1,17 +1,17 @@
 module Refinery
   module Admin
-    class PagePositionsController < Refinery::AdminController
+    class MenuLinksController < Refinery::AdminController
 
       def create
         respond_to do |format|
           format.js do
-            @page_positions = []
+            @menu_links = []
             if params[:refinery_resource_ids]
               params[:refinery_resource_ids].each do |id|
-                @page_positions << PagePosition.create({refinery_resource_id: id}.merge(params[:page_position]))
+                @menu_links << MenuLink.create({refinery_resource_id: id}.merge(params[:menu_link]))
               end
             else
-              @page_positions << PagePosition.create(params[:page_position])
+              @menu_links << MenuLink.create(params[:menu_link])
             end
           end
         end
@@ -20,8 +20,8 @@ module Refinery
       def destroy
         respond_to do |format|
           format.js do
-            @page_position = PagePosition.find(params[:id])
-            @page_position.destroy
+            @menu_link = MenuLink.find(params[:id])
+            @menu_link.destroy
           end
         end
       end

data/app/controllers/refinery/admin/page_menus_controller.rb

@@ -4,35 +4,36 @@ module Refinery
       
       crudify :'refinery/page_menu', 
               :xhr_paging => true, 
-              :sortable => false
+              :sortable => false,
+              :include => [:links]
       
-      before_filter :find_page_positions, only: [:edit, :update]
-      before_filter :set_page_positions, only: [:create, :update]
+      before_filter :find_menu_links, only: [:edit, :update]
+      before_filter :set_links_positions, only: [:create, :update]
       
       private
 
       # Based upon http://github.com/matenia/jQuery-Awesome-Nested-Set-Drag-and-Drop
-      def set_page_positions
+      def set_links_positions
         previous = nil
         params[:ul].each do |_, list|
           list.each do |index, hash|
-            moved_item_id = hash['id'].split(/page_position\_?/).reject(&:empty?).first
+            moved_item_id = hash['id'].split(/menu_link\_?/).reject(&:empty?).first
 
             if moved_item_id
-              current_position = @page_menu.positions.find(moved_item_id) # Scope?
+              current_link = @page_menu.links.find(moved_item_id) # Scope?
 
-              if current_position.respond_to?(:move_to_root)
+              if current_link.respond_to?(:move_to_root)
                 if previous.present?
-                  current_position.move_to_right_of(@page_menu.positions.find(previous)) #SCOPE?
+                  current_link.move_to_right_of(@page_menu.links.find(previous)) #SCOPE?
                 else
-                  current_position.move_to_root
+                  current_link.move_to_root
                 end
               else
-                current_position.update_attributes :position => index
+                current_link.update_attributes :position => index
               end
 
               if hash['children'].present?
-                update_child_page_positions(hash, current_position)
+                update_child_links_positions(hash, current_link)
               end
 
               previous = moved_item_id
@@ -40,24 +41,24 @@ module Refinery
           end
         end if params[:ul].present?
 
-        PagePosition.rebuild!
+        MenuLink.rebuild!
       end
 
-      def update_child_page_positions(_node, position)
+      def update_child_links_positions(_node, link)
         list = _node['children']['0']
         list.each do |index, child|
-          child_id = child['id'].split(/page_position\_?/).reject(&:empty?).first
-          child_position = @page_menu.positions.find(child_id) # Scoped?
-          child_position.move_to_child_of(position)
+          child_id = child['id'].split(/menu_link\_?/).reject(&:empty?).first
+          child_link = @page_menu.links.find(child_id) # Scoped?
+          child_link.move_to_child_of(link)
 
           if child['children'].present?
-            update_child_page_positions(child, child_position)
+            update_child_links_positions(child, child_link)
           end
         end
       end
       
-      def find_page_positions
-        @page_positions = @page_menu.roots
+      def find_menu_links
+        @menu_links = @page_menu.roots
       end
       
     end

data/app/models/refinery/{page_position.rb → menu_link.rb}

@@ -1,5 +1,5 @@
 module Refinery
-  class PagePosition < Refinery::Core::BaseModel
+  class MenuLink < Refinery::Core::BaseModel
     
     attr_accessible :parent_id, :refinery_page_id, :refinery_menu_id, :refinery_resource_id, :refinery_resource_type,
                     :title_attribute, :custom_url, :label
@@ -12,6 +12,9 @@ module Refinery
     acts_as_nested_set :dependent => :destroy
     
     validates :menu, :presence => true
+    validates :label, :presence => true
+
+    before_validation :set_label
 
     def self.find_all_of_type(type)
       # find all resources of the given type, determined by the configuration
@@ -31,20 +34,34 @@ module Refinery
       Refinery::PageMenus.menu_resources[type.to_sym]
     end
 
+    def set_label
+      if label.blank?
+        if custom_link?
+          begin
+            self.label = custom_url.match(/(\w+)\.\w+$/).captures.join.titleize 
+          rescue
+            self.label = custom_url
+          end
+        else
+          self.label = resource.send(resource_config[:title_attr]) 
+        end
+      end
+    end
+
     def resource_klass
-      Refinery::PagePosition.resource_klass(resource_type)
+      Refinery::MenuLink.resource_klass(resource_type)
     end
 
     def resource_config
-      Refinery::PagePosition.resource_config(resource_type)
+      Refinery::MenuLink.resource_config(resource_type)
     end
 
     def resource_type
-      refinery_resource_type || 'refinery_page'
+      refinery_resource_type || "Custom link"
     end
     
     def type_name
-      custom_link? ? "Custom link" : refinery_resource_type.titleize()
+      resource_type.titleize
     end
 
     def custom_link?
@@ -60,16 +77,16 @@ module Refinery
       resource_klass.find(refinery_resource_id)
     end
 
-    def resource_url
-      resource.present? ? resource.url : '/'
-    end
-
     def resource_title
       resource[resource_config[:title_attr]]
     end
 
     def title
-      title_attribute.present? ? title_attribute : label.present? ? label : resource.title 
+      title_attribute.present? ? title_attribute : label
+    end
+
+    def resource_url
+      resource.present? ? resource.url : '/'
     end
         
     def url
@@ -99,7 +116,7 @@ module Refinery
         :menu_match => menu_match,
         :parent_id => parent_id,
         :rgt => rgt,
-        :title => title,
+        :title => label, # title attributes has not yet been implemented in RefineryCMS
         :type => self.class.name,
         :url => url
       }

data/app/models/refinery/page_menu.rb

@@ -1,18 +1,18 @@
 module Refinery
   class PageMenu < Refinery::Core::BaseModel  
     
-    has_many :positions, :class_name => "::Refinery::PagePosition", :foreign_key => :refinery_menu_id, :dependent => :destroy, :order => "lft ASC"
+    has_many :links, :class_name => "::Refinery::MenuLink", :foreign_key => :refinery_menu_id, :dependent => :destroy, :order => "lft ASC"
     
     validates :title, :presence => true, :uniqueness => true
     validates :permatitle, :presence => true, :uniqueness => true
-    validates_associated :positions
+    validates_associated :links
     
-    attr_accessible :title, :permatitle, :positions, :positions_attributes
+    attr_accessible :title, :permatitle, :links, :links_attributes
 
-    accepts_nested_attributes_for :positions, :allow_destroy => true
+    accepts_nested_attributes_for :links, :allow_destroy => true
 
     def roots
-      @roots ||= positions.select {|pos| pos.parent_id.nil?}
+      @roots ||= links.select {|pos| pos.parent_id.nil?}
     end    
       
   end

data/app/views/refinery/admin/{page_positions → menu_links}/_custom_link.html.erb

@@ -1,5 +1,5 @@
 <div class="field">
-  <%= f.label :custom_url, "Url" %>
+  <%= f.label :custom_url, t('.custom_url') %>
   <%= f.text_field :custom_url %>
 </div>
 

data/app/views/refinery/admin/menu_links/_menu_link.html.erb

@@ -0,0 +1,29 @@
+<%= fields_for 'page_menu[links_attributes]', menu_link do |f| %>
+  <li class='pp-link clearfix record' id="<%= dom_id(menu_link)%>">
+    <div class='header'>
+      <div class='name'><%= menu_link.label %></div>
+      <div class='type'><%= menu_link.type_name %></div>
+      <span class='arrow'>&nbsp;</span>
+    </div>
+    <div class='body'>
+      <%= f.hidden_field :id %>
+      <% if f.object.custom_link? %>
+        <%= render partial: "refinery/admin/menu_links/custom_link", object: menu_link, locals: {f: f} %>
+      <% else %>
+        <%= render partial: "refinery/admin/menu_links/resource_link", object: menu_link, locals: {f: f} %>
+      <% end %>
+      <%= link_to t('remove', :scope => 'refinery.admin.menu_links'), admin_menu_link_path(menu_link), 
+                  method: :delete, 
+                  remote: true, 
+                  class: 'remove' %>
+    </div>
+    
+    <% if menu_link.children.any? %>
+      <ul class='nested'>
+        <% menu_link.children.each do |child|  %>
+          <%= render partial: 'refinery/admin/menu_links/menu_link', object: child %>
+        <% end %>
+      </ul>
+    <% end %>
+  </li>
+<% end %>

data/app/views/refinery/admin/{page_positions → menu_links}/_resource_link.html.erb

@@ -10,5 +10,5 @@
 
 <div class="field">
   <%= f.label :original %>
-  <div class='original-resource'><%= resource_link.resource.title %></div>
+  <div class='original-resource'><%= resource_link.resource_title %></div>
 </div>

data/app/views/refinery/admin/{page_positions → menu_links}/_resource_link_editor_box.html.erb

@@ -1,21 +1,21 @@
 <%= content_tag :div, class: "pp-add-box resource-pp-add-box" do %>
-  <%= form_for [refinery, :admin, @page_menu.positions.build(refinery_resource_type: resource_type)], remote: true do |f| %>
+  <%= form_for [refinery, :admin, @page_menu.links.build(refinery_resource_type: resource_type)], remote: true do |f| %>
     <h3><%= resource_type.to_s.titleize %></h3>
     <div class='pp-selection-box'>
       <ul class='checkboxes'>
         <%= f.hidden_field :refinery_menu_id %>
         <%= f.hidden_field :refinery_resource_type %>
 
-        <% resources = Refinery::PagePosition.find_all_of_type(resource_type) %>
+        <% resources = Refinery::MenuLink.find_all_of_type(resource_type) %>
         <% resources.each_with_index do |object, index| %>
           <li>
             <%= check_box_tag "refinery_resource_ids[]", object.id %>
-            <%= label_tag "refinery_resource_ids[]", object.title %> 
+            <%= label_tag "refinery_resource_ids[]", object.send(Refinery::MenuLink.resource_config(resource_type)[:title_attr]) %> 
           </li>
         <% end %>
       </ul>
     </div>
     <% # add resource type here %>
-    <%= f.submit "Add"  %>
+    <%= f.submit t('add', :scope => 'refinery.admin.menu_links', resource: resource_type.to_s.titleize)  %>
   <% end %>
 <% end %>

data/app/views/refinery/admin/menu_links/create.js.erb

@@ -0,0 +1,6 @@
+$('.pp-placeholder').remove();
+reset_link_forms();
+<% @menu_links.each do |menu_link| %>
+	var partial = '<%= j render partial: "refinery/admin/menu_links/menu_link", object: menu_link %>'
+	$('#sortable_list').append(partial);
+<% end %>

data/app/views/refinery/admin/menu_links/destroy.js.erb

@@ -0,0 +1,3 @@
+$('#menu_link_<%= @menu_link.id %>').fadeOut(function(){
+	$('#menu_link_<%= @menu_link.id %>').remove();
+});

data/app/views/refinery/admin/page_menus/_form.html.erb

@@ -10,24 +10,22 @@
                :include_object_name => true %>
 
 
-
     <ul id="sortable_list">
-      <% if @page_positions.present? %>
-        <% @page_positions.each do |page_position|  %>
-          <%= render partial: 'refinery/admin/page_positions/page_position', object: page_position %>
+      <% if @menu_links.present? %>
+        <% @menu_links.each do |menu_link|  %>
+          <%= render partial: 'refinery/admin/menu_links/menu_link', object: menu_link %>
         <% end %>
       <% else %>
         <li class='pp-placeholder' id="">
           <%# We need a div here so we don't get a js error for a empty list %>
-          <div>Use the left side to add links to your menu.</div>
+          <div><%= t('.no_links') %></div>
         </li>
       <% end %>
     </ul>
   </div>
 
-
   <%= render '/refinery/admin/form_actions', :f => f,
               :continue_editing => false,
-              :delete_title => t('delete', :scope => 'refinery.travels.admin.travels.category'),
-              :delete_confirmation => t('message', :scope => 'refinery.admin.delete') %>
+              :delete_title => t('delete', :scope => 'refinery.admin.page_menus.page_menu'),
+              :delete_confirmation => t('message', :scope => 'refinery.admin.delete', title: @page_menu.title) %>
 <% end %>

data/app/views/refinery/admin/page_menus/_form_actions.html.erb

@@ -1,23 +1,23 @@
 <div id='left_actions'>
   
   <div id="custom_url_box" class="pp-add-box">
-    <%= form_for [refinery, :admin, @page_menu.positions.build], remote: true do |f| %>
+    <%= form_for [refinery, :admin, @page_menu.links.build], remote: true do |f| %>
       <%= f.hidden_field :refinery_menu_id %>
       <h3>Custom Link</h3>
       <div class='field'>
-        <%= f.label :custom_url, "Url" %>
+        <%= f.label :custom_url, t('custom_url', scope: 'refinery.admin.menu_links.custom_link') %>
         <%= f.text_field :custom_url %>
       </div>
       <div class='field'>
         <%= f.label :label %>
         <%= f.text_field :label %>
       </div>
-    <%= f.submit "Add" %>
+    <%= f.submit t('add', :scope => 'refinery.admin.menu_links.custom_link') %>
     <% end %>
   </div>
 
   <% Refinery::PageMenus.menu_resources.each do |resource_type, config| %>
-    <%= render partial: "refinery/admin/page_positions/resource_link_editor_box", locals: { resource_type: resource_type, config: config } %>
+    <%= render partial: "refinery/admin/menu_links/resource_link_editor_box", locals: { resource_type: resource_type, config: config } %>
   <% end %>
 
 </div>

data/app/views/refinery/admin/page_menus/_page_menu.html.erb

@@ -1,4 +1,4 @@
-<li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%#= dom_id(test) %>">
+<li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%= dom_id(page_menu) %>">
   <span class='title'>
     <%= page_menu.title %>
 

data/app/views/refinery/admin/page_menus/_page_menus.html.erb

@@ -1,2 +1,3 @@
-<%= will_paginate @page_mennus if Refinery::Admin::PageMenusController.pageable? %>
-<%= render 'sortable_list' %>
+<ul>
+  <%= render :partial => 'page_menu', :collection => @page_menus %>
+</ul>

data/app/views/refinery/admin/page_menus/edit.html.erb

@@ -6,7 +6,5 @@
 
 <%= render '/refinery/admin/make_sortable', :tree => true %>
 
-<%#= render '/refinery/admin/sortable_list', :continue_reordering => !!local_assigns[:continue_reordering] %>
-
 <% content_for :stylesheets, stylesheet_link_tag('refinery/select_form') %>
 <% content_for :javascripts, javascript_include_tag('refinery/backend.js') %>

data/config/locales/da.yml

@@ -2,35 +2,33 @@ da:
   refinery:
     plugins:
       refinery_page_menus:
-        title: Side Menu
-        description: Opret og håndter brugerdefinerede menuer for din side
+        title: Menuer
+        description: Opret og administrer brugerdefinerede menuer for din side
     admin:
-      pages:
-        form_advanced_options: 
-          show_in_menu_title: Vis i hovedmenuen
-          show_in_menu_description: Vis siden i hovedmenuen på sitet
-          show_in_menu_help: Afkryds ikke, hvis du vil fjerne siden fra hovedmenuen på sitet. Dette kan benyttes, hvis du vil have en side, du kan linke til direkte, eller bruge i en anden menu, men som ikke skal vises i hovedmenuen.
-        actions:
-          pages:
-            title: Sider
-            create_new: Tilføj en ny side
-            manage: Håndter sider
-          menus:
-            title: Menuer
-            main: Hovedmenu
-            create_new: Tilføj en ny menu
-            manage: Håndter menuer
-            edit: Redigér menuen
+      menu_links:
+        remove: fjern
+        add: "Tilføj %{resource}"
+        custom_link:
+          add: Tilføj brugerdefineret link
+          custom_url: Url
       page_menus:
         form:
-          menu_pages: Sider i menuen
-          pages_help: Dette er en liste over alle de sider der indgår i menuen. Vælg sider og tryk '<' for at fjerne dem.
-          all_pages: Sider ikke i menuen
-          all_pages_help: Dette er en liste over alle tilgængelige sider der ikke indgår i menuen. Vælg hvilke sider der skal indgå i menuen, og tryk '>'.
+          no_links: "Brug panelet i venstre, til at tilføje links til din menu."
+        records:
+          title: Menuer
+          no_items_yet: Der er ingen menuer endnu. Bed din webudvikler om at oprette en for dig.
+        page_menu:
+          edit: Redigér menuen
+          delete: Slet menuen permanent
   activerecord:
     models:
       refinery/page_menu: Menu
+      refinery/menu_link: Link
     attributes:
       refinery/page_menu:
         title: Titel
-        pages: Sider
+        permatitle: Permanent titel
+      refinery/menu_link:
+        title_attribute: Titel attribut
+        custom_url: Url
+        label: Label

data/config/locales/en.yml

@@ -2,35 +2,33 @@ en:
   refinery:
     plugins:
       refinery_page_menus:
-        title: Page Menu
+        title: Menus
         description: Create and manage custom menus for your site
     admin:
-      pages:
-        form_advanced_options: 
-          show_in_menu_title: Show in mainmenu
-          show_in_menu_description: Show the page in the mainmenu on the site
-          show_in_menu_help: Uncheck this box if you want to remove a page from your mainmenu. This can be handy if you have a page you want to link people to directly or use in another menu but don't want to show the page in the menu.
-        actions:
-          pages:
-            title: Pages
-            create_new: Add new page
-            manage: Manage pages
-          menus:
-            title: Menus
-            main: Mainmenu
-            create_new: Add new menu
-            manage: Manage menus
-            edit: Edit this menu
+      menu_links:
+        remove: remove
+        add: "Add %{resource}"
+        custom_link:
+          add: Add Custom Link
+          custom_url: Url
       page_menus:
         form:
-          menu_pages: Pages in the menu
-          pages_help: This is a list of all the pages for this menu. Select pages and click '<' to remove them from the menu.
-          all_pages: Pages not in the menu
-          all_pages_help: This is a list of all available pages that&apos;s not in the menu already. Select those pages you want in the menu and click '>' to add them.
+          no_links: Use the left side to add links to your menu.
+        records:
+          title: Menus
+          no_items_yet: There are no menues yet. Ask your developer to create one for you.
+        page_menu:
+          edit: Edit this menu
+          delete: Remove this menu forever
   activerecord:
     models:
       refinery/page_menu: Menu
+      refinery/menu_link: Link
     attributes:
       refinery/page_menu:
         title: Title
-        pages: Pages
+        permatitle: Permatitle
+      refinery/menu_link:
+        title_attribute: Title attribute
+        custom_url: Url
+        label: Label

data/config/locales/fr.yml

@@ -2,32 +2,8 @@ fr:
   refinery:
     plugins:
       refinery_page_menus:
-        title: Menu de pages
+        title: Menus
         description: Créer et gérer des menus personnalisés pour votre site
-    admin:
-      pages:
-        form_advanced_options: 
-          show_in_menu_title: Afficher dans le menu principal (mainmenu)
-          show_in_menu_description: Afficher la page dans le menu principal (mainmenu) du site
-          show_in_menu_help: Décochez cette case si vous souhaitez supprimer une page de votre menu principal (mainmenu). Cela peut  être pratique si vous avez une page que vous souhaitez lier directement ou utiliser dans un autre menu.
-             This can be handy if you have a page you want to link people to directly or use in another menu but don't want to show the page in the menu.
-        actions:
-          pages:
-            title: Pages
-            create_new: Créer une nouvelle page
-            manage: Gérer les pages
-          menus:
-            title: Menus
-            main: Menu principal (mainmenu)
-            create_new: Créer un nouveau menu
-            manage: Gérer les menus
-            edit: Modifier ce menu
-      page_menus:
-        form:
-          menu_pages: Pages dans le menu
-          pages_help: Ceci est la liste de toutes les pages ins&eacute;r&eacute;es dans le menu. S&eacute;lectionnez les pages et cliquez sur le bouton &apos;<&apos; pour les enlever de ce menu.
-          all_pages: Pages hors du menu
-          all_pages_help: Ceci est la liste de toutes les pages qui ne sont pas encore ins&eacute;r&eacute;es dans le menu. S&eacute;lectionnez les pages que vous souhaitez avoir dans le menu et cliquez sur le bouton &apos;>&apos; pour les ajouter.
   activerecord:
     models:
       refinery/page_menu: Menu

data/config/routes.rb

@@ -2,11 +2,11 @@ Refinery::Core::Engine.routes.draw do
 
   # Admin routes
   namespace :admin, :path => 'refinery' do
-    resources :page_positions, only: [:create, :destroy]
+    resources :menu_links, only: [:create, :destroy]
 
     resources :page_menus do
       post :update_positions, :on => :collection
-      resources :page_positions, :only => [:index, :show] do
+      resources :menu_links, :only => [:index, :show] do
         post :update_positions, :on => :collection
       end
     end

data/db/migrate/06_rename_page_positions_to_menu_links.rb

@@ -0,0 +1,5 @@
+class RenamePagePositionsToMenuLinks < ActiveRecord::Migration
+  def change
+  	rename_table :refinery_page_positions, :refinery_menu_links
+  end
+end

data/db/seeds.rb

@@ -14,5 +14,5 @@ if defined?(::Refinery::PageMenu)
 end
 
 Refinery::PageMenus.default_menus.each do |menu|
-	Refinery::PageMenu.create(title: menu.titleize, permatitle: menu)
+	Refinery::PageMenu.create(title: menu.titleize, permatitle: menu.underscore)
 end

data/lib/refinery/page_menus.rb

@@ -2,12 +2,10 @@ require 'refinerycms-core'
 
 module Refinery
   autoload :PageMenusGenerator, 'generators/refinery/page_menus/page_menus_generator'
-  autoload :InstanceMethods, 'refinery/page_menus/admin/instance_methods'
   
   module PageMenus
     require 'refinery/page_menus/engine'
     require 'refinery/page_menus/configuration'
-    require 'refinery/page_menus/controller_extension'
     
     autoload :InstanceMethods, 'refinery/page_menus/instance_methods'
 

data/lib/refinery/page_menus/configuration.rb

@@ -14,7 +14,7 @@ module Refinery
     self.menu_resources = {
       refinery_page: {
         klass: 'Refinery::Page',
-        admin_partial: '/refinery/admin/page_positions/page_position',
+        admin_partial: '/refinery/admin/menu_links/menu_link',
         title_attr: 'title',
         admin_page_filter: {
           draft: false

data/lib/refinery/page_menus/engine.rb

@@ -14,18 +14,12 @@ module Refinery
 
       initializer "register refinery_page_menus plugin" do
         Refinery::Plugin.register do |plugin|
-          plugin.name = 'page_menus'
+          plugin.name = 'refinery_page_menus'
           plugin.url = proc { Refinery::Core::Engine.routes.url_helpers.admin_page_menus_path }
           plugin.pathname = root
-          plugin.menu_match = /refinery\/(page_menus|main_menu|page_positions)/ #Match controller path
-          # plugin.hide_from_menu = true
+          plugin.menu_match = /refinery\/(page_menus|menu_links)/ #Match controller path
         end
       end
-
-      # config.to_prepare do
-      #   require 'refinerycms-pages'        
-      #   Refinery::Admin::PagesController.send :has_and_belongs_to_page_menus
-      # end
       
       config.after_initialize do
         Refinery.register_extension(Refinery::PageMenus)

data/lib/refinery/page_menus/instance_methods.rb

@@ -8,7 +8,7 @@ module Refinery
 
       # Compiles a page menu.
       def refinery_page_menu(menu_title)
-        ::Refinery::Menu.new(::Refinery::PageMenu.find_or_create_by_permatitle(menu_title).positions).roots
+        ::Refinery::Menu.new(::Refinery::PageMenu.find_or_create_by_permatitle(menu_title).links).roots
       end
 
     end

data/lib/refinery/page_menus/version.rb

@@ -3,7 +3,7 @@ module Refinery
 	  class Version
 	    @major = 2
 	    @minor = 0
-	    @tiny  = 4
+	    @tiny  = 5
 	    @build = nil
 
 	    class << self

data/lib/tasks/refinery/page_menus.rake

@@ -0,0 +1,65 @@
+namespace :refinery do
+
+  namespace :page_menus do
+
+    desc "Create a new menu"
+    task :create_menu => :environment do
+    	permatitle = ENV['permatitle'] || ENV['perma']
+    	title = ENV['title']
+    	if title
+  			permatitle = title.gsub(' ', '_').underscore if permatitle.nil?
+    		begin
+    			menu = Refinery::PageMenu.create!(title: title, permatitle: permatitle)
+       		puts "Created new menu with title '#{title}' and permatitle '#{permatitle}'"
+    			puts "To use this menu in your views, paste this code into your view file:"
+    			puts "<%= render :partial => '/refinery/menu', :locals => { "
+    			puts "           :roots => refinery_page_menu('#{permatitle}') } %>"
+	    	rescue Exception => e
+	    		puts e
+	    	end
+    	else
+    		puts "You didn't specify a title for your menu. Here are some examples:"
+    		puts "rake refinery:page_menus:create_menu title='Top Menu'"
+    		puts "rake refinery:page_menus:create_menu permatitle=footer_menu"
+    		puts "rake refinery:page_menus:create_menu title='Sitebar Menu' permatitle=sitebar_menu"
+    		puts ""
+    		puts "If not presnce permatitles will be underscored version of the title input, ie:"
+    		puts "title='Top Menu' will result in the permatitle 'top_menu'"
+    	end
+    end
+
+    desc "Create a new menu"
+    task :menus => :environment do
+  		begin
+  			menus = Refinery::PageMenu.all
+
+				if menus.none?
+					puts "You don't have any menus."
+					puts "To create a new menu, run this rake task:"
+					puts "rake refinery:page_menus:create_menu title='your menu title'"
+				elsif menus.one?
+					puts "You have the one menu '#{menus.first.title}' with the permatitle '#{menus.first.permatitle}'."
+					puts ""
+				  puts "To use '#{menus.first.title}' in your views, paste this code into your view file:"
+					puts "<%= render :partial => '/refinery/menu', :locals => { "
+					puts "           :roots => refinery_page_menu('#{menus.first.permatitle}') } %>"
+				elsif menus.many?
+					puts "Your have the following menus:"
+					menus.each do |menu|
+						puts "'#{menu.title}' with permatitle '#{menu.permatitle}'"
+					end
+					puts ""
+				  puts "To use one of these menus in your views, paste this code into your view file:"
+					puts "<%= render :partial => '/refinery/menu', :locals => { "
+					puts "           :roots => refinery_page_menu('<PERMATITLE>') } %>"
+					puts "and replace <PERMATITLE> with the permatitle for the choosen menu"
+				end
+
+    	rescue Exception => e
+    		puts e
+    	end
+    end
+
+  end
+
+end

data/readme.md

@@ -1,22 +1,19 @@
 # Page Menus Extension for Refinery CMS
 
-## IMPORTANT: IN DEVELOPMENT!
-
-This extension is still in development! There is no tests yet. 
-Also you can't create new menus in the admin interface, you have to create them yourself.
-
-A stable complete version will soon be released.
-
 If you are willing to contribute please send me a mail (johan@pylonweb.dk), and follow the contribution guidelines below. Especially test would be appriciated!
 
 ## About
 
 Page menus allows you to create and edit several custom menus for your Refinery CMS app. 
 
+![image](https://raw.github.com/pylonweb/refinerycms-page-menus/master/doc/refinery_menu_edit.png)
+
 ## Requirements
 
 * refinerycms >= 2.0.6
 
+(have not been tested on lower versions but does most likely work on all versions after 2.0.0)
+
 ## Install
 
 Add this line to your applications `Gemfile`
@@ -42,19 +39,31 @@ rake db:migrate
 Now when you start up your Refinery application, go to the pages in your admin interface, and you should see a roll-down menu called "Menus".
 
 ## Usage
+### Add to your view
 
-`app/views/refinery/pages/_header.html.erb`
-
+Go to `app/views/refinery/pages/_header.html.erb` in your application.
 If you don't have this file then Refinery will be using its default. You can override this with
 
 ```bash
 rake refinery:override view=refinery/_header
 ```
 
+Then add this code to the header, to generate the custom menu:
 ```erb
-== render :partial => "/refinery/menu", :locals => { 
-				:roots => refinery_page_menu("custom_menu")
-	          }	          	          
+<%= render :partial => "/refinery/menu", :locals => { 
+			:roots => refinery_page_menu("custom_menu")
+	  }	%>     	          
+```
+"custom_menu" must be replaced by the permatitle of your menu.
+### Rake commands
+To show list all your menus and their permatitles run this rake task:
+```bash
+rake refinery:page_menus:menus
+```
+
+You can create a new menu in the rails console, or you can use the following command:
+```bash
+rake refinery:page_menus:create_menu title=some_title
 ```
 
 ## Contributing

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-page-menus
 version: !ruby/object:Gem::Version
-  version: 2.0.4
+  version: 2.0.5
   prerelease: 
 platform: ruby
 authors:
@@ -59,22 +59,6 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.1.0
-- !ruby/object:Gem::Dependency
-  name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 1.5.5
 - !ruby/object:Gem::Dependency
   name: refinerycms-testing
   requirement: !ruby/object:Gem::Requirement
@@ -99,25 +83,23 @@ extra_rdoc_files: []
 files:
 - app/assets/javascripts/refinery/backend.js.coffee
 - app/assets/stylesheets/refinery/select_form.css.scss
+- app/controllers/refinery/admin/menu_links_controller.rb
 - app/controllers/refinery/admin/page_menus_controller.rb
-- app/controllers/refinery/admin/page_positions_controller.rb
-- app/helpers/refinery/page_positions_helper.rb
+- app/models/refinery/menu_link.rb
 - app/models/refinery/page_menu.rb
-- app/models/refinery/page_position.rb
+- app/views/refinery/admin/menu_links/_custom_link.html.erb
+- app/views/refinery/admin/menu_links/_menu_link.html.erb
+- app/views/refinery/admin/menu_links/_resource_link.html.erb
+- app/views/refinery/admin/menu_links/_resource_link_editor_box.html.erb
+- app/views/refinery/admin/menu_links/create.js.erb
+- app/views/refinery/admin/menu_links/destroy.js.erb
 - app/views/refinery/admin/page_menus/_form.html.erb
 - app/views/refinery/admin/page_menus/_form_actions.html.erb
 - app/views/refinery/admin/page_menus/_page_menu.html.erb
 - app/views/refinery/admin/page_menus/_page_menus.html.erb
 - app/views/refinery/admin/page_menus/_records.html.erb
-- app/views/refinery/admin/page_menus/_sortable_list.html.erb
 - app/views/refinery/admin/page_menus/edit.html.erb
 - app/views/refinery/admin/page_menus/index.html.erb
-- app/views/refinery/admin/page_positions/_custom_link.html.erb
-- app/views/refinery/admin/page_positions/_page_position.html.erb
-- app/views/refinery/admin/page_positions/_resource_link.html.erb
-- app/views/refinery/admin/page_positions/_resource_link_editor_box.html.erb
-- app/views/refinery/admin/page_positions/create.js.erb
-- app/views/refinery/admin/page_positions/destroy.js.erb
 - config/locales/da.yml
 - config/locales/en.yml
 - config/locales/fr.yml
@@ -127,16 +109,17 @@ files:
 - db/migrate/03_add_menu_match_to_page_positions.rb
 - db/migrate/04_add_flex_fields_to_page_positions.rb
 - db/migrate/05_remove_refinery_page_id_from_refinery_page_positions.rb
+- db/migrate/06_rename_page_positions_to_menu_links.rb
 - db/seeds.rb
 - lib/generators/refinery/page_menus/page_menus_generator.rb
 - lib/generators/refinery/page_menus/templates/config/initializers/refinery/page_menus.rb.erb
 - lib/refinery/page_menus/configuration.rb
-- lib/refinery/page_menus/controller_extension.rb
 - lib/refinery/page_menus/engine.rb
 - lib/refinery/page_menus/instance_methods.rb
 - lib/refinery/page_menus/version.rb
 - lib/refinery/page_menus.rb
 - lib/refinerycms-page-menus.rb
+- lib/tasks/refinery/page_menus.rake
 - readme.md
 homepage: http://github.com/pylonweb/refinerycms-page-menus
 licenses:
@@ -151,12 +134,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1045030147705129350
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 1045030147705129350
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23

data/app/helpers/refinery/page_positions_helper.rb

@@ -1,66 +0,0 @@
-module Refinery
-  module PagePositionsHelper
-    require 'nokogiri'
-
-    def render_menu_list(page_positions)
-      results = "".html_safe
-      page_positions.each do |page_position|
-        if page_position.custom_link?
-          results << render_custom_menu_link(page_position)
-        else
-          results << render_resource_menu_link(page_position)
-        end
-      end
-      results
-    end
-
-    def render_custom_menu_link(page_position)
-      list_partial = render(partial: "custom_page_position", locals: {page_position: page_position})
-
-      dom = Nokogiri::HTML.fragment(list_partial)
-      li = dom.css('li').first
-
-      # append nested ul to end of this li
-      li << nested_ul(page_position)
-
-      dom.to_s.html_safe
-    end
-
-    def render_resource_menu_link(page_position)
-      list_partial = render(:partial => page_position.resource_config[:admin_partial], :collection => [page_position.resource])
-
-      dom = Nokogiri::HTML.fragment(list_partial)
-      li = dom.css('li').first
-
-      # change li's id to that of the page_partial
-      li['id'] = dom_id(page_position)
-
-      # wrap inside of li in div if it's not already
-      if dom.css('li > div').empty?
-        div = Nokogiri.make("<div class='clearfix'></div>")
-        div.children = li.children
-        li.children = div
-      end
-
-      # edit title to show actual link label as well
-      title_div = dom.css('.title').first
-      if title_div.present?
-        title_div.content = page_position.label
-      end
-
-      # append nested ul to end of this li
-      li << nested_ul(page_position)
-
-      dom.to_s.html_safe
-    end
-
-    def nested_ul(page_position)
-      # recursively create nested list of children
-      content_tag :ul, class: 'nested' do
-        render_menu_list(page_position.children)
-      end
-    end
-
-
-  end
-end

data/app/views/refinery/admin/page_menus/_sortable_list.html.erb

@@ -1,5 +0,0 @@
-<ul id='sortable_list'>
-  <%= render :partial => 'page_menu', :collection => @page_menus %>
-</ul>
-<%= render '/refinery/admin/sortable_list',
-            :continue_reordering => (local_assigns.keys.include?(:continue_reordering)) ? continue_reordering : true %>

data/app/views/refinery/admin/page_positions/_page_position.html.erb

@@ -1,26 +0,0 @@
-<%= fields_for 'page_menu[positions_attributes]', page_position do |f| %>
-  <li class='pp-link clearfix record' id="<%= dom_id(page_position)%>">
-    <div class='header'>
-      <div class='name'><%= page_position.title %></div>
-      <div class='type'><%= page_position.type_name %></div>
-      <span class='arrow'>&nbsp;</span>
-    </div>
-    <div class='body'>
-      <%= f.hidden_field :id %>
-      <% if f.object.custom_link? %>
-        <%= render partial: "refinery/admin/page_positions/custom_link", object: page_position, locals: {f: f} %>
-      <% else %>
-        <%= render partial: "refinery/admin/page_positions/resource_link", object: page_position, locals: {f: f} %>
-      <% end %>
-      <%= link_to "remove", admin_page_position_path(page_position), method: :delete, remote: true, class: 'remove' %>
-    </div>
-    
-    <% if page_position.children.any? %>
-      <ul class='nested'>
-        <% page_position.children.each do |child|  %>
-          <%= render partial: 'refinery/admin/page_positions/page_position', object: child %>
-        <% end %>
-      </ul>
-    <% end %>
-  </li>
-<% end %>

data/app/views/refinery/admin/page_positions/create.js.erb

@@ -1,5 +0,0 @@
-$('.pp-placeholder').remove();
-<% @page_positions.each do |page_position| %>
-	var partial = '<%= j render partial: "refinery/admin/page_positions/page_position", object: page_position %>'
-	$('#sortable_list').append(partial);
-<% end %>

data/app/views/refinery/admin/page_positions/destroy.js.erb

@@ -1,3 +0,0 @@
-$('#page_position_<%= @page_position.id %>').fadeOut(function(){
-	$('#page_position_<%= @page_position.id %>').remove();
-});

data/lib/refinery/page_menus/controller_extension.rb

@@ -1,48 +0,0 @@
-module Refinery
-  module PageMenus
-    module ControllerExtension
-      
-      def has_and_belongs_to_page_menus
-        
-        before_filter :find_all_menus, :only => [:index, :list]
-        
-        module_eval do
-          
-          def list
-            unless searching?
-              find_all_pages
-            else
-              search_all_pages
-            end
-
-            render_partial_response?
-          end
-          
-          def index
-            unless searching?
-              if Refinery::PageMenus.show_hidden_pages_in_main_menu
-                find_all_pages
-              else
-                @pages = Refinery::Page.where(:show_in_menu => true).includes(:translations, :children).order("lft ASC")
-              end
-            else
-              search_all_pages
-            end
-          
-            render_partial_response?
-          end
-
-          protected
-    
-          def find_all_menus
-            @page_menus = Refinery::PageMenu.order('title ASC')
-          end
-          
-        end
-        
-      end
-    end
-  end
-end
-
-ActionController::Base.send(:extend, Refinery::PageMenus::ControllerExtension)