chaltron 0.2.2 → 0.2.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/chaltron/main.js.coffee +3 -4
- data/app/views/chaltron/ldap/multi_new.html.erb +1 -1
- data/app/views/chaltron/ldap/search.html.erb +1 -1
- data/app/views/chaltron/users/_side_filters.html.erb +4 -4
- data/app/views/chaltron/users/index.html.erb +3 -3
- data/config/chaltron_navigation.rb +5 -5
- data/lib/chaltron/version.rb +1 -1
- metadata +4 -4
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 686f2e43c9827924c3bf4f42f028245aadb5af6a
|
4
|
+
data.tar.gz: c25e8cc1f006013cd89ea96853893e5eed5bcf05
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 998ad529aa6f64791ad19b5cad9f260f5211b23a92b8da7c5d3bc1790139191036d1454c416551b46ca0f3e40e9fe6c3bef4f8681f9557aca1ebdc931081ea8c
|
7
|
+
data.tar.gz: 809e3cc6a2314590b192118f4f792c102741639b21477aad63743cdd2450682facc98b911e8466e6ebf3f44730d782bdce3ae44ffc535749dd2e6727dd296fb0
|
@@ -1,8 +1,7 @@
|
|
1
|
-
$ ->
|
1
|
+
$(document).on 'turbolinks:load', ->
|
2
|
+
$('.dropdown-toggle').dropdown()
|
3
|
+
|
2
4
|
# Flash
|
3
5
|
if (flash = $('.flash-container div.alert')).length > 0
|
4
6
|
flash.click -> $(@).fadeOut()
|
5
7
|
setTimeout (-> flash.fadeOut()), 5000
|
6
|
-
|
7
|
-
$(document).on 'turbolinks:load', ->
|
8
|
-
$('.dropdown-toggle').dropdown()
|
@@ -3,7 +3,7 @@
|
|
3
3
|
|
4
4
|
<%= content_tag :p, t('.par') %>
|
5
5
|
|
6
|
-
<%= bootstrap_form_for(User.new, url:
|
6
|
+
<%= bootstrap_form_for(User.new, url: ldap_multi_create_path, method: :post,
|
7
7
|
layout: :horizontal, html: {id: 'ldap_create'}) do |f| %>
|
8
8
|
|
9
9
|
<%= f.form_group do %>
|
@@ -1,7 +1,7 @@
|
|
1
1
|
<div class='container-fluid'>
|
2
2
|
<h3 class='page-header'><%= t('.title') %></h3>
|
3
3
|
|
4
|
-
<%= bootstrap_form_tag(url:
|
4
|
+
<%= bootstrap_form_tag(url: ldap_multi_new_path, method: :post, layout: :horizontal) do |f| %>
|
5
5
|
|
6
6
|
<%= f.text_field :userid, label: t('.name_label'), help: t('.name_help') %>
|
7
7
|
<%= f.text_field :fullname, label: t('.fullname_label'), help: t('.fullname_help') %>
|
@@ -1,18 +1,18 @@
|
|
1
1
|
<% if ldap_enabled? %>
|
2
2
|
<div class='list-group'>
|
3
|
-
<%= link_to
|
3
|
+
<%= link_to users_path(filters: filters.merge(provider: nil).to_h),
|
4
4
|
class: (filters[:provider].blank? ? 'list-group-item active': 'list-group-item') do %>
|
5
5
|
<span class='badge pull-right'><%= User.count %></span>
|
6
6
|
<%= t '.provider.all' %>
|
7
7
|
<% end %>
|
8
8
|
|
9
|
-
<%= link_to
|
9
|
+
<%= link_to users_path(filters: filters.merge(provider: 'local').to_h),
|
10
10
|
class: (filters[:provider] == 'local' ? 'list-group-item active': 'list-group-item') do %>
|
11
11
|
<span class='badge pull-right'><%= User.where(provider: nil).count %></span>
|
12
12
|
<%= t '.provider.local' %>
|
13
13
|
<% end %>
|
14
14
|
|
15
|
-
<%= link_to
|
15
|
+
<%= link_to users_path(filters: filters.merge(provider: 'ldap').to_h),
|
16
16
|
class: (filters[:provider] == 'ldap' ? 'list-group-item active': 'list-group-item') do %>
|
17
17
|
<span class='badge pull-right'><%= User.where(provider: :ldap).count %></span>
|
18
18
|
<%= t '.provider.ldap' %>
|
@@ -22,7 +22,7 @@
|
|
22
22
|
<% end %>
|
23
23
|
|
24
24
|
<div class='list-group'>
|
25
|
-
<%= link_to
|
25
|
+
<%= link_to users_path(filters: filters.merge(activity: 'no_login').to_h),
|
26
26
|
class: (filters[:activity] == 'no_login' ? 'list-group-item active': 'list-group-item') do %>
|
27
27
|
<span class='badge pull-right'><%= User.where(sign_in_count: 0).count %></span>
|
28
28
|
<%= t '.activity.no_login' %>
|
@@ -13,12 +13,12 @@
|
|
13
13
|
<% end %>
|
14
14
|
|
15
15
|
<ul class='dropdown-menu' role='menu'>
|
16
|
-
<li><%= link_to t('.new_ldap_user'),
|
17
|
-
<li><%= link_to t('.new_local_user'),
|
16
|
+
<li><%= link_to t('.new_ldap_user'), ldap_search_path %></li>
|
17
|
+
<li><%= link_to t('.new_local_user'), new_user_path %></li>
|
18
18
|
</ul>
|
19
19
|
</div>
|
20
20
|
<% else %>
|
21
|
-
<%= link_to
|
21
|
+
<%= link_to new_user_path, class: 'btn btn-primary pull-right' do %>
|
22
22
|
<%= icon :plus, t('.new_local_user') %>
|
23
23
|
<% end %>
|
24
24
|
<% end %>
|
@@ -11,23 +11,23 @@ SimpleNavigation::Configuration.run do |navigation|
|
|
11
11
|
admin.item :users,
|
12
12
|
{ icon: 'fa fa-fw fa-users',
|
13
13
|
text: I18n.t('chaltron.menu.users')
|
14
|
-
},
|
14
|
+
}, users_path, highlights_on: /\/(users|ldap)(?!\/self_(show|edit|update))/ if can?(:manage, User)
|
15
15
|
admin.item :logs,
|
16
16
|
{ icon: 'fa fa-fw fa-book',
|
17
17
|
text: I18n.t('chaltron.menu.logs')
|
18
|
-
},
|
18
|
+
}, logs_path, highlights_on: /\/logs/ if can?(:read, Log)
|
19
19
|
end if can?(:manage, User) or can?(:read, Log)
|
20
20
|
primary.item :logged, current_user.display_name.html_safe, nil do |user|
|
21
21
|
user.dom_class = 'dropdown-menu-right'
|
22
22
|
user.item :self_edit, { icon: 'fa fa-fw fa-user',
|
23
|
-
text: I18n.t('chaltron.menu.self_show') },
|
23
|
+
text: I18n.t('chaltron.menu.self_show') }, self_show_users_path,
|
24
24
|
highlights_on: /\/self_(show|edit|update)/
|
25
25
|
|
26
26
|
user.item :logout, { icon: 'fa fa-fw fa-sign-out', text: 'Logout' },
|
27
|
-
|
27
|
+
destroy_user_session_path, method: :delete
|
28
28
|
end
|
29
29
|
else
|
30
|
-
primary.item :login, { icon: 'fa fa-fw fa-sign-in', text: 'Login' },
|
30
|
+
primary.item :login, { icon: 'fa fa-fw fa-sign-in', text: 'Login' }, new_user_session_path
|
31
31
|
end
|
32
32
|
end
|
33
33
|
end
|
data/lib/chaltron/version.rb
CHANGED
metadata
CHANGED
@@ -1,14 +1,14 @@
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
2
2
|
name: chaltron
|
3
3
|
version: !ruby/object:Gem::Version
|
4
|
-
version: 0.2.
|
4
|
+
version: 0.2.3
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- vicvega
|
8
8
|
autorequire:
|
9
9
|
bindir: bin
|
10
10
|
cert_chain: []
|
11
|
-
date: 2017-
|
11
|
+
date: 2017-10-03 00:00:00.000000000 Z
|
12
12
|
dependencies:
|
13
13
|
- !ruby/object:Gem::Dependency
|
14
14
|
name: rails
|
@@ -16,14 +16,14 @@ dependencies:
|
|
16
16
|
requirements:
|
17
17
|
- - "~>"
|
18
18
|
- !ruby/object:Gem::Version
|
19
|
-
version: '5.
|
19
|
+
version: '5.0'
|
20
20
|
type: :runtime
|
21
21
|
prerelease: false
|
22
22
|
version_requirements: !ruby/object:Gem::Requirement
|
23
23
|
requirements:
|
24
24
|
- - "~>"
|
25
25
|
- !ruby/object:Gem::Version
|
26
|
-
version: '5.
|
26
|
+
version: '5.0'
|
27
27
|
- !ruby/object:Gem::Dependency
|
28
28
|
name: devise
|
29
29
|
requirement: !ruby/object:Gem::Requirement
|