Created shared/visibility_select and merged with feature permissions ui

Fixed up nested padding and added dynamic text js

Added padding and tests

1 files changed, 52 insertions, 59 deletions

diff --git a/app/views/projects/edit.html.haml b/app/views/projects/edit.html.haml
index 38e7fc4279c..16a26f7d066 100644
--- a/app/views/projects/edit.html.haml
+++ b/app/views/projects/edit.html.haml
@@ -21,76 +21,69 @@
             .form-group
               = f.label :default_branch, "Default Branch", class: 'label-light'
               = f.select(:default_branch, @project.repository.branch_names, {}, {class: 'select2 select-wide'})
-        .form-group.project-visibility-level-holder
-          = f.label :visibility_level, class: 'label-light' do
-            Visibility Level
-            = link_to "(?)", help_page_path("public_access/public_access")
-          - if can_change_visibility_level?(@project, current_user)
-            = render('shared/visibility_radios', model_method: :visibility_level, form: f, selected_level: @project.visibility_level, form_model: @project)
-          - else
-            .info
-              = visibility_level_icon(@project.visibility_level)
-              %strong
-                = visibility_level_label(@project.visibility_level)
-              .light= visibility_level_description(@project.visibility_level, @project)
-
-        .form-group
-          = render 'shared/allow_request_access', form: f
-
         .form-group
           = f.label :tag_list, "Tags", class: 'label-light'
           = f.text_field :tag_list, value: @project.tag_list.to_s, maxlength: 2000, class: "form-control"
           %p.help-block Separate tags with commas.
         %hr
-        %fieldset.features.append-bottom-0
+        %fieldset.append-bottom-0
           %h5.prepend-top-0
-            Feature Visibility
-
-          = f.fields_for :project_feature do |feature_fields|
-            .form_group.prepend-top-20
-              .row
-                .col-md-9
-                  = feature_fields.label :repository_access_level, "Repository", class: 'label-light'
-                  %span.help-block Push files to be stored in this project
-                .col-md-3.js-repo-access-level
-                  = project_feature_access_select(:repository_access_level)
-
-                .col-sm-12
-                  .row
-                    .col-md-9.project-feature-nested
-                      = feature_fields.label :merge_requests_access_level, "Merge requests", class: 'label-light'
-                      %span.help-block Submit changes to be merged upstream
-                    .col-md-3
-                      = project_feature_access_select(:merge_requests_access_level)
+            Sharing & Permissions
+          .form_group.prepend-top-20
+            .row.js-visibility-select
+              .col-md-9
+                %label.label-light
+                  = label_tag :project_visibility, 'Project Visibility', class: 'label-light'
+                  = link_to "(?)", help_page_path("public_access/public_access")
+                %span.help-block
+              .col-md-3.visibility-select-container
+                = render('shared/visibility_select', model_method: :visibility_level, form: f, selected_level: @project.visibility_level)
+            = f.fields_for :project_feature do |feature_fields|
+              %fieldset.features
+                .row.project-feature-nested
+                  .col-md-9.header
+                    = feature_fields.label :repository_access_level, "Repository", class: 'label-light'
+                    %span.help-block Push files to be stored in this project
+                  .col-md-3.js-repo-access-level
+                    = project_feature_access_select(:repository_access_level)
 
-                  .row
-                    .col-md-9.project-feature-nested
-                      = feature_fields.label :builds_access_level, "Builds", class: 'label-light'
-                      %span.help-block Submit, test and deploy your changes before merge
-                    .col-md-3
-                      = project_feature_access_select(:builds_access_level)
+                  .col-sm-12
+                    .row.project-feature-nested
+                      .col-md-9.header
+                        = feature_fields.label :merge_requests_access_level, "Merge requests", class: 'label-light'
+                        %span.help-block Submit changes to be merged upstream
+                      .col-md-3
+                        = project_feature_access_select(:merge_requests_access_level)
 
-              .row
-                .col-md-9
-                  = feature_fields.label :snippets_access_level, "Snippets", class: 'label-light'
-                  %span.help-block Share code pastes with others out of Git repository
-                .col-md-3
-                  = project_feature_access_select(:snippets_access_level)
+                    .row.project-feature-nested
+                      .col-md-9.header
+                        = feature_fields.label :builds_access_level, "Builds", class: 'label-light'
+                        %span.help-block Submit, test and deploy your changes before merge
+                      .col-md-3.double-nested
+                        = project_feature_access_select(:builds_access_level)
 
-              .row
-                .col-md-9
-                  = feature_fields.label :issues_access_level, "Issues", class: 'label-light'
-                  %span.help-block Lightweight issue tracking system for this project
-                .col-md-3
-                  = project_feature_access_select(:issues_access_level)
+                    .row
+                      .col-md-9.header
+                        = feature_fields.label :snippets_access_level, "Snippets", class: 'label-light'
+                        %span.help-block Share code pastes with others out of Git repository
+                      .col-md-3
+                        = project_feature_access_select(:snippets_access_level)
 
-              .row
-                .col-md-9
-                  = feature_fields.label :wiki_access_level, "Wiki", class: 'label-light'
-                  %span.help-block Pages for project documentation
-                .col-md-3
-                  = project_feature_access_select(:wiki_access_level)
+                    .row
+                      .col-md-9.header
+                        = feature_fields.label :issues_access_level, "Issues", class: 'label-light'
+                        %span.help-block Lightweight issue tracking system for this project
+                      .col-md-3
+                        = project_feature_access_select(:issues_access_level)
 
+                    .row
+                      .col-md-9.header
+                        = feature_fields.label :wiki_access_level, "Wiki", class: 'label-light'
+                        %span.help-block Pages for project documentation
+                      .col-md-3
+                        = project_feature_access_select(:wiki_access_level)
+          .form-group
+            = render 'shared/allow_request_access', form: f
           - if Gitlab.config.lfs.enabled && current_user.admin?
             .row
               .col-md-9