kotovalexarian-likes-gitlab
/
gitlab-org--gitlab-foss
1
0
Fork 0
Code Releases Activity

Align permissions options

This commit is contained in:
Annabel Dunstone Gray 2016-11-22 07:51:49 -07:00 committed by Luke "Jared" Bennett
parent 63c3ba7ae0
commit 26b0fe8d2e
No known key found for this signature in database
GPG Key ID: 402ED51FB5D306C2
3 changed files with 49 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/visibility_select.js.es6
View File

@ -3,7 +3,7 @@
const VISIBILITY_DESCRIPTIONS = { const VISIBILITY_DESCRIPTIONS = {
0: 'Project access must be granted explicitly to each user.', 0: 'Project access must be granted explicitly to each user.',
10: 'Project access must be granted explicitly to each user.', 10: 'This project can be cloned by any logged in user.',
20: 'The project can be cloned without any authentication.', 20: 'The project can be cloned without any authentication.',
}; };

36
app/assets/stylesheets/pages/projects.scss
View File

@ -15,29 +15,17 @@
.new_project, .new_project,
.edit-project { .edit-project {
.visibility-select-container { .sharing-and-permissions {
padding-left: 26px; .header {
padding-top: $gl-vert-padding;
@media(max-width: $screen-md-min) {
padding-left: 15px;
} }
}
fieldset { .label-light {
margin-bottom: 0;
}
&.features { .help-block {
margin-top: 0;
.header {
padding-top: $gl-vert-padding;
}
.label-light {
margin-bottom: 0;
}
.help-block {
margin-top: 0;
}
} }
.form-group { .form-group {
@ -876,10 +864,16 @@ pre.light-well {
} }
} }
.project-feature-nested { .project-feature {
@media (min-width: $screen-sm-min) { @media (min-width: $screen-sm-min) {
padding-left: 45px; padding-left: 45px;
} }
&.nested {
@media (min-width: $screen-sm-min) {
padding-left: 90px;
}
}
} }
.project-repo-select { .project-repo-select {

67
app/views/projects/edit.html.haml
View File

@ -29,7 +29,7 @@
%fieldset.append-bottom-0 %fieldset.append-bottom-0
%h5.prepend-top-0 %h5.prepend-top-0
Sharing & Permissions Sharing & Permissions
.form_group.prepend-top-20 .form_group.prepend-top-20.sharing-and-permissions
.row.js-visibility-select .row.js-visibility-select
.col-md-9 .col-md-9
%label.label-light %label.label-light
@ -40,48 +40,47 @@
= render('shared/visibility_select', model_method: :visibility_level, form: f, selected_level: @project.visibility_level) = render('shared/visibility_select', model_method: :visibility_level, form: f, selected_level: @project.visibility_level)
= f.fields_for :project_feature do |feature_fields| = f.fields_for :project_feature do |feature_fields|
%fieldset.features %fieldset.features
.row.project-feature-nested .row
.col-md-9.header .col-md-9.project-feature
= feature_fields.label :repository_access_level, "Repository", class: 'label-light' = feature_fields.label :repository_access_level, "Repository", class: 'label-light'
%span.help-block Push files to be stored in this project %span.help-block Push files to be stored in this project
.col-md-3.js-repo-access-level .col-md-3.js-repo-access-level
= project_feature_access_select(:repository_access_level) = project_feature_access_select(:repository_access_level)
.col-sm-12 .row
.row.project-feature-nested .col-md-9.project-feature.nested
.col-md-9.header = feature_fields.label :merge_requests_access_level, "Merge requests", class: 'label-light'
= feature_fields.label :merge_requests_access_level, "Merge requests", class: 'label-light' %span.help-block Submit changes to be merged upstream
%span.help-block Submit changes to be merged upstream .col-md-3
.col-md-3 = project_feature_access_select(:merge_requests_access_level)
= project_feature_access_select(:merge_requests_access_level)
.row.project-feature-nested .row
.col-md-9.header .col-md-9.project-feature.nested
= feature_fields.label :builds_access_level, "Builds", class: 'label-light' = feature_fields.label :builds_access_level, "Builds", class: 'label-light'
%span.help-block Submit, test and deploy your changes before merge %span.help-block Submit, test and deploy your changes before merge
.col-md-3.double-nested .col-md-3
= project_feature_access_select(:builds_access_level) = project_feature_access_select(:builds_access_level)
.row .row
.col-md-9.header .col-md-9.project-feature
= feature_fields.label :snippets_access_level, "Snippets", class: 'label-light' = feature_fields.label :snippets_access_level, "Snippets", class: 'label-light'
%span.help-block Share code pastes with others out of Git repository %span.help-block Share code pastes with others out of Git repository
.col-md-3 .col-md-3
= project_feature_access_select(:snippets_access_level) = project_feature_access_select(:snippets_access_level)
.row .row
.col-md-9.header .col-md-9.project-feature
= feature_fields.label :issues_access_level, "Issues", class: 'label-light' = feature_fields.label :issues_access_level, "Issues", class: 'label-light'
%span.help-block Lightweight issue tracking system for this project %span.help-block Lightweight issue tracking system for this project
.col-md-3 .col-md-3
= project_feature_access_select(:issues_access_level) = project_feature_access_select(:issues_access_level)
.row .row
.col-md-9.header .col-md-9.project-feature
= feature_fields.label :wiki_access_level, "Wiki", class: 'label-light' = feature_fields.label :wiki_access_level, "Wiki", class: 'label-light'
%span.help-block Pages for project documentation %span.help-block Pages for project documentation
.col-md-3 .col-md-3
= project_feature_access_select(:wiki_access_level) = project_feature_access_select(:wiki_access_level)
.form-group .form-group
= render 'shared/allow_request_access', form: f = render 'shared/allow_request_access', form: f
- if Gitlab.config.lfs.enabled && current_user.admin? - if Gitlab.config.lfs.enabled && current_user.admin?