parent
be85fde663
commit
5542c9456c
|
@ -7,13 +7,11 @@
|
||||||
.select2-choice {
|
.select2-choice {
|
||||||
background: #fff;
|
background: #fff;
|
||||||
border-color: $input-border;
|
border-color: $input-border;
|
||||||
border-color: $border-white-light;
|
|
||||||
height: 35px;
|
height: 35px;
|
||||||
padding: $gl-vert-padding $gl-btn-padding;
|
padding: $gl-vert-padding $gl-btn-padding;
|
||||||
font-size: $gl-font-size;
|
font-size: $gl-font-size;
|
||||||
line-height: 1.42857143;
|
line-height: 1.42857143;
|
||||||
|
border-radius: $border-radius-base;
|
||||||
@include border-radius($border-radius-default);
|
|
||||||
|
|
||||||
.select2-arrow {
|
.select2-arrow {
|
||||||
background-image: none;
|
background-image: none;
|
||||||
|
@ -199,6 +197,14 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.select2-highlighted {
|
||||||
|
.group-result {
|
||||||
|
.group-path {
|
||||||
|
color: #fff;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
.group-result {
|
.group-result {
|
||||||
.group-image {
|
.group-image {
|
||||||
float: left;
|
float: left;
|
||||||
|
|
|
@ -71,8 +71,8 @@ $gl-avatar-size: 40px;
|
||||||
$error-exclamation-point: #e62958;
|
$error-exclamation-point: #e62958;
|
||||||
$border-radius-default: 2px;
|
$border-radius-default: 2px;
|
||||||
$btn-transparent-color: #8f8f8f;
|
$btn-transparent-color: #8f8f8f;
|
||||||
$ssh-key-icon-color: #8f8f8f;
|
$settings-icon-color: #8f8f8f;
|
||||||
$ssh-key-icon-size: 18px;
|
$settings-icon-size: 18px;
|
||||||
$provider-btn-group-border: #e5e5e5;
|
$provider-btn-group-border: #e5e5e5;
|
||||||
$provider-btn-not-active-color: #4688f1;
|
$provider-btn-not-active-color: #4688f1;
|
||||||
|
|
||||||
|
|
|
@ -18,7 +18,8 @@
|
||||||
}
|
}
|
||||||
|
|
||||||
.account-btn-link,
|
.account-btn-link,
|
||||||
.profile-settings-sidebar a {
|
.profile-settings-sidebar a,
|
||||||
|
.settings-sidebar a {
|
||||||
color: $md-link-color;
|
color: $md-link-color;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -123,12 +124,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.key-icon {
|
|
||||||
color: $ssh-key-icon-color;
|
|
||||||
font-size: $ssh-key-icon-size;
|
|
||||||
line-height: 42px;
|
|
||||||
}
|
|
||||||
|
|
||||||
.key-created-at {
|
.key-created-at {
|
||||||
line-height: 42px;
|
line-height: 42px;
|
||||||
}
|
}
|
||||||
|
@ -180,14 +175,6 @@
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
.profile-settings-message {
|
|
||||||
line-height: 32px;
|
|
||||||
color: $warning-message-color;
|
|
||||||
background-color: $warning-message-bg;
|
|
||||||
border: 1px solid $warning-message-border;
|
|
||||||
border-radius: $border-radius-base;
|
|
||||||
}
|
|
||||||
|
|
||||||
.oauth-applications {
|
.oauth-applications {
|
||||||
form {
|
form {
|
||||||
display: inline-block;
|
display: inline-block;
|
||||||
|
|
|
@ -0,0 +1,14 @@
|
||||||
|
.settings-list-icon {
|
||||||
|
color: $settings-icon-color;
|
||||||
|
font-size: $settings-icon-size;
|
||||||
|
line-height: 42px;
|
||||||
|
}
|
||||||
|
|
||||||
|
.settings-message {
|
||||||
|
padding: 5px;
|
||||||
|
line-height: 1.3;
|
||||||
|
color: $warning-message-color;
|
||||||
|
background-color: $warning-message-bg;
|
||||||
|
border: 1px solid $warning-message-border;
|
||||||
|
border-radius: $border-radius-base;
|
||||||
|
}
|
|
@ -44,7 +44,7 @@
|
||||||
= icon('pencil')
|
= icon('pencil')
|
||||||
= render 'delete_form', application: application, small: true
|
= render 'delete_form', application: application, small: true
|
||||||
- else
|
- else
|
||||||
.profile-settings-message.text-center
|
.settings-message.text-center
|
||||||
You don't have any applications
|
You don't have any applications
|
||||||
.oauth-authorized-applications.prepend-top-20.append-bottom-default
|
.oauth-authorized-applications.prepend-top-20.append-bottom-default
|
||||||
- if user_oauth_applications?
|
- if user_oauth_applications?
|
||||||
|
@ -78,5 +78,5 @@
|
||||||
%td= token.scopes
|
%td= token.scopes
|
||||||
%td= render 'doorkeeper/authorized_applications/delete_form', token: token
|
%td= render 'doorkeeper/authorized_applications/delete_form', token: token
|
||||||
- else
|
- else
|
||||||
.profile-settings-message.text-center
|
.settings-message.text-center
|
||||||
You don't have any authorized applications
|
You don't have any authorized applications
|
||||||
|
|
|
@ -1,6 +1,6 @@
|
||||||
%li.key-list-item
|
%li.key-list-item
|
||||||
.pull-left.append-right-10
|
.pull-left.append-right-10
|
||||||
= icon 'key', class: "key-icon hidden-xs"
|
= icon 'key', class: "settings-list-icon hidden-xs"
|
||||||
.key-list-item-info
|
.key-list-item-info
|
||||||
= link_to path_to_key(key, is_admin), class: "title" do
|
= link_to path_to_key(key, is_admin), class: "title" do
|
||||||
= key.title
|
= key.title
|
||||||
|
|
|
@ -4,7 +4,7 @@
|
||||||
%ul.well-list
|
%ul.well-list
|
||||||
= render partial: 'profiles/keys/key', collection: @keys, locals: { is_admin: is_admin }
|
= render partial: 'profiles/keys/key', collection: @keys, locals: { is_admin: is_admin }
|
||||||
- else
|
- else
|
||||||
%p.profile-settings-message.text-center
|
%p.settings-message.text-center
|
||||||
- if is_admin
|
- if is_admin
|
||||||
There are no SSH keys associated with this account.
|
There are no SSH keys associated with this account.
|
||||||
- else
|
- else
|
||||||
|
|
|
@ -1,41 +1,44 @@
|
||||||
- page_title "Groups"
|
- page_title "Groups"
|
||||||
%h3.page_title Share project with other groups
|
.row.prepend-top-default
|
||||||
%p.light
|
.col-lg-3.settings-sidebar
|
||||||
Projects can be stored in only one group at once. However you can share a project with other groups here.
|
%h4.prepend-top-0
|
||||||
%hr
|
Share project with other groups
|
||||||
- if @group_links.present?
|
%p
|
||||||
.enabled-groups.panel.panel-default
|
Projects can be stored in only one group at once. However you can share a project with other groups here.
|
||||||
.panel-heading
|
.col-lg-9
|
||||||
Already shared with
|
%h5.prepend-top-0
|
||||||
%ul.well-list
|
Set a group to share
|
||||||
- @group_links.each do |group_link|
|
= form_tag namespace_project_group_links_path(@project.namespace, @project), method: :post do
|
||||||
- group = group_link.group
|
|
||||||
%li
|
|
||||||
.pull-right
|
|
||||||
= link_to namespace_project_group_link_path(@project.namespace, @project, group_link), method: :delete, class: 'btn btn-sm' do
|
|
||||||
%i.icon-remove
|
|
||||||
disable sharing
|
|
||||||
= link_to group do
|
|
||||||
%strong
|
|
||||||
%i.icon-folder-open
|
|
||||||
= group.name
|
|
||||||
%br
|
|
||||||
.light up to #{group_link.human_access}
|
|
||||||
|
|
||||||
|
|
||||||
.available-groups
|
|
||||||
%h4
|
|
||||||
Can be shared with
|
|
||||||
%div
|
|
||||||
= form_tag namespace_project_group_links_path(@project.namespace, @project), method: :post, class: 'form-horizontal' do
|
|
||||||
.form-group
|
.form-group
|
||||||
= label_tag :link_group_id, 'Group', class: 'control-label'
|
= label_tag :link_group_id, "Group", class: "label-light"
|
||||||
.col-sm-10
|
= groups_select_tag(:link_group_id, skip_group: @project.group.try(:path))
|
||||||
= groups_select_tag(:link_group_id, skip_group: @project.group.try(:path))
|
|
||||||
.form-group
|
.form-group
|
||||||
= label_tag :link_group_access, 'Max access level', class: 'control-label'
|
= label_tag :link_group_access, "Max access level", class: "label-light"
|
||||||
.col-sm-10
|
= select_tag :link_group_access, options_for_select(ProjectGroupLink.access_options, ProjectGroupLink.default_access), class: "form-control"
|
||||||
= select_tag :link_group_access, options_for_select(ProjectGroupLink.access_options, ProjectGroupLink.default_access), class: "form-control"
|
= submit_tag "Share", class: "btn btn-create"
|
||||||
.form-actions
|
.col-sm-12
|
||||||
= submit_tag "Share", class: "btn btn-create"
|
%hr
|
||||||
|
.col-lg-3.settings-sidebar
|
||||||
|
%h4.prepend-top-0
|
||||||
|
.col-lg-9.append-bottom-default
|
||||||
|
%h5.prepend-top-0
|
||||||
|
Groups you share with (#{@group_links.size})
|
||||||
|
- if @group_links.present?
|
||||||
|
%ul.well-list
|
||||||
|
- @group_links.each do |group_link|
|
||||||
|
- group = group_link.group
|
||||||
|
%li
|
||||||
|
.pull-left.append-right-10.hidden-xs
|
||||||
|
= icon("folder-open-o", class: "settings-list-icon")
|
||||||
|
.pull-left
|
||||||
|
= link_to group do
|
||||||
|
= group.name
|
||||||
|
%br
|
||||||
|
up to #{group_link.human_access}
|
||||||
|
.pull-right
|
||||||
|
= link_to namespace_project_group_link_path(@project.namespace, @project, group_link), method: :delete, class: "btn btn-transparent" do
|
||||||
|
%span.sr-only disable sharing
|
||||||
|
= icon("trash")
|
||||||
|
- else
|
||||||
|
.settings-message.text-center
|
||||||
|
There are no groups with access to your project, add one in the form above
|
||||||
|
|
Loading…
Reference in New Issue