refinerycms-llama_menus 1.0.7 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f5ecb6806aedd8b89ec56bf622659bca67f01a2a
-  data.tar.gz: b8592db93ca46539c4ffd0ac74ca3450541e70bc
+  metadata.gz: 545d8adb97ddcc01a6de710a40db79d6a19d99d9
+  data.tar.gz: b36860881f74723f69559c494145df1b04504542
 SHA512:
-  metadata.gz: fce6d9c0abb305b5c9ba371dfb55d94fd0e8427754c2e8b6f263c721e4bde1b53e7f63b3846f78d2bbd2a7b3d5f0703ee89762956f7da2a37b7902747ac05add
-  data.tar.gz: fb1975d7ea4fd03ef6a7ca1b5ea021aed9904881903b6b3e17dbbb784c5f75b3f23e0c2de5d8a04bea1c742f84ea4f9f8e6a661f57e16777c638a28408469641
+  metadata.gz: 47dfeaf24451898dd9dcc2a7cf00b6dce8a5a92d1eac001d10062956a35ebe86537c57be6447575c53d402de9f5cd64d73b9ab8f2f91f5ce8e131aa02916a799
+  data.tar.gz: 3846fcfc3f52b2d98f0ba6e650f26b6af8114f28b03f46e6c76b27277fcb726c868d0ea323828913740b9237477cf6020fcb485d77b21a3eb636011661a85a27

data/app/assets/stylesheets/refinery/menus.css.scss

@@ -0,0 +1,6 @@
+#content .menu-item-edit {
+  .field {
+    width: inherit;
+    display: inline-block;
+  }
+}

data/app/helpers/refinery/menus/admin/menu_items_helper.rb

@@ -10,6 +10,15 @@ module Refinery
           blank + rows
         end
 
+        def link_to_add_sub_fields(name, f, association)
+          new_object = f.object.send(association).klass.new
+          id = new_object.object_id
+          fields = f.fields_for(association, new_object, child_index: id) do |builder|
+            render("sub_" + association.to_s.singularize + "_fields", f: builder)
+          end
+          link_to(name, '#', class: "add_fields", data: {id: id, add: true, fields: fields.gsub("\n", "")})
+        end
+
       end
     end
   end

data/app/models/refinery/menus/menu.rb

@@ -9,7 +9,7 @@ module Refinery
 
       validates :name, :presence => true, :uniqueness => true
 
-      has_many :menu_items, class_name: 'Refinery::Menus::MenuItem', dependent: :destroy
+      has_many :menu_items, as: :menuable, class_name: 'Refinery::Menus::MenuItem', dependent: :destroy
       accepts_nested_attributes_for :menu_items, allow_destroy: true
     end
   end

data/app/models/refinery/menus/menu_item.rb

@@ -3,15 +3,20 @@ module Refinery
     class MenuItem < ActiveRecord::Base
       self.table_name = 'refinery_menu_items'
 
-      attr_accessible :label, :position, :linkable_type, :linkable_id, :menu_id, :url, :linkable
+      attr_accessible :label, :position, :linkable_type, :linkable_id,
+        :url, :linkable, :menuable, :menu_items_attributes
 
-      belongs_to :menu, class_name: 'Refinery::Menus::Menu'
+      belongs_to :menuable, polymorphic: true
       belongs_to :linkable, polymorphic: true
+      has_many :menu_items, as: :menuable, class_name: 'Refinery::Menus::MenuItem', dependent: :destroy
 
       validates :label, :presence => true
       validates :linkable, :presence => {:unless => 'url?'}
       validates :url, :presence => {:unless => 'linkable_type?'}
 
+      alias_attribute :sub_menu_items, :menu_items
+      accepts_nested_attributes_for :menu_items, allow_destroy: true
+
     end
   end
 end

data/app/views/refinery/menus/admin/menus/_menu_item_fields.html.erb

@@ -1,40 +1,14 @@
- <fieldset class='nested' data-nested-item='true' data-sortable-item='true'>
-   <%= refinery_icon_tag 'arrow_switch', 'data-handle' => true, :title => 'Reorder', :class => 'handle' %>
-   <%= f.hidden_field :position, 'data-position' => true %>
-  <div class='field'>
-    <span class='label_with_help'>
-      <%= f.label :label %>
-      <%= refinery_help_tag t('refinery.menus.admin.tooltips.label') %>
-    </span>
-    <%= f.text_field :label %>
-  </div>
-  <div class='field'>
-    <span class='label_with_help'>
-      <%= f.label :url %>
-      <%= refinery_help_tag t('refinery.menus.admin.tooltips.url') %>
-    </span>
-    <%= f.text_field :url %>
-  </div>
-
-  <% if Refinery::Menus.linkable_classes.any? %>
-    <% if Refinery::Menus.linkable_classes.many? %>
-      <div class='field'>
-        <span class='label_with_help'>
-          <%= f.label :linkable_type %>
-          <%= refinery_help_tag t('refinery.menus.admin.tooltips.linkable_type') %>
-        </span>
-      </div>
-    <% else %>
-      <%= f.hidden_field :linkable_type, value: Refinery::Menus.linkables.first.class_name %>
-    <% end %>
-    <div class='field'>
-      <%= f.label :linkable_id %>
-      <% Refinery::Menus.linkable_classes.each do |linkable_class| %>
-        <%= f.select :linkable_id, options_for_select_from_linkable_class(linkable_class) %>
-      <% end %>
-    </div>
-  <% end %>
+<fieldset class='nested menu-item-edit' data-nested-item='true' data-sortable-item='true'>
 
+  <%= render 'refinery/menus/admin/menus/shared_menu_item_fields', :f => f %>
   
-  <%= link_to_remove_field 'Remove this menu item', f %>
+  <div>
+    <% if f.object.sub_menu_items.present? %>
+      <%= f.label :sub_menu_items %>
+      <%= f.fields_for :menu_items do |j| %>
+        <%= render 'refinery/menus/admin/menus/sub_menu_item_fields', :f => j %>
+      <% end %>
+    <% end %>
+    <%= link_to_add_sub_fields 'Add sub-menu item', f, :menu_items %>
+  </div>
 </fieldset>

data/app/views/refinery/menus/admin/menus/_shared_menu_item_fields.html.erb

@@ -0,0 +1,38 @@
+<div class="handle">
+  <%= refinery_icon_tag 'arrow_switch', 'data-handle' => true, :title => 'Reorder' %>
+  <%= link_to_remove_field refinery_icon_tag('bin_closed', 'data-handle' => true, :title => 'Delete'), f %>
+  <%= f.hidden_field :position, 'data-position' => true %>
+</div>
+<div class='field'>
+  <span class='label_with_help'>
+    <%= f.label :label %>
+    <%= refinery_help_tag t('refinery.menus.admin.tooltips.label') %>
+  </span>
+  <%= f.text_field :label %>
+</div>
+<div class='field'>
+  <span class='label_with_help'>
+    <%= f.label :url %>
+    <%= refinery_help_tag t('refinery.menus.admin.tooltips.url') %>
+  </span>
+  <%= f.text_field :url %>
+</div>
+
+<% if Refinery::Menus.linkable_classes.any? %>
+  <% if Refinery::Menus.linkable_classes.many? %>
+    <div class='field'>
+      <span class='label_with_help'>
+        <%= f.label :linkable_type %>
+        <%= refinery_help_tag t('refinery.menus.admin.tooltips.linkable_type') %>
+      </span>
+    </div>
+  <% else %>
+    <%= f.hidden_field :linkable_type, value: Refinery::Menus.linkables.first.class_name %>
+  <% end %>
+  <div class='field'>
+    <%= f.label :linkable_id %>
+    <% Refinery::Menus.linkable_classes.each do |linkable_class| %>
+      <%= f.select :linkable_id, options_for_select_from_linkable_class(linkable_class) %>
+    <% end %>
+  </div>
+<% end %>

data/app/views/refinery/menus/admin/menus/_sub_menu_item_fields.html.erb

@@ -0,0 +1,3 @@
+ <fieldset class='nested menu-item-edit' data-nested-item='true' data-sortable-item='true'>
+  <%= render 'refinery/menus/admin/menus/shared_menu_item_fields', :f => f %>
+</fieldset>

data/app/views/refinery/widgets/_menu_widget.html.slim

@@ -12,3 +12,11 @@ nav.navbar.navbar-default role='navigation'
         - Refinery::Menus::MenuItemDecorator.decorate_collection(widget.menu_widget.menu.menu_items.order(:position)).each do |menu_item|
           li class=('active' if current_page?(menu_item.url(refinery)))
             = link_to menu_item.label, menu_item.url(refinery)
+          - if current_page?(menu_item.url(refinery))
+            - content_for :sub_menu do
+              .collapse.navbar-collapse#bs-example-navbar-collapse-2
+                ul.nav.navbar-nav
+                  - Refinery::Menus::MenuItemDecorator.decorate_collection(menu_item.menu_items.order(:position)).each do |sub_menu_item|
+                    = content_tag :li, class: ('active' if @page && @page.try(:self_and_ancestors).try(:include?, sub_menu_item.linkable)) do
+                      = link_to sub_menu_item.label, sub_menu_item.url(refinery)
+    = yield :sub_menu

data/db/migrate/4_add_menuable_id_and_type_to_menu_items.rb

@@ -0,0 +1,8 @@
+class AddMenuableIdAndTypeToMenuItems < ActiveRecord::Migration
+
+  def change 
+    rename_column :refinery_menu_items, :menu_id, :menuable_id
+    add_column :refinery_menu_items, :menuable_type, :string
+  end
+
+end

data/lib/refinery/menus/engine.rb

@@ -23,6 +23,10 @@ module Refinery
         Refinery.register_extension(Refinery::Menus)
       end
 
+      Refinery::Core.configure do |config| #   # Register extra javascript for backend
+        config.register_stylesheet "refinery/menus", :media => 'screen'
+      end
+
       config.to_prepare do
         Dir["#{File.dirname(__FILE__)}/../../../app/helpers/**/*.rb"].each { |f| load(f) }
         Dir["#{File.dirname(__FILE__)}/../../../app/decorators/**/*.rb"].each { |f| load(f) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: refinerycms-llama_menus
 version: !ruby/object:Gem::Version
-  version: 1.0.7
+  version: 1.1.0
 platform: ruby
 authors:
 - Nick Bolt
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-28 00:00:00.000000000 Z
+date: 2014-01-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: refinerycms-core
@@ -72,6 +72,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- app/assets/stylesheets/refinery/menus.css.scss
 - app/controllers/refinery/menus/admin/menus_controller.rb
 - app/controllers/refinery/menus/menus_controller.rb
 - app/decorators/refinery/menus/menu_item_decorator.rb
@@ -85,7 +86,9 @@ files:
 - app/views/refinery/menus/admin/menus/_menu_item_fields.html.erb
 - app/views/refinery/menus/admin/menus/_menus.html.erb
 - app/views/refinery/menus/admin/menus/_records.html.erb
+- app/views/refinery/menus/admin/menus/_shared_menu_item_fields.html.erb
 - app/views/refinery/menus/admin/menus/_sortable_list.html.erb
+- app/views/refinery/menus/admin/menus/_sub_menu_item_fields.html.erb
 - app/views/refinery/menus/admin/menus/edit.html.erb
 - app/views/refinery/menus/admin/menus/index.html.erb
 - app/views/refinery/menus/admin/menus/new.html.erb
@@ -106,6 +109,7 @@ files:
 - db/migrate/1_create_menus_menus.rb
 - db/migrate/2_create_menus_menu_items.rb
 - db/migrate/3_create_menus_menu_widgets.rb
+- db/migrate/4_add_menuable_id_and_type_to_menu_items.rb
 - db/seeds.rb
 - lib/generators/refinery/menus_generator.rb
 - lib/generators/refinery/templates/config/initializers/refinery/menus.rb.erb