coalescing_panda 3.1.8 → 3.1.9
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/assets/javascripts/coalescing_panda/canvas_batch.js.coffee +1 -6
- data/app/views/coalescing_panda/canvas_batches/_canvas_batch.html.haml +6 -3
- data/app/views/layouts/coalescing_panda/application.html.erb +3 -1
- data/lib/coalescing_panda/controller_helpers.rb +1 -1
- data/lib/coalescing_panda/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 7ca9411c999343acf354094a8bf331ed37b52a36
|
|
4
|
+
data.tar.gz: 9e2732d89b64b63f0c2a8dbb534e25646016e63c
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 619e0697fb5f824a39393313673b0e64eb3dd52bf5cae70a489a39d41c3646a35d3d4974e442a93f29d85e7df7bea12ce55e3bb404602ce4f1a3a4c660cc8545
|
|
7
|
+
data.tar.gz: a7b1db8b7ea8f3c26ae60f29fb14d13cd23aae9deb324d2d66052ff278aa61eed046bbeb3007ca4c26cfab153bd04fb13c7297c85b7c9e0992b6ee9395497457
|
|
@@ -30,12 +30,7 @@ window.CoalescingPanda.CanvasBatchProgress = class CanvasBatchProgress
|
|
|
30
30
|
url: window.clearPath
|
|
31
31
|
type: 'POST'
|
|
32
32
|
success: (data) ->
|
|
33
|
-
|
|
34
|
-
$('#batch-progress').fadeOut(1000)
|
|
35
|
-
$('#batch-progress').html("")
|
|
36
|
-
$('#batch-progress').show()
|
|
37
|
-
|
|
38
|
-
delay = (ms, func) -> setTimeout func, ms
|
|
33
|
+
# Don't need to anything
|
|
39
34
|
|
|
40
35
|
clearIntervalAndBatch = (data, batch) ->
|
|
41
36
|
clearInterval(window.batchInterval)
|
|
@@ -2,7 +2,9 @@
|
|
|
2
2
|
-if @batch.status == "Queued"
|
|
3
3
|
%h6 Data is queued for download from Canvas.
|
|
4
4
|
-if @batch.status == "Completed"
|
|
5
|
-
|
|
5
|
+
.alert.alert-success
|
|
6
|
+
%button.close{"data-dismiss" => "alert", :type => "button"} ×
|
|
7
|
+
Data successfully downloaded from Canvas.
|
|
6
8
|
|
|
7
9
|
-if @batch.status == "Started"
|
|
8
10
|
%h6 Downloading data from Canvas
|
|
@@ -10,6 +12,7 @@
|
|
|
10
12
|
.bar{:style => "width: #{@batch.percent_complete}%;"}
|
|
11
13
|
|
|
12
14
|
-if @batch.status == "Error"
|
|
13
|
-
|
|
14
|
-
|
|
15
|
+
.alert.alert-block.alert-error
|
|
16
|
+
%button.close{"data-dismiss" => "alert", :type => "button"} ×
|
|
17
|
+
%h6 Data failed to download from Canvas
|
|
15
18
|
= @batch.message
|
|
@@ -30,7 +30,7 @@ module CoalescingPanda
|
|
|
30
30
|
#delete the added params so the original oauth sig still works
|
|
31
31
|
@lti_params.delete('action')
|
|
32
32
|
@lti_params.delete('controller')
|
|
33
|
-
render 'coalescing_panda/oauth2/oauth2'
|
|
33
|
+
render 'coalescing_panda/oauth2/oauth2', layout: 'coalescing_panda/application'
|
|
34
34
|
end
|
|
35
35
|
end
|
|
36
36
|
end
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: coalescing_panda
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 3.1.
|
|
4
|
+
version: 3.1.9
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Nathan Mills
|
|
@@ -10,7 +10,7 @@ authors:
|
|
|
10
10
|
autorequire:
|
|
11
11
|
bindir: bin
|
|
12
12
|
cert_chain: []
|
|
13
|
-
date: 2014-12-
|
|
13
|
+
date: 2014-12-03 00:00:00.000000000 Z
|
|
14
14
|
dependencies:
|
|
15
15
|
- !ruby/object:Gem::Dependency
|
|
16
16
|
name: rails
|