effective_pages 1.0.14 → 1.0.15
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +5 -1
- data/app/controllers/admin/menus_controller.rb +1 -1
- data/app/controllers/admin/pages_controller.rb +1 -1
- data/app/views/admin/menus/_actions.html.haml +10 -4
- data/app/views/admin/menus/_form.html.haml +23 -22
- data/lib/effective_pages/version.rb +1 -1
- data/lib/effective_pages.rb +3 -3
- data/lib/generators/effective_pages/install_generator.rb +0 -3
- metadata +2 -3
- data/lib/generators/templates/README +0 -1
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 573e78725bddee6be8f8ebaf63bc2029e788c4e0
|
4
|
+
data.tar.gz: e25c35be628b91769c9f4bb4d36e96b6bff43a16
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 00e90ad1a8e73f880c823ecd90cef9a7abd3aaeff1abc3cb16e76d44e6ac0bf334d4e6e4264aaa119e596479a44f9a51e1c048ba41c26d14e6a5aec46ce19860
|
7
|
+
data.tar.gz: 8258f37d1fb159e9e931d7bb111acb71e1a1080fa7cd202b25885f230d0423421463178d16965f2460e737ccf3695f81e371afaa1db40f3d93b57ee4d8857041
|
data/README.md
CHANGED
@@ -399,7 +399,11 @@ The permissions you actually want to define are as follows (using CanCan):
|
|
399
399
|
|
400
400
|
```ruby
|
401
401
|
can [:show], Effective::Page
|
402
|
-
|
402
|
+
|
403
|
+
if user.is?(:admin)
|
404
|
+
can :manage, Effective::Page
|
405
|
+
can :manage, Effective::Menu
|
406
|
+
end
|
403
407
|
```
|
404
408
|
|
405
409
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
module Admin
|
2
2
|
class MenusController < ApplicationController
|
3
|
-
|
3
|
+
respond_to?(:before_action) ? before_action(:authenticate_user!) : before_filter(:authenticate_user!) # Devise
|
4
4
|
|
5
5
|
helper EffectiveMenusAdminHelper
|
6
6
|
|
@@ -1,6 +1,6 @@
|
|
1
1
|
module Admin
|
2
2
|
class PagesController < ApplicationController
|
3
|
-
|
3
|
+
respond_to?(:before_action) ? before_action(:authenticate_user!) : before_filter(:authenticate_user!) # Devise
|
4
4
|
|
5
5
|
layout (EffectivePages.layout.kind_of?(Hash) ? EffectivePages.layout[:admin] : EffectivePages.layout)
|
6
6
|
|
@@ -1,4 +1,10 @@
|
|
1
|
-
|
2
|
-
|
3
|
-
|
4
|
-
|
1
|
+
= link_to effective_pages.edit_admin_menu_path(menu), title: 'Settings' do
|
2
|
+
%span.glyphicon.glyphicon-cog
|
3
|
+
|
4
|
+
- if defined?(EffectiveRegions)
|
5
|
+
= link_to (effective_regions.edit_path('/')), title: 'Edit Content', 'data-no-turbolink': true, target: '_blank' do
|
6
|
+
%span.glyphicon.glyphicon-edit
|
7
|
+
|
8
|
+
= link_to effective_pages.admin_menu_path(menu), title: 'Delete', data: { method: :delete, confirm: 'Are you sure? This menu will be made unavailable.' } do
|
9
|
+
%span.glyphicon.glyphicon-trash
|
10
|
+
|
@@ -1,30 +1,31 @@
|
|
1
1
|
= 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|
|
2
2
|
= f.input :title, :hint => "Give this menu a title"
|
3
3
|
|
4
|
-
|
4
|
+
- if defined?(EffectiveRoles)
|
5
|
+
%h3 Menu Item Visibility
|
5
6
|
|
6
|
-
|
7
|
-
|
8
|
-
|
9
|
-
|
10
|
-
|
11
|
-
|
12
|
-
|
7
|
+
%table.table
|
8
|
+
%thead
|
9
|
+
%th Menu Item
|
10
|
+
%th.text-center Public
|
11
|
+
%th.text-center Signed In
|
12
|
+
- EffectiveRoles.roles.each do |role|
|
13
|
+
%th.text-center= ":#{role}"
|
13
14
|
|
14
|
-
|
15
|
-
|
16
|
-
|
17
|
-
|
18
|
-
|
19
|
-
|
20
|
-
|
21
|
-
|
22
|
-
|
23
|
-
|
24
|
-
|
25
|
-
|
26
|
-
|
27
|
-
|
15
|
+
%tbody
|
16
|
+
- stack = [menu.menu_items.first]
|
17
|
+
- menu.menu_items.each_with_index do |menu_item, index|
|
18
|
+
- next if index == 0
|
19
|
+
- stack.pop while menu_item.rgt > stack.last.rgt if stack.size > 1
|
20
|
+
%tr
|
21
|
+
%td
|
22
|
+
= (" " * (stack.size-1)).html_safe
|
23
|
+
= (menu_item.divider? ? ':divider' : menu_item.title)
|
24
|
+
%td.text-center= visible_badge(menu_item, stack, Proc.new { |item| item.roles_mask == nil || item.roles_mask == -1 })
|
25
|
+
%td.text-center= visible_badge(menu_item, stack, Proc.new { |item| item.roles_mask == nil || item.roles_mask == 0 })
|
26
|
+
- EffectiveRoles.roles.each do |role|
|
27
|
+
%td.text-center= visible_badge(menu_item, stack, Proc.new { |item| item.visible_for?(role) })
|
28
|
+
- stack.push(menu_item)
|
28
29
|
|
29
30
|
.form-group
|
30
31
|
.col-xs-12
|
data/lib/effective_pages.rb
CHANGED
@@ -67,7 +67,7 @@ module EffectivePages
|
|
67
67
|
HashWithIndifferentAccess.new().tap do |pages|
|
68
68
|
files.each do |file|
|
69
69
|
name = File.basename(file).split('.').first
|
70
|
-
next if name.starts_with?('_') || Array(EffectivePages.excluded_pages).map
|
70
|
+
next if name.starts_with?('_') || Array(EffectivePages.excluded_pages).map { |str| str.to_s }.include?(name)
|
71
71
|
|
72
72
|
pages[name.to_sym] = {}
|
73
73
|
end
|
@@ -81,8 +81,8 @@ module EffectivePages
|
|
81
81
|
files.each do |file|
|
82
82
|
name = File.basename(file).split('.').first
|
83
83
|
next if name.starts_with?('_')
|
84
|
-
next if name.include?('
|
85
|
-
next if Array(EffectivePages.excluded_layouts).map
|
84
|
+
next if name.include?('mailer')
|
85
|
+
next if Array(EffectivePages.excluded_layouts).map { |str| str.to_s }.include?(name)
|
86
86
|
|
87
87
|
layouts[name.to_sym] = {}
|
88
88
|
end
|
@@ -35,9 +35,6 @@ module EffectivePages
|
|
35
35
|
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.*/
|
36
36
|
end
|
37
37
|
|
38
|
-
def show_readme
|
39
|
-
readme "README" if behavior == :invoke
|
40
|
-
end
|
41
38
|
end
|
42
39
|
end
|
43
40
|
end
|
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: effective_pages
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 1.0.
|
4
|
+
version: 1.0.15
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Code and Effect
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2016-
|
11
|
+
date: 2016-10-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -185,7 +185,6 @@ files:
|
|
185
185
|
- lib/effective_pages/engine.rb
|
186
186
|
- lib/effective_pages/version.rb
|
187
187
|
- lib/generators/effective_pages/install_generator.rb
|
188
|
-
- lib/generators/templates/README
|
189
188
|
- lib/generators/templates/effective_pages.rb
|
190
189
|
- lib/generators/templates/example.html.haml
|
191
190
|
- lib/tasks/effective_pages_tasks.rake
|
@@ -1 +0,0 @@
|
|
1
|
-
Thanks for using EffectivePages
|