diff options
author | Phil Hughes <me@iamphill.com> | 2016-04-11 20:27:34 +0300 |
---|---|---|
committer | Phil Hughes <me@iamphill.com> | 2016-04-11 20:27:34 +0300 |
commit | 3cfbd2b1601842feea0a7739098a90e2d1dccec4 (patch) | |
tree | 8f58cb309a03fbf4ae33ac9727a700a592ff1613 /app/views/import/fogbugz | |
parent | 4087bd16e8e083550d306fd0c90d2a892b8577bf (diff) |
Added loading icon to import buttons
See #14488 for more details
Diffstat (limited to 'app/views/import/fogbugz')
-rw-r--r-- | app/views/import/fogbugz/status.html.haml | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/app/views/import/fogbugz/status.html.haml b/app/views/import/fogbugz/status.html.haml index 6ee16c8be4b..f5966fac65b 100644 --- a/app/views/import/fogbugz/status.html.haml +++ b/app/views/import/fogbugz/status.html.haml @@ -13,10 +13,15 @@ how FogBugz email addresses and usernames are imported into GitLab. %hr %p - = button_tag 'Import all 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 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 FogBugz @@ -28,7 +33,7 @@ %td = project.import_source %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 +52,9 @@ %td.import-target = "#{current_user.username}/#{repo.name}" %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 :javascript new ImporterStatus("#{jobs_import_fogbugz_path}", "#{import_fogbugz_path}"); |