card-mod-layout 0.13.2 → 0.14.1

Sign up to get free protection for your applications and to get access to all the features.
Files changed (11) hide show
  1. checksums.yaml +4 -4
  2. data/locales/de.yml +4 -0
  3. data/set/abstract/{pointer/html_views.rb → items.rb} +1 -1
  4. data/set/abstract/pointer.rb +9 -0
  5. data/set/all/layouts.rb +30 -16
  6. data/set/all/modal/modal_dialog.haml +1 -1
  7. data/set/all/navbar_links.rb +1 -1
  8. data/set/all/overlay.rb +3 -3
  9. data/set/all/process_layout.rb +16 -6
  10. data/set/right/enabled_roles.rb +1 -1
  11. metadata +12 -10
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 279164d73c453d207fc558a74227e32657264cd43935dcf0704ef1c05cffeeda
4
- data.tar.gz: d8bcac2dcc099a2b0c3c8cc5e9379e2fae43ec187f535485d36854151cf12e9f
3
+ metadata.gz: 64d672613b26109d720b7adb43f3ed58aaf6707eba436037088099e73735afbb
4
+ data.tar.gz: 594e9141551447cbb07edcb2f774f8ca9f685567cd9ff55623537b868fb9872c
5
5
  SHA512:
6
- metadata.gz: 6545ebcaeddd71625dc012acd565dde525e81dcc5990d6a8fcb2f0d2ad2be2406849d591cfec2e01feac55ea61b46881b63911c8343daa076d6e6c02bd5d8c8f
7
- data.tar.gz: ad44f6da2ebffb996c281df3ab6d21e4c04736525715824acc25298dc40554c21dd38cefcaf64de4d8905cf0c577d4979867547c4ed4db87837688a3e6987a70
6
+ metadata.gz: 81ef6255d0f3c929f2f75be45aa4ead7135efda8c40cb8c80fa818242644711b93e3655a29d44ab06dfc529c7a7ec32eb24b9b7284ace60828295140d401cdb5
7
+ data.tar.gz: da583b1f2d2047f0eba8474161ed0af3fe05c6f86f2dc3ffcae59057ea2d2c6d1242a4d093d75cb9861c3233c70fb83210b5257be8569bc6414a3841c079f5e1
data/locales/de.yml ADDED
@@ -0,0 +1,4 @@
1
+ de:
2
+ layout_available_layouts: "Verfügbare Layouts: %{available_layouts}"
3
+ layout_unknown_layout: "Unbekanntes Layout: %{name}"
4
+ legacy_toc: Inhaltsverzeichnis
data/set/abstract/{pointer/html_views.rb → items.rb} RENAMED
@@ -1,5 +1,5 @@
1
1
  format :html do
2
2
  view :nav_item do
3
- nav_dropdown
3
+ wrap_with_nav_item nav_dropdown
4
4
  end
5
5
  end
data/set/abstract/pointer.rb ADDED
@@ -0,0 +1,9 @@
1
+ include_set Abstract::Items
2
+
3
+ format :html do
4
+ def navbar_items view: :nav_item, **_args
5
+ card.item_cards.map do |item_card|
6
+ nest item_card, view: view
7
+ end
8
+ end
9
+ end
data/set/all/layouts.rb CHANGED
@@ -1,34 +1,48 @@
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 }
6
6
  end
7
7
 
8
- layout :pre do # {{_main|raw}}
9
- wrap_with :pre do
10
- layout_nest
11
- end
8
+ layout :simple do
9
+ body_tag { layout_nest }
12
10
  end
13
11
 
14
- layout :simple do
15
- layout_nest
12
+ layout :pre do # {{_main|raw}}
13
+ body_tag do
14
+ wrap_with :pre do
15
+ layout_nest
16
+ end
17
+ end
16
18
  end
17
19
 
18
20
  layout :no_side do # {{_main|open}}
19
- <<-HTML.strip_heredoc
20
- <header>#{nest :header, view: :core}</header>
21
- <article>#{layout_nest}</article>
22
- <footer>{nest :footer, view: :core}</footer>
23
- HTML
21
+ body_tag do
22
+ <<-HTML.strip_heredoc
23
+ <header>#{nest :header, view: :core}</header>
24
+ <article>#{layout_nest}</article>
25
+ <footer>{nest :footer, view: :core}</footer>
26
+ HTML
27
+ end
24
28
  end
25
29
 
26
30
  layout :default do
31
+ body_tag do
32
+ <<-HTML.strip_heredoc
33
+ <header>#{nest :header, view: :core}</header>
34
+ <article>#{layout_nest}</article>
35
+ <aside>#{nest :sidebar, view: :core}</aside>
36
+ <footer>{nest :footer, view: :core}</footer>
37
+ HTML
38
+ end
39
+ end
40
+
41
+ def body_tag klasses=""
27
42
  <<-HTML.strip_heredoc
28
- <header>#{nest :header, view: :core}</header>
29
- <article>#{layout_nest}</article>
30
- <aside>#{nest :sidebar, view: :core}</aside>
31
- <footer>{nest :footer, view: :core}</footer>
43
+ <body class="#{klasses}">
44
+ #{yield}
45
+ </body>
32
46
  HTML
33
47
  end
34
48
  end
data/set/all/modal/modal_dialog.haml CHANGED
@@ -4,7 +4,7 @@
4
4
  .modal-content
5
5
  .modal-header.clearfix
6
6
  = title
7
- = menu
7
+ = menu if voo.show? :menu
8
8
  .modal-body
9
9
  = body
10
10
  - if footer.present?
data/set/all/navbar_links.rb CHANGED
@@ -20,7 +20,7 @@ format :html do
20
20
  end
21
21
  end
22
22
 
23
- # overridden in Abstact::Pointer to render dropdown
23
+ # overridden in Abstract::Items to render dropdown
24
24
  view :nav_item do
25
25
  wrap_with_nav_item link_view(class: "nav-link")
26
26
  end
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
@@ -95,7 +95,7 @@ format :html do
95
95
  private
96
96
 
97
97
  def overlay_framer slot, header, slot_opts, &block
98
- class_up "card-slot", "_overlay"
98
+ class_up "card-slot", "_overlay", :single_use
99
99
  with_frame slot, header, slot_opts, &block
100
100
  end
101
101
  end
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
 
data/set/right/enabled_roles.rb CHANGED
@@ -25,7 +25,7 @@ end
25
25
 
26
26
  event :clear_roles_cache, :prepare_to_store, before: :store_in_session do
27
27
  clear_roles
28
- Auth.update_always_cache Auth.as_id, nil
28
+ Auth.update_always_cache nil
29
29
  end
30
30
 
31
31
  format :html do
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.14.1
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: 2022-01-04 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.104.1
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.104.1
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.14.1
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.14.1
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.14.1
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.14.1
57
57
  description: ''
58
58
  email:
59
59
  - info@decko.org
@@ -66,9 +66,11 @@ files:
66
66
  - lib/card/layout/code_layout.rb
67
67
  - lib/card/layout/proc_layout.rb
68
68
  - lib/card/layout/unknown_layout.rb
69
+ - locales/de.yml
69
70
  - locales/en.yml
70
71
  - set/abstract/account_dropdown.rb
71
- - set/abstract/pointer/html_views.rb
72
+ - set/abstract/items.rb
73
+ - set/abstract/pointer.rb
72
74
  - set/all/alert.rb
73
75
  - set/all/layouts.rb
74
76
  - set/all/modal.rb
@@ -116,7 +118,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
116
118
  - !ruby/object:Gem::Version
117
119
  version: '0'
118
120
  requirements: []
119
- rubygems_version: 3.1.6
121
+ rubygems_version: 3.2.15
120
122
  signing_key:
121
123
  specification_version: 4
122
124
  summary: decko layouts