diff options
| author | Phil Hughes <me@iamphill.com> | 2016-04-11 18:27:34 +0100 |
|---|---|---|
| committer | Phil Hughes <me@iamphill.com> | 2016-04-11 18:27:34 +0100 |
| commit | 3cfbd2b1601842feea0a7739098a90e2d1dccec4 (patch) | |
| tree | 8f58cb309a03fbf4ae33ac9727a700a592ff1613 /app/views/import/bitbucket | |
| parent | 4087bd16e8e083550d306fd0c90d2a892b8577bf (diff) | |
| download | gitlab-ce-3cfbd2b1601842feea0a7739098a90e2d1dccec4.tar.gz | |
Added loading icon to import buttons
See #14488 for more details
Diffstat (limited to 'app/views/import/bitbucket')
| -rw-r--r-- | app/views/import/bitbucket/status.html.haml | 20 |
1 files changed, 14 insertions, 6 deletions
diff --git a/app/views/import/bitbucket/status.html.haml b/app/views/import/bitbucket/status.html.haml index aec2e836c9f..134d88481db 100644 --- a/app/views/import/bitbucket/status.html.haml +++ b/app/views/import/bitbucket/status.html.haml @@ -10,13 +10,19 @@ %hr %p - if @incompatible_repos.any? - = button_tag 'Import all compatible projects', class: "btn btn-success js-import-all" + = button_tag class: "btn btn-import btn-success js-import-all" do + = icon('spinner spin', class: 'loading-icon') + Import all compatible projects - else - = button_tag 'Import all projects', class: "btn btn-success js-import-all" + = button_tag class: "btn btn-success js-import-all" do + = icon('spinner spin', class: 'loading-icon') + Import all projects - -.table-holder +.table-responsive %table.table.import-jobs + %colgroup.import-jobs-from-col + %colgroup.import-jobs-to-col + %colgroup.import-jobs-status-col %thead %tr %th From Bitbucket @@ -28,7 +34,7 @@ %td = link_to project.import_source, "https://bitbucket.org/#{project.import_source}", target: "_blank" %td - %strong= link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project] + = link_to project.path_with_namespace, [project.namespace.becomes(Namespace), project] %td.job-status - if project.import_status == 'finished' %span @@ -47,7 +53,9 @@ %td.import-target = "#{repo["owner"]}/#{repo["slug"]}" %td.import-actions.job-status - = button_tag "Import", class: "btn js-add-to-import" + = button_tag class: "btn btn-import js-add-to-import" do + = icon('spinner spin', class: 'loading-icon') + Import - @incompatible_repos.each do |repo| %tr{id: "repo_#{repo["owner"]}___#{repo["slug"]}"} %td |