1 files changed, 36 insertions, 25 deletions

diff --git a/app/views/projects/new.html.haml b/app/views/projects/new.html.haml
index 9ee54fef062..5d5637c1588 100644
--- a/app/views/projects/new.html.haml
+++ b/app/views/projects/new.html.haml
@@ -9,18 +9,6 @@
           %strong Project name
         .col-sm-10
           = f.text_field :name, placeholder: "Example Project", class: "form-control", tabindex: 1, autofocus: true
-          .help-inline
-            = link_to "#", class: 'js-toggle-visibility-link' do
-              %span Customize repository name?
-
-      .form-group.js-toggle-visibility-container.hide
-        = f.label :path, class: 'control-label' do
-          %span Repository name
-        .col-sm-10
-          .input-group
-            = f.text_field :path, class: 'form-control'
-            %span.input-group-addon .git
-
 
       - if current_user.can_select_namespace?
         .form-group
@@ -29,19 +17,42 @@
           .col-sm-10
             = f.select :namespace_id, namespaces_options(params[:namespace_id] || :current_user), {}, {class: 'select2', tabindex: 2}
 
-      .form-group
-        .col-sm-2
-        .col-sm-10
-          = link_to "#", class: 'appear-link' do
-            %i.icon-upload-alt
-            %span Import existing repository?
-      .form-group.appear-data.import-url-data
-        = f.label :import_url, class: 'control-label' do
-          %span Import existing repo
-        .col-sm-10
-          = f.text_field :import_url, class: 'form-control', placeholder: 'https://github.com/randx/six.git'
-          .light
-            URL must be cloneable
+      %hr
+      .js-toggle-container
+        .form-group
+          .col-sm-2
+          .col-sm-10
+            = link_to "#", class: 'js-toggle-button' do
+              %i.icon-edit
+              %span Customize repository name?
+        .js-toggle-content.hide
+          .form-group
+            = f.label :path, class: 'control-label' do
+              %span Repository name
+            .col-sm-10
+              .input-group
+                = f.text_field :path, class: 'form-control'
+                %span.input-group-addon .git
+
+      .js-toggle-container
+        .form-group
+          .col-sm-2
+          .col-sm-10
+            = link_to "#", class: 'js-toggle-button' do
+              %i.icon-upload-alt
+              %span Import existing repository?
+        .js-toggle-content.hide
+          .form-group.import-url-data
+            = f.label :import_url, class: 'control-label' do
+              %span Import existing repo
+            .col-sm-10
+              = f.text_field :import_url, class: 'form-control', placeholder: 'https://github.com/randx/six.git'
+              .bs-callout.bs-callout-info
+                This url must be publicly accessible or you can add a username and password like this: https://username:password@gitlab.com/company/project.git.
+                %br
+                The import will time out after 2 minutes. For big repositories, use a clone/push combination.
+      %hr
+
       .form-group
         = f.label :description, class: 'control-label' do
           Description