refinerycms-page-menus 2.0.3 → 2.0.4

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

@@ -0,0 +1,24 @@
+jQuery =>
+	$('#form-container').css('min-height', $('#left_actions').height() + "px")
+
+	$('#sortable_list, .sortable_list').addClass("reordering")
+	list_reorder.sortable_list.nestedSortable("enable")
+
+	$('#sortable_list').on 'click', '.header', ->
+		$(this).siblings('.body').slideToggle()
+
+	$('#page_menu_form').submit (e) ->
+		save_structure($(this))
+
+save_structure = (form) ->
+	list_reorder.sortable_list.nestedSortable("disable")
+
+	$('#sortable_list, .sortable_list').removeClass("reordering")
+
+	if list_reorder.update_url != null
+		serialized_lists = list_reorder.sortable_list.serializelist()
+
+		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)

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

@@ -0,0 +1,182 @@
+.select_from{
+  display:block;
+  float:left;
+  width: 100%;
+}
+
+.select_to{
+  display:block;
+  float:left; 
+  width: 100%;
+}
+
+.select_buttons {
+  display:inline-block;
+  float:left;
+  text-align:right;
+  padding-top: 180px;
+  width: 36px;
+}
+
+
+.pp-add-box {
+  background: #aaa;
+  margin-top: 20px;
+  width: 220px;
+  padding: 15px;
+
+  h3 {
+    margin-top: 0;
+  }
+
+  input[type='text'] {
+    width: 210px;
+  }
+
+  label {
+    margin-top: 10px;
+  }
+
+  .pp-selection-box {
+    background: white;
+    max-height: 140px;
+    padding: 10px;
+    overflow-y: scroll;
+    border: 1px solid #7f9db9;
+  }
+}
+
+.pp-add-box .button {
+  margin-top: 15px;
+}
+
+#left_actions {
+  position:absolute;
+  top: 63px;
+
+  .controls a {    
+    background-color: #dbedff;
+    background-position: 12px;
+    background-repeat: no-repeat;
+    border: 1px solid #65C3F7;
+    display: block;
+    padding: 9px 12px 9px 36px;
+    
+    &:hover {
+      background-color: #cae7fb;
+    }
+  }
+
+  .resource-pp-add-box{
+    label {
+      display: inline;
+      font-weight: normal;
+    }
+  }
+
+  
+}
+
+#pp-select-container {
+  position: relative;
+}
+
+#form-container {
+  padding-left: 250px;
+  padding-right: 10px;
+  #sortable_list {
+    margin: 20px 0 0 20px;
+    padding: 10px 20px 20px 20px;
+    background: #eee;
+    width: 650px;
+    min-height: 400px;
+    
+    list-style: none;
+    
+    ul {
+      li {
+        list-style: none;
+      }
+      list-style: none;
+    }
+  
+    .pp-placeholder {
+      margin-top: 10px;
+      cursor: default;
+    }
+  }
+
+}
+
+
+.pp-link {
+  position: relative;
+  margin-top: 10px!important;
+  list-style: none;
+
+  .header {
+    height: 20px;
+    line-height: 20px;
+    padding: 8px;
+    background: #c3e1ff;
+
+    &:hover {
+      background: #add6ff;
+    }
+
+    .type {
+      position: absolute;
+      top: 8px;
+      right: 36px;
+    }
+
+    .arrow {
+      background-repeat: no-repeat;
+      background-image: url(/assets/refinery/icons/down.gif);
+      background-position:center; 
+      position: absolute;
+      right: 0px;
+      top: 0px;
+      width: 36px;
+      height: 36px;
+      cursor: pointer;
+    }
+  }
+
+  .body {
+    display: none;
+    background: #dbedff;
+    padding: 15px;
+    height: 100px;
+    position: relative;
+
+    label {
+      display: inline-block;
+      margin-right: 10px;
+      margin-top: 0;
+      width: 100px;
+      text-align: right;
+    }
+
+    input {
+      width: 250px;
+    }
+    
+    a.remove {
+      position: absolute;
+      right: 10px;
+      bottom: 10px;
+      cursor: pointer;
+    }
+
+    .original-resource {
+      display: inline-block;
+      margin: 5px 0;
+    }
+  }
+
+}
+
+.field input[type=text] {
+  padding: 3px 5px;
+}

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

@@ -2,8 +2,64 @@ module Refinery
   module Admin
     class PageMenusController < ::Refinery::AdminController
       
-      crudify :'refinery/page_menu', :xhr_paging => true, :sortable => false, :redirect_to_url => "refinery.admin_page_menu_page_positions_path(@page_menu)"
+      crudify :'refinery/page_menu', 
+              :xhr_paging => true, 
+              :sortable => false
+      
+      before_filter :find_page_positions, only: [:edit, :update]
+      before_filter :set_page_positions, only: [:create, :update]
+      
+      private
+
+      # Based upon http://github.com/matenia/jQuery-Awesome-Nested-Set-Drag-and-Drop
+      def set_page_positions
+        previous = nil
+        params[:ul].each do |_, list|
+          list.each do |index, hash|
+            moved_item_id = hash['id'].split(/page_position\_?/).reject(&:empty?).first
+
+            if moved_item_id
+              current_position = @page_menu.positions.find(moved_item_id) # Scope?
+
+              if current_position.respond_to?(:move_to_root)
+                if previous.present?
+                  current_position.move_to_right_of(@page_menu.positions.find(previous)) #SCOPE?
+                else
+                  current_position.move_to_root
+                end
+              else
+                current_position.update_attributes :position => index
+              end
+
+              if hash['children'].present?
+                update_child_page_positions(hash, current_position)
+              end
 
+              previous = moved_item_id
+            end
+          end
+        end if params[:ul].present?
+
+        PagePosition.rebuild!
+      end
+
+      def update_child_page_positions(_node, position)
+        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)
+
+          if child['children'].present?
+            update_child_page_positions(child, child_position)
+          end
+        end
+      end
+      
+      def find_page_positions
+        @page_positions = @page_menu.roots
+      end
+      
     end
   end
 end

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

@@ -2,49 +2,29 @@ module Refinery
   module Admin
     class PagePositionsController < Refinery::AdminController
 
-      crudify :'refinery/page_position',
-              :order => "lft ASC",
-              :include => [:children],
-              :paging => false
-              
-      before_filter :find_all_menus, :find_menu, :only => [:index, :update_positions]
-
-      # after_filter lambda{::Refinery::Page.expire_page_caching}, :only => [:update_positions]
-
-      # before_filter :restrict_access, :only => [:create, :update, :update_positions, :destroy],
-      #                 :if => proc { Refinery.i18n_enabled? }
-
-
-      def children
-        @page_position = find_page_position
-        render :layout => false
-      end
-
-    protected
-
-      def find_all_page_positions(conditions = '')
-        @page_positions = @page_menu.positions.where(conditions).order('lft ASC') 
-      end
-
-      def find_menu
-        if params[:page_menu_id]
-          @page_menu = Refinery::PageMenu.find(params[:page_menu_id]) 
+      def create
+        respond_to do |format|
+          format.js do
+            @page_positions = []
+            if params[:refinery_resource_ids]
+              params[:refinery_resource_ids].each do |id|
+                @page_positions << PagePosition.create({refinery_resource_id: id}.merge(params[:page_position]))
+              end
+            else
+              @page_positions << PagePosition.create(params[:page_position])
+            end
+          end
         end
       end
 
-      def find_all_menus
-        @page_menus = Refinery::PageMenu.order('title ASC')
+      def destroy
+        respond_to do |format|
+          format.js do
+            @page_position = PagePosition.find(params[:id])
+            @page_position.destroy
+          end
+        end
       end
-  
-      # def restrict_access
-      #   if current_refinery_user.has_role?(:translator) && !current_refinery_user.has_role?(:superuser) &&
-      #        (params[:switch_locale].blank? || params[:switch_locale] == Refinery::I18n.default_frontend_locale.to_s)
-      #     flash[:error] = t('translator_access', :scope => 'refinery.admin.pages')
-      #     redirect_to refinery.admin_pages_path
-      #   end
-      # 
-      #   return true
-      # end
 
     end
   end

data/app/helpers/refinery/page_positions_helper.rb

@@ -0,0 +1,66 @@
+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/models/refinery/page_menu.rb

@@ -2,26 +2,14 @@ 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 :pages, :class_name => "::Refinery::Page", :through => :positions, :foreign_key => :refinery_page_id
     
     validates :title, :presence => true, :uniqueness => true
     validates :permatitle, :presence => true, :uniqueness => true
     validates_associated :positions
     
-    def pages=(new_ids)
-      old_ids = positions.map(&:refinery_page_id)
-      (new_ids - old_ids).each do |id|
-        positions.build(:refinery_page_id => id) if !id.empty?
-      end
-      (old_ids - new_ids).each do |id|
-        positions.where(:refinery_page_id => id).destroy_all
-      end
-      self.save
-    end
-      
-    # def fast_menu(columns = [])
-    #   live.in_menu.order('lft ASC').includes(:translations)
-    # end
+    attr_accessible :title, :permatitle, :positions, :positions_attributes
+
+    accepts_nested_attributes_for :positions, :allow_destroy => true
 
     def roots
       @roots ||= positions.select {|pos| pos.parent_id.nil?}

data/app/models/refinery/page_position.rb

@@ -1,36 +1,108 @@
 module Refinery
   class PagePosition < Refinery::Core::BaseModel
     
-    attr_accessible :parent_id, :refinery_page_id, :refinery_menu_id
+    attr_accessible :parent_id, :refinery_page_id, :refinery_menu_id, :refinery_resource_id, :refinery_resource_type,
+                    :title_attribute, :custom_url, :label
     
     belongs_to :menu, :class_name => '::Refinery::PageMenu', :foreign_key => :refinery_menu_id
-    belongs_to :page, :class_name => '::Refinery::Page', :foreign_key => :refinery_page_id
+    belongs_to :resource, :foreign_key => :refinery_resource_id, :polymorphic => true
 
     # Docs for acts_as_nested_set https://github.com/collectiveidea/awesome_nested_set
     # rather than :delete_all we want :destroy
     acts_as_nested_set :dependent => :destroy
     
-    validates :page, :presence => true
     validates :menu, :presence => true
+
+    def self.find_all_of_type(type)
+      # find all resources of the given type, determined by the configuration
+      # TODO - we may want to allow configuration of conditions (DONE), ordering, etc
+      if self.resource_config(type)[:admin_page_filter]
+        resource_klass(type).where(self.resource_config(type)[:admin_page_filter])
+      else
+        resource_klass(type).all
+      end
+    end
+
+    def self.resource_klass(type)
+      resource_config(type)[:klass].constantize
+    end
+
+    def self.resource_config(type)
+      Refinery::PageMenus.menu_resources[type.to_sym]
+    end
+
+    def resource_klass
+      Refinery::PagePosition.resource_klass(resource_type)
+    end
+
+    def resource_config
+      Refinery::PagePosition.resource_config(resource_type)
+    end
+
+    def resource_type
+      refinery_resource_type || 'refinery_page'
+    end
     
+    def type_name
+      custom_link? ? "Custom link" : refinery_resource_type.titleize()
+    end
+
+    def custom_link?
+      refinery_resource_id.nil? || refinery_resource_type.nil?
+    end
+
+    def resource_link?
+      refinery_resource_id.present? && refinery_resource_type.present?
+    end
+
+    def resource
+      return nil if custom_link?
+      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
-      page.title
+      title_attribute.present? ? title_attribute : label.present? ? label : resource.title 
     end
         
     def url
-      page.url
-    end
-    
-    def url=(value)
-      page.url = value
+      if custom_link?
+        custom_url
+      else
+        resource_url
+      end
     end
-    
-    def original_id
-      page.id
+
+    def as_json(options={})
+      json = super(options)
+      if resource_link?
+        json = {
+          resource: {
+            title: resource_title
+          }
+        }.merge(json)
+      end
+      json
     end
-    
-    def original_type
-      page.type
+
+    def to_refinery_menu_item
+      {
+        :id => id,
+        :lft => lft,
+        :menu_match => menu_match,
+        :parent_id => parent_id,
+        :rgt => rgt,
+        :title => title,
+        :type => self.class.name,
+        :url => url
+      }
     end
     
   end

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

@@ -1,41 +1,33 @@
-<%= form_for [refinery, :admin, @page_menu], :html => {:onsubmit => "selectAll('.select_to')" } do |f| -%>
-  <%= render '/refinery/admin/error_messages',
-              :object => @page_menu,
-              :include_object_name => true %>
-
+<%= form_for [refinery, :admin, @page_menu], html: { id: 'page_menu_form' } do |f| %>
   <div class='field'>
     <%= f.label :title %>
     <%= f.text_field :title, class: "larger widest" %>
-  </div> 
+  </div>
+  <div id='form-container'>
+
+    <%= render '/refinery/admin/error_messages',
+               :object => @page_menu,
+               :include_object_name => true %>
+
 
-		
-	<div class='select'>	
-		
-		<div class="hemisquare">
-			<span class='label_with_help'>
-				<%= label_tag :all_pages, t('.all_pages') %>
-			  <%= refinery_help_tag t('.all_pages_help') %>
-			</span>
-			<%= collection_select :all, :pages, Refinery::Page.all - @page_menu.pages, :id, :title, {}, { :allow_blank => true, :size => 20, :multiple => true, :class => "select_from" } %>
-		</div>
-		
-		<div class='select_buttons'>
-			<%= button_tag ">", :type => 'button', :onclick => "moveSelectedPage('.select_from','.select_to')", :class => 'select_add' %>
-			<%= button_tag "<", :type => 'button', :onclick => "moveSelectedPage('.select_to','.select_from')", :class => 'select_remove' %>
-		</div>
-		
-		<div class="hemisquare right_side">
-			<span class='label_with_help'>
-				<%= f.label :pages, t('.menu_pages') %>
-			  <%= refinery_help_tag t('.pages_help') %>
-			</span>
-			<%= f.collection_select :pages, @page_menu.pages, :id, :title, {}, { :allow_blank => true, :size => 20, :multiple => true, :class => "select_to" } %>
-		</div>
-		
+
+    <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 %>
+        <% 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>
+        </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') %>
-<% end %>
+              :continue_editing => false,
+              :delete_title => t('delete', :scope => 'refinery.travels.admin.travels.category'),
+              :delete_confirmation => t('message', :scope => 'refinery.admin.delete') %>
+<% end %>

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

@@ -0,0 +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| %>
+      <%= f.hidden_field :refinery_menu_id %>
+      <h3>Custom Link</h3>
+      <div class='field'>
+        <%= f.label :custom_url, "Url" %>
+        <%= f.text_field :custom_url %>
+      </div>
+      <div class='field'>
+        <%= f.label :label %>
+        <%= f.text_field :label %>
+      </div>
+    <%= f.submit "Add" %>
+    <% 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 } %>
+  <% end %>
+
+</div>

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

@@ -0,0 +1,16 @@
+<li class='clearfix record <%= cycle("on", "on-hover") %>' id="<%#= dom_id(test) %>">
+  <span class='title'>
+    <%= page_menu.title %>
+
+  </span>
+  <span class='actions'>
+    
+    <%= link_to refinery_icon_tag("application_edit.png"), refinery.edit_admin_page_menu_path(page_menu),
+         :title => t('.edit') %>
+    <%= link_to refinery_icon_tag("delete.png"), refinery.admin_page_menu_path(page_menu),
+        :class => "cancel confirm-delete",
+        :title => t('.delete'),
+        :confirm => t('message', :scope => 'refinery.admin.delete', :title => page_menu.title),
+        :method => :delete %>
+  </span>
+</li>

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

@@ -0,0 +1,2 @@
+<%= will_paginate @page_mennus if Refinery::Admin::PageMenusController.pageable? %>
+<%= render 'sortable_list' %>