Simplify project page

1 files changed, 33 insertions, 61 deletions

diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index cc41b908946..0934c47a8e2 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -14,24 +14,40 @@
     .col-lg-3.profile-settings-sidebar
       %h4.prepend-top-0
         New project
-      - if import_sources_enabled?
-        %p
-          A project is where you house your files (repository), plan your work (issues), and publish your documentation (wiki), #{link_to 'among other things', help_page_path("user/project/index.md", anchor: "projects-features"), target: '_blank'}.
-        %p
-          All features are enabled when you create a project, but you can disable the ones you don’t need in the project settings.
+      %p
+        A project is where you house your files (repository), plan your work (issues), and publish your documentation (wiki), #{link_to 'among other things', help_page_path("user/project/index.md", anchor: "projects-features"), target: '_blank'}.
+      %p
+        All features are enabled when you create a project, but you can disable the ones you don’t need in the project settings.
     .col-lg-9.js-toggle-container
-      = form_for @project, html: { class: 'new_project' } do |f|
-        .create-project-options
-          .first-column
+      %ul.nav-links.gitlab-tabs{ role: 'tablist' }
+        %li.active{ role: 'presentation' }
+          %a{ href: '#blank-project-pane', id: 'blank-project-tab', data: { toggle: 'tab' }, role: 'tab' }
+            %span.hidden-xs Blank project
+            %span.visible-xs Blank
+        %li{ role: 'presentation' }
+          %a{ href: '#create-from-template-pane', id: 'create-from-template-tab', data: { toggle: 'tab' }, role: 'tab' }
+            %span.hidden-xs Create from template
+            %span.visible-xs Template
+        %li{ role: 'presentation' }
+          %a{ href: '#import-project-pane', id: 'import-project-tab', data: { toggle: 'tab' }, role: 'tab' }
+            %span.hidden-xs Import project
+            %span.visible-xs Import
+
+      .tab-content.gitlab-tab-content
+        .tab-pane.active{ id: 'blank-project-pane', role: 'tabpanel' }
+          = form_for @project, html: { class: 'new_project' } do |f|
+            = render 'new_project_fields', f: f, project_name_id: "blank-project-name"
+
+        .tab-pane.no-padding{ id: 'create-from-template-pane', role: 'tabpanel' }
+          = form_for @project, html: { class: 'new_project' } do |f|
             .project-template
               .form-group
-                = f.label :template_project, class: 'label-light' do
-                  Create from template
-                  = link_to icon('question-circle'), help_page_path("gitlab-basics/create-project"), target: '_blank', aria: { label: "What’s included in a template?" }, title: "What’s included in a template?", class: 'has-tooltip', data: { placement: 'top'}
                 %div
                   = render 'project_templates', f: f
-          - if import_sources_enabled?
-            .second-column
+
+        .tab-pane.import-project-pane{ id: 'import-project-pane', role: 'tabpanel' }
+          = form_for @project, html: { class: 'new_project' } do |f|
+            - if import_sources_enabled?
               .project-import
                 .form-group.clearfix
                   = f.label :visibility_level, class: 'label-light' do #the label here seems wrong
@@ -74,54 +90,10 @@
                       .import_gitlab_project.has-tooltip{ data: { container: 'body' } }
                         = link_to new_import_gitlab_project_path, class: 'btn btn_import_gitlab_project project-submit' do
                           = icon('gitlab', text: 'GitLab export')
-
-        .row
-          .col-lg-12
-            .js-toggle-content.hide
-              %hr
-                = render "shared/import_form", f: f
-        %hr
-
-        .row
-          .form-group.col-xs-12.col-sm-6
-            = f.label :namespace_id, class: 'label-light' do
-              %span
-                Project path
-            .form-group
-              .input-group
-                - if current_user.can_select_namespace?
-                  .input-group-addon
-                    = root_url
-                  = f.select :namespace_id, namespaces_options(namespace_id_from(params) || :current_user, display_path: true, extra_group: namespace_id_from(params)), {}, { class: 'select2 js-select-namespace', tabindex: 1}
-
-                - else
-                  .input-group-addon.static-namespace
-                    #{root_url}#{current_user.username}/
-                  = f.hidden_field :namespace_id, value: current_user.namespace_id
-          .form-group.col-xs-12.col-sm-6.project-path
-            = f.label :path, class: 'label-light' do
-              %span
-                Project name
-            = f.text_field :path, placeholder: "my-awesome-project", class: "form-control", tabindex: 2, autofocus: true, required: true
-        - if current_user.can_create_group?
-          .help-block
-            Want to house several dependent projects under the same namespace?
-            = link_to "Create a group", new_group_path
-
-        .form-group
-          = f.label :description, class: 'label-light' do
-            Project description
-            %span.light (optional)
-          = f.text_area :description, placeholder: 'Description format',  class: "form-control", rows: 3, maxlength: 250
-
-        .form-group.visibility-level-setting
-          = f.label :visibility_level, class: 'label-light' do
-            Visibility Level
-            = link_to icon('question-circle'), help_page_path("public_access/public_access"), aria: { label: 'Documentation for Visibility Level' }
-          = render 'shared/visibility_level', f: f, visibility_level: visibility_level.to_i, can_change_visibility_level: true, form_model: @project, with_label: false
-
-        = f.submit 'Create project', class: "btn btn-create project-submit", tabindex: 4
-        = link_to 'Cancel', dashboard_projects_path, class: 'btn btn-cancel'
+                  .col-lg-12
+                    .js-toggle-content.hide
+                      %hr
+                        = render "shared/import_form", f: f
 
 .save-project-loader.hide
   .center