tramway-admin 1.6.2 → 1.6.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 29b74a02aa15fc3e623ef3f447410c29058f3e42dedab22cff33309c11b1d175
4
- data.tar.gz: ac68c6ed7d8e695bff67acf87fd6318e443a609bee06c772ab7e975e660ff2e3
3
+ metadata.gz: 549476f0e2ade569531af185bac5c737cfed252d61d419b1fe1e695ee4e337c7
4
+ data.tar.gz: 2cd61f7805ab5fa050a60504dee3200929d608bdfa04d49ee6fa8eb47a99f74b
5
5
  SHA512:
6
- metadata.gz: f613a56b9ec6ab4cddf093123aa52cdccc0932a9d9c4aa88bf08ff152a702125a8ad1974a7f3b8f1e99d3c20b5aa16c2e3c9b88b271e26ca7608674644a88bb6
7
- data.tar.gz: e65f9deb7a7a6fddbbb66cfd60bcfc51e48fdc42b958f7be5d53eacdf81d0870f23bca801c2403b13f8176efcf528ec4c052a4b0c1296a694c9a0e85bfd8642d
6
+ metadata.gz: 0a66622b18c45311760d801be761d8a96b9b44e32de54939c96e78aa93385c55140a8285b4e46d472be7538e9eae259906be00bd40bb933753e6e5dea7331ec9
7
+ data.tar.gz: ddfcb0f662239bf50d55aaf267844bab6709e0036969fd3dd34c6191ca1cca36e8d2478cf13a785193769f71e896cd94bdca13d2bc8440d224688504332a09e8
@@ -7,28 +7,8 @@ module Tramway
7
7
  include RussianCasesHelper
8
8
  include ::Tramway::Admin::RecordsHelper
9
9
  include ::Tramway::Admin::SingletonHelper
10
+ include ::Tramway::Admin::NavbarHelper
10
11
  include ::Tramway::Collections::Helper
11
-
12
- def title(page_title = default_title)
13
- title_text = "#{page_title} | #{t('application.name')}"
14
- content_for(:title) { title_text }
15
- end
16
-
17
- def default_title
18
- t('.title')
19
- end
20
-
21
- def page_title(action, model_name)
22
- t("helpers.actions.#{action}") + ' ' + genitive(model_name)
23
- end
24
-
25
- def customized_admin_navbar_given?
26
- customized_admin_navbar.present?
27
- end
28
-
29
- def customized_admin_navbar
30
- ::Tramway::Admin.customized_admin_navbar
31
- end
32
12
  end
33
13
  end
34
14
  end
@@ -0,0 +1,13 @@
1
+ module Tramway
2
+ module Admin
3
+ module NavbarHelper
4
+ def customized_admin_navbar_given?
5
+ customized_admin_navbar.present?
6
+ end
7
+
8
+ def customized_admin_navbar
9
+ ::Tramway::Admin.customized_admin_navbar
10
+ end
11
+ end
12
+ end
13
+ end
@@ -3,7 +3,7 @@
3
3
  - if ::Tramway::Admin.customized_admin_navbar.present?
4
4
  = ::Tramway::Admin.customized_admin_navbar
5
5
  - else
6
- = link_to @application&.title || t('aplication.title'), try(:root_path) || '/', class: 'navbar-brand'
6
+ = link_to @application&.title || t('aplication.title'), ::Tramway::Admin::Engine.routes.url_helpers.root_path, class: 'navbar-brand'
7
7
  %button.navbar-toggler.collapsed{ aria: { controls: :navbar, expanded: "false", label: 'Toggle Navigation' }, data: { target: "#navbar", toggle: :collapse }, type: :button }
8
8
  %span.navbar-toggler-icon
9
9
  .navbar-collapse.collapse#navbar
@@ -0,0 +1,3 @@
1
+ - title @application&.title
2
+ %h1
3
+ = @application&.title
@@ -1,5 +1,5 @@
1
1
  module Tramway
2
2
  module Admin
3
- VERSION = '1.6.2'
3
+ VERSION = '1.6.3'
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tramway-admin
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.6.2
4
+ version: 1.6.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Pavel Kalashnikov
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2018-10-10 00:00:00.000000000 Z
11
+ date: 2018-10-13 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bootstrap-kaminari-views
@@ -212,6 +212,7 @@ files:
212
212
  - app/controllers/tramway/admin/welcome_controller.rb
213
213
  - app/helpers/tramway/admin/additional_buttons_builder.rb
214
214
  - app/helpers/tramway/admin/application_helper.rb
215
+ - app/helpers/tramway/admin/navbar_helper.rb
215
216
  - app/helpers/tramway/admin/records_helper.rb
216
217
  - app/helpers/tramway/admin/russian_cases_helper.rb
217
218
  - app/helpers/tramway/admin/singleton_helper.rb