contour 1.0.0.beta9 → 1.0.0.beta10

data/app/assets/javascripts/contour.js

@@ -4,10 +4,11 @@
 //= require jquery
 //= require jquery_ujs
 //= require twitter-bootstrap/v2.0.3/bootstrap
-//= require twitter-bootstrap/bootstrap-collapse.js
-//= require twitter-bootstrap/bootstrap-dropdown.js
-//= require twitter-bootstrap/bootstrap-modal.js
-//= require twitter-bootstrap/bootstrap-tab.js
+//= require twitter-bootstrap/bootstrap-collapse
+//= require twitter-bootstrap/bootstrap-dropdown
+//= require twitter-bootstrap/bootstrap-modal
+//= require twitter-bootstrap/bootstrap-tab
+//= require twitter-bootstrap/bootstrap-scroll-modal
 //= require twitter-bootstrap/bootstrap
 //= require external/highcharts-2.1.9.src.js
 //= require external/exporting-2.1.9.src.js

data/app/assets/javascripts/twitter-bootstrap/bootstrap-collapse.js

@@ -154,4 +154,4 @@
     })
   })
 
-}(window.jQuery);
+}(window.jQuery);

data/app/assets/javascripts/twitter-bootstrap/bootstrap-dropdown.js

@@ -1,5 +1,5 @@
 /* ============================================================
- * bootstrap-dropdown.js v2.0.2
+ * bootstrap-dropdown.js v2.0.3
  * http://twitter.github.com/bootstrap/javascript.html#dropdowns
  * ============================================================
  * Copyright 2012 Twitter, Inc.
@@ -18,15 +18,16 @@
  * ============================================================ */
 
 
-!function( $ ){
+!function ($) {
+
+  "use strict"; // jshint ;_;
 
-  "use strict"
 
  /* DROPDOWN CLASS DEFINITION
   * ========================= */
 
   var toggle = '[data-toggle="dropdown"]'
-    , Dropdown = function ( element ) {
+    , Dropdown = function (element) {
         var $el = $(element).on('click.dropdown.data-api', this.toggle)
         $('html').on('click.dropdown.data-api', function () {
           $el.parent().removeClass('open')
@@ -37,12 +38,16 @@
 
     constructor: Dropdown
 
-  , toggle: function ( e ) {
+  , toggle: function (e) {
       var $this = $(this)
-        , selector = $this.attr('data-target')
         , $parent
+        , selector
         , isActive
 
+      if ($this.is('.disabled, :disabled')) return
+
+      selector = $this.attr('data-target')
+
       if (!selector) {
         selector = $this.attr('href')
         selector = selector && selector.replace(/.*(?=#[^\s]*$)/, '') //strip for ie7
@@ -54,7 +59,8 @@
       isActive = $parent.hasClass('open')
 
       clearMenus()
-      !isActive && $parent.toggleClass('open')
+
+      if (!isActive) $parent.toggleClass('open')
 
       return false
     }
@@ -69,7 +75,7 @@
   /* DROPDOWN PLUGIN DEFINITION
    * ========================== */
 
-  $.fn.dropdown = function ( option ) {
+  $.fn.dropdown = function (option) {
     return this.each(function () {
       var $this = $(this)
         , data = $this.data('dropdown')
@@ -86,7 +92,9 @@
 
   $(function () {
     $('html').on('click.dropdown.data-api', clearMenus)
-    $('body').on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
+    $('body')
+      .on('click.dropdown', '.dropdown form', function (e) { e.stopPropagation() })
+      .on('click.dropdown.data-api', toggle, Dropdown.prototype.toggle)
   })
 
-}( window.jQuery );
+}(window.jQuery);

data/app/assets/javascripts/twitter-bootstrap/bootstrap-modal.js

@@ -1,5 +1,5 @@
 /* =========================================================
- * bootstrap-modal.js v2.0.2
+ * bootstrap-modal.js v2.0.3
  * http://twitter.github.com/bootstrap/javascript.html#modals
  * =========================================================
  * Copyright 2012 Twitter, Inc.
@@ -18,14 +18,15 @@
  * ========================================================= */
 
 
-!function( $ ){
+!function ($) {
+
+  "use strict"; // jshint ;_;
 
-  "use strict"
 
  /* MODAL CLASS DEFINITION
   * ====================== */
 
-  var Modal = function ( content, options ) {
+  var Modal = function (content, options) {
     this.options = options
     this.$element = $(content)
       .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
@@ -41,19 +42,23 @@
 
     , show: function () {
         var that = this
+          , e = $.Event('show')
+
+        this.$element.trigger(e)
 
-        if (this.isShown) return
+        if (this.isShown || e.isDefaultPrevented()) return
 
         $('body').addClass('modal-open')
 
         this.isShown = true
-        this.$element.trigger('show')
 
         escape.call(this)
         backdrop.call(this, function () {
           var transition = $.support.transition && that.$element.hasClass('fade')
 
-          !that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position
+          if (!that.$element.parent().length) {
+            that.$element.appendTo(document.body) //don't move modals dom position
+          }
 
           that.$element
             .show()
@@ -71,21 +76,24 @@
         })
       }
 
-    , hide: function ( e ) {
+    , hide: function (e) {
         e && e.preventDefault()
 
-        if (!this.isShown) return
-
         var that = this
+
+        e = $.Event('hide')
+
+        this.$element.trigger(e)
+
+        if (!this.isShown || e.isDefaultPrevented()) return
+
         this.isShown = false
 
         $('body').removeClass('modal-open')
 
         escape.call(this)
 
-        this.$element
-          .trigger('hide')
-          .removeClass('in')
+        this.$element.removeClass('in')
 
         $.support.transition && this.$element.hasClass('fade') ?
           hideWithTransition.call(this) :
@@ -111,7 +119,7 @@
     })
   }
 
-  function hideModal( that ) {
+  function hideModal(that) {
     this.$element
       .hide()
       .trigger('hidden')
@@ -119,7 +127,7 @@
     backdrop.call(this)
   }
 
-  function backdrop( callback ) {
+  function backdrop(callback) {
     var that = this
       , animate = this.$element.hasClass('fade') ? 'fade' : ''
 
@@ -173,7 +181,7 @@
  /* MODAL PLUGIN DEFINITION
   * ======================= */
 
-  $.fn.modal = function ( option ) {
+  $.fn.modal = function (option) {
     return this.each(function () {
       var $this = $(this)
         , data = $this.data('modal')
@@ -207,4 +215,4 @@
     })
   })
 
-}( window.jQuery );
+}(window.jQuery);

data/app/assets/javascripts/twitter-bootstrap/bootstrap-scroll-modal.js

@@ -0,0 +1,234 @@
+/*!
+ * Bootstrap Scroll Modal
+ * Version: 1.0
+ * Made for your convenience by @theericanderson
+ * A variaton of but a small piece of the insanely awesome Twitter Bootstrap (http://twitter.github.com/bootstrap)
+ */
+
+/* =========================================================
+ * bootstrap-modal.js v2.0.2
+ * http://twitter.github.com/bootstrap/javascript.html#modals
+ * =========================================================
+ * Copyright 2012 Twitter, Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * ========================================================= */
+
+
+!function( $ ){
+
+  "use strict"
+
+ /* MODAL CLASS DEFINITION
+  * ====================== */
+
+  var Modal = function ( content, options ) {
+    this.options = options
+    this.$element = $(content)
+  }
+
+  Modal.prototype = {
+
+      constructor: Modal
+
+    , toggle: function () {
+        return this[!this.isShown ? 'show' : 'hide']()
+      }
+
+    , show: function () {
+        var that = this
+
+        if (this.isShown) return
+
+        $('body').addClass('modal-open')
+
+        this.isShown = true
+        this.$element.trigger('show')
+
+        escape.call(this)
+        backdrop.call(this, function () {
+          var transition = $.support.transition && that.$element.hasClass('fade')
+
+          !that.$element.parent().length && that.$element.appendTo(document.body) //don't move modals dom position
+
+          that.$element
+            .show()
+
+          if (transition) {
+            that.$element[0].offsetWidth // force reflow
+          }
+
+          that.$element.addClass('in')
+
+          transition ?
+            that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) :
+            that.$element.trigger('shown')
+
+        })
+      }
+
+    , hide: function ( e ) {
+        e && e.preventDefault()
+
+        if (!this.isShown) return
+
+        var that = this
+        this.isShown = false
+
+        $('body').removeClass('modal-open')
+
+        escape.call(this)
+
+        this.$element
+          .trigger('hide')
+          .removeClass('in')
+
+        $.support.transition && this.$element.hasClass('fade') ?
+          hideWithTransition.call(this) :
+          hideModal.call(this)
+      }
+
+  }
+
+
+ /* MODAL PRIVATE METHODS
+  * ===================== */
+
+  function hideWithTransition() {
+    var that = this
+      , timeout = setTimeout(function () {
+          that.$element.off($.support.transition.end)
+          hideModal.call(that)
+        }, 500)
+
+    this.$element.one($.support.transition.end, function () {
+      clearTimeout(timeout)
+      hideModal.call(that)
+    })
+  }
+
+  function hideModal( that ) {
+    this.$element
+      .hide()
+      .trigger('hidden')
+
+    backdrop.call(this)
+  }
+
+  function backdrop( callback ) {
+    var that = this
+      , animate = this.$element.hasClass('fade') ? 'fade' : ''
+
+    if (this.isShown && this.options.backdrop) {
+      var doAnimate = $.support.transition && animate
+
+      this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
+        .insertBefore(this.$element)
+
+      if (this.options.dynamic) {
+        this.$elementWrapper = $('<div class="modal-wrapper" />')
+          .prependTo(this.$backdrop)
+          .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
+        this.$element.prependTo(this.$elementWrapper)    
+      } else {
+        this.$element.prependTo(this.$backdrop)
+        .delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
+      }
+
+      $('html').css({ 'overflow' : 'hidden'  })
+
+      if (this.options.backdrop != 'static') {
+        this.$backdrop.on('click', function(e){
+          if (e.target == e.delegateTarget) {
+            that.hide(e)
+          }
+        })
+      }
+
+      if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
+
+      this.$backdrop.addClass('in')
+
+      doAnimate ?
+        this.$backdrop.one($.support.transition.end, callback) :
+        callback()
+
+    } else if (!this.isShown && this.$backdrop) {
+      this.$backdrop.removeClass('in')
+
+      $.support.transition && this.$element.hasClass('fade')?
+        this.$backdrop.one($.support.transition.end, $.proxy(removeBackdrop, this)) :
+        removeBackdrop.call(this)
+
+    } else if (callback) {
+      callback()
+    }
+  }
+
+  function removeBackdrop() {
+    this.$element.insertAfter(this.$backdrop)
+    this.$backdrop.remove()
+    this.$backdrop = null
+    $('html').css({ 'overflow' : 'auto'  })
+  }
+
+  function escape() {
+    var that = this
+    if (this.isShown && this.options.keyboard) {
+      $(document).on('keyup.dismiss.modal', function ( e ) {
+        e.which == 27 && that.hide()
+      })
+    } else if (!this.isShown) {
+      $(document).off('keyup.dismiss.modal')
+    }
+  }
+
+
+ /* MODAL PLUGIN DEFINITION
+  * ======================= */
+
+  $.fn.modal = function ( option ) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('modal')
+        , options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
+      if (!data) $this.data('modal', (data = new Modal(this, options)))
+      if (typeof option == 'string') data[option]()
+      else if (options.show) data.show()
+    })
+  }
+
+  $.fn.modal.defaults = {
+      backdrop: true
+    , keyboard: true
+    , show: true
+  }
+
+  $.fn.modal.Constructor = Modal
+
+
+ /* MODAL DATA-API
+  * ============== */
+
+  $(function () {
+    $('body').on('click.modal.data-api', '[data-toggle="modal"]', function ( e ) {
+      var $this = $(this), href
+        , $target = $($this.attr('data-target') || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '')) //strip for ie7
+        , option = $target.data('modal') ? 'toggle' : $.extend({}, $target.data(), $this.data())
+
+      e.preventDefault()
+      $target.modal(option)
+    })
+  })
+
+}( window.jQuery );

data/app/assets/javascripts/twitter-bootstrap/bootstrap-tab.js

@@ -1,5 +1,5 @@
 /* ========================================================
- * bootstrap-tab.js v2.0.2
+ * bootstrap-tab.js v2.0.3
  * http://twitter.github.com/bootstrap/javascript.html#tabs
  * ========================================================
  * Copyright 2012 Twitter, Inc.
@@ -18,9 +18,10 @@
  * ======================================================== */
 
 
-!function( $ ){
+!function ($) {
+
+  "use strict"; // jshint ;_;
 
-  "use strict"
 
  /* TAB CLASS DEFINITION
   * ==================== */
@@ -39,6 +40,7 @@
         , selector = $this.attr('data-target')
         , previous
         , $target
+        , e
 
       if (!selector) {
         selector = $this.attr('href')
@@ -49,11 +51,14 @@
 
       previous = $ul.find('.active a').last()[0]
 
-      $this.trigger({
-        type: 'show'
-      , relatedTarget: previous
+      e = $.Event('show', {
+        relatedTarget: previous
       })
 
+      $this.trigger(e)
+
+      if (e.isDefaultPrevented()) return
+
       $target = $(selector)
 
       this.activate($this.parent('li'), $ul)
@@ -127,4 +132,4 @@
     })
   })
 
-}( window.jQuery );
+}(window.jQuery);

data/app/assets/stylesheets/bootstrap-responsive-overrides.css

@@ -6,17 +6,15 @@ dt, dd {
   min-height: 40px;
 }
 
-/*
-dt, dd {
-  display: block;
-  float: left;
-  margin-top: 20px;
-}
-
-dt { clear: both; }
-dl { overflow: hidden; }
-
-.dl-horizontal dd {
-  margin-left: 30px;
+@media (max-width: 480px) {
+  .modal-wrapper {
+    position: absolute;
+    top: 10px;
+    right: 10px;
+    left: 10px;
+    width: auto;
+    margin: 0;
+    z-index: 1050;
+    overflow: visible;
+  }
 }
-*/

data/app/assets/stylesheets/contour.css

@@ -5,6 +5,7 @@
  *= require_self
  *= require twitter-bootstrap/v2.0.3/bootstrap
  *= require bootstrap-base-overrides
+ *= require twitter-bootstrap/bootstrap-scroll-modal
  *= require twitter-bootstrap/v2.0.3/bootstrap-responsive
  *= require bootstrap-responsive-overrides
  *= require jquery-ui-1.8.10.custom

data/app/assets/stylesheets/twitter-bootstrap/bootstrap-scroll-modal.css

@@ -0,0 +1,43 @@
+/*!
+ * Bootstrap Scroll Modal
+ * Version: 1.0
+ * Made for your convenience by @theericanderson
+ * A variaton of but a small piece of the insanely awesome Twitter Bootstrap (http://twitter.github.com/bootstrap)
+ */
+
+.modal-backdrop {
+  overflow-x: hidden;
+  overflow-y: auto;
+  background-color: rgba(0, 0, 0, 0.8);
+}
+.modal-backdrop.fade {
+  background-color: rgba(0, 0, 0, 0.0);
+}
+.modal-backdrop,
+.modal-backdrop.fade.in {
+  background: rgba(0, 0, 0, 0.8);
+}
+.modal-backdrop, .modal-backdrop.fade, .modal-backdrop.fade.in {
+  opacity: 1.0;
+  filter: alpha(opacity=100);
+}
+.modal-wrapper {
+  position: absolute;
+  top: 50px;
+  left: 50%;
+  z-index: 1050;
+  width: 560px;
+  margin-left: -280px;
+  padding-bottom: 80px;
+  overflow: visible;
+}
+.modal-wrapper .modal {
+  position: static;
+  margin: 0;
+  z-index: 1060;
+}
+/* Some different styling for dynamic height modals */
+.modal-wrapper .modal .modal-body {
+  overflow-y: visible;
+  max-height: none;
+}

data/lib/contour/version.rb

@@ -3,7 +3,7 @@ module Contour
     MAJOR = 1
     MINOR = 0
     TINY = 0
-    BUILD = "beta9" # nil, "pre", "rc", "rc2"
+    BUILD = "beta10" # 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: 1.0.0.beta9
+  version: 1.0.0.beta10
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-07 00:00:00.000000000 Z
+date: 2012-05-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70156906703140 !ruby/object:Gem::Requirement
+  requirement: &70259172276980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70156906703140
+  version_requirements: *70259172276980
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70156906702640 !ruby/object:Gem::Requirement
+  requirement: &70259172272680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70156906702640
+  version_requirements: *70259172272680
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70156906702180 !ruby/object:Gem::Requirement
+  requirement: &70259172270540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70156906702180
+  version_requirements: *70259172270540
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70156906701720 !ruby/object:Gem::Requirement
+  requirement: &70259172267600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70156906701720
+  version_requirements: *70259172267600
 - !ruby/object:Gem::Dependency
   name: omniauth-openid
-  requirement: &70156906701260 !ruby/object:Gem::Requirement
+  requirement: &70259172265620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70156906701260
+  version_requirements: *70259172265620
 - !ruby/object:Gem::Dependency
   name: omniauth-ldap
-  requirement: &70156906700800 !ruby/object:Gem::Requirement
+  requirement: &70259172264060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70156906700800
+  version_requirements: *70259172264060
 - !ruby/object:Gem::Dependency
   name: omniauth-twitter
-  requirement: &70156906700340 !ruby/object:Gem::Requirement
+  requirement: &70259172263040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,10 +87,10 @@ dependencies:
         version: 0.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *70156906700340
+  version_requirements: *70259172263040
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &70156906699880 !ruby/object:Gem::Requirement
+  requirement: &70259172261840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70156906699880
+  version_requirements: *70259172261840
 - !ruby/object:Gem::Dependency
   name: omniauth-linkedin
-  requirement: &70156906699400 !ruby/object:Gem::Requirement
+  requirement: &70259172261020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70156906699400
+  version_requirements: *70259172261020
 - !ruby/object:Gem::Dependency
   name: omniauth-cas
-  requirement: &70156906698940 !ruby/object:Gem::Requirement
+  requirement: &70259172259820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70156906698940
+  version_requirements: *70259172259820
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70156906698560 !ruby/object:Gem::Requirement
+  requirement: &70259172258700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70156906698560
+  version_requirements: *70259172258700
 description: Basic Rails Framework files and assets for layout and authentication
 email: remosm@gmail.com
 executables: []
@@ -423,6 +423,7 @@ files:
 - app/assets/javascripts/twitter-bootstrap/bootstrap-collapse.js
 - app/assets/javascripts/twitter-bootstrap/bootstrap-dropdown.js
 - app/assets/javascripts/twitter-bootstrap/bootstrap-modal.js
+- app/assets/javascripts/twitter-bootstrap/bootstrap-scroll-modal.js
 - app/assets/javascripts/twitter-bootstrap/bootstrap-tab.js
 - app/assets/javascripts/twitter-bootstrap/bootstrap.js.coffee
 - app/assets/javascripts/twitter-bootstrap/v2.0.3/bootstrap.js
@@ -432,6 +433,7 @@ files:
 - app/assets/stylesheets/contour.css
 - app/assets/stylesheets/jquery-ui-1.8.10.custom.css
 - app/assets/stylesheets/jquery.qtip.css
+- app/assets/stylesheets/twitter-bootstrap/bootstrap-scroll-modal.css
 - app/assets/stylesheets/twitter-bootstrap/v2.0.3/bootstrap-responsive.css
 - app/assets/stylesheets/twitter-bootstrap/v2.0.3/bootstrap.css
 - app/controllers/contour/authentications_controller.rb