contour 2.6.0.beta1 → 2.6.0.beta2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 173ab00eaf27734a91193fbe0c7a1d4a0c38f340
-  data.tar.gz: f6ce37179d53f657e2e3a4b392b4fe9c82662bc6
+  metadata.gz: 46d44025def303c6df4d4e275fa63e98739334c0
+  data.tar.gz: 4a1487b5f2562c6f0f7def1796a0a3500cbd9731
 SHA512:
-  metadata.gz: d5729612074a1713cc37f5f3cfad22daf9dc62e882bcdc59f3b76dbfb42e1cd42b8ba4063011e95d6c1a9db48df00cd2c5c964c37eeb8ab9a16d6053995d6cf3
-  data.tar.gz: 47fb5d6edd3018c3970e89c8d288faa12546bb635bf0e4359fb17645dd02e57c812273e1511f7160b6e0b443a75bdbb6d237efb477bae51a09b6f7b82f73588c
+  metadata.gz: 9a1dfa5ebd05c7d899d304b9f3ebaa1a8ec8cd4b1625fc9d3c2f31a0c4781da1374a523c76f5cbe7eae2d6e65532e0d0a3625fc83e2b9003c0755ba7517d2956
+  data.tar.gz: 8de697ec73ad5cff0338163a0b79b37217f23a6e95b67fdd88f5ee19a5569ad99d6f6424188050473c75d1fe19f20d7cfa95b009178248a585cb3344a8d79222

data/CHANGELOG.md

@@ -1,5 +1,8 @@
 ## 2.6.0
 
+### Breaking Changes
+- Removed the `showWaiting` JavaScript function and corresponding `ajax-loader.gif` image
+
 ### Enhancements
 - Simplified inclusion of Bootstrap using `bootstrap-sass`
   - This allows the app to be themed by including all or parts of a modified `variables.scss` in the application's `application.css.scss` file

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

@@ -1,11 +1,4 @@
 # Global functions referenced from HTML
-@showWaiting = (element_id, text, centered) ->
-  element = $(element_id)
-  if element && centered
-    element.html("<div class='spinner-centered'><div class='spinner'>#{text}</div></div>")
-  else if element
-    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'>&times;</button>#{message}</div>"
   flash_container = $('[data-object~="flash-container"]')

data/app/assets/stylesheets/bootstrap/{bs-callout.css → bs-callout.scss}

@@ -1,25 +1,30 @@
 /* Base styles (regardless of theme) */
+
 .bs-callout {
   margin: 20px 0;
   padding: 15px 30px 15px 15px;
   border-left: 5px solid #eee;
 }
+
 .bs-callout h4 {
   margin-top: 0;
   font-weight: 500;
 }
+
 .bs-callout p:last-child {
   margin-bottom: 0;
 }
+
 .bs-callout code,
 .bs-callout .highlight {
   background-color: #fff;
 }
 
 /* Themes for different contexts */
+
 .bs-callout-danger {
   background-color: #fcf2f2;
-  border-color: #dFb5b4;
+  border-color: #dfb5b4;
 }
 .bs-callout-warning {
   background-color: #fefbed;

data/app/assets/stylesheets/contour.scss

@@ -0,0 +1,9 @@
+@import 'bootstrap-sprockets';
+@import 'bootstrap';
+
+@import 'bootstrap/bs-callout';
+@import 'bootstrap-overrides';
+@import 'typeahead.js-bootstrap';
+@import 'jquery-ui-1.10.0.custom';
+@import 'datepicker';
+@import 'contour/about';

data/lib/contour/version.rb

@@ -3,7 +3,7 @@ module Contour
     MAJOR = 2
     MINOR = 6
     TINY = 0
-    BUILD = "beta1" # nil, "pre", "rc", "rc2"
+    BUILD = "beta2" # 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.6.0.beta1
+  version: 2.6.0.beta2
 platform: ruby
 authors:
 - Remo Mueller
@@ -174,7 +174,6 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- app/assets/images/contour/ajax-loader.gif
 - app/assets/images/contour/cas_32.png
 - app/assets/images/contour/cas_64.png
 - app/assets/images/contour/facebook_32.png
@@ -209,14 +208,13 @@ files:
 - app/assets/javascripts/external/bootstrap-datepicker.js
 - app/assets/javascripts/external/jquery-ui-1.10.0.custom.min.js
 - app/assets/javascripts/external/typeahead.js
-- app/assets/stylesheets/bootstrap-overrides.css
-- app/assets/stylesheets/bootstrap/bs-callout.css
-- app/assets/stylesheets/contour.css.scss
-- app/assets/stylesheets/contour/about.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/typeahead.js-bootstrap.css
+- app/assets/stylesheets/bootstrap-overrides.scss
+- app/assets/stylesheets/bootstrap/bs-callout.scss
+- app/assets/stylesheets/contour.scss
+- app/assets/stylesheets/contour/about.scss
+- app/assets/stylesheets/datepicker.scss
+- app/assets/stylesheets/jquery-ui-1.10.0.custom.scss
+- app/assets/stylesheets/typeahead.js-bootstrap.scss
 - app/controllers/contour/authentications_controller.rb
 - app/controllers/contour/confirmations_controller.rb
 - app/controllers/contour/passwords_controller.rb

data/app/assets/stylesheets/contour.css.scss

@@ -1,10 +0,0 @@
-@import 'bootstrap-sprockets';
-@import 'bootstrap';
-
-@import 'bootstrap/bs-callout.css';
-@import 'bootstrap-overrides.css';
-@import 'typeahead.js-bootstrap.css';
-@import 'jquery-ui-1.10.0.custom.css';
-@import 'datepicker.css';
-@import 'contour/about.css';
-@import 'spinner.css';

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

@@ -1,14 +0,0 @@
-.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;
-}