Skip to content

Commit ec20b97

Browse files
author
Nikolay Moskvin
committed
Fixed breadcrums and navigation from left
1 parent d787d06 commit ec20b97

File tree

5 files changed

+20
-16
lines changed

5 files changed

+20
-16
lines changed

app/assets/stylesheets/rails_admin/base/theming.scss

+3-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,9 @@ body.rails_admin {
2222
}
2323

2424
.sidebar-nav {
25-
padding: 9px 0;
25+
padding: 9px 60px 9px 10px;
26+
position: fixed;
27+
background: #eaf0f1;
2628
}
2729

2830
/* fat labels in forms */

app/assets/stylesheets/rails_admin/bootstrap/_type.scss

+1-1
Original file line numberDiff line numberDiff line change
@@ -142,7 +142,7 @@ mark,
142142

143143
.page-header {
144144
padding-bottom: (($line-height-computed / 2) - 1);
145-
margin: ($line-height-computed * 2) 0 $line-height-computed;
145+
margin: ($line-height-computed / 2) 0 $line-height-computed;
146146
border-bottom: 1px solid $page-header-border-color;
147147
}
148148

app/helpers/rails_admin/application_helper.rb

+10-8
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def main_navigation
7676

7777
label = navigation_label || t('admin.misc.navigation')
7878

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?
8080
end.join.html_safe
8181
end
8282

@@ -96,7 +96,6 @@ def navigation(nodes_stack, nodes, level = 0)
9696
url = url_for(action: :index, controller: 'rails_admin/main', model_name: model_param)
9797
level_class = " nav-level-#{level}" if level > 0
9898
nav_icon = node.navigation_icon ? %(<i class="#{node.navigation_icon}"></i>).html_safe : ''
99-
10099
li = content_tag :li, 'data-model' => model_param do
101100
link_to nav_icon + capitalize_first_letter(node.label_plural), url, class: "pjax#{level_class}"
102101
end
@@ -109,21 +108,24 @@ def breadcrumb(action = @action, _acc = [])
109108
(parent_actions ||= []) << action
110109
end while action.breadcrumb_parent && (action = action(*action.breadcrumb_parent)) # rubocop:disable Loop
111110

112-
content_tag(:ul, class: 'breadcrumb') do
111+
content_tag(:ol, class: 'breadcrumb') do
113112
parent_actions.collect do |a|
114113
am = a.send(:eval, 'bindings[:abstract_model]')
115114
o = a.send(:eval, 'bindings[:object]')
116115
content_tag(:li, class: current_action?(a, am, o) && 'active') do
117116
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))
121124
end
122125
else
123-
content_tag(:span, wording_for(:breadcrumb, a, am, o))
126+
wording_for(:breadcrumb, a, am, o)
124127
end
125128
end
126-
crumb += content_tag(:span, '/', class: 'divider') unless current_action?(a, am, o)
127129
crumb
128130
end
129131
end.reverse.join.html_safe

app/views/layouts/rails_admin/application.html.haml

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@
1616
.container-fluid
1717
.row
1818
.col-sm-3.col-md-2
19-
.well.sidebar-nav
20-
%ul.nav.nav-list= main_navigation
21-
%ul.nav.nav-list= static_navigation
19+
.sidebar-nav
20+
%ul.nav.nav-pills.nav-stacked= main_navigation
21+
-# %ul.nav.nav-list= static_navigation
2222
.col-sm-9.col-sm-offset-3.col-md-10.col-md-offset-2
23-
.row-fluid
23+
.row
2424
.content{:'data-pjax-container' => true}= render template: 'layouts/rails_admin/pjax'

app/views/layouts/rails_admin/pjax.html.haml

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
:javascript
2-
$('.nav.nav-list li.active').removeClass('active');
3-
$('.nav.nav-list li[data-model="#{@abstract_model.to_param}"]').addClass('active');
2+
$('.nav.nav-pills li.active').removeClass('active');
3+
$('.nav.nav-pills li[data-model="#{@abstract_model.to_param}"]').addClass('active');
44

55
%title= "#{@abstract_model.try(:pretty_name) || @page_name} | #{[_get_plugin_name[0] || 'Rails', _get_plugin_name[1] || 'Admin'].join(' ')}"
66
.page-header

0 commit comments

Comments
 (0)