app/views/layouts/tramway/admin/shared/_navbar.html.haml in tramway-admin-4.1.1.2 vs app/views/layouts/tramway/admin/shared/_navbar.html.haml in tramway-admin-4.1.1.3
- old
+ new
@@ -2,11 +2,11 @@
- if ::Tramway::Admin.customized_admin_navbar.present?
= ::Tramway::Admin.customized_admin_navbar
- else
.container-fluid
= link_to @application&.try(:title) || @application&.public_name || t('aplication.title'), ::Tramway::Admin::Engine.routes.url_helpers.root_path, class: 'navbar-brand'
- %button.navbar-toggler.collapsed{ aria: { controls: :navbar, expanded: "false", label: 'Toggle Navigation' }, data: { target: "#navbar", toggle: :collapse }, type: :button }
+ %button.navbar-toggler.collapsed{ aria: { controls: :navbar, expanded: "false", label: 'Toggle Navigation' }, data: { bs: { target: "#navbar" , toggle: :collapse } }, type: :button }
%span.navbar-toggler-icon
.navbar-collapse.collapse#navbar
- if current_admin
%ul.navbar-nav
- ::Tramway::Admin.navbar_items_for(@application_engine || @application.name, role: current_admin.role)&.each do |item|
@@ -28,10 +28,10 @@
- if sub_item.values.first == :singleton
= dropdown_model_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.singleton_path(model: model)
- if sub_item.values.first == :record
= dropdown_model_item model: model, route: ::Tramway::Admin::Engine.routes.url_helpers.records_path(model: model, scope: decorator_class(model).collections.first), pluralize: plural(model.constantize.model_name).capitalize
- %ul.nav.navbar-nav.ml-auto.justify-content-end
+ %ul.nav.navbar-nav.ml-auto.justify-content-end.navbar-collapse.collapse
- if current_admin
%li.nav-item
%span.nav-link
= "#{current_admin.first_name} #{current_admin.last_name}"
- if @notifications_count.present?