contour 1.0.0.beta → 1.0.0.beta2

data/app/assets/javascripts/contour.js

@@ -4,6 +4,7 @@
 //= require jquery
 //= require jquery_ujs
 //= require twitter/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

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

@@ -10,4 +10,7 @@
   $.each(elements, (index, value) ->
     element = $(value)
     element.fadeIn(2000)
-  )
+  )
+
+jQuery ->
+  $(".collapse").collapse()

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

@@ -0,0 +1,157 @@
+/* =============================================================
+ * bootstrap-collapse.js v2.0.3
+ * http://twitter.github.com/bootstrap/javascript.html#collapse
+ * =============================================================
+ * 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"; // jshint ;_;
+
+
+ /* COLLAPSE PUBLIC CLASS DEFINITION
+  * ================================ */
+
+  var Collapse = function (element, options) {
+    this.$element = $(element)
+    this.options = $.extend({}, $.fn.collapse.defaults, options)
+
+    if (this.options.parent) {
+      this.$parent = $(this.options.parent)
+    }
+
+    this.options.toggle && this.toggle()
+  }
+
+  Collapse.prototype = {
+
+    constructor: Collapse
+
+  , dimension: function () {
+      var hasWidth = this.$element.hasClass('width')
+      return hasWidth ? 'width' : 'height'
+    }
+
+  , show: function () {
+      var dimension
+        , scroll
+        , actives
+        , hasData
+
+      if (this.transitioning) return
+
+      dimension = this.dimension()
+      scroll = $.camelCase(['scroll', dimension].join('-'))
+      actives = this.$parent && this.$parent.find('> .accordion-group > .in')
+
+      if (actives && actives.length) {
+        hasData = actives.data('collapse')
+        if (hasData && hasData.transitioning) return
+        actives.collapse('hide')
+        hasData || actives.data('collapse', null)
+      }
+
+      this.$element[dimension](0)
+      this.transition('addClass', $.Event('show'), 'shown')
+      this.$element[dimension](this.$element[0][scroll])
+    }
+
+  , hide: function () {
+      var dimension
+      if (this.transitioning) return
+      dimension = this.dimension()
+      this.reset(this.$element[dimension]())
+      this.transition('removeClass', $.Event('hide'), 'hidden')
+      this.$element[dimension](0)
+    }
+
+  , reset: function (size) {
+      var dimension = this.dimension()
+
+      this.$element
+        .removeClass('collapse')
+        [dimension](size || 'auto')
+        [0].offsetWidth
+
+      this.$element[size !== null ? 'addClass' : 'removeClass']('collapse')
+
+      return this
+    }
+
+  , transition: function (method, startEvent, completeEvent) {
+      var that = this
+        , complete = function () {
+            if (startEvent.type == 'show') that.reset()
+            that.transitioning = 0
+            that.$element.trigger(completeEvent)
+          }
+
+      this.$element.trigger(startEvent)
+
+      if (startEvent.isDefaultPrevented()) return
+
+      this.transitioning = 1
+
+      this.$element[method]('in')
+
+      $.support.transition && this.$element.hasClass('collapse') ?
+        this.$element.one($.support.transition.end, complete) :
+        complete()
+    }
+
+  , toggle: function () {
+      this[this.$element.hasClass('in') ? 'hide' : 'show']()
+    }
+
+  }
+
+
+ /* COLLAPSIBLE PLUGIN DEFINITION
+  * ============================== */
+
+  $.fn.collapse = function (option) {
+    return this.each(function () {
+      var $this = $(this)
+        , data = $this.data('collapse')
+        , options = typeof option == 'object' && option
+      if (!data) $this.data('collapse', (data = new Collapse(this, options)))
+      if (typeof option == 'string') data[option]()
+    })
+  }
+
+  $.fn.collapse.defaults = {
+    toggle: true
+  }
+
+  $.fn.collapse.Constructor = Collapse
+
+
+ /* COLLAPSIBLE DATA-API
+  * ==================== */
+
+  $(function () {
+    $('body').on('click.collapse.data-api', '[data-toggle=collapse]', function ( e ) {
+      var $this = $(this), href
+        , target = $this.attr('data-target')
+          || e.preventDefault()
+          || (href = $this.attr('href')) && href.replace(/.*(?=#[^\s]+$)/, '') //strip for ie7
+        , option = $(target).data('collapse') ? 'toggle' : $this.data()
+      $(target).collapse(option)
+    })
+  })
+
+}(window.jQuery);

data/app/assets/stylesheets/bootstrap_and_overrides.css.less

@@ -27,3 +27,16 @@ body { padding-top: 60px; }
 //
 // Example:
 // @linkColor: #ff0000;
+
+dt, dd {
+  display: block;
+  float: left;
+  margin-top: 20px;
+}
+
+dt { clear: both; }
+dl { overflow: hidden; }
+
+.dl-horizontal dd {
+  margin-left: 30px;
+}

data/app/helpers/contour_helper.rb

@@ -0,0 +1,18 @@
+# From Twitter-Bootstrap-Rails
+module ContourHelper
+  def flash_block
+    output = ''
+    flash.each do |type, message|
+      output += flash_container(type, message)
+    end
+
+    raw(output)
+  end
+
+  def flash_container(type, message)
+    raw(content_tag(:div, :class => "alert alert-#{type}") do
+      content_tag(:a, raw("×"),:class => 'close', :data => {:dismiss => 'alert'}) +
+      message
+    end)
+  end
+end

data/app/views/contour/layouts/application.html.erb

@@ -38,6 +38,10 @@
   </div>
 <% end %>
 
+  <div class="container">
+    <%= flash_block %>
+  </div>
+
   <div class="navbar navbar-fixed-top">
     <%= render partial: 'contour/layouts/menu' %>
   </div>

data/contour.gemspec

@@ -30,7 +30,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'omniauth',                '~> 1.0.3'
   s.add_dependency 'omniauth-openid',         '~> 1.0.1'
   s.add_dependency 'omniauth-ldap',           '~> 1.0.2'
-  s.add_dependency 'omniauth-twitter',        '~> 0.0.10'
+  s.add_dependency 'omniauth-twitter',        '~> 0.0.11'
   s.add_dependency 'omniauth-facebook',       '~> 1.2.0'
   s.add_dependency 'omniauth-linkedin',       '~> 0.0.6'
   s.add_dependency 'omniauth-cas',            '~> 0.0.6'

data/lib/contour/version.rb

@@ -3,7 +3,7 @@ module Contour
     MAJOR = 1
     MINOR = 0
     TINY = 0
-    BUILD = "beta" # 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: 1.0.0.beta
+  version: 1.0.0.beta2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-26 00:00:00.000000000 Z
+date: 2012-04-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &70198996780040 !ruby/object:Gem::Requirement
+  requirement: &70203892515100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 3.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *70198996780040
+  version_requirements: *70203892515100
 - !ruby/object:Gem::Dependency
   name: twitter-bootstrap-rails
-  requirement: &70198993112700 !ruby/object:Gem::Requirement
+  requirement: &70203892514600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 2.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70198993112700
+  version_requirements: *70203892514600
 - !ruby/object:Gem::Dependency
   name: jquery-rails
-  requirement: &70198993112000 !ruby/object:Gem::Requirement
+  requirement: &70203892514140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 2.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70198993112000
+  version_requirements: *70203892514140
 - !ruby/object:Gem::Dependency
   name: devise
-  requirement: &70198993110820 !ruby/object:Gem::Requirement
+  requirement: &70203892513680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.0.4
   type: :runtime
   prerelease: false
-  version_requirements: *70198993110820
+  version_requirements: *70203892513680
 - !ruby/object:Gem::Dependency
   name: omniauth
-  requirement: &70198993109500 !ruby/object:Gem::Requirement
+  requirement: &70203892513220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70198993109500
+  version_requirements: *70203892513220
 - !ruby/object:Gem::Dependency
   name: omniauth-openid
-  requirement: &70198993108400 !ruby/object:Gem::Requirement
+  requirement: &70203892512760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: 1.0.1
   type: :runtime
   prerelease: false
-  version_requirements: *70198993108400
+  version_requirements: *70203892512760
 - !ruby/object:Gem::Dependency
   name: omniauth-ldap
-  requirement: &70198993107520 !ruby/object:Gem::Requirement
+  requirement: &70203892512300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -87,21 +87,21 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70198993107520
+  version_requirements: *70203892512300
 - !ruby/object:Gem::Dependency
   name: omniauth-twitter
-  requirement: &70198993106200 !ruby/object:Gem::Requirement
+  requirement: &70203892511840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.0.10
+        version: 0.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *70198993106200
+  version_requirements: *70203892511840
 - !ruby/object:Gem::Dependency
   name: omniauth-facebook
-  requirement: &70198993921440 !ruby/object:Gem::Requirement
+  requirement: &70203892511380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +109,10 @@ dependencies:
         version: 1.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70198993921440
+  version_requirements: *70203892511380
 - !ruby/object:Gem::Dependency
   name: omniauth-linkedin
-  requirement: &70198993920980 !ruby/object:Gem::Requirement
+  requirement: &70203892510920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70198993920980
+  version_requirements: *70203892510920
 - !ruby/object:Gem::Dependency
   name: omniauth-cas
-  requirement: &70198993920520 !ruby/object:Gem::Requirement
+  requirement: &70203892510460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 0.0.6
   type: :runtime
   prerelease: false
-  version_requirements: *70198993920520
+  version_requirements: *70203892510460
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &70198993920140 !ruby/object:Gem::Requirement
+  requirement: &70203892510080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70198993920140
+  version_requirements: *70203892510080
 description: Basic Rails Framework files and assets for layout and authentication
 email: remosm@gmail.com
 executables: []
@@ -431,6 +431,7 @@ files:
 - app/assets/javascripts/external/jquery-ui-1.8.10.custom.min.js
 - app/assets/javascripts/external/jquery.qtip.min.js
 - app/assets/javascripts/external/waypoints.js
+- 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-tab.js
@@ -445,6 +446,7 @@ files:
 - app/controllers/contour/registrations_controller.rb
 - app/controllers/contour/samples_controller.rb
 - app/controllers/contour/sessions_controller.rb
+- app/helpers/contour_helper.rb
 - app/models/authentication.rb
 - app/views/contour/authentications/_index.html.erb
 - app/views/contour/authentications/_menu.html.erb