Fix CSS for mobile
- Externalize strings - Update PO file
This commit is contained in:
parent
e1c45b4a66
commit
7461c4227a
4 changed files with 32 additions and 20 deletions
|
@ -98,7 +98,7 @@
|
||||||
position: absolute;
|
position: absolute;
|
||||||
right: 4px;
|
right: 4px;
|
||||||
top: 0;
|
top: 0;
|
||||||
height: 35px;
|
height: 33px;
|
||||||
padding-left: 10px;
|
padding-left: 10px;
|
||||||
padding-right: 10px;
|
padding-right: 10px;
|
||||||
color: $gray-darkest;
|
color: $gray-darkest;
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
- page_title "Members"
|
- page_title _("Members")
|
||||||
- can_manage_members = can?(current_user, :admin_group_member, @group)
|
- can_manage_members = can?(current_user, :admin_group_member, @group)
|
||||||
- show_invited_members = can_manage_members && @invited_members.exists?
|
- show_invited_members = can_manage_members && @invited_members.exists?
|
||||||
- total_members = @members.total_count
|
- total_members = @members.total_count
|
||||||
|
@ -7,12 +7,12 @@
|
||||||
|
|
||||||
.project-members-page.prepend-top-default
|
.project-members-page.prepend-top-default
|
||||||
%h4
|
%h4
|
||||||
Members
|
= _("Members")
|
||||||
%hr
|
%hr
|
||||||
- if can_manage_members
|
- if can_manage_members
|
||||||
.project-members-new.append-bottom-default
|
.project-members-new.append-bottom-default
|
||||||
%p.clearfix
|
%p.clearfix
|
||||||
Add new member to
|
= _("Add new member to")
|
||||||
%strong= @group.name
|
%strong= @group.name
|
||||||
= render "new_group_member"
|
= render "new_group_member"
|
||||||
|
|
||||||
|
@ -24,30 +24,30 @@
|
||||||
%li.nav-item
|
%li.nav-item
|
||||||
= link_to "#existing_members", class: ["nav-link", ("active" unless pending_active)] , 'data-toggle' => 'tab' do
|
= link_to "#existing_members", class: ["nav-link", ("active" unless pending_active)] , 'data-toggle' => 'tab' do
|
||||||
%span
|
%span
|
||||||
Existing
|
= _("Existing")
|
||||||
%span.badge.badge-pill= @members.total_count
|
%span.badge.badge-pill= @members.total_count
|
||||||
- if show_invited_members
|
- if show_invited_members
|
||||||
%li.nav-item
|
%li.nav-item
|
||||||
= link_to "#invited_members", class: ["nav-link", ("active" if pending_active)], 'data-toggle' => 'tab' do
|
= link_to "#invited_members", class: ["nav-link", ("active" if pending_active)], 'data-toggle' => 'tab' do
|
||||||
%span
|
%span
|
||||||
Pending
|
= _("Pending")
|
||||||
%span.badge.badge-pill= @invited_members.total_count
|
%span.badge.badge-pill= @invited_members.total_count
|
||||||
|
|
||||||
.tab-content
|
.tab-content
|
||||||
#existing_members.tab-pane{ :class => ("active" unless pending_active) }
|
#existing_members.tab-pane{ :class => ("active" unless pending_active) }
|
||||||
.card.card-without-border
|
.card.card-without-border
|
||||||
.d-flex.flex-column.flex-md-row.row-content-block.second-block
|
.d-flex.flex-column.flex-md-row.row-content-block.second-block
|
||||||
%span.flex-grow-1
|
%span.flex-grow-1.align-self-md-center.col-form-label
|
||||||
Members with access to
|
= _("Members with access to")
|
||||||
%strong= @group.name
|
%strong= @group.name
|
||||||
= form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form flex-project-members-form' do
|
= form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form' do
|
||||||
.form-group
|
.form-group.flex-grow
|
||||||
.position-relative.append-right-8
|
.position-relative.pr-md-2
|
||||||
= search_field_tag :search, params[:search], { placeholder: 'Search', class: 'form-control', spellcheck: false }
|
= search_field_tag :search, params[:search], { placeholder: _('Search'), class: 'form-control', spellcheck: false }
|
||||||
%button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
|
%button.member-search-btn{ type: "submit", "aria-label" => _("Submit search") }
|
||||||
= icon("search")
|
= icon("search")
|
||||||
- if can_manage_members
|
- if can_manage_members
|
||||||
= label_tag '2fa', '2FA', class: 'col-form-label label-bold append-right-8'
|
= label_tag '2fa', '2FA', class: 'col-form-label label-bold pr-md-2'
|
||||||
= render 'shared/members/filter_2fa_dropdown'
|
= render 'shared/members/filter_2fa_dropdown'
|
||||||
= render 'shared/members/sort_dropdown'
|
= render 'shared/members/sort_dropdown'
|
||||||
%ul.content-list.members-list
|
%ul.content-list.members-list
|
||||||
|
@ -59,13 +59,13 @@
|
||||||
.card.card-without-border
|
.card.card-without-border
|
||||||
.d-flex.flex-column.flex-md-row.row-content-block.second-block
|
.d-flex.flex-column.flex-md-row.row-content-block.second-block
|
||||||
%span.flex-grow-1
|
%span.flex-grow-1
|
||||||
Members with pending access to
|
= _("Members with pending access to")
|
||||||
%strong= @group.name
|
%strong= @group.name
|
||||||
= form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form flex-project-members-form' do
|
= form_tag group_group_members_path(@group), method: :get, class: 'form-inline member-search-form' do
|
||||||
.form-group
|
.form-group
|
||||||
.position-relative.append-right-8
|
.position-relative.pr-md-2
|
||||||
= search_field_tag :search_invited, params[:search_invited], { placeholder: 'Search', class: 'form-control', spellcheck: false }
|
= search_field_tag :search_invited, params[:search_invited], { placeholder: _('Search'), class: 'form-control', spellcheck: false }
|
||||||
%button.member-search-btn{ type: "submit", "aria-label" => "Submit search" }
|
%button.member-search-btn{ type: "submit", "aria-label" => _("Submit search") }
|
||||||
= icon("search")
|
= icon("search")
|
||||||
%ul.content-list.members-list
|
%ul.content-list.members-list
|
||||||
= render partial: 'shared/members/member', collection: @invited_members, as: :member
|
= render partial: 'shared/members/member', collection: @invited_members, as: :member
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
- filter = params[:two_factor] || 'everyone'
|
- filter = params[:two_factor] || 'everyone'
|
||||||
- filter_options = { 'everyone' => _('Everyone'), 'enabled' => _('Enabled'), 'disabled' => _('Disabled') }
|
- filter_options = { 'everyone' => _('Everyone'), 'enabled' => _('Enabled'), 'disabled' => _('Disabled') }
|
||||||
.dropdown.inline.member-filter-2fa-dropdown.pr-2
|
.dropdown.inline.member-filter-2fa-dropdown.pr-md-2
|
||||||
= dropdown_toggle(filter_options[filter], { toggle: 'dropdown' })
|
= dropdown_toggle(filter_options[filter], { toggle: 'dropdown' })
|
||||||
%ul.dropdown-menu.dropdown-menu-align-right.dropdown-menu-selectable
|
%ul.dropdown-menu.dropdown-menu-align-right.dropdown-menu-selectable
|
||||||
%li.dropdown-header
|
%li.dropdown-header
|
||||||
|
|
|
@ -708,6 +708,9 @@ msgstr ""
|
||||||
msgid "Add new directory"
|
msgid "Add new directory"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Add new member to"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
msgid "Add or subtract spent time"
|
msgid "Add or subtract spent time"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -4595,6 +4598,9 @@ msgstr ""
|
||||||
msgid "Except policy:"
|
msgid "Except policy:"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Existing"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
msgid "Existing members and groups"
|
msgid "Existing members and groups"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
@ -6571,6 +6577,12 @@ msgstr ""
|
||||||
msgid "Members of <strong>%{project_name}</strong>"
|
msgid "Members of <strong>%{project_name}</strong>"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Members with access to"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
|
msgid "Members with pending access to"
|
||||||
|
msgstr ""
|
||||||
|
|
||||||
msgid "Merge"
|
msgid "Merge"
|
||||||
msgstr ""
|
msgstr ""
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue