effective_pages 1.0.14 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf763d4f232daee6825b70eecba5ab5b53291811
-  data.tar.gz: 82f8a5ce46c7a2701906d5fe1a11055237c173d5
+  metadata.gz: 573e78725bddee6be8f8ebaf63bc2029e788c4e0
+  data.tar.gz: e25c35be628b91769c9f4bb4d36e96b6bff43a16
 SHA512:
-  metadata.gz: 16dc7d33c5d459508610253ef31bb3bd0d14f31ced3721e669956966b861d11b384faa267d6523d6a37e53642122fd6546decd5a605477feb9fd529afb487eb0
-  data.tar.gz: c08ea63b217667b50b891fda31aae620ee2fb3afdff489b00b64722440f0cd912f9b1f25cd479f8e519d08873a3f733972df8138614760b4e0061dedb89cc1fc
+  metadata.gz: 00e90ad1a8e73f880c823ecd90cef9a7abd3aaeff1abc3cb16e76d44e6ac0bf334d4e6e4264aaa119e596479a44f9a51e1c048ba41c26d14e6a5aec46ce19860
+  data.tar.gz: 8258f37d1fb159e9e931d7bb111acb71e1a1080fa7cd202b25885f230d0423421463178d16965f2460e737ccf3695f81e371afaa1db40f3d93b57ee4d8857041

data/README.md

@@ -399,7 +399,11 @@ The permissions you actually want to define are as follows (using CanCan):
 
 ```ruby
 can [:show], Effective::Page
-can [:manage], Effective::Page if user.is?(:admin)
+
+if user.is?(:admin)
+  can :manage, Effective::Page
+  can :manage, Effective::Menu
+end
 ```
 
 

data/app/controllers/admin/menus_controller.rb

@@ -1,6 +1,6 @@
 module Admin
   class MenusController < ApplicationController
-    before_filter :authenticate_user!   # This is devise, ensure we're logged in.
+    respond_to?(:before_action) ? before_action(:authenticate_user!) : before_filter(:authenticate_user!) # Devise
 
     helper EffectiveMenusAdminHelper
 

data/app/controllers/admin/pages_controller.rb

@@ -1,6 +1,6 @@
 module Admin
   class PagesController < ApplicationController
-    before_filter :authenticate_user!   # This is devise, ensure we're logged in.
+    respond_to?(:before_action) ? before_action(:authenticate_user!) : before_filter(:authenticate_user!) # Devise
 
     layout (EffectivePages.layout.kind_of?(Hash) ? EffectivePages.layout[:admin] : EffectivePages.layout)
 

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

@@ -1,4 +1,10 @@
-%span.actions
-  = link_to 'Edit', effective_pages.edit_admin_menu_path(menu)
-  = '-'
-  = link_to 'Delete', effective_pages.admin_menu_path(menu), :data => {:method => :delete, :confirm => "Are you sure?  This menu will be made unavailable."}
+= link_to effective_pages.edit_admin_menu_path(menu), title: 'Settings' do
+  %span.glyphicon.glyphicon-cog
+
+- if defined?(EffectiveRegions)
+  = link_to (effective_regions.edit_path('/')), title: 'Edit Content', 'data-no-turbolink': true, target: '_blank' do
+    %span.glyphicon.glyphicon-edit
+
+= link_to effective_pages.admin_menu_path(menu), title: 'Delete', data: { method: :delete, confirm: 'Are you sure?  This menu will be made unavailable.' } do
+  %span.glyphicon.glyphicon-trash
+

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

@@ -1,30 +1,31 @@
 = 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"
 
-  %h3 Menu Item Visibility
+  - if defined?(EffectiveRoles)
+    %h3 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}"
+    %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)
+      %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

data/lib/effective_pages/version.rb

@@ -1,3 +1,3 @@
 module EffectivePages
-  VERSION = '1.0.14'.freeze
+  VERSION = '1.0.15'.freeze
 end

data/lib/effective_pages.rb

@@ -67,7 +67,7 @@ module EffectivePages
     HashWithIndifferentAccess.new().tap do |pages|
       files.each do |file|
         name = File.basename(file).split('.').first
-        next if name.starts_with?('_') || Array(EffectivePages.excluded_pages).map(&:to_s).include?(name)
+        next if name.starts_with?('_') || Array(EffectivePages.excluded_pages).map { |str| str.to_s }.include?(name)
 
         pages[name.to_sym] = {}
       end
@@ -81,8 +81,8 @@ module EffectivePages
       files.each do |file|
         name = File.basename(file).split('.').first
         next if name.starts_with?('_')
-        next if name.include?('mailer_layout')
-        next if Array(EffectivePages.excluded_layouts).map(&:to_s).include?(name)
+        next if name.include?('mailer')
+        next if Array(EffectivePages.excluded_layouts).map { |str| str.to_s }.include?(name)
 
         layouts[name.to_sym] = {}
       end

data/lib/generators/effective_pages/install_generator.rb

@@ -35,9 +35,6 @@ module EffectivePages
         inject_into_file "config/routes.rb", "\n  # if you want EffectivePages to render the home / root page\n  # uncomment the following line and create an Effective::Page with slug == 'home' \n  # root :to => 'Effective::Pages#show', :id => 'home'\n", :before => /root (:?)to.*/
       end
 
-      def show_readme
-        readme "README" if behavior == :invoke
-      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_pages
 version: !ruby/object:Gem::Version
-  version: 1.0.14
+  version: 1.0.15
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-29 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -185,7 +185,6 @@ files:
 - lib/effective_pages/engine.rb
 - lib/effective_pages/version.rb
 - lib/generators/effective_pages/install_generator.rb
-- lib/generators/templates/README
 - lib/generators/templates/effective_pages.rb
 - lib/generators/templates/example.html.haml
 - lib/tasks/effective_pages_tasks.rake

data/lib/generators/templates/README

@@ -1 +0,0 @@
-Thanks for using EffectivePages