contour 2.0.0.rc4 → 2.0.0.rc5

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. checksums.yaml +4 -4
  2. data/app/assets/javascripts/contour/global.js.coffee +2 -2
  3. data/app/assets/stylesheets/contour.css +1 -0
  4. data/app/assets/stylesheets/spinner.css.erb +14 -0
  5. data/lib/contour/version.rb +1 -1
  6. metadata +2 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 9251ecb3b3eadb331ba8b24ebb55eccf56dbb92c
4
- data.tar.gz: 096062e8f02184d374926a20e5f3e42024af7ad3
3
+ metadata.gz: 1293e9a056f02fbc58a5ec497be412a05013855f
4
+ data.tar.gz: 41252e2002cf3655ef1bfde32d910f67e8bc4d9d
5
5
  SHA512:
6
- metadata.gz: a4667433609eb78d07623b05dac908a514cd56558538b27f07a1a43456d1be66726c7fb131767a1cac6b3190b2c0d60412343c4732282b6271e8743f1152daf6
7
- data.tar.gz: f4378bd341287e32d0719b9babfe1305eb252b7c0772af979f1a0671073b3f4b83436d1e689b10a9c3a0e553e0bbf32e2de127e3c950464ebb7d78f58eb5c173
6
+ metadata.gz: 3f554e2604833008eb7c164becfdc11eb04bd98a9fea9f9a4094753fe3e85fdbbc4d2a110925782677af22f0ef1c73e5f77e8372acccb37e94a74614e4c7241b
7
+ data.tar.gz: 32656a3c8d42eae4a6f1c77b4acf5a1e7f3392a25193b606cf37884f8ea404f358f863e377d58edc892d067a563035dec40ce26d23110225e2a4c49842a5f1e7
data/app/assets/javascripts/contour/global.js.coffee CHANGED
@@ -2,9 +2,9 @@
2
2
  @showWaiting = (element_id, text, centered) ->
3
3
  element = $(element_id)
4
4
  if element && centered
5
- element.html('<br /><div class=\"center\"><img width=\"13\" height=\"13\" src=\"' + root_url + 'assets/contour/ajax-loader.gif\" align=\"absmiddle\" alt=\"...\" />' + text + '</div><br />')
5
+ element.html("<div class='spinner-centered'><div class='spinner'>#{text}</div></div>")
6
6
  else if element
7
- element.html('<img width=\"13\" height=\"13\" src=\"' + root_url + 'assets/contour/ajax-loader.gif\" align=\"absmiddle\" alt=\"...\" />' + text)
7
+ element.html("<div class='spinner'>#{text}</div>")
8
8
 
9
9
  @flashMessage = (message, alert_type = 'success', overwrite = true) ->
10
10
  div_block = "<div class='navbar-alert alert alert-#{alert_type}'><button type='button' class='close' data-dismiss='alert'>×</button>#{message}</div>"
data/app/assets/stylesheets/contour.css CHANGED
@@ -14,4 +14,5 @@
14
14
  *= require contour/about
15
15
  *= require contour/authentication
16
16
  *= require contour/errors
17
+ *= require spinner
17
18
  */
data/app/assets/stylesheets/spinner.css.erb ADDED
@@ -0,0 +1,14 @@
1
+ .spinner {
2
+ background-image: url(contour/ajax-loader<%= asset_path('contour/ajax-loader.gif').split('ajax-loader').last %>);
3
+ padding-left: 20px;
4
+ height: 16px;
5
+ background-repeat: no-repeat;
6
+ line-height: 16px;
7
+ font-size: 14px;
8
+ white-space: nowrap;
9
+ }
10
+
11
+ .spinner-centered {
12
+ width: 0px;
13
+ margin: 0 auto;
14
+ }
data/lib/contour/version.rb CHANGED
@@ -3,7 +3,7 @@ module Contour
3
3
  MAJOR = 2
4
4
  MINOR = 0
5
5
  TINY = 0
6
- BUILD = "rc4" # nil, "pre", "rc", "rc2"
6
+ BUILD = "rc5" # nil, "pre", "rc", "rc2"
7
7
 
8
8
  STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
9
9
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: contour
3
3
  version: !ruby/object:Gem::Version
4
- version: 2.0.0.rc4
4
+ version: 2.0.0.rc5
5
5
  platform: ruby
6
6
  authors:
7
7
  - Remo Mueller
@@ -233,6 +233,7 @@ files:
233
233
  - app/assets/stylesheets/contour.css
234
234
  - app/assets/stylesheets/datepicker.css
235
235
  - app/assets/stylesheets/jquery-ui-1.10.0.custom.css
236
+ - app/assets/stylesheets/spinner.css.erb
236
237
  - app/assets/stylesheets/timepicker.css
237
238
  - app/assets/stylesheets/twitter-bootstrap/bootstrap-scroll-modal.css
238
239
  - app/assets/stylesheets/twitter-bootstrap/v2.3.2/bootstrap-responsive.css