effective_pages 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 922310db05a57eef7ef291c30097716e2d81fca8
-  data.tar.gz: c923e43f89d461bf5a2a13cd7051be76a45b748d
+  metadata.gz: ba132a8e040a61087a5fa782a1568d5cfeece1d1
+  data.tar.gz: 207faa7553505f9131e8d7fdae1f5820b46ab86f
 SHA512:
-  metadata.gz: be05a9ddedd4958b5be1f04266f27aa9097d8f079caa5048c8ba31c4bdf4b4769457bcb7e85481dbb39b3d043268c11298104b15b685f1b69b982eb8e15ed06e
-  data.tar.gz: 251b3d2b50834499f591137cb65db4bf7de386424d26e9a482e753d8d2cb355217e72c1e3fee931a3bcca78cb4b79576123b0665861faae2d79f4a1c9209290a
+  metadata.gz: 8049254713603cd2c4a71e48ae3ea5a2fa52487940f5b5c38561506d04a849f4a9bb192c1130c4fe680cc30dc71bc7370f82386612c972b92776704f20b9a982
+  data.tar.gz: 4f66f35feebb7fe492bbc7a32767b4791340099384591ed88a202471f029ce3f28afb816b43cb5adf544b4c79746bffcc37e5a60b9a95d6f605b09ffaff1b6eb

data/app/controllers/admin/menus_controller.rb

@@ -28,49 +28,20 @@ module Admin
 
       if @menu.save
         flash[:success] = 'Successfully created menu'
-        redirect_to effective_pages.edit_admin_menu_path(@menu)
+        redirect_to effective_pages.admin_menu_path(@menu)
       else
         flash.now[:danger] = 'Unable to create menu'
         render :action => :new
       end
     end
 
-    def edit
+    def show
       @menu = Effective::Menu.find(params[:id])
-      @page_title = 'Edit Menu'
+      @page_title = @menu.to_s
 
       authorize_effective_menus!
     end
 
-    def update
-      @menu = Effective::Menu.find(params[:id])
-      @page_title = 'Edit Menu'
-
-      authorize_effective_menus!
-
-      if @menu.update_attributes(menu_params)
-        flash[:success] = 'Successfully updated menu'
-        redirect_to effective_pages.edit_admin_menu_path(@menu)
-      else
-        flash.now[:danger] = 'Unable to update menu'
-        render :action => :edit
-      end
-    end
-
-    def destroy
-      @menu = Effective::Menu.find(params[:id])
-
-      authorize_effective_menus!
-
-      if @menu.destroy
-        flash[:success] = 'Successfully deleted menu'
-      else
-        flash[:danger] = 'Unable to delete menu'
-      end
-
-      redirect_to effective_pages.admin_menus_path
-    end
-
     private
 
     def authorize_effective_menus!

data/app/helpers/effective_breadcrumbs_helper.rb

@@ -1,6 +1,6 @@
 module EffectiveBreadcrumbsHelper
   def render_breadcrumbs(menu, page)
-    menu = Effective::Menu.find_by_title(menu) if menu.kind_of?(String)
+    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?

data/app/helpers/effective_menus_helper.rb

@@ -1,6 +1,6 @@
 module EffectiveMenusHelper
   def render_menu(menu, options = {}, &block)
-    menu = Effective::Menu.find_by_title(menu) if menu.kind_of?(String)
+    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? && EffectivePages.authorized?(controller, :edit, menu) rescue false)

data/app/models/effective/datatables/menus.rb

@@ -3,7 +3,8 @@ if defined?(EffectiveDatatables)
     module Datatables
       class Menus < Effective::Datatable
         datatable do
-          table_column :id
+          table_column :id, visible: false
+          table_column :updated_at, visible: false
 
           table_column :title
           actions_column partial: '/admin/menus/actions'

data/app/models/effective/datatables/pages.rb

@@ -7,6 +7,7 @@ if defined?(EffectiveDatatables)
           default_entries :all
 
           table_column :id, visible: false
+          table_column :updated_at, visible: false
 
           table_column :title
           table_column :slug

data/app/models/effective/menu.rb

@@ -138,6 +138,10 @@ module Effective
       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

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

@@ -1,4 +1,4 @@
-= link_to effective_pages.edit_admin_menu_path(menu), title: 'Settings' do
+= link_to effective_pages.admin_menu_path(menu), title: 'Settings' do
   %span.glyphicon.glyphicon-cog
 
 - if defined?(EffectiveRegions)

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

@@ -1,35 +1,6 @@
 = simple_form_for(menu, (EffectivePages.simple_form_options || {}).merge(:url => (menu.persisted? ? effective_pages.admin_menu_path(menu) : effective_pages.admin_menus_path))) do |f|
   = f.input :title, :hint => "Give this menu a title"
 
-  - if defined?(EffectiveRoles)
-    %h2 Menu Item Visibility
-
-    %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)
-
-  .form-group
-    .col-xs-12
-      .form-group
-        .pull-right
-          = f.button :submit, 'Save', data: { disable_with: 'Saving...' }
-          = link_to 'Cancel', effective_pages.admin_menus_path
+  .pull-right
+    = f.button :submit, 'Save', data: { disable_with: 'Saving...' }
+    = link_to 'Cancel', effective_pages.admin_menus_path

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

@@ -0,0 +1,39 @@
+%h1.effective-admin-heading= @page_title
+
+- if defined?(EffectiveRegions)
+  .row.effective-admin-actions
+    .col-sm-6
+      %p
+        To edit the main menu, drag and drop items from the fullscreen editor.
+    .col-sm-6
+      %p.text-right
+        = link_to "Edit #{@menu}", effective_regions.edit_path('/'), class: 'btn btn-primary', 'data-no-turbolink': true, 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/_form.html.haml

@@ -16,12 +16,12 @@
   - if EffectivePages.pages.length == 1
     = f.input :template, as: :hidden, input_html: { value: EffectivePages.pages.first.first }
   - else
-    = f.input :template, as: (defined?(EffectiveFormInputs?) ? :effective_select : :select), collection: EffectivePages.pages, include_blank: false
+    = f.input :template, as: (defined?(EffectiveFormInputs) ? :effective_select : :select), collection: EffectivePages.pages, include_blank: false
 
   - if EffectivePages.layouts.length == 1
     = f.input :layout, as: :hidden, value: EffectivePages.layouts.first
   - else
-    = f.input :layout, as: (defined?(EffectiveFormInputs?) ? :effective_select : :select), collection: EffectivePages.layouts, include_blank: false
+    = f.input :layout, as: (defined?(EffectiveFormInputs) ? :effective_select : :select), collection: EffectivePages.layouts, include_blank: false
 
   - if f.object.respond_to?(:roles)
     = f.input :roles, collection: EffectiveRoles.roles_collection(f.object), as: :check_boxes, hint: '* leave blank for a regular public page that anyone can view'

data/config/routes.rb

@@ -7,8 +7,8 @@ end
 EffectivePages::Engine.routes.draw do
   if defined?(EffectiveDatatables)
     namespace :admin do
-      resources :pages, :except => [:show]
-      resources :menus, :except => [:show]
+      resources :pages, except: [:show]
+      resources :menus, only: [:index, :show, :new, :create]
     end
   end
 

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '1.1.0'.freeze
+  VERSION = '1.1.1'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-07 00:00:00.000000000 Z
+date: 2016-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -172,6 +172,7 @@ files:
 - app/views/admin/menus/edit.html.haml
 - app/views/admin/menus/index.html.haml
 - app/views/admin/menus/new.html.haml
+- app/views/admin/menus/show.html.haml
 - app/views/admin/pages/_actions.html.haml
 - app/views/admin/pages/_additional_fields.html.haml
 - app/views/admin/pages/_asset_box_fields.html.haml