Added loading icon to import buttons

See #14488 for more details
This commit is contained in:
Phil Hughes 2016-04-11 18:27:34 +01:00
parent 4087bd16e8
commit 3cfbd2b160
8 changed files with 119 additions and 38 deletions

View file

@ -4,18 +4,33 @@ class @ImporterStatus
this.setAutoUpdate()
initStatusPage: ->
$(".js-add-to-import").click (event) =>
new_namespace = null
tr = $(event.currentTarget).closest("tr")
id = tr.attr("id").replace("repo_", "")
if tr.find(".import-target input").length > 0
new_namespace = tr.find(".import-target input").prop("value")
tr.find(".import-target").empty().append(new_namespace + "/" + tr.find(".import-target").data("project_name"))
$.post @import_url, {repo_id: id, new_namespace: new_namespace}, dataType: 'script'
$(".js-add-to-import")
.off 'click'
.on 'click', (event) =>
new_namespace = null
$btn = $(event.currentTarget)
$tr = $btn.closest("tr")
id = $tr.attr("id").replace("repo_", "")
if $tr.find(".import-target input").length > 0
new_namespace = $tr.find(".import-target input").prop("value")
$tr.find(".import-target").empty().append(new_namespace + "/" + $tr.find(".import-target").data("project_name"))
$(".js-import-all").click (event) =>
$(".js-add-to-import").each ->
$(this).click()
$btn
.disable()
.addClass 'is-loading'
$.post @import_url, {repo_id: id, new_namespace: new_namespace}, dataType: 'script'
$(".js-import-all")
.off 'click'
.on 'click', (event) =>
$btn = $(event.currentTarget)
$btn
.disable()
.addClass 'is-loading'
$(".js-add-to-import").each ->
$(this).click()
setAutoUpdate: ->
setInterval (=>

View file

@ -16,3 +16,24 @@ i.icon-gitorious-big {
width: 18px;
height: 18px;
}
.import-jobs-from-col,
.import-jobs-to-col {
width: 40%;
}
.import-jobs-status-col {
width: 20%;
}
.btn-import {
.loading-icon {
display: none;
}
&.is-loading {
.loading-icon {
display: inline-block;
}
}
}

View file

@ -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

View file

@ -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}");

View file

@ -8,10 +8,15 @@
Select projects you want to import.
%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 GitHub
@ -23,7 +28,7 @@
%td
= link_to project.import_source, "https://github.com/#{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
@ -42,7 +47,9 @@
%td.import-target
= repo.full_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_github_path}", "#{import_github_path}");

View file

@ -8,10 +8,15 @@
Select projects you want to import.
%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 GitLab.com
@ -23,7 +28,7 @@
%td
= link_to project.import_source, "https://gitlab.com/#{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
@ -42,7 +47,9 @@
%td.import-target
= repo["path_with_namespace"]
%td.import-actions.job-status
= button_tag "Import", class: "btn js-add-to-import"
= button_tag class: "btn js-add-to-import" do
= icon('spinner spin', class: 'loading-icon')
Import
:javascript
new ImporterStatus("#{jobs_import_gitlab_path}", "#{import_gitlab_path}");

View file

@ -8,10 +8,15 @@
Select projects you want to import.
%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 Gitorious.org
@ -23,7 +28,7 @@
%td
= link_to project.import_source, "https://gitorious.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
@ -42,7 +47,9 @@
%td.import-target
= repo.full_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_gitorious_path}", "#{import_gitorious_path}");

View file

@ -14,12 +14,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-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 Google Code
@ -31,7 +38,7 @@
%td
= link_to project.import_source, "https://code.google.com/p/#{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
@ -50,7 +57,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
- @incompatible_repos.each do |repo|
%tr{id: "repo_#{repo.id}"}
%td