contour 2.1.0.beta6 → 2.1.0.beta7
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.
- checksums.yaml +4 -4
- data/CHANGELOG.md +1 -0
- data/app/assets/javascripts/contour.js +0 -1
- data/app/assets/stylesheets/bootstrap-overrides.css +1 -1
- data/app/assets/stylesheets/contour.css +0 -1
- data/lib/contour/version.rb +1 -1
- metadata +1 -3
- data/app/assets/javascripts/twitter-bootstrap/bootstrap-scroll-modal.js +0 -276
- data/app/assets/stylesheets/twitter-bootstrap/bootstrap-scroll-modal.css +0 -70
checksums.yaml
CHANGED
@@ -1,7 +1,7 @@
|
|
1
1
|
---
|
2
2
|
SHA1:
|
3
|
-
metadata.gz:
|
4
|
-
data.tar.gz:
|
3
|
+
metadata.gz: 38656f23a5add367725cd16557dfac565776b70d
|
4
|
+
data.tar.gz: af4d1a04682367410e38b9d2941c329da7b0da85
|
5
5
|
SHA512:
|
6
|
-
metadata.gz:
|
7
|
-
data.tar.gz:
|
6
|
+
metadata.gz: 5644735f53d42380a52b415217c15f8b6deb5eab3c3a5295d3115a82ccfcdfbafc6178581b6bbb1e6f6d7bbaad78875857de2570578c246ad17a8d685a4c88b7
|
7
|
+
data.tar.gz: 25014a955a416d956d7f44f889ece0b8bb819c6086fabea555cb34df79ff01f0166c1f5636602016bfd569641a8dd9ce53261c7624ea58ed3240b577938ce45f
|
data/CHANGELOG.md
CHANGED
@@ -6,6 +6,7 @@
|
|
6
6
|
- Added `btn-cancel` and `btn-cancel-inverse` to complement other BS3 button styles
|
7
7
|
- Menu dropdowns can now have headers
|
8
8
|
- `links: [ ..., { header: 'Dropdown header' }, ... ]`
|
9
|
+
- Removed bootstrap-scroll-modal since it collided with BS3's implementation
|
9
10
|
|
10
11
|
## 2.0.0 (July 25, 2013)
|
11
12
|
|
data/lib/contour/version.rb
CHANGED
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.1.0.
|
4
|
+
version: 2.1.0.beta7
|
5
5
|
platform: ruby
|
6
6
|
authors:
|
7
7
|
- Remo Mueller
|
@@ -227,7 +227,6 @@ files:
|
|
227
227
|
- app/assets/javascripts/external/highcharts-3.0.2.src.js
|
228
228
|
- app/assets/javascripts/external/jquery-ui-1.10.0.custom.min.js
|
229
229
|
- app/assets/javascripts/external/typeahead.js
|
230
|
-
- app/assets/javascripts/twitter-bootstrap/bootstrap-scroll-modal.js
|
231
230
|
- app/assets/javascripts/twitter-bootstrap/bootstrap.js.coffee
|
232
231
|
- app/assets/stylesheets/bootstrap/bs-callout.css
|
233
232
|
- app/assets/stylesheets/bootstrap/v3.0.0-rc1/bootstrap.css
|
@@ -241,7 +240,6 @@ files:
|
|
241
240
|
- app/assets/stylesheets/jquery-ui-1.10.0.custom.css
|
242
241
|
- app/assets/stylesheets/spinner.css.erb
|
243
242
|
- app/assets/stylesheets/timepicker.css
|
244
|
-
- app/assets/stylesheets/twitter-bootstrap/bootstrap-scroll-modal.css
|
245
243
|
- app/assets/stylesheets/typeahead.js-bootstrap.css
|
246
244
|
- app/controllers/contour/authentications_controller.rb
|
247
245
|
- app/controllers/contour/confirmations_controller.rb
|
@@ -1,276 +0,0 @@
|
|
1
|
-
/*!
|
2
|
-
* Bootstrap Scroll Modal
|
3
|
-
* Version: 1.2
|
4
|
-
* Made for your convenience by @theericanderson.
|
5
|
-
* A variaton of only small piece of the insanely awesome
|
6
|
-
* Twitter Bootstrap (http://twitter.github.com/bootstrap).
|
7
|
-
*/
|
8
|
-
|
9
|
-
/* =========================================================
|
10
|
-
* bootstrap-modal.js v2.2.1
|
11
|
-
* http://twitter.github.com/bootstrap/javascript.html#modals
|
12
|
-
* =========================================================
|
13
|
-
* Copyright 2012 Twitter, Inc.
|
14
|
-
*
|
15
|
-
* Licensed under the Apache License, Version 2.0 (the "License");
|
16
|
-
* you may not use this file except in compliance with the License.
|
17
|
-
* You may obtain a copy of the License at
|
18
|
-
*
|
19
|
-
* http://www.apache.org/licenses/LICENSE-2.0
|
20
|
-
*
|
21
|
-
* Unless required by applicable law or agreed to in writing, software
|
22
|
-
* distributed under the License is distributed on an "AS IS" BASIS,
|
23
|
-
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
24
|
-
* See the License for the specific language governing permissions and
|
25
|
-
* limitations under the License.
|
26
|
-
* ========================================================= */
|
27
|
-
|
28
|
-
|
29
|
-
!function ($) {
|
30
|
-
|
31
|
-
"use strict"; // jshint ;_;
|
32
|
-
|
33
|
-
/* MODAL CLASS DEFINITION
|
34
|
-
* ====================== */
|
35
|
-
|
36
|
-
var Modal = function (element, options) {
|
37
|
-
this.options = options
|
38
|
-
this.$element = $(element)
|
39
|
-
.delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
|
40
|
-
this.options.remote && this.$element.find('.modal-body').load(this.options.remote)
|
41
|
-
}
|
42
|
-
|
43
|
-
Modal.prototype = {
|
44
|
-
|
45
|
-
constructor: Modal
|
46
|
-
|
47
|
-
, toggle: function () {
|
48
|
-
return this[!this.isShown ? 'show' : 'hide']()
|
49
|
-
}
|
50
|
-
|
51
|
-
, show: function () {
|
52
|
-
var that = this
|
53
|
-
, e = $.Event('show')
|
54
|
-
|
55
|
-
if (this.isShown || e.isDefaultPrevented()) return
|
56
|
-
|
57
|
-
this.isShown = true
|
58
|
-
|
59
|
-
this.escape()
|
60
|
-
|
61
|
-
if (this.options.dynamic) {
|
62
|
-
this.$elementWrapper = $('<div class="modal-wrapper" />').insertBefore(this.$element)
|
63
|
-
this.$element.prependTo(this.$elementWrapper)
|
64
|
-
}
|
65
|
-
|
66
|
-
this.backdrop(function () {
|
67
|
-
var transition = $.support.transition && that.$element.hasClass('fade')
|
68
|
-
|
69
|
-
if (!that.$element.parent().length) {
|
70
|
-
that.$element.appendTo(document.body) //don't move modals dom position
|
71
|
-
}
|
72
|
-
|
73
|
-
that.$element
|
74
|
-
.show()
|
75
|
-
|
76
|
-
if (transition) {
|
77
|
-
that.$element[0].offsetWidth // force reflow
|
78
|
-
}
|
79
|
-
|
80
|
-
that.$element
|
81
|
-
.addClass('in')
|
82
|
-
.attr('aria-hidden', false)
|
83
|
-
|
84
|
-
that.enforceFocus()
|
85
|
-
|
86
|
-
transition ?
|
87
|
-
that.$element.one($.support.transition.end, function () { that.$element.trigger('shown') }) :
|
88
|
-
that.$element.focus().trigger('shown')
|
89
|
-
|
90
|
-
})
|
91
|
-
}
|
92
|
-
|
93
|
-
, hide: function ( e ) {
|
94
|
-
e && e.preventDefault()
|
95
|
-
|
96
|
-
var that = this
|
97
|
-
|
98
|
-
e = $.Event('hide')
|
99
|
-
|
100
|
-
this.$element.trigger(e)
|
101
|
-
|
102
|
-
if (!this.isShown || e.isDefaultPrevented()) return
|
103
|
-
|
104
|
-
this.isShown = false
|
105
|
-
|
106
|
-
this.escape()
|
107
|
-
|
108
|
-
$(document).off('focusin.modal')
|
109
|
-
|
110
|
-
this.$element
|
111
|
-
.removeClass('in')
|
112
|
-
.attr('aria-hidden', true)
|
113
|
-
|
114
|
-
$.support.transition && this.$element.hasClass('fade') ?
|
115
|
-
this.hideWithTransition() :
|
116
|
-
this.hideModal()
|
117
|
-
}
|
118
|
-
|
119
|
-
, enforceFocus: function () {
|
120
|
-
var that = this
|
121
|
-
$(document).on('focusin.modal', function (e) {
|
122
|
-
if (that.$element[0] !== e.target && !that.$element.has(e.target).length) {
|
123
|
-
that.$element.focus()
|
124
|
-
}
|
125
|
-
})
|
126
|
-
}
|
127
|
-
|
128
|
-
, escape: function () {
|
129
|
-
var that = this
|
130
|
-
if (this.isShown && this.options.keyboard) {
|
131
|
-
this.$element.on('keyup.dismiss.modal', function ( e ) {
|
132
|
-
e.which == 27 && that.hide()
|
133
|
-
})
|
134
|
-
} else if (!this.isShown) {
|
135
|
-
this.$element.off('keyup.dismiss.modal')
|
136
|
-
}
|
137
|
-
}
|
138
|
-
|
139
|
-
, hideWithTransition: function () {
|
140
|
-
var that = this
|
141
|
-
, timeout = setTimeout(function () {
|
142
|
-
that.$element.off($.support.transition.end)
|
143
|
-
that.hideModal()
|
144
|
-
}, 500)
|
145
|
-
|
146
|
-
this.$element.one($.support.transition.end, function () {
|
147
|
-
clearTimeout(timeout)
|
148
|
-
that.hideModal()
|
149
|
-
})
|
150
|
-
}
|
151
|
-
|
152
|
-
, hideModal: function (that) {
|
153
|
-
this.$element
|
154
|
-
.hide()
|
155
|
-
.trigger('hidden')
|
156
|
-
|
157
|
-
if (this.options.dynamic) {
|
158
|
-
this.$element.insertAfter(this.$elementWrapper)
|
159
|
-
this.$elementWrapper.remove()
|
160
|
-
this.$elementWrapper = null
|
161
|
-
}
|
162
|
-
|
163
|
-
this.backdrop()
|
164
|
-
}
|
165
|
-
|
166
|
-
, removeBackdrop: function () {
|
167
|
-
this.$element.insertAfter(this.$backdrop)
|
168
|
-
this.$backdrop.remove()
|
169
|
-
this.$backdrop = null
|
170
|
-
$('body').css({ 'overflow' : '' })
|
171
|
-
}
|
172
|
-
|
173
|
-
, backdrop: function (callback) {
|
174
|
-
var that = this
|
175
|
-
, animate = this.$element.hasClass('fade') ? 'fade' : ''
|
176
|
-
|
177
|
-
if (this.isShown && this.options.backdrop) {
|
178
|
-
var doAnimate = $.support.transition && animate
|
179
|
-
|
180
|
-
this.$backdrop = $('<div class="modal-backdrop ' + animate + '" />')
|
181
|
-
.appendTo(document.body)
|
182
|
-
|
183
|
-
// Below are Bootstrap Scroll Modal additions to the backdrop function.
|
184
|
-
|
185
|
-
if (!that.$element.parent().length) {
|
186
|
-
this.$backdrop.appendTo(document.body) // don't move modals dom position
|
187
|
-
} else if (this.options.dynamic) {
|
188
|
-
this.$backdrop.insertBefore(this.$elementWrapper)
|
189
|
-
} else {
|
190
|
-
this.$backdrop.insertBefore(this.$element)
|
191
|
-
}
|
192
|
-
|
193
|
-
if (this.options.dynamic) {
|
194
|
-
this.$elementWrapper.prependTo(this.$backdrop)
|
195
|
-
.delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
|
196
|
-
} else {
|
197
|
-
this.$element.prependTo(this.$backdrop)
|
198
|
-
.delegate('[data-dismiss="modal"]', 'click.dismiss.modal', $.proxy(this.hide, this))
|
199
|
-
}
|
200
|
-
|
201
|
-
$('body').css({ 'overflow' : 'hidden' })
|
202
|
-
|
203
|
-
this.$backdrop.on('click', function(e){
|
204
|
-
if (that.options.backdrop == 'static') {
|
205
|
-
$.proxy(that.$element[0].focus, that.$element[0])
|
206
|
-
} else if (e.target == e.delegateTarget) {
|
207
|
-
that.hide(e)
|
208
|
-
}
|
209
|
-
})
|
210
|
-
|
211
|
-
// end additions
|
212
|
-
|
213
|
-
if (doAnimate) this.$backdrop[0].offsetWidth // force reflow
|
214
|
-
|
215
|
-
this.$backdrop.addClass('in')
|
216
|
-
|
217
|
-
doAnimate ?
|
218
|
-
this.$backdrop.one($.support.transition.end, callback) :
|
219
|
-
callback()
|
220
|
-
|
221
|
-
} else if (!this.isShown && this.$backdrop) {
|
222
|
-
this.$backdrop.removeClass('in')
|
223
|
-
|
224
|
-
$.support.transition && this.$element.hasClass('fade')?
|
225
|
-
this.$backdrop.one($.support.transition.end, $.proxy(this.removeBackdrop, this)) :
|
226
|
-
this.removeBackdrop()
|
227
|
-
|
228
|
-
} else if (callback) {
|
229
|
-
callback()
|
230
|
-
}
|
231
|
-
}
|
232
|
-
}
|
233
|
-
|
234
|
-
|
235
|
-
/* MODAL PLUGIN DEFINITION
|
236
|
-
* ======================= */
|
237
|
-
|
238
|
-
$.fn.modal = function (option) {
|
239
|
-
return this.each(function () {
|
240
|
-
var $this = $(this)
|
241
|
-
, data = $this.data('modal')
|
242
|
-
, options = $.extend({}, $.fn.modal.defaults, $this.data(), typeof option == 'object' && option)
|
243
|
-
if (!data) $this.data('modal', (data = new Modal(this, options)))
|
244
|
-
if (typeof option == 'string') data[option]()
|
245
|
-
else if (options.show) data.show()
|
246
|
-
})
|
247
|
-
}
|
248
|
-
|
249
|
-
$.fn.modal.defaults = {
|
250
|
-
backdrop: true
|
251
|
-
, keyboard: true
|
252
|
-
, show: true
|
253
|
-
}
|
254
|
-
|
255
|
-
$.fn.modal.Constructor = Modal
|
256
|
-
|
257
|
-
|
258
|
-
/* MODAL DATA-API
|
259
|
-
* ============== */
|
260
|
-
|
261
|
-
$(document).on('click.modal.data-api', '[data-toggle="modal"]', function (e) {
|
262
|
-
var $this = $(this)
|
263
|
-
, href = $this.attr('href')
|
264
|
-
, $target = $($this.attr('data-target') || (href && href.replace(/.*(?=#[^\s]+$)/, ''))) //strip for ie7
|
265
|
-
, option = $target.data('modal') ? 'toggle' : $.extend({ remote:!/#/.test(href) && href }, $target.data(), $this.data())
|
266
|
-
|
267
|
-
e.preventDefault()
|
268
|
-
|
269
|
-
$target
|
270
|
-
.modal(option)
|
271
|
-
.one('hide', function () {
|
272
|
-
$this.focus()
|
273
|
-
})
|
274
|
-
})
|
275
|
-
|
276
|
-
}(window.jQuery);
|
@@ -1,70 +0,0 @@
|
|
1
|
-
/*!
|
2
|
-
* Bootstrap Scroll Modal
|
3
|
-
* Version: 1.2
|
4
|
-
* Made for your convenience by @theericanderson
|
5
|
-
* A variaton of but a small piece of the insanely awesome Twitter Bootstrap (http://twitter.github.com/bootstrap)
|
6
|
-
*/
|
7
|
-
|
8
|
-
.modal-backdrop {
|
9
|
-
overflow-x: hidden;
|
10
|
-
overflow-y: auto;
|
11
|
-
background-color: rgba(0, 0, 0, 0.8);
|
12
|
-
}
|
13
|
-
.modal-backdrop.fade {
|
14
|
-
background-color: rgba(0, 0, 0, 0.0);
|
15
|
-
}
|
16
|
-
.modal-backdrop.fade.in {
|
17
|
-
background: rgba(0, 0, 0, 0.8);
|
18
|
-
}
|
19
|
-
.modal-backdrop.in, .modal-backdrop.fade.in {
|
20
|
-
opacity: 1.0;
|
21
|
-
filter: alpha(opacity=100);
|
22
|
-
}
|
23
|
-
.modal-wrapper {
|
24
|
-
position: relative;
|
25
|
-
top: 50px;
|
26
|
-
left: 50%;
|
27
|
-
z-index: 1050;
|
28
|
-
width: 560px;
|
29
|
-
margin-left: -280px;
|
30
|
-
margin-bottom: 100px;
|
31
|
-
overflow: visible;
|
32
|
-
}
|
33
|
-
.modal-wrapper .modal {
|
34
|
-
position: static;
|
35
|
-
margin: 0;
|
36
|
-
z-index: 1060;
|
37
|
-
}
|
38
|
-
/* Some different styling for dynamic height modals */
|
39
|
-
.modal-wrapper .modal .modal-body {
|
40
|
-
overflow-y: visible;
|
41
|
-
max-height: none;
|
42
|
-
z-index: 1060; /* IE8 fix for radio button focus / blur issue */
|
43
|
-
}
|
44
|
-
|
45
|
-
/* Styles to ensure Scroll Modal works on smaller browsers, specifically mobile. */
|
46
|
-
@media (max-width: 767px) {
|
47
|
-
.modal-wrapper {
|
48
|
-
position: relative;
|
49
|
-
top: 50px;
|
50
|
-
left: 20%;
|
51
|
-
z-index: 1050;
|
52
|
-
width: 70%;
|
53
|
-
margin-left: 0px;
|
54
|
-
margin-bottom: 80px;
|
55
|
-
overflow: visible;
|
56
|
-
}
|
57
|
-
}
|
58
|
-
|
59
|
-
@media (max-width : 480px) {
|
60
|
-
.modal-wrapper {
|
61
|
-
position: relative;
|
62
|
-
top: 50px;
|
63
|
-
left: 10%;
|
64
|
-
z-index: 1050;
|
65
|
-
width: 80%;
|
66
|
-
margin-left: 0px;
|
67
|
-
margin-bottom: 80px;
|
68
|
-
overflow: visible;
|
69
|
-
}
|
70
|
-
}
|