Improve manifest feature frontend after review

Signed-off-by: Dmitriy Zaporozhets <dmitriy.zaporozhets@gmail.com>

3 files changed, 26 insertions, 21 deletions

diff --git a/app/views/import/manifest/_form.html.haml b/app/views/import/manifest/_form.html.haml
index 5fdc97537fe..6c938255e65 100644
--- a/app/views/import/manifest/_form.html.haml
+++ b/app/views/import/manifest/_form.html.haml
@@ -18,5 +18,5 @@
       = _('Choose the top-level group for your repository imports.')
 
   .append-bottom-10
-    = submit_tag 'List available repositories', class: 'btn btn-success'
-    = link_to 'Cancel', new_project_path, class: 'btn btn-cancel'
+    = submit_tag _('List available repositories'), class: 'btn btn-success'
+    = link_to _('Cancel'), new_project_path, class: 'btn btn-cancel'
diff --git a/app/views/import/manifest/status.html.haml b/app/views/import/manifest/status.html.haml
index 653dc249182..c8065d90103 100644
--- a/app/views/import/manifest/status.html.haml
+++ b/app/views/import/manifest/status.html.haml
@@ -12,9 +12,6 @@
 
 .table-responsive
   %table.table.import-jobs
-    %colgroup.import-jobs-from-col
-    %colgroup.import-jobs-to-col
-    %colgroup.import-jobs-status-col
     %thead
       %tr
         %th= _('Repository URL')
diff --git a/app/views/projects/_import_project_pane.html.haml b/app/views/projects/_import_project_pane.html.haml
index cfbaebec876..3da6db08580 100644
--- a/app/views/projects/_import_project_pane.html.haml
+++ b/app/views/projects/_import_project_pane.html.haml
@@ -9,41 +9,49 @@
         .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')
-      %div
-        - if github_import_enabled?
+
+      - if github_import_enabled?
+        %div
           = link_to new_import_github_path, class: 'btn js-import-github' do
             = icon('github', text: 'GitHub')
-      %div
-        - if bitbucket_import_enabled?
+
+      - if bitbucket_import_enabled?
+        %div
           = link_to status_import_bitbucket_path, class: "btn import_bitbucket #{'how_to_import_link' unless bitbucket_import_configured?}" do
             = icon('bitbucket', text: 'Bitbucket')
           - unless bitbucket_import_configured?
             = render 'bitbucket_import_modal'
-      %div
-        - if gitlab_import_enabled?
+
+      - if gitlab_import_enabled?
+        %div
           = link_to status_import_gitlab_path, class: "btn import_gitlab #{'how_to_import_link' unless gitlab_import_configured?}" do
             = icon('gitlab', text: 'GitLab.com')
           - unless gitlab_import_configured?
             = render 'gitlab_import_modal'
-      %div
-        - if google_code_import_enabled?
+
+      - if google_code_import_enabled?
+        %div
           = link_to new_import_google_code_path, class: 'btn import_google_code' do
             = icon('google', text: 'Google Code')
-      %div
-        - if fogbugz_import_enabled?
+
+      - if fogbugz_import_enabled?
+        %div
           = link_to new_import_fogbugz_path, class: 'btn import_fogbugz' do
             = icon('bug', text: 'Fogbugz')
-      %div
-        - if gitea_import_enabled?
+
+      - if gitea_import_enabled?
+        %div
           = link_to new_import_gitea_path, class: 'btn import_gitea' do
             = custom_icon('go_logo')
             Gitea
-      %div
-        - if git_import_enabled?
+
+      - if git_import_enabled?
+        %div
           %button.btn.js-toggle-button.js-import-git-toggle-button{ type: "button", data: { toggle_open_class: 'active' } }
             = icon('git', text: 'Repo by URL')
-      %div
-        - if manifest_import_enabled?
+
+      - if manifest_import_enabled?
+        %div
           = link_to new_import_manifest_path, class: 'btn import_manifest' do
             = icon('file-text-o', text: 'Manifest file')