@@ -76,7 +76,7 @@ def main_navigation
76
76
77
77
label = navigation_label || t ( 'admin.misc.navigation' )
78
78
79
- %(<li class='nav -header'>#{ capitalize_first_letter label } </li>#{ li_stack } ) if li_stack . present?
79
+ %(<li class='dropdown -header'>#{ capitalize_first_letter label } </li>#{ li_stack } ) if li_stack . present?
80
80
end . join . html_safe
81
81
end
82
82
@@ -96,7 +96,6 @@ def navigation(nodes_stack, nodes, level = 0)
96
96
url = url_for ( action : :index , controller : 'rails_admin/main' , model_name : model_param )
97
97
level_class = " nav-level-#{ level } " if level > 0
98
98
nav_icon = node . navigation_icon ? %(<i class="#{ node . navigation_icon } "></i>) . html_safe : ''
99
-
100
99
li = content_tag :li , 'data-model' => model_param do
101
100
link_to nav_icon + capitalize_first_letter ( node . label_plural ) , url , class : "pjax#{ level_class } "
102
101
end
@@ -109,21 +108,24 @@ def breadcrumb(action = @action, _acc = [])
109
108
( parent_actions ||= [ ] ) << action
110
109
end while action . breadcrumb_parent && ( action = action ( *action . breadcrumb_parent ) ) # rubocop:disable Loop
111
110
112
- content_tag ( :ul , class : 'breadcrumb' ) do
111
+ content_tag ( :ol , class : 'breadcrumb' ) do
113
112
parent_actions . collect do |a |
114
113
am = a . send ( :eval , 'bindings[:abstract_model]' )
115
114
o = a . send ( :eval , 'bindings[:object]' )
116
115
content_tag ( :li , class : current_action? ( a , am , o ) && 'active' ) do
117
116
crumb = begin
118
- if a . http_methods . include? ( :get )
119
- link_to url_for ( action : a . action_name , controller : 'rails_admin/main' , model_name : am . try ( :to_param ) , id : ( o . try ( :persisted? ) && o . try ( :id ) || nil ) ) , class : 'pjax' do
120
- wording_for ( :breadcrumb , a , am , o )
117
+ if not current_action? ( a , am , o )
118
+ if a . http_methods . include? ( :get )
119
+ link_to url_for ( action : a . action_name , controller : 'rails_admin/main' , model_name : am . try ( :to_param ) , id : ( o . try ( :persisted? ) && o . try ( :id ) || nil ) ) , class : 'pjax' do
120
+ wording_for ( :breadcrumb , a , am , o )
121
+ end
122
+ else
123
+ content_tag ( :span , wording_for ( :breadcrumb , a , am , o ) )
121
124
end
122
125
else
123
- content_tag ( :span , wording_for ( :breadcrumb , a , am , o ) )
126
+ wording_for ( :breadcrumb , a , am , o )
124
127
end
125
128
end
126
- crumb += content_tag ( :span , '/' , class : 'divider' ) unless current_action? ( a , am , o )
127
129
crumb
128
130
end
129
131
end . reverse . join . html_safe
0 commit comments