card-mod-layout 0.13.2 → 0.13.3

Sign up to get free protection for your applications and to get access to all the features.
Files changed (5) hide show
  1. checksums.yaml +4 -4
  2. data/set/all/layouts.rb +1 -1
  3. data/set/all/overlay.rb +2 -2
  4. data/set/all/process_layout.rb +16 -6
  5. metadata +8 -8
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 279164d73c453d207fc558a74227e32657264cd43935dcf0704ef1c05cffeeda
4
- data.tar.gz: d8bcac2dcc099a2b0c3c8cc5e9379e2fae43ec187f535485d36854151cf12e9f
3
+ metadata.gz: 67d13f7478101066914e7e33c5147e6364d0d35c3dee7c4e4ee084515a8de833
4
+ data.tar.gz: 527f709b26d589df70380b3b00397ed9f8360ecbea9f8cf0da922f3ef79fc90e
5
5
  SHA512:
6
- metadata.gz: 6545ebcaeddd71625dc012acd565dde525e81dcc5990d6a8fcb2f0d2ad2be2406849d591cfec2e01feac55ea61b46881b63911c8343daa076d6e6c02bd5d8c8f
7
- data.tar.gz: ad44f6da2ebffb996c281df3ab6d21e4c04736525715824acc25298dc40554c21dd38cefcaf64de4d8905cf0c577d4979867547c4ed4db87837688a3e6987a70
6
+ metadata.gz: 8303c7ef950ab6cbac14ab9afff3bdf003a32e5858d41a514c30a9eb1160d2cd52dd2d886bf7abfc6752ef748c19ec202b23840e9d91f3f158296fccfe2a5357
7
+ data.tar.gz: 2a4ff422a3071bd98cb7b569563b1705bfad8e86508550916efa5de84c4887e03282ff2cfec3be586dd45e7a6d9a05f52474e75d533457d69967b38542f1928a
data/set/all/layouts.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  format :html do
2
- attr_reader :interior
2
+ delegate :interior, to: :voo
3
3
 
4
4
  def layout_nest
5
5
  wrap_main { interior }
data/set/all/overlay.rb CHANGED
@@ -4,7 +4,7 @@ format :html do
4
4
  type: "button" }.freeze
5
5
 
6
6
  wrapper :overlay do |opts|
7
- class_up "card-slot", "_overlay d0-card-overlay bg-body"
7
+ class_up "card-slot", "_overlay d0-card-overlay bg-body", :single_use
8
8
  @content_body = true
9
9
  voo.hide! :menu
10
10
  overlay_frame true, overlay_header(opts[:title]), opts[:slot] do
@@ -44,7 +44,7 @@ format :html do
44
44
  end
45
45
 
46
46
  def slotify_overlay_link
47
- overlay_menu_link "external-link-square", card: card
47
+ overlay_menu_link "external-link-square-alt", card: card
48
48
  end
49
49
 
50
50
  def close_overlay_link
data/set/all/process_layout.rb CHANGED
@@ -6,26 +6,36 @@ format :html do
6
6
 
7
7
  def show_with_page_layout view, args
8
8
  main!
9
+ layout = page_layout view
9
10
  args = main_render_args view, args
10
- if explicit_modal_wrapper?(view) && page_layout.to_sym != :modal
11
+ if explicit_modal_wrapper?(view) && layout.to_sym != :modal
11
12
  render_outside_of_layout view, args
12
13
  else
13
- render_with_layout view, page_layout, args
14
+ render_with_layout view, layout, args
14
15
  end
15
16
  end
16
17
 
17
- def page_layout
18
- params[:layout] || layout_name_from_rule || :default
18
+ def page_layout view
19
+ params[:layout] || layout_for_view(view) || layout_name_from_rule || :default
20
+ end
21
+
22
+ # for override
23
+ def layout_for_view _view
24
+ nil
19
25
  end
20
26
 
21
27
  def render_with_layout view, layout, args={}
22
28
  view_opts = Layout.main_nest_opts(layout, self)
23
- view ||= view_opts.delete(:view) || default_nest_view
29
+ view ||= view_opts.delete(:view) || default_page_view
24
30
  view_opts[:home_view] = view
25
31
  view_opts[:layout] = layout
26
32
  render! view, view_opts.reverse_merge(args)
27
33
  end
28
34
 
35
+ def default_page_view
36
+ default_nest_view
37
+ end
38
+
29
39
  def show_layout?
30
40
  !Env.ajax? || params[:layout]
31
41
  end
@@ -50,7 +60,7 @@ format :html do
50
60
  end
51
61
 
52
62
  def render_outside_of_layout view, args
53
- body = render_with_layout nil, page_layout, {}
63
+ body = render_with_layout nil, page_layout(view), {}
54
64
  body_with_modal body, render!(view, args)
55
65
  end
56
66
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: card-mod-layout
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.13.2
4
+ version: 0.13.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Ethan McCutchen
@@ -10,7 +10,7 @@ authors:
10
10
  autorequire:
11
11
  bindir: bin
12
12
  cert_chain: []
13
- date: 2021-08-06 00:00:00.000000000 Z
13
+ date: 2021-09-24 00:00:00.000000000 Z
14
14
  dependencies:
15
15
  - !ruby/object:Gem::Dependency
16
16
  name: card
@@ -18,42 +18,42 @@ dependencies:
18
18
  requirements:
19
19
  - - '='
20
20
  - !ruby/object:Gem::Version
21
- version: 1.103.2
21
+ version: 1.103.3
22
22
  type: :runtime
23
23
  prerelease: false
24
24
  version_requirements: !ruby/object:Gem::Requirement
25
25
  requirements:
26
26
  - - '='
27
27
  - !ruby/object:Gem::Version
28
- version: 1.103.2
28
+ version: 1.103.3
29
29
  - !ruby/object:Gem::Dependency
30
30
  name: card-mod-account
31
31
  requirement: !ruby/object:Gem::Requirement
32
32
  requirements:
33
33
  - - '='
34
34
  - !ruby/object:Gem::Version
35
- version: 0.13.2
35
+ version: 0.13.3
36
36
  type: :runtime
37
37
  prerelease: false
38
38
  version_requirements: !ruby/object:Gem::Requirement
39
39
  requirements:
40
40
  - - '='
41
41
  - !ruby/object:Gem::Version
42
- version: 0.13.2
42
+ version: 0.13.3
43
43
  - !ruby/object:Gem::Dependency
44
44
  name: card-mod-session
45
45
  requirement: !ruby/object:Gem::Requirement
46
46
  requirements:
47
47
  - - '='
48
48
  - !ruby/object:Gem::Version
49
- version: 0.13.2
49
+ version: 0.13.3
50
50
  type: :runtime
51
51
  prerelease: false
52
52
  version_requirements: !ruby/object:Gem::Requirement
53
53
  requirements:
54
54
  - - '='
55
55
  - !ruby/object:Gem::Version
56
- version: 0.13.2
56
+ version: 0.13.3
57
57
  description: ''
58
58
  email:
59
59
  - info@decko.org