ecm_user_area2 2.2.0 → 2.3.0
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/helpers/ecm/user_area_helper.rb +4 -2
- data/app/views/ecm/user_area/_navigation.html.haml +1 -1
- data/app/views/ecm/user_area/{_navigation_dropdown.html.haml → navigation_dropdown/_bootstrap3.html.haml} +0 -0
- data/app/views/ecm/user_area/navigation_dropdown/_bootstrap4.html.haml +14 -0
- data/lib/ecm/user_area/version.rb +1 -1
- metadata +4 -3
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 5fd2c1583269f4cd2bb59d30d94946766937d617
|
|
4
|
+
data.tar.gz: 3aaf58f7cfd78353e96e7affb557b573a9a7bda0
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: a969d231bc2d060004ef28269b3172f478019d546c0bedffe75569156171d01a70936af329d598ce310145eb5835b3e640b56417bebda4d4ece5d6f4356d8109
|
|
7
|
+
data.tar.gz: e0ab2531c4685f789b28718084fbfa115bf306f1a657a06123bdedf227735dba27ad6b5965c162e121774dabd6c135b9e0ac6561941f16fb3446f42b9f61c4e6
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
module Ecm::UserAreaHelper
|
|
2
2
|
def render_user_navigation(*args)
|
|
3
3
|
options = args.extract_options!
|
|
4
|
-
options.reverse_merge!(dropdown: false)
|
|
4
|
+
options.reverse_merge!(dropdown: false, bootstrap_version: 3)
|
|
5
5
|
dropdown = options.delete(:dropdown)
|
|
6
|
+
bootstrap_version = options.delete(:bootstrap_version)
|
|
7
|
+
|
|
6
8
|
|
|
7
9
|
if dropdown
|
|
8
|
-
render partial:
|
|
10
|
+
render partial: "ecm/user_area/navigation_dropdown/bootstrap#{bootstrap_version}"
|
|
9
11
|
else
|
|
10
12
|
render partial: 'ecm/user_area/navigation'
|
|
11
13
|
end
|
|
@@ -5,7 +5,7 @@
|
|
|
5
5
|
= t('.not_signed_in')
|
|
6
6
|
%ul.nav.navbar-nav
|
|
7
7
|
- if user_signed_in?
|
|
8
|
-
%li= link_to t('.edit'), ecm_user_area.
|
|
8
|
+
%li= link_to t('.edit'), ecm_user_area.edit_current_user_path
|
|
9
9
|
%li= link_to t('.sign_out'), ecm_user_area.user_session_path, method: :delete
|
|
10
10
|
- else
|
|
11
11
|
%li= link_to t('.sign_in'), ecm_user_area.new_user_session_path
|
|
File without changes
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
%li.nav-item.dropdown
|
|
2
|
+
%a#dropdown02.nav-link.dropdown-toggle{ href: '#', 'data-toggle': 'dropdown', role: 'button', 'aria-has-popup': true, 'aria-expanded': false }
|
|
3
|
+
-if user_signed_in?
|
|
4
|
+
= current_user.email
|
|
5
|
+
- else
|
|
6
|
+
= t('.not_signed_in')
|
|
7
|
+
.dropdown-menu{"aria-labelledby" => "dropdown02"}
|
|
8
|
+
- if user_signed_in?
|
|
9
|
+
= link_to t('.edit'), ecm_user_area.edit_current_user_path, class: 'dropdown-item'
|
|
10
|
+
= link_to t('.sign_out'), ecm_user_area.user_session_path, class: 'dropdown-item', method: :delete
|
|
11
|
+
- else
|
|
12
|
+
= link_to t('.sign_in'), ecm_user_area.new_user_session_path, class: 'dropdown-item'
|
|
13
|
+
- if Ecm::UserArea::Configuration.enable_registrations
|
|
14
|
+
= link_to t('.new'), ecm_user_area.new_current_user_path, class: 'dropdown-item'
|
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: ecm_user_area2
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 2.
|
|
4
|
+
version: 2.3.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Roberto Vasquez Angel
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date:
|
|
11
|
+
date: 2018-01-02 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|
|
@@ -432,7 +432,6 @@ files:
|
|
|
432
432
|
- app/sessions/ecm/user_area/session/base.rb
|
|
433
433
|
- app/sessions/ecm/user_area/user_session.rb
|
|
434
434
|
- app/views/ecm/user_area/_navigation.html.haml
|
|
435
|
-
- app/views/ecm/user_area/_navigation_dropdown.html.haml
|
|
436
435
|
- app/views/ecm/user_area/current_users/_form.html.haml
|
|
437
436
|
- app/views/ecm/user_area/current_users/_form_errors.html.haml
|
|
438
437
|
- app/views/ecm/user_area/current_users/_head_extras.html.haml
|
|
@@ -441,6 +440,8 @@ files:
|
|
|
441
440
|
- app/views/ecm/user_area/current_users/edit.html.haml
|
|
442
441
|
- app/views/ecm/user_area/current_users/new.html.haml
|
|
443
442
|
- app/views/ecm/user_area/current_users/show.html.haml
|
|
443
|
+
- app/views/ecm/user_area/navigation_dropdown/_bootstrap3.html.haml
|
|
444
|
+
- app/views/ecm/user_area/navigation_dropdown/_bootstrap4.html.haml
|
|
444
445
|
- app/views/ecm/user_area/password_reset_requests/base/_form.html.haml
|
|
445
446
|
- app/views/ecm/user_area/password_reset_requests/base/_form_errors.html.haml
|
|
446
447
|
- app/views/ecm/user_area/password_reset_requests/base/_head_extras.html.haml
|