bootswatch_rails 3.2.0.21 → 3.2.0.22
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/Makefile +2 -0
- data/lib/bootswatch_rails/version.rb +1 -1
- data/lib/generators/bootswatch_rails/sorcery/templates/index.html.erb +6 -4
- data/lib/generators/bootswatch_rails/sorcery/templates/show.html.erb +8 -3
- data/lib/generators/bootswatch_rails/sorcery/templates/users_controller.rb +2 -2
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: f2006ea43501ef37e862e5075bef13a15cc9829a
|
|
4
|
+
data.tar.gz: f4e9466be1f2dd4964bafe6e3da8cd0250014dce
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 38ca818073bd18a3d0b7a0c65565054e4cb604096b4507b3d0ac55e975d2a4bb4be7a205ee5c88fc9740e16c91dd8fc234c8b2dbe11c973138a6b638415983c7
|
|
7
|
+
data.tar.gz: 18740e3490f9870db0b5f68af5e9a81205ec45647c5422bddba6bf8447541c8e1822f4313f4c7bd3e69e5f909d8d76a922d1c321ea4fb73051340d01fd93089e
|
data/Makefile
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
module BootswatchRails
|
|
2
2
|
BOOTSTRAP = "3.2.0"
|
|
3
|
-
VERSION = "3.2.0.
|
|
3
|
+
VERSION = "3.2.0.22"
|
|
4
4
|
THEMES = [:amelia, :cerulean, :cosmo, :custom, :cyborg, :darkly, :flatly, :journal, :lumen, :paper, :readable, :sandstone, :simplex, :slate, :spacelab, :superhero, :united, :yeti]
|
|
5
5
|
DEFAULT = 1
|
|
6
6
|
end
|
|
@@ -26,10 +26,12 @@
|
|
|
26
26
|
<td><%%= t('enums.<%= name %>.status.' + <%= name %>.status) %></td>
|
|
27
27
|
<td class="index-actions">
|
|
28
28
|
<%%= link_to t('actions.show'), <%= name %>, class: 'btn btn-default btn-xs' %>
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
<%%-
|
|
29
|
+
<%%- if current_<%= name %>.status.to_sym == :sysadm or <%= name %> == current_<%= name %> -%>
|
|
30
|
+
<br>
|
|
31
|
+
<%%= link_to t('actions.edit'), [:edit, <%= name %>], class: 'btn btn-default btn-xs' %>
|
|
32
|
+
<%%- end -%>
|
|
33
|
+
<%%- if current_<%= name %>.status.to_sym == :sysadm and <%= name %> != current_<%= name %> -%>
|
|
34
|
+
<br>
|
|
33
35
|
<%%= link_to t('actions.destroy'), <%= name %>, method: :delete, data: { confirm: t('actions.confirm') }, class: 'btn btn-danger btn-xs' %>
|
|
34
36
|
<%%- end -%>
|
|
35
37
|
</td>
|
|
@@ -81,8 +81,13 @@
|
|
|
81
81
|
</tbody>
|
|
82
82
|
</table>
|
|
83
83
|
|
|
84
|
-
|
|
85
|
-
<%%= link_to t('actions.
|
|
86
|
-
|
|
84
|
+
<%%- if current_<%= name %>.status.to_sym == :sysadm or @<%= name %> == current_<%= name %> -%>
|
|
85
|
+
<%%= link_to t('actions.edit'), [:edit, @<%= name %>], class: 'btn btn-primary' %>
|
|
86
|
+
<%%= link_to t('actions.back.index'), <%= table_name %>_path, class: 'btn btn-default' %>
|
|
87
|
+
<%%- else -%>
|
|
88
|
+
<%%= link_to t('actions.back.index'), <%= table_name %>_path, class: 'btn btn-primary' %>
|
|
89
|
+
<%%- end -%>
|
|
90
|
+
<%%- if current_<%= name %>.status.to_sym == :sysadm and @<%= name %> != current_<%= name %> -%>
|
|
87
91
|
<%%= link_to t('actions.destroy'), @<%= name %>, method: :delete, data: { confirm: t('actions.confirm') }, class: 'btn btn-danger' %>
|
|
88
92
|
<%%- end -%>
|
|
93
|
+
|
|
@@ -127,7 +127,7 @@ class <%= controller_name.camelize %> < ApplicationController
|
|
|
127
127
|
# DELETE /<%= table_name %>/1
|
|
128
128
|
# DELETE /<%= table_name %>/1.json
|
|
129
129
|
def destroy
|
|
130
|
-
if @<%= name %> == current_<%= name %> or current_<%= name %>.status != :sysadm
|
|
130
|
+
if @<%= name %> == current_<%= name %> or current_<%= name %>.status.to_sym != :sysadm
|
|
131
131
|
redirect_to root_path, alert: t('sorcery.forbidden')
|
|
132
132
|
return
|
|
133
133
|
end
|
|
@@ -141,7 +141,7 @@ class <%= controller_name.camelize %> < ApplicationController
|
|
|
141
141
|
# GET /<%= table_name %>/log_out
|
|
142
142
|
def log_out
|
|
143
143
|
logout
|
|
144
|
-
redirect_to root_url, notice: t('
|
|
144
|
+
redirect_to root_url, notice: t('sorcery.goodbye')
|
|
145
145
|
end
|
|
146
146
|
|
|
147
147
|
private
|