jav_madmin 3.3.2 → 3.3.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 +4 -4
- data/app/views/madmin/application/_navigation.html.erb +3 -3
- data/lib/madmin/menu.rb +1 -8
- data/lib/madmin/version.rb +1 -1
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: de5e112e317fa81235e17c2d449ed30233b5f7de20bb646ba17eb587065f914c
|
|
4
|
+
data.tar.gz: 28360b51195be493c260b182df03a08b7a5d4de3ed419a46682ecdcb7fde8f36
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7283c6f7073392ef550e9e5be2813ffbeb2a2cb5d30dbf345ed2fa22e10848e0785f406f23f98170ba90ccadb86453b7eb5cc696a3981c75fd179e933bf03dee
|
|
7
|
+
data.tar.gz: 6770f1fde2084d0657c6b578b4fb392deebbbf2d85f9dbaa19dd8dbce60095aa5827d1daf916bd99f229cd70942e270739844955895bb4622cabd15f02e047ab
|
|
@@ -3,13 +3,13 @@
|
|
|
3
3
|
|
|
4
4
|
<% Madmin.menu.render do |item| %>
|
|
5
5
|
<% if item.url %>
|
|
6
|
-
<%= nav_link_to item.
|
|
6
|
+
<%= nav_link_to item.label, item.url, starts_with: item.url %>
|
|
7
7
|
<% else %>
|
|
8
|
-
<h4><%= item.
|
|
8
|
+
<h4><%= item.label %></h4>
|
|
9
9
|
<% end %>
|
|
10
10
|
|
|
11
11
|
<% item.items.each do |item| %>
|
|
12
|
-
<%= nav_link_to item.
|
|
12
|
+
<%= nav_link_to item.label, item.url, starts_with: item.url %>
|
|
13
13
|
<% end %>
|
|
14
14
|
<% end %>
|
|
15
15
|
</nav>
|
data/lib/madmin/menu.rb
CHANGED
|
@@ -45,7 +45,7 @@ module Madmin
|
|
|
45
45
|
def items
|
|
46
46
|
@children.values.sort do |a, b|
|
|
47
47
|
result = a.position <=> b.position
|
|
48
|
-
result = a.
|
|
48
|
+
result = a.label <=> b.label if result == 0 # sort alphabetically for the same position
|
|
49
49
|
result
|
|
50
50
|
end
|
|
51
51
|
end
|
|
@@ -67,13 +67,6 @@ module Madmin
|
|
|
67
67
|
@children = {}
|
|
68
68
|
end
|
|
69
69
|
|
|
70
|
-
def human_label
|
|
71
|
-
@human_label ||= if label.is_a?(Symbol)
|
|
72
|
-
I18n.t("activerecord.models.#{label}", count: 2, default: [:"madmin.navigation.#{label}", label.to_s.pluralize(I18n.locale).titleize])
|
|
73
|
-
else
|
|
74
|
-
label
|
|
75
|
-
end
|
|
76
|
-
end
|
|
77
70
|
end
|
|
78
71
|
end
|
|
79
72
|
end
|
data/lib/madmin/version.rb
CHANGED