effective_pages 3.0.0 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 56bbdfa9406cb66a2fc4171e85e118038d339b056555a33fbc105880397772c7
-  data.tar.gz: a5bf336957ac12e9cb39a4e20be9f649cf89fa5a2be0dabb17638db7fd4efde2
+  metadata.gz: e2607792f3255903a84c8ef0b74d49d9278265a5ad0bdd518aae75efe55aeee7
+  data.tar.gz: b5e0ce5b60989700346dffa5709693c9fe80ed12a49f93f2feaa488623d38f24
 SHA512:
-  metadata.gz: ceef3c2528eefddfbfdc15c03c36b4f9f1b77b4cd8c4ff8ed683f6bdd1c8fdbd034d3138b24de88840d2cc93d1a6302629884187ceb4ddacc1c8ce1e2e4834dc
-  data.tar.gz: dc8d257ad150d15d2fd9d4784ed3a22dfc7b353544dd0f723f5d356bb463d92aa6cf29229be251bc576222c0eeed2e3dca5ac17c6a28cba3690735f78bf647d6
+  metadata.gz: 4f0b5af9258a98e3cd3af75523b5670716ea37a6c78d37b8951071602489ccbeee773605ee025ccf08aca905c21e139581349fe4c822f900d788493e69eb6e4e
+  data.tar.gz: 2f5ece4423c3742e50e104779d9a58ef8ca4a69870e8bec5a9851538c680615acba337a85be9d286c4f967341d223f2e71d7fcaa6cb7954058b03aadb04ccfb6

data/app/controllers/admin/menus_controller.rb

@@ -5,7 +5,7 @@ module Admin
 
     include Effective::CrudController
 
-    helper EffectiveMenusAdminHelper
+    resource_scope -> { Effective::Page.all }
 
     if (config = EffectivePages.layout)
       layout(config.kind_of?(Hash) ? config[:admin] : config)

data/app/controllers/admin/pages_controller.rb

@@ -12,7 +12,11 @@ module Admin
     submit :save, 'Save'
     submit :save, 'Save and Add New', redirect: :new
     submit :save, 'Save and View', redirect: -> { effective_pages.page_path(resource) }
-    submit :save, 'Duplicate', only: :edit, redirect: -> { effective_posts.new_admin_page_path(duplicate_id: resource.id) }
+    submit :save, 'Duplicate', only: :edit, redirect: -> { effective_pages.new_admin_page_path(duplicate_id: resource.id) }
+
+    def permitted_params
+      params.require(:effective_page).permit!
+    end
 
   end
 end

data/app/controllers/effective/pages_controller.rb

@@ -1,7 +1,5 @@
 module Effective
   class PagesController < ApplicationController
-    before_action(:authenticate_user!) if defined?(Devise) && EffectiveResources.authenticate_user
-
     include Effective::CrudController
 
     def show
@@ -10,9 +8,11 @@ module Effective
 
       @page = @pages.find(params[:id])
 
-      raise ActiveRecord::RecordNotFound unless @page.present? # Incase .find() isn't raising it
-      raise Effective::AccessDenied.new('Access Denied', :show, @page) unless @page.roles_permit?(current_user)
+      if @page.authenticate_user? || @page.roles.present?
+        authenticate_user!
+      end
 
+      raise Effective::AccessDenied.new('Access Denied', :show, @page) unless @page.roles_permit?(current_user)
       EffectiveResources.authorize!(self, :show, @page)
 
       @page_title = @page.title
@@ -29,7 +29,7 @@ module Effective
       end
 
       template = File.join(EffectivePages.pages_path, @page.template)
-      layout = (@page.layout.presence || resource_layout)
+      layout = File.join(EffectivePages.layouts_path, @page.layout)
 
       render(template, layout: layout, locals: { page: @page })
     end

data/app/datatables/effective_pages_datatable.rb

@@ -1,5 +1,12 @@
 class EffectivePagesDatatable < Effective::Datatable
 
+  filters do
+    scope :published
+    scope :draft
+    scope :on_menu
+    scope :all
+  end
+
   datatable do
     order :title, :asc
     length :all
@@ -18,13 +25,22 @@ class EffectivePagesDatatable < Effective::Datatable
     col :layout, visible: false
     col :tempate, visible: false
 
+    col :menu
+    col :menu_name, visible: false
+    col :menu_url, visible: false
+    col :menu_parent, visible: false
+    col :menu_position, visible: false
+
+    col :authenticate_user, visible: false
+    col :roles, visible: false
+
     actions_col do |page|
       dropdown_link_to('View', effective_pages.page_path(page), target: '_blank')
     end
   end
 
   collection do
-    Effective::Page.all
+    Effective::Page.deep.all
   end
 
 end

data/app/datatables/effective_pages_menu_datatable.rb

@@ -0,0 +1,38 @@
+class EffectivePagesMenuDatatable < Effective::Datatable
+
+  datatable do
+    reorder :menu_position
+
+    if attributes[:menu_parent_id].present?
+      col :menu_parent
+    end
+
+    col :title do |page|
+      link_to(page, effective_pages.edit_admin_page_path(page))
+    end
+
+    col :menu_url, label: 'Redirect Url'
+    col :menu_position, label: 'Position', visible: false
+    col :menu_children, label: 'Children'
+
+    actions_col(new: false, destroy: false)
+  end
+
+  collection(apply_belongs_to: false) do
+    scope = Effective::Page.deep.for_menu(menu)
+
+    scope = if attributes[:menu_parent_id].present?
+      scope.where(menu_parent_id: attributes[:menu_parent_id])
+    else
+      scope.where(menu_parent_id: nil)
+    end
+
+    scope
+  end
+
+  def menu
+    menu = EffectivePages.menus.find { |menu| menu.to_s == attributes[:menu].to_s }
+    menu || raise("unexpected menu: #{attributes[:menu] || 'none'}")
+  end
+
+end

data/app/helpers/effective_menus_helper.rb

@@ -1,156 +1,51 @@
+# frozen_string_literal: true
 module EffectiveMenusHelper
-  def render_menu(menu, options = {}, &block)
-    menu = Effective::Menu.find_by_title(menu.to_s) if menu.kind_of?(String) || menu.kind_of?(Symbol)
-    return "<ul class='nav navbar-nav'><li>Menu '#{menu}' does not exist</li></ul>".html_safe if !menu.present?
 
-    if (effectively_editting? && EffectiveResources.authorized?(controller, :edit, menu) rescue false)
-      options[:menu_id] = menu.id
-      form_for(menu, :url => '/') { |form| options[:form] = form }
-    end
-
-    menu_items = menu.menu_items
-
-    if menu.new_record?
-      menu_items = menu_items.to_a.sort! { |a, b| a.lft <=> b.lft }
-    end
+  def render_menu(name, options = {}, &block)
+    name = name.to_s
+    menu = Array(EffectivePages.menus).find { |menu| menu.to_s == name }
 
-    if block_given? && options[:form].blank?
-      render_menu_items(menu_items, options) { yield }
-    else
-      render_menu_items(menu_items, options)
+    if menu.blank?
+      raise("unable to find menu #{name}. Please add it to config/initializers/effective_pages.rb")
     end
 
-    # if options[:for_editor]
-    #else
-    #  Rails.cache.fetch(menu) { render_menu_items(menu.menu_items, options) }
-    #end
+    content_tag(:ul, options) { render('effective/pages/menu', menu: menu) }
   end
 
-  def render_menu_items(items, options = {}, &block)
-    if options[:form].present? && options[:form].kind_of?(ActionView::Helpers::FormBuilder) == false
-      raise 'Expecting ActionView::Helpers::FormBuilder object for :form => option'
-    end
-
-    html = ''
-
-    if options[:form]
-      html << "<ul class='nav navbar-nav effective-menu #{options[:class]}'"
-        html << " data-effective-menu-id='#{options[:menu_id] || 0}'"
-        html << " data-effective-menu-expand-html=\"#{render(:partial => 'admin/menu_items/expand').gsub('"', "'").gsub("\n", '').gsub('  ', '')}\""
-        html << " data-effective-menu-new-html=\"#{render(:partial => 'admin/menu_items/new', :locals => { :item => Effective::MenuItem.new(), :form => options[:form] }).gsub('"', "'").gsub("\n", '').gsub('  ', '').gsub('[0]', '[:new]').gsub('_0_', '_:new_')}\""
+  def render_breadcrumbs(menu, page = @page, root: 'Home')
+    return breadcrumbs_root_url(page, root: root) if request.path == '/'
+    return breadcrumbs_fallback(page, root: root) unless page.kind_of?(Effective::Page)
 
-        maxdepth = ((options[:maxdepth].presence || EffectivePages.menu[:maxdepth].presence).to_i rescue 0)
-        html << " data-effective-menu-maxdepth='#{maxdepth}'" if maxdepth > 0
+    parents = [page.menu_parent].compact
 
-      html << ">"
-    else
-      html << "<ul class='nav navbar-nav#{' ' + options[:class].to_s if options[:class].present?}'>"
+    content_tag(:ol, class: 'breadcrumb') do
+      (
+        [content_tag(:li, link_to(root, root_path, title: root), class: 'breadcrumb-item')] +
+        parents.map do |page|
+          url = (page.menu_url.presence || effective_pages.page_path(page))
+          content_tag(:li, link_to(page, url, title: page.title), class: 'breadcrumb-item')
+        end +
+        [content_tag(:li, page, class: 'breadcrumb-item active', 'aria-current': 'page')]
+      ).join.html_safe
     end
-
-    stack = [items.to_a.first] # A stack to keep track of rgt values.
-    skip_to_lft = 0 # This lets us skip over nodes we don't have visible_for? permission to see
-
-    items.each_with_index do |item, index|
-      next if index == 0 # We always skip the first Root node
-
-      # This allows us to skip over nodes we don't have permission to view
-      next if item.lft < skip_to_lft
-      if options[:form].blank? && !item.visible_for?(defined?(current_user) ? current_user : nil)
-        skip_to_lft = item.rgt + 1
-        next
-      end
-
-      if stack.size > 1
-        html << "<ul class='dropdown-menu'>" if (item.rgt < stack.last.rgt) # Level down?
-
-        while item.rgt > stack.last.rgt # Level up?
-          stack.pop
-          html << "</ul></li>" if (item.rgt > stack.last.rgt)
-        end
-      end
-
-      # Render the <li>...</li> with carets only on top level dropdowns, not sub dropdowns
-      html << render_menu_item(item, stack.size == 1, options)
-
-      stack.push(item)
-    end
-
-    while stack.size > 0
-      item = stack.pop
-
-      if stack.size == 0 # Very last one
-        html << render(:partial => 'admin/menu_items/actions') if options[:form]
-        html << (capture(&block) || '') if block_given? && !options[:form]
-        html << '</ul>'
-      elsif item.leaf? == false
-        html << '</ul></li>'
-      end
-    end
-
-    html.html_safe
   end
 
-  private
-
-  # This is where we actually build out an li item
-  def render_menu_item(item, caret, options)
-    html = ""
-
-    url = (
-      if item.menuable.kind_of?(Effective::Page)
-        effective_pages.page_path(item.menuable)
-      elsif item.divider?
-        nil
-      elsif (item.special || '').end_with?('_path')
-        self.send(item.special) rescue nil
-      elsif item.url.present?
-        item.url
-      end
-    ).presence || '#'
+  alias_method :render_breadcrumb, :render_breadcrumbs
 
-    classes = (item.classes || '').split(' ')
-    classes << 'active' if EffectivePages.menu[:apply_active_class] && request.try(:fullpath) == url
-    classes << 'divider' if item.divider?
-    classes << 'dropdown' if item.dropdown?
-    classes = classes.join(' ')
-
-    if item.leaf?
-      html << (classes.present? ? "<li class='#{classes}'>" : "<li>")
-
-      if !item.divider? || options[:form] # Show the URL in edit mode, but not normally
-        html << render_menu_item_anchor_tag(item, caret, url)
-      end
-
-      if options[:form]
-        html << render(:partial => 'admin/menu_items/item', :locals => { :item => item, :form => options[:form] })
-      end
-
-      html << "</li>"
-    else
-      html << (classes.present? ? "<li class='#{classes}'>" : "<li>")
-      html << render_menu_item_anchor_tag(item, caret, url)
-
-      if options[:form]
-        html << render(:partial => 'admin/menu_items/item', :locals => { :item => item, :form => options[:form] })
-      end
+  def breadcrumbs_root_url(page = @page, root: 'Home')
+    content_tag(:ol, class: 'breadcrumb') do
+      content_tag(:li, root, class: 'breadcrumb-item active', 'aria-current': 'page')
     end
-
-    html
   end
 
-  def render_menu_item_anchor_tag(item, caret, url)
-    new_window_html = (item.new_window? ? " target='_blank'" : "")
+  def breadcrumbs_fallback(page = @page, root: 'Home')
+    label = (page if page.kind_of?(Effective::Page)) || @page_title || 'Here'
 
-    if item.special == 'destroy_user_session_path'
-      "<a href='#{url}' data-method='delete' data-no-turbolink='true'>#{item.title}</a>"
-    elsif item.dropdown?
-      ''.tap do |html|
-        html << "<a href='#{url}' data-toggle='dropdown'#{new_window_html}>#{item.title}"
-        html << "<span class='caret'></span>" if caret
-        html << "</a>"
-      end
-    else
-      "<a href='#{url}'#{new_window_html}>#{item.title}</a>"
+    content_tag(:ol, class: 'breadcrumb') do
+      [
+        content_tag(:li, link_to(root, root_path, title: root), class: 'breadcrumb-item'),
+        content_tag(:li, label, class: 'breadcrumb-item active', 'aria-current': 'page')
+      ].join.html_safe
     end
   end
 

data/app/models/effective/page.rb

@@ -1,14 +1,19 @@
 module Effective
   class Page < ActiveRecord::Base
     attr_accessor :current_user
+    attr_accessor :menu_root_level
 
-    acts_as_slugged
+    # These parent / children are for the menu as well
+    belongs_to :menu_parent, class_name: 'Effective::Page', optional: true
+
+    has_many :menu_children, -> { Effective::Page.menuable }, class_name: 'Effective::Page',
+      foreign_key: :menu_parent_id, inverse_of: :menu_parent
 
-    log_changes if respond_to?(:log_changes)
     acts_as_role_restricted
+    acts_as_slugged
+    has_many_rich_texts
 
-    has_rich_text :body
-    has_many :menu_items, as: :menuable, dependent: :destroy
+    log_changes if respond_to?(:log_changes)
 
     self.table_name = EffectivePages.pages_table_name.to_s
 
@@ -22,21 +27,59 @@ module Effective
       template          :string
 
       slug              :string
+
+      # Menu stuff
+      menu              :boolean
+      menu_name         :string
+
+      menu_title        :string
+      menu_url          :string
+      menu_position     :integer
+
+      # Access
       roles_mask        :integer
+      authenticate_user :boolean
 
       timestamps
     end
 
+    before_validation(if: -> { menu? && menu_position.blank? }) do
+      self.menu_position = (self.class.where(menu_parent: menu_parent).maximum(:menu_position) || -1) + 1
+    end
+
+    validate(if: -> { menu_url.present? }) do
+      unless menu_url.start_with?('http://') || menu_url.start_with?('https://') || menu_url.start_with?('/')
+        self.errors.add(:menu_url, "must start with http(s):// or /")
+      end
+    end
+
     validates :title, presence: true, length: { maximum: 255 }
     validates :meta_description, presence: true, length: { maximum: 150 }
 
+    validates :layout, presence: true
     validates :template, presence: true
 
-    scope :drafts, -> { where(draft: true) }
+    validates :menu_name, if: -> { menu? && EffectivePages.menus.present? },
+      presence: true, inclusion: { in: EffectivePages.menus.map(&:to_s) }
+
+    # validates :menu_position, if: -> { menu? },
+    #   presence: true, uniqueness: { scope: [:menu_name, :menu_parent_id] }
+
+    scope :deep, -> { includes(:menu_parent, menu_children: :menu_parent) }
+
+    scope :draft, -> { where(draft: true) }
     scope :published, -> { where(draft: false) }
     scope :sorted, -> { order(:title) }
+    scope :on_menu, -> { where(menu: true) }
     scope :except_home, -> { where.not(title: 'Home') }
 
+    scope :menuable, -> { where(menu: true).order(:menu_position) }
+    scope :menu_deep, -> { includes(:menu_parent, :menu_children) }
+
+    scope :for_menu, -> (name) { menuable.where(menu_name: name) }
+    scope :for_menu_root, -> (name) { for_menu(name).menu_deep.root_level }
+    scope :root_level, -> { where(menu_parent_id: nil) }
+
     def to_s
       title
     end
@@ -50,9 +93,12 @@ module Effective
       Page.new(attributes.except('id', 'updated_at', 'created_at')).tap do |page|
         page.title = page.title + ' (Copy)'
         page.slug = page.slug + '-copy'
-        page.draft = true
 
-        post.body = body
+        rich_texts.each do |rt|
+          page.send("rich_text_#{rt.name}=", rt.body)
+        end
+
+        page.draft = true
       end
     end
 
@@ -60,6 +106,10 @@ module Effective
       duplicate.tap { |page| page.save! }
     end
 
+    def menu_root_level
+      menu_parent.blank?
+    end
+
   end
 
 end

data/app/views/admin/menus/index.html.haml

@@ -0,0 +1,11 @@
+%h1= @page_title
+
+%p
+  Click Reorder to drag & drop reorder the menu.
+  Edit an item to reorder its children items.
+
+- EffectivePages.menus.each do |menu|
+  %h2 #{menu.to_s.titleize} Menu
+  - datatable = EffectivePagesMenuDatatable.new(menu: menu)
+  = render_datatable(datatable, simple: true, inline: true)
+  %hr

data/app/views/admin/pages/_form.html.haml

@@ -1,29 +1,28 @@
-= effective_form_with(model: page, url: page.persisted? ? effective_pages.admin_page_path(page.id) : effective_pages.admin_pages_path) do |f|
-  = f.text_field :title, hint: 'The title of your page.'
+- if inline_datatable? && inline_datatable.attributes[:menu]
+  - menu = inline_datatable.attributes[:menu]
+  - datatable = EffectivePagesMenuDatatable.new(menu: menu, menu_parent_id: page.id)
 
-  - if (templates = EffectivePages.templates).length > 1
-    = f.select :template, templates
-  - else
-    = f.hidden_field :template, value: templates.first
+  = render '/admin/pages/form_menu', page: page
 
-  - if (layouts = EffectivePages.layouts).length > 1
-    = f.select :layout, layouts
-  - else
-    = f.hidden_field :layout, value: layouts.first
+  - if datatable.present?(self)
+    %h3 Children
+    = render_datatable(datatable, simple: true, inline: true)
 
-  - if f.object.persisted? || f.object.errors.include?(:slug)
-    - current_url = (effective_pages.page_url(f.object) rescue nil)
-    = f.text_field :slug, hint: "The slug controls this page's internet address. Be careful, changing the slug will break links that other websites may have to the old address.<br>#{('This page is currently reachable via ' + link_to(current_url.gsub(f.object.slug, '<strong>' + f.object.slug + '</strong>').html_safe, current_url)) if current_url }".html_safe
+- else
+  = tabs do
+    = tab 'Page' do
+      = render '/admin/pages/form_page', page: page
 
-  = f.text_field :meta_description, hint: "A one or two sentence summary of this page. Appears on Google search results underneath the page title.", input_html: { maxlength: 150 }
+    - if page.persisted?
+      = tab 'Menu' do
+        = render '/admin/pages/form_menu', page: page
 
-  = render partial: '/admin/pages/additional_fields', locals: { page: page, form: f, f: f }
+      - unless page.menu_root_level
+        = tab 'Content' do
+          = render '/admin/pages/form_content', page: page
 
-  = f.rich_text_area :body, hint: 'The main body of your page'
+      = tab 'Access' do
+        = render '/admin/pages/form_access', page: page
 
-  = f.check_box :draft, label: 'Save this page as a draft. It will not be accessible on the website.'
-
-  - if defined?(EffectiveRoles) and f.object.respond_to?(:roles) && EffectivePages.use_effective_roles
-    = render partial: '/admin/pages/roles', locals: { page: page, form: f, f: f }
-
-  = effective_submit(f)
+      = tab 'Logs' do
+        = render_datatable(page.log_changes_datatable, inline: true, namespace: :admin)

data/app/views/admin/pages/_form_access.html.haml

@@ -0,0 +1,10 @@
+= effective_form_with(model: page, url: page.persisted? ? effective_pages.admin_page_path(page.id) : effective_pages.admin_pages_path) do |f|
+  = f.check_box :authenticate_user, label: 'Yes, the user must be be signed in to view this page'
+
+  - if EffectivePages.use_effective_roles
+    = f.checks :roles, EffectiveRoles.roles_collection(f.object)
+
+  %p.text-hint
+    * leave blank for a regular public page that anyone can view
+
+  = f.submit

data/app/views/admin/pages/_form_content.html.haml

@@ -0,0 +1,3 @@
+= effective_form_with(model: page, url: page.persisted? ? effective_pages.admin_page_path(page.id) : effective_pages.admin_pages_path) do |f|
+  = render '/admin/pages/rich_text_areas', page: page, f: f
+  = effective_submit(f)

data/app/views/admin/pages/_form_menu.html.haml

@@ -0,0 +1,24 @@
+= effective_form_with(model: page, url: page.persisted? ? effective_pages.admin_page_path(page.id) : effective_pages.admin_pages_path) do |f|
+  = f.check_box :menu, label: 'Yes, display this page on the menu'
+
+  = f.show_if :menu, true do
+
+    - if (menus = EffectivePages.menus).length > 1
+      = f.select :menu_name, menus
+    - else
+      = f.hidden_field :menu_name, value: menus.first
+
+    = f.check_box :menu_root_level, label: "This is a top level menu item. Do not show page content."
+
+    = f.show_if :menu_root_level, true do
+      = f.hidden_field :menu_parent_id, value: nil
+
+    = f.show_if :menu_root_level, false do
+      = f.select :menu_parent_id, Effective::Page.menuable.root_level.where.not(id: f.object), required: true
+
+    = f.text_field :menu_title, hint: "Display this title on menus instead of full page title"
+
+    = f.text_field :menu_url, label: "Redirect to path or url instead of displaying page",
+      hint: "Must start with http(s):// or /"
+
+  = f.submit

data/app/views/admin/pages/_form_page.html.haml

@@ -0,0 +1,31 @@
+= effective_form_with(model: page, url: page.persisted? ? effective_pages.admin_page_path(page.id) : effective_pages.admin_pages_path) do |f|
+  = f.text_field :title, hint: 'The title of your page.'
+
+  = f.check_box :draft,
+    label: 'Save this page as a draft. It will not be accessible on the website.'
+
+  = f.text_field :meta_description,
+    hint: "A one or two sentence summary of this page. Appears on Google search results underneath the page title.",
+    input_html: { maxlength: 150 }
+
+  - if (layouts = EffectivePages.layouts).length > 1
+    = f.select :layout, layouts
+  - else
+    = f.hidden_field :layout, value: layouts.first
+
+  - if (templates = EffectivePages.templates).length > 1
+    = f.select :template, templates
+  - else
+    = f.hidden_field :template, value: templates.first
+
+  - if f.object.persisted? || f.object.errors.include?(:slug)
+    - current_url = (effective_pages.page_url(f.object) rescue nil)
+    = f.text_field :slug, hint: "The slug controls this page's internet address. Be careful, changing the slug will break links that other websites may have to the old address.<br>#{('This page is currently reachable via ' + link_to(current_url.gsub(f.object.slug, '<strong>' + f.object.slug + '</strong>').html_safe, current_url)) if current_url }".html_safe
+
+  = render partial: '/admin/pages/additional_fields', locals: { page: page, form: f, f: f }
+
+  -# This is for duplicate
+  - if f.object.new_record? && f.object.rich_texts.present?
+    = render partial: '/admin/pages/rich_text_areas', locals: { page: page, form: f, f: f }
+
+  = effective_submit(f)

data/app/views/admin/pages/_rich_text_areas.html.haml

@@ -0,0 +1,2 @@
+= f.rich_text_area :rich_text_body, label: 'Body', hint: 'The main body of your page'
+= f.rich_text_area :rich_text_sidebar, label: 'Sidebar', hint: 'The sidebar content of your page'

data/app/views/effective/pages/_menu.html.haml

@@ -0,0 +1,20 @@
+- raise('expected a menu') unless menu.present?
+- menu = menu.to_s
+
+- Effective::Page.for_menu_root(menu).each do |page|
+  - next unless EffectiveResources.authorized?(self, :show, page)
+  - next if (page.authenticate_user || page.roles.present?) && current_user.blank?
+  - next if page.roles.present? && !current_user.roles.include?(page.roles)
+
+  - menu_children = page.menu_children.select { |page| page.menu_name == menu }
+
+  - if menu_children.blank?
+    = nav_link_to((page.menu_title.presence || page.title), (page.menu_url.presence || effective_pages.page_path(page)))
+  - else
+    = nav_dropdown(page.to_s) do
+      - menu_children.each do |page|
+        - next unless EffectiveResources.authorized?(self, :show, page)
+        - next if (page.authenticate_user || page.roles.present?) && current_user.blank?
+        - next if page.roles.present? && !current_user.roles.include?(page.roles)
+
+        = nav_link_to((page.menu_title.presence || page.title), (page.menu_url.presence || effective_pages.page_path(page)))

data/config/effective_pages.rb

@@ -1,10 +1,8 @@
 EffectivePages.setup do |config|
   config.pages_table_name = :pages
-  config.menus_table_name = :menus
-  config.menu_items_table_name = :menu_items
 
-  # Call devise authenticate_user! as a before_action on Effective::Pages#show
-  config.authenticate_user = false
+  # The menu names a page can belong to
+  config.menus = [:main, :footer]
 
   # The directory where your page templates live
   # Any files in this directory will be automatically available when
@@ -52,10 +50,4 @@ EffectivePages.setup do |config|
   # Layout Settings
   # config.layout = { admin: 'admin' }
 
-  # All effective_page menu options
-  config.menu = {
-    apply_active_class: true,  # Add an .active class to the appropriate li item based on current page url
-    maxdepth: 2                # 2 by default, strict bootstrap3 doesnt support dropdowns in your dropdowns
-  }
-
 end

data/config/routes.rb

@@ -1,17 +1,13 @@
-class EffectivePagesConstraint
-  def self.matches?(request)
-    Effective::Page.find(request.path_parameters[:id] || '/').present? rescue false
-  end
-end
-
 EffectivePages::Engine.routes.draw do
   namespace :admin do
     resources :pages, except: [:show]
-    resources :menus
+    resources :menus, only: [:index]
   end
 
   scope module: 'effective' do
-    get '*id', to: 'pages#show', constraints: EffectivePagesConstraint, as: :page
+    match '*id', to: 'pages#show', via: :get, as: :page, constraints: lambda { |req|
+      Effective::Page.find_by_slug_or_id(req.path_parameters[:id] || '/').present?
+    }
   end
 end
 

data/db/migrate/01_create_effective_pages.rb.erb

@@ -4,49 +4,32 @@ class CreateEffectivePages < ActiveRecord::Migration[4.2]
       t.string :title
       t.string :meta_description
 
-      t.boolean :draft, :default => false
+      t.boolean :draft, default: false
 
-      t.string :layout, :default => 'application'
+      t.string :layout, default: 'application'
       t.string :template
 
       t.string :slug
-      t.integer :roles_mask, :default => 0
+
+      t.boolean :authenticate_user, default: false
+      t.integer :roles_mask, default: 0
+
+      t.integer :menu_parent_id
+      t.boolean :menu, default: false
+      t.string :menu_name
+      t.string :menu_title
+      t.string :menu_url
+      t.integer :menu_position
 
       t.datetime :updated_at
       t.datetime :created_at
     end
-    add_index <%= @pages_table_name %>, :slug, :unique => true
-
-    create_table <%= @menus_table_name %> do |t|
-      t.string      :title
-      t.timestamps
-    end
-
-    create_table <%= @menu_items_table_name %> do |t|
-      t.integer       :menu_id
 
-      t.integer       :menuable_id
-      t.string        :menuable_type
-
-      t.string        :title
-
-      t.string        :url
-      t.string        :special
-
-      t.string        :classes
-      t.boolean       :new_window, :default => false
-      t.integer       :roles_mask, :default => nil
-
-      t.integer       :lft
-      t.integer       :rgt
-    end
-    add_index <%= @menu_items_table_name %>, :lft
+    add_index <%= @pages_table_name %>, :slug, :unique => true
   end
 
   def self.down
     drop_table <%= @pages_table_name %>
-    drop_table <%= @menus_table_name %>
-    drop_table <%= @menu_items_table_name %>
   end
 
 end

data/lib/effective_pages.rb

@@ -1,18 +1,18 @@
-require 'effective_datatables'
-require 'effective_resources'
 require 'effective_roles'
+require 'effective_resources'
+require 'effective_datatables'
 require 'effective_pages/engine'
 require 'effective_pages/version'
 
 module EffectivePages
   def self.config_keys
     [
-      :pages_table_name, :menus_table_name, :menu_items_table_name,
+      :pages_table_name,
       :pages_path, :excluded_pages, :layouts_path, :excluded_layouts,
       :site_og_image, :site_og_image_width, :site_og_image_height,
       :site_title, :site_title_suffix, :fallback_meta_description,
       :silence_missing_page_title_warnings, :silence_missing_meta_description_warnings, :silence_missing_canonical_url_warnings,
-      :use_effective_roles, :authenticate_user, :menu, :layout
+      :use_effective_roles, :menus, :layout
     ]
   end
 
@@ -39,10 +39,4 @@ module EffectivePages
     end.compact.sort
   end
 
-  def self.permitted_params
-    @permitted_params ||= [
-      :title, :meta_description, :draft, :layout, :template, :slug, roles: []
-    ]
-  end
-
 end

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.0.5'.freeze
 end

data/lib/generators/effective_pages/install_generator.rb

@@ -21,9 +21,6 @@ module EffectivePages
 
       def create_migration_file
         @pages_table_name = ':' + EffectivePages.pages_table_name.to_s
-        @menus_table_name = ':' + EffectivePages.menus_table_name.to_s
-        @menu_items_table_name = ':' + EffectivePages.menu_items_table_name.to_s
-
         migration_template ('../' * 3) + 'db/migrate/01_create_effective_pages.rb.erb', 'db/migrate/create_effective_pages.rb'
       end
 

data/lib/generators/templates/example.html.haml

@@ -1,2 +1,5 @@
 %h1= page.title
-= page.body
+
+.row
+  .col-9= page.rich_text_body
+  .col-3= page.rich_text_sidebar

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.0.5
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-23 00:00:00.000000000 Z
+date: 2021-04-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -78,24 +78,20 @@ files:
 - app/controllers/admin/menus_controller.rb
 - app/controllers/admin/pages_controller.rb
 - app/controllers/effective/pages_controller.rb
-- app/datatables/effective_menus_datatable.rb
 - app/datatables/effective_pages_datatable.rb
-- app/helpers/effective_breadcrumbs_helper.rb
-- app/helpers/effective_menus_admin_helper.rb
+- app/datatables/effective_pages_menu_datatable.rb
 - app/helpers/effective_menus_helper.rb
 - app/helpers/effective_pages_helper.rb
-- app/models/effective/menu.rb
-- app/models/effective/menu_item.rb
 - app/models/effective/page.rb
-- app/views/admin/menu_items/_actions.html.haml
-- app/views/admin/menu_items/_expand.html.haml
-- app/views/admin/menu_items/_item.html.haml
-- app/views/admin/menu_items/_new.html.haml
-- app/views/admin/menus/_form.html.haml
-- app/views/admin/menus/show.html.haml
+- app/views/admin/menus/index.html.haml
 - app/views/admin/pages/_additional_fields.html.haml
 - app/views/admin/pages/_form.html.haml
-- app/views/admin/pages/_roles.html.haml
+- app/views/admin/pages/_form_access.html.haml
+- app/views/admin/pages/_form_content.html.haml
+- app/views/admin/pages/_form_menu.html.haml
+- app/views/admin/pages/_form_page.html.haml
+- app/views/admin/pages/_rich_text_areas.html.haml
+- app/views/effective/pages/_menu.html.haml
 - config/effective_pages.rb
 - config/routes.rb
 - db/migrate/01_create_effective_pages.rb.erb

data/app/datatables/effective_menus_datatable.rb

@@ -1,16 +0,0 @@
-class EffectiveMenusDatatable < Effective::Datatable
-
-  datatable do
-    col :id, visible: false
-    col :updated_at, visible: false
-
-    col :title
-
-    actions_col
-  end
-
-  collection do
-    Effective::Menu.all
-  end
-
-end

data/app/helpers/effective_breadcrumbs_helper.rb

@@ -1,41 +0,0 @@
-module EffectiveBreadcrumbsHelper
-  def render_breadcrumbs(menu, page)
-    menu = Effective::Menu.find_by_title(menu.to_s) if menu.kind_of?(String) || menu.kind_of?(Symbol)
-    return "Menu '#{menu}' does not exist".html_safe unless menu.present?
-
-    return breadcrumbs_fallback(page) if !page.present?
-
-    menu_item = if page.kind_of?(Effective::Page)
-      url = effective_pages.page_path(page)
-      menu.menu_items.find { |item| item.menuable == page || item.title == page.title || item.url == url }
-    elsif page.kind_of?(String)
-      downcased = page.downcase
-      menu.menu_items.find { |item| item.title.downcase == downcased || item.url == downcased }
-    else
-      menu.menu_items.find { |item| item.menuable == page || item.title == page || item.url == page }
-    end
-
-    return breadcrumbs_fallback(page) unless menu_item.present?
-
-    parents = menu.menu_items.select { |item| item.lft < menu_item.lft && item.rgt > menu_item.rgt }
-
-    content_tag(:ol, class: 'breadcrumb') do
-      (
-        parents.map { |parent| content_tag(:li, link_to(parent.title, parent.url.presence || '#', title: parent.title)) } +
-        [content_tag(:li, page.try(:title) || page, class: 'active')]
-      ).join().html_safe
-    end
-  end
-
-  alias_method :render_breadcrumb, :render_breadcrumbs
-
-  def breadcrumbs_fallback(page = nil, root: 'Home')
-    content_tag(:ol, class: 'breadcrumb') do
-      [
-        content_tag(:li, link_to(root, root_path, title: root)),
-        content_tag(:li, ((page.title if page.respond_to?(:title)) || page || @page_title || 'Here'), class: 'active')
-      ].join().html_safe
-    end
-  end
-
-end

data/app/helpers/effective_menus_admin_helper.rb

@@ -1,8 +0,0 @@
-module EffectiveMenusAdminHelper
-
-  def visible_badge(menu_item, stack, comparator)
-    visible = comparator.call(menu_item) && stack.all? { |parent_menu_item| parent_menu_item.lft == 1 || comparator.call(parent_menu_item) }
-    content_tag(:span, (visible ? 'YES'.freeze : 'NO'.freeze), :class => "label label-#{(visible ? 'primary' : 'warning')}")
-  end
-
-end

data/app/models/effective/menu.rb

@@ -1,148 +0,0 @@
-module Effective
-  class Menu < ActiveRecord::Base
-    attr_accessor :current_user
-
-    log_changes if respond_to?(:log_changes)
-
-    self.table_name = EffectivePages.menus_table_name.to_s
-
-    effective_resource do
-      title           :string
-      timestamps
-    end
-
-    validates :title, presence: true, uniqueness: true, length: { maximum: 255 }
-
-    has_many :menu_items, -> { MenuItem.sorted }, inverse_of: :menu, dependent: :delete_all
-    accepts_nested_attributes_for :menu_items, allow_destroy: true
-
-    before_save do
-      if self.menu_items.find { |menu_item| menu_item.lft == 1 }.blank?
-        menu_items.build(title: 'Home', url: '/', lft: 1, rgt: 2)
-      end
-    end
-
-    def to_s
-      self[:title] || 'New Menu'
-    end
-
-    def contains?(obj)
-      menu_items.find { |menu_item| menu_item.url == obj || menu_item.menuable == obj }.present?
-    end
-
-    # This is the entry point to the DSL method for creating menu items
-    def build(&block)
-      raise 'build must be called with a block' if !block_given?
-
-      root = menu_items.build(title: 'Home', url: '/', lft: 1, rgt: 2)
-      root.parent = true
-      instance_exec(&block) # A call to dropdown or item
-      root.rgt = menu_items.map(&:rgt).max
-      self
-    end
-
-    private
-
-    def dropdown(title, options = {}, &block)
-      raise 'dropdown must be called with a block' if !block_given?
-      raise 'dropdown menu_items may not have a URL' if options.kind_of?(String) || options.kind_of?(Symbol)
-      raise 'dropdown second parameter expects a Hash' unless options.kind_of?(Hash)
-
-      prev_item = menu_items.last
-
-      if prev_item.parent == true # This came from root or dropdown
-        lft = prev_item.lft + 1 # Go down. from lft
-        rgt = prev_item.rgt + 1
-      else
-        lft = prev_item.rgt + 1 # Go accross. from rgt
-        rgt = prev_item.rgt + 2
-      end
-
-      # Make room for new item by shifting everything after me up by 2
-      menu_items.each do |item|
-        item.rgt = (item.rgt + 2) if item.rgt > (lft - 1)
-        item.lft = (item.lft + 2) if item.lft > (lft - 1)
-      end
-
-      atts = build_menu_item_attributes(title, '', options).merge({:lft => lft, :rgt => rgt})
-
-      dropdown = menu_items.build(atts)
-      dropdown.parent = true
-
-      instance_exec(&block)
-
-      # Level up
-      dropdown.rgt = menu_items.last.rgt + 1 # Level up
-      dropdown.parent = false
-      menu_items << menu_items.delete(dropdown) # Put myself on the end of the array
-    end
-
-    # The URL parameter can be:
-    # - an Effective::Page object
-    # - the symbol :divider
-    # - a symbol or string that ends with _path
-    # - or a string that is the url
-
-    def item(title, url = '#', options = {})
-      raise 'item third parameter expects a Hash' unless options.kind_of?(Hash)
-
-      prev_item = menu_items.last
-
-      if prev_item.parent == true # This came from root or dropdown
-        lft = prev_item.lft + 1 # Go down. from lft
-        rgt = prev_item.rgt + 1
-      else
-        lft = prev_item.rgt + 1 # Go accross, from rgt
-        rgt = prev_item.rgt + 2
-      end
-
-      menu_items.each do |item|
-        item.rgt = (item.rgt + 2) if item.rgt > (lft - 1)
-        item.lft = (item.lft + 2) if item.lft > (lft - 1)
-      end
-
-      atts = build_menu_item_attributes(title, url, options).merge({:lft => lft, :rgt => rgt})
-
-      menu_items.build(atts)
-    end
-
-    def divider(options = {})
-      item(:divider, :divider, options)
-    end
-
-    def build_menu_item_attributes(title, url, options)
-      options[:roles_mask] ||= 0 if (options.delete(:signed_in) || options.delete(:private))
-      options[:roles_mask] ||= -1 if (options.delete(:signed_out) || options.delete(:guest))
-
-      if options[:roles]
-        options[:roles_mask] = EffectiveRoles.roles_mask_for(options.delete(:roles))
-      end
-
-      options[:classes] = options.delete(:class)
-
-      if title == :divider || url == :divider || options[:divider] == true
-        options[:title] = 'divider'
-        options[:special] = 'divider'
-      elsif title.kind_of?(Effective::Page)
-        options[:title] = title.title
-        options[:menuable] = title
-        options[:url] = '#'
-      elsif url.kind_of?(Effective::Page)
-        options[:title] = title.presence || url.title
-        options[:menuable] = url
-        options[:url] = '#'
-      elsif url.to_s.end_with?('_path')
-        options[:title] = title
-        options[:special] = url
-      else
-        options[:title] = title
-        options[:url] = url
-      end
-
-      options
-    end
-
-
-  end
-
-end

data/app/models/effective/menu_item.rb

@@ -1,81 +0,0 @@
-module Effective
-  class MenuItem < ActiveRecord::Base
-    attr_accessor :parent  # This gets set on the Root node and a node created by Dropdown, so the item function knows whether to go down or to go accross
-
-    belongs_to :menu, inverse_of: :menu_items
-    belongs_to :menuable, polymorphic: true # Optionaly belong to an object
-
-    self.table_name = EffectivePages.menu_items_table_name.to_s
-
-    acts_as_role_restricted
-
-    effective_resource do
-      title           :string
-
-      url             :string
-      special         :string  # divider / search / *_path
-
-      classes         :string
-      new_window      :boolean
-      roles_mask      :integer # 0 is going to mean logged in, -1 is going to mean public, > 0 will be future implementation of roles masking
-
-      lft             :integer
-      rgt             :integer
-
-      timestamps
-    end
-
-    validates :title, presence: true, length: { maximum: 255 }
-    validates :url, length: { maximum: 255 }
-    validates :special, length: { maximum: 255 }
-    validates :classes, length: { maximum: 255 }
-    validates :new_window, inclusion: { in: [true, false] }
-
-    validates :lft, presence: true
-    validates :rgt, presence: true
-
-    scope :deep, -> { includes(:menuable) }
-    scope :sorted, -> { order(:lft) }
-
-    def leaf?
-      (rgt.to_i - lft.to_i) == 1
-    end
-
-    def dropdown?
-      !leaf?
-    end
-
-    def divider?
-      leaf? && special == 'divider'
-    end
-
-    # For now it's just logged in or not?
-    # This will work with effective_roles one day...
-    def visible_for?(user)
-      can_view_page = (
-        if dropdown?
-          true
-        elsif menuable.kind_of?(Effective::Page)
-          menuable.roles_permit?(user)
-        else
-          true
-        end
-      )
-
-      can_view_menu_item = (
-        if roles_mask == nil
-          true
-        elsif roles_mask == -1 # Am I logged out?
-          user.blank?
-        elsif roles_mask == 0 # Am I logged in?
-          user.present?
-        else
-          roles_permit?(user)
-        end
-      )
-
-      can_view_page && can_view_menu_item
-    end
-
-  end
-end

data/app/views/admin/menu_items/_actions.html.haml

@@ -1,4 +0,0 @@
-.actions
-  %span.add-item.glyphicon.glyphicon-plus-sign
-  %span.remove-item.glyphicon.glyphicon-trash
-

data/app/views/admin/menu_items/_expand.html.haml

@@ -1,2 +0,0 @@
-%ul.dropdown-menu
-  %li.effective-menu-expand  

data/app/views/admin/menu_items/_item.html.haml

@@ -1,13 +0,0 @@
-.menu-item
-  = form.fields_for :menu_items, item do |f|
-    = f.hidden_field :title, :autocomplete => 'off'
-    = f.hidden_field :menuable_id, :autocomplete => 'off'
-    = f.hidden_field :menuable_type, :autocomplete => 'off'
-    = f.hidden_field :url, :autocomplete => 'off'
-    = f.hidden_field :special, :autocomplete => 'off'
-    = f.hidden_field :new_window, :autocomplete => 'off'
-    = f.hidden_field :classes, :autocomplete => 'off'
-    = f.hidden_field :roles_mask, :autocomplete => 'off'
-    = f.hidden_field :lft, :autocomplete => 'off'
-    = f.hidden_field :rgt, :autocomplete => 'off'
-    = f.hidden_field :_destroy, :autocomplete => 'off'

data/app/views/admin/menu_items/_new.html.haml

@@ -1,3 +0,0 @@
-%li.new-item
-  %a{:href => ''}
-  = render :partial => 'admin/menu_items/item', :locals => {:item => item, :form => form}

data/app/views/admin/menus/_form.html.haml

@@ -1,4 +0,0 @@
-= effective_form_with(model: menu, url: (menu.persisted? ? effective_pages.admin_menu_path(menu) : effective_pages.admin_menus_path)) do |f|
-  = f.text_field :title, hint: 'Give this menu a title'
-
-  = f.submit

data/app/views/admin/menus/show.html.haml

@@ -1,39 +0,0 @@
-%h1.effective-admin-heading= @page_title
-
-- if defined?(EffectiveRegions)
-  .row.effective-admin-actions
-    .col-sm-6
-      %p
-        All menu editing may be done from the fullscreen editor. Just drag and drop menu items.
-    .col-sm-6
-      %p.text-right
-        = link_to "Edit #{@menu}", effective_regions.edit_path('/'), class: 'btn btn-primary', 'data-no-turbolink': true, 'data-turbolinks': false, target: '_blank'
-
-- if defined?(EffectiveRoles)
-  %h2 Menu Items
-
-  - if @menu.menu_items.length > 1
-    %table.table
-      %thead
-        %th Menu Item
-        %th.text-center Public
-        %th.text-center Signed In
-        - EffectiveRoles.roles.each do |role|
-          %th.text-center= ":#{role}"
-
-      %tbody
-        - stack = [@menu.menu_items.first]
-        - @menu.menu_items.each_with_index do |menu_item, index|
-          - next if index == 0
-          - stack.pop while menu_item.rgt > stack.last.rgt if stack.size > 1
-          %tr
-            %td
-              = ("  " * (stack.size-1)).html_safe
-              = (menu_item.divider? ? ':divider' : menu_item.title)
-            %td.text-center= visible_badge(menu_item, stack, Proc.new { |item| item.roles_mask == nil || item.roles_mask == -1 })
-            %td.text-center= visible_badge(menu_item, stack, Proc.new { |item| item.roles_mask == nil || item.roles_mask == 0 })
-            - EffectiveRoles.roles.each do |role|
-              %td.text-center= visible_badge(menu_item, stack, Proc.new { |item| item.visible_for?(role) })
-          - stack.push(menu_item)
-  - else
-    %p No menu items.

data/app/views/admin/pages/_roles.html.haml

@@ -1 +0,0 @@
-= f.checks :roles, EffectiveRoles.roles_collection(f.object), hint: '* leave blank for a regular public page that anyone can view'