contour 2.0.0.rc4 → 2.0.0.rc5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9251ecb3b3eadb331ba8b24ebb55eccf56dbb92c
-  data.tar.gz: 096062e8f02184d374926a20e5f3e42024af7ad3
+  metadata.gz: 1293e9a056f02fbc58a5ec497be412a05013855f
+  data.tar.gz: 41252e2002cf3655ef1bfde32d910f67e8bc4d9d
 SHA512:
-  metadata.gz: a4667433609eb78d07623b05dac908a514cd56558538b27f07a1a43456d1be66726c7fb131767a1cac6b3190b2c0d60412343c4732282b6271e8743f1152daf6
-  data.tar.gz: f4378bd341287e32d0719b9babfe1305eb252b7c0772af979f1a0671073b3f4b83436d1e689b10a9c3a0e553e0bbf32e2de127e3c950464ebb7d78f58eb5c173
+  metadata.gz: 3f554e2604833008eb7c164becfdc11eb04bd98a9fea9f9a4094753fe3e85fdbbc4d2a110925782677af22f0ef1c73e5f77e8372acccb37e94a74614e4c7241b
+  data.tar.gz: 32656a3c8d42eae4a6f1c77b4acf5a1e7f3392a25193b606cf37884f8ea404f358f863e377d58edc892d067a563035dec40ce26d23110225e2a4c49842a5f1e7

data/app/assets/javascripts/contour/global.js.coffee

@@ -2,9 +2,9 @@
 @showWaiting = (element_id, text, centered) ->
   element = $(element_id)
   if element && centered
-    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 />')
+    element.html("<div class='spinner-centered'><div class='spinner'>#{text}</div></div>")
   else if element
-    element.html('<img width=\"13\" height=\"13\" src=\"' + root_url + 'assets/contour/ajax-loader.gif\" align=\"absmiddle\" alt=\"...\" />' + text)
+    element.html("<div class='spinner'>#{text}</div>")
 
 @flashMessage = (message, alert_type = 'success', overwrite = true) ->
   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

@@ -14,4 +14,5 @@
  *= require contour/about
  *= require contour/authentication
  *= require contour/errors
+ *= require spinner
 */

data/app/assets/stylesheets/spinner.css.erb

@@ -0,0 +1,14 @@
+.spinner {
+  background-image: url(contour/ajax-loader<%= asset_path('contour/ajax-loader.gif').split('ajax-loader').last %>);
+  padding-left: 20px;
+  height: 16px;
+  background-repeat: no-repeat;
+  line-height: 16px;
+  font-size: 14px;
+  white-space: nowrap;
+}
+
+.spinner-centered {
+  width: 0px;
+  margin: 0 auto;
+}

data/lib/contour/version.rb

@@ -3,7 +3,7 @@ module Contour
     MAJOR = 2
     MINOR = 0
     TINY = 0
-    BUILD = "rc4" # nil, "pre", "rc", "rc2"
+    BUILD = "rc5" # nil, "pre", "rc", "rc2"
 
     STRING = [MAJOR, MINOR, TINY, BUILD].compact.join('.')
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: contour
 version: !ruby/object:Gem::Version
-  version: 2.0.0.rc4
+  version: 2.0.0.rc5
 platform: ruby
 authors:
 - Remo Mueller
@@ -233,6 +233,7 @@ files:
 - app/assets/stylesheets/contour.css
 - app/assets/stylesheets/datepicker.css
 - app/assets/stylesheets/jquery-ui-1.10.0.custom.css
+- app/assets/stylesheets/spinner.css.erb
 - app/assets/stylesheets/timepicker.css
 - app/assets/stylesheets/twitter-bootstrap/bootstrap-scroll-modal.css
 - app/assets/stylesheets/twitter-bootstrap/v2.3.2/bootstrap-responsive.css