diff options
| author | Stan Hu <stanhu@gmail.com> | 2019-05-25 02:47:43 +0300 |
|---|---|---|
| committer | George Tsiolis <tsiolis.g@gmail.com> | 2019-08-05 11:21:41 +0300 |
| commit | 1b718d40f88d73108b34ef0fca20211183fdfdd1 (patch) | |
| tree | 9b9339e15262b25797d4d30ded8e586e0f36be2a /app/views/shared/members | |
| parent | e8b4dbadc53b136d3a83f64c6862b5c884ea74bc (diff) | |
Minor UX tweaks based on feedback
Show the pending page if user searches for an invited user.
Remove the sort in the pending page to avoid confusion.
Diffstat (limited to 'app/views/shared/members')
| -rw-r--r-- | app/views/shared/members/_filter_2fa_dropdown.html.haml | 2 | ||||
| -rw-r--r-- | app/views/shared/members/_sort_dropdown.html.haml | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/app/views/shared/members/_filter_2fa_dropdown.html.haml b/app/views/shared/members/_filter_2fa_dropdown.html.haml index 3e98587aeaa..a2bc5e9ecdf 100644 --- a/app/views/shared/members/_filter_2fa_dropdown.html.haml +++ b/app/views/shared/members/_filter_2fa_dropdown.html.haml @@ -1,7 +1,7 @@ - filter = params[:two_factor] || 'everyone' - filter_options = { 'everyone' => _('Everyone'), 'enabled' => _('Enabled'), 'disabled' => _('Disabled') } .dropdown.inline.member-filter-2fa-dropdown - = dropdown_toggle('2FA: ' + filter_options[filter], { toggle: 'dropdown' }) + = dropdown_toggle(filter_options[filter], { toggle: 'dropdown' }) %ul.dropdown-menu.dropdown-menu-align-right.dropdown-menu-selectable %li.dropdown-header = _("Filter by two-factor authentication") diff --git a/app/views/shared/members/_sort_dropdown.html.haml b/app/views/shared/members/_sort_dropdown.html.haml index 59bdfb73e6e..5b792e989f0 100644 --- a/app/views/shared/members/_sort_dropdown.html.haml +++ b/app/views/shared/members/_sort_dropdown.html.haml @@ -1,3 +1,4 @@ += label_tag :sort_by, 'Sort by', class: 'col-form-label label-bold pl-4 pr-2' .dropdown.inline.member-sort-dropdown = dropdown_toggle(member_sort_options_hash[@sort], { toggle: 'dropdown' }) %ul.dropdown-menu.dropdown-menu-right.dropdown-menu-selectable |