contour 1.1.3 → 1.2.0.pre

Sign up to get free protection for your applications and to get access to all the features.
Files changed (34) hide show
  1. data/CHANGELOG.rdoc +18 -9
  2. data/README.rdoc +4 -4
  3. data/app/assets/images/twitter-bootstrap/{v2.2.2 → v2.3.0}/glyphicons-halflings-white.png +0 -0
  4. data/app/assets/images/twitter-bootstrap/{v2.2.2 → v2.3.0}/glyphicons-halflings.png +0 -0
  5. data/app/assets/javascripts/contour.js +2 -2
  6. data/app/assets/javascripts/contour/global.js.coffee +14 -8
  7. data/app/assets/javascripts/external/bootstrap-datepicker.js +983 -0
  8. data/app/assets/javascripts/external/bootstrap-timepicker.js +837 -0
  9. data/app/assets/javascripts/external/jquery-ui-1.10.0.custom.min.js +6 -0
  10. data/app/assets/javascripts/twitter-bootstrap/{v2.2.2 → v2.3.0}/bootstrap.js +189 -80
  11. data/app/assets/stylesheets/bootstrap-base-overrides.css +6 -14
  12. data/app/assets/stylesheets/contour.css +5 -3
  13. data/app/assets/stylesheets/datepicker.css +301 -0
  14. data/app/assets/stylesheets/jquery-ui-1.10.0.custom.css +86 -0
  15. data/app/assets/stylesheets/timepicker.css +82 -0
  16. data/app/assets/stylesheets/twitter-bootstrap/{v2.2.2 → v2.3.0}/bootstrap-responsive.css +24 -7
  17. data/app/assets/stylesheets/twitter-bootstrap/{v2.2.2 → v2.3.0}/bootstrap.css +238 -119
  18. data/app/controllers/contour/authentications_controller.rb +1 -2
  19. data/app/views/contour/authentications/_login_table.html.erb +1 -1
  20. data/app/views/contour/layouts/_menu.html.erb +5 -0
  21. data/contour.gemspec +3 -3
  22. data/lib/contour.rb +10 -0
  23. data/lib/contour/version.rb +3 -3
  24. data/lib/generators/contour/install/templates/contour.rb +9 -0
  25. data/lib/generators/contour/scaffold/templates/_paginate.html.erb +1 -1
  26. data/lib/generators/contour/scaffold/templates/index.html.erb +1 -1
  27. data/test/dummy/app/models/user.rb +0 -1
  28. data/test/dummy/db/development.sqlite3 +0 -0
  29. data/test/dummy/db/test.sqlite3 +0 -0
  30. data/test/dummy/log/development.log +129 -0
  31. data/test/dummy/log/test.log +2059 -47940
  32. metadata +26 -18
  33. data/app/assets/javascripts/external/jquery-ui-1.8.22.custom.min.js +0 -93
  34. data/app/assets/stylesheets/jquery-ui-1.8.22.custom.css +0 -381
@@ -1,13 +1,13 @@
1
1
  /* bootstrap-base-overrides.css */
2
2
  /* These overrides come after bootstrap.css but before bootstrap-responsive.css */
3
3
 
4
- /* Line 2255 */
4
+ /* Line 2276 */
5
5
  [class^="icon-"],
6
6
  [class*=" icon-"] {
7
- background-image: url(twitter-bootstrap/v2.2.2/glyphicons-halflings.png);
7
+ background-image: url(twitter-bootstrap/v2.3.0/glyphicons-halflings.png);
8
8
  }
9
9
 
10
- /* Line 2275 */
10
+ /* Line 2292 */
11
11
  .icon-white,
12
12
  .nav-pills > .active > a > [class^="icon-"],
13
13
  .nav-pills > .active > a > [class*=" icon-"],
@@ -21,15 +21,15 @@
21
21
  .dropdown-menu > .active > a > [class*=" icon-"],
22
22
  .dropdown-submenu:hover > a > [class^="icon-"],
23
23
  .dropdown-submenu:hover > a > [class*=" icon-"] {
24
- background-image: url(twitter-bootstrap/v2.2.2/glyphicons-halflings-white.png);
24
+ background-image: url(twitter-bootstrap/v2.3.0/glyphicons-halflings-white.png);
25
25
  }
26
26
 
27
- /* Line 4346 */
27
+ /* Line 4412 */
28
28
  .navbar .brand {
29
29
  color: #ffffff;
30
30
  }
31
31
 
32
- /* Line 4773 */
32
+ /* Line 4848 */
33
33
  .navbar-inverse .nav li.dropdown.open > .dropdown-toggle,
34
34
  .navbar-inverse .nav li.dropdown.active > .dropdown-toggle,
35
35
  .navbar-inverse .nav li.dropdown.open.active > .dropdown-toggle {
@@ -41,11 +41,3 @@ body { padding-top: 60px; }
41
41
  h1, h2, h3, h4, h5, h6 {
42
42
  font-weight: 300;
43
43
  }
44
-
45
- .tooltip {
46
- line-height: 20px;
47
- }
48
-
49
- .center {
50
- text-align: center;
51
- }
@@ -3,14 +3,16 @@
3
3
  * and any sub-directories. You're free to add application-wide styles to this file and they'll appear at
4
4
  * the top of the compiled file, but it's generally better to create a new file per style scope.
5
5
  *= require_self
6
- *= require twitter-bootstrap/v2.2.2/bootstrap
6
+ *= require twitter-bootstrap/v2.3.0/bootstrap
7
7
  *= require bootstrap-base-overrides
8
8
  *= require twitter-bootstrap/bootstrap-scroll-modal
9
- *= require twitter-bootstrap/v2.2.2/bootstrap-responsive
9
+ *= require twitter-bootstrap/v2.3.0/bootstrap-responsive
10
10
  *= require twitter-bootstrap/bootstrap-subnav
11
11
  *= require bootstrap-responsive-overrides
12
- *= require jquery-ui-1.8.22.custom
12
+ *= require jquery-ui-1.10.0.custom
13
13
  *= require jquery.qtip
14
+ *= require datepicker
15
+ *= require timepicker
14
16
  *= require contour/about
15
17
  *= require contour/authentication
16
18
  */
@@ -0,0 +1,301 @@
1
+ /*!
2
+ * Datepicker for Bootstrap
3
+ *
4
+ * Copyright 2012 Stefan Petre
5
+ * Improvements by Andrew Rowls
6
+ * Licensed under the Apache License v2.0
7
+ * http://www.apache.org/licenses/LICENSE-2.0
8
+ *
9
+ */
10
+ .datepicker {
11
+ padding: 4px;
12
+ margin-top: 1px;
13
+ -webkit-border-radius: 4px;
14
+ -moz-border-radius: 4px;
15
+ border-radius: 4px;
16
+ direction: ltr;
17
+ /*.dow {
18
+ border-top: 1px solid #ddd !important;
19
+ }*/
20
+
21
+ }
22
+ .datepicker-inline {
23
+ width: 220px;
24
+ }
25
+ .datepicker.datepicker-rtl {
26
+ direction: rtl;
27
+ }
28
+ .datepicker.datepicker-rtl table tr td span {
29
+ float: right;
30
+ }
31
+ .datepicker-dropdown {
32
+ top: 0;
33
+ left: 0;
34
+ }
35
+ .datepicker-dropdown:before {
36
+ content: '';
37
+ display: inline-block;
38
+ border-left: 7px solid transparent;
39
+ border-right: 7px solid transparent;
40
+ border-bottom: 7px solid #ccc;
41
+ border-bottom-color: rgba(0, 0, 0, 0.2);
42
+ position: absolute;
43
+ top: -7px;
44
+ left: 6px;
45
+ }
46
+ .datepicker-dropdown:after {
47
+ content: '';
48
+ display: inline-block;
49
+ border-left: 6px solid transparent;
50
+ border-right: 6px solid transparent;
51
+ border-bottom: 6px solid #ffffff;
52
+ position: absolute;
53
+ top: -6px;
54
+ left: 7px;
55
+ }
56
+ .datepicker > div {
57
+ display: none;
58
+ }
59
+ .datepicker.days div.datepicker-days {
60
+ display: block;
61
+ }
62
+ .datepicker.months div.datepicker-months {
63
+ display: block;
64
+ }
65
+ .datepicker.years div.datepicker-years {
66
+ display: block;
67
+ }
68
+ .datepicker table {
69
+ margin: 0;
70
+ }
71
+ .datepicker td,
72
+ .datepicker th {
73
+ text-align: center;
74
+ width: 20px;
75
+ height: 20px;
76
+ -webkit-border-radius: 4px;
77
+ -moz-border-radius: 4px;
78
+ border-radius: 4px;
79
+ border: none;
80
+ }
81
+ .table-striped .datepicker table tr td,
82
+ .table-striped .datepicker table tr th {
83
+ background-color: transparent;
84
+ }
85
+ .datepicker table tr td.day:hover {
86
+ background: #eeeeee;
87
+ cursor: pointer;
88
+ }
89
+ .datepicker table tr td.old,
90
+ .datepicker table tr td.new {
91
+ color: #999999;
92
+ }
93
+ .datepicker table tr td.disabled,
94
+ .datepicker table tr td.disabled:hover {
95
+ background: none;
96
+ color: #999999;
97
+ cursor: default;
98
+ }
99
+ .datepicker table tr td.today,
100
+ .datepicker table tr td.today:hover,
101
+ .datepicker table tr td.today.disabled,
102
+ .datepicker table tr td.today.disabled:hover {
103
+ background-color: #fde19a;
104
+ background-image: -moz-linear-gradient(top, #fdd49a, #fdf59a);
105
+ background-image: -ms-linear-gradient(top, #fdd49a, #fdf59a);
106
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#fdd49a), to(#fdf59a));
107
+ background-image: -webkit-linear-gradient(top, #fdd49a, #fdf59a);
108
+ background-image: -o-linear-gradient(top, #fdd49a, #fdf59a);
109
+ background-image: linear-gradient(top, #fdd49a, #fdf59a);
110
+ background-repeat: repeat-x;
111
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#fdd49a', endColorstr='#fdf59a', GradientType=0);
112
+ border-color: #fdf59a #fdf59a #fbed50;
113
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
114
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
115
+ }
116
+ .datepicker table tr td.today:hover,
117
+ .datepicker table tr td.today:hover:hover,
118
+ .datepicker table tr td.today.disabled:hover,
119
+ .datepicker table tr td.today.disabled:hover:hover,
120
+ .datepicker table tr td.today:active,
121
+ .datepicker table tr td.today:hover:active,
122
+ .datepicker table tr td.today.disabled:active,
123
+ .datepicker table tr td.today.disabled:hover:active,
124
+ .datepicker table tr td.today.active,
125
+ .datepicker table tr td.today:hover.active,
126
+ .datepicker table tr td.today.disabled.active,
127
+ .datepicker table tr td.today.disabled:hover.active,
128
+ .datepicker table tr td.today.disabled,
129
+ .datepicker table tr td.today:hover.disabled,
130
+ .datepicker table tr td.today.disabled.disabled,
131
+ .datepicker table tr td.today.disabled:hover.disabled,
132
+ .datepicker table tr td.today[disabled],
133
+ .datepicker table tr td.today:hover[disabled],
134
+ .datepicker table tr td.today.disabled[disabled],
135
+ .datepicker table tr td.today.disabled:hover[disabled] {
136
+ background-color: #fdf59a;
137
+ }
138
+ .datepicker table tr td.today:active,
139
+ .datepicker table tr td.today:hover:active,
140
+ .datepicker table tr td.today.disabled:active,
141
+ .datepicker table tr td.today.disabled:hover:active,
142
+ .datepicker table tr td.today.active,
143
+ .datepicker table tr td.today:hover.active,
144
+ .datepicker table tr td.today.disabled.active,
145
+ .datepicker table tr td.today.disabled:hover.active {
146
+ background-color: #fbf069 \9;
147
+ }
148
+ .datepicker table tr td.active,
149
+ .datepicker table tr td.active:hover,
150
+ .datepicker table tr td.active.disabled,
151
+ .datepicker table tr td.active.disabled:hover {
152
+ background-color: #006dcc;
153
+ background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
154
+ background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
155
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
156
+ background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
157
+ background-image: -o-linear-gradient(top, #0088cc, #0044cc);
158
+ background-image: linear-gradient(top, #0088cc, #0044cc);
159
+ background-repeat: repeat-x;
160
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
161
+ border-color: #0044cc #0044cc #002a80;
162
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
163
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
164
+ color: #fff;
165
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
166
+ }
167
+ .datepicker table tr td.active:hover,
168
+ .datepicker table tr td.active:hover:hover,
169
+ .datepicker table tr td.active.disabled:hover,
170
+ .datepicker table tr td.active.disabled:hover:hover,
171
+ .datepicker table tr td.active:active,
172
+ .datepicker table tr td.active:hover:active,
173
+ .datepicker table tr td.active.disabled:active,
174
+ .datepicker table tr td.active.disabled:hover:active,
175
+ .datepicker table tr td.active.active,
176
+ .datepicker table tr td.active:hover.active,
177
+ .datepicker table tr td.active.disabled.active,
178
+ .datepicker table tr td.active.disabled:hover.active,
179
+ .datepicker table tr td.active.disabled,
180
+ .datepicker table tr td.active:hover.disabled,
181
+ .datepicker table tr td.active.disabled.disabled,
182
+ .datepicker table tr td.active.disabled:hover.disabled,
183
+ .datepicker table tr td.active[disabled],
184
+ .datepicker table tr td.active:hover[disabled],
185
+ .datepicker table tr td.active.disabled[disabled],
186
+ .datepicker table tr td.active.disabled:hover[disabled] {
187
+ background-color: #0044cc;
188
+ }
189
+ .datepicker table tr td.active:active,
190
+ .datepicker table tr td.active:hover:active,
191
+ .datepicker table tr td.active.disabled:active,
192
+ .datepicker table tr td.active.disabled:hover:active,
193
+ .datepicker table tr td.active.active,
194
+ .datepicker table tr td.active:hover.active,
195
+ .datepicker table tr td.active.disabled.active,
196
+ .datepicker table tr td.active.disabled:hover.active {
197
+ background-color: #003399 \9;
198
+ }
199
+ .datepicker table tr td span {
200
+ display: block;
201
+ width: 23%;
202
+ height: 54px;
203
+ line-height: 54px;
204
+ float: left;
205
+ margin: 1%;
206
+ cursor: pointer;
207
+ -webkit-border-radius: 4px;
208
+ -moz-border-radius: 4px;
209
+ border-radius: 4px;
210
+ }
211
+ .datepicker table tr td span:hover {
212
+ background: #eeeeee;
213
+ }
214
+ .datepicker table tr td span.disabled,
215
+ .datepicker table tr td span.disabled:hover {
216
+ background: none;
217
+ color: #999999;
218
+ cursor: default;
219
+ }
220
+ .datepicker table tr td span.active,
221
+ .datepicker table tr td span.active:hover,
222
+ .datepicker table tr td span.active.disabled,
223
+ .datepicker table tr td span.active.disabled:hover {
224
+ background-color: #006dcc;
225
+ background-image: -moz-linear-gradient(top, #0088cc, #0044cc);
226
+ background-image: -ms-linear-gradient(top, #0088cc, #0044cc);
227
+ background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0044cc));
228
+ background-image: -webkit-linear-gradient(top, #0088cc, #0044cc);
229
+ background-image: -o-linear-gradient(top, #0088cc, #0044cc);
230
+ background-image: linear-gradient(top, #0088cc, #0044cc);
231
+ background-repeat: repeat-x;
232
+ filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#0088cc', endColorstr='#0044cc', GradientType=0);
233
+ border-color: #0044cc #0044cc #002a80;
234
+ border-color: rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.1) rgba(0, 0, 0, 0.25);
235
+ filter: progid:DXImageTransform.Microsoft.gradient(enabled=false);
236
+ color: #fff;
237
+ text-shadow: 0 -1px 0 rgba(0, 0, 0, 0.25);
238
+ }
239
+ .datepicker table tr td span.active:hover,
240
+ .datepicker table tr td span.active:hover:hover,
241
+ .datepicker table tr td span.active.disabled:hover,
242
+ .datepicker table tr td span.active.disabled:hover:hover,
243
+ .datepicker table tr td span.active:active,
244
+ .datepicker table tr td span.active:hover:active,
245
+ .datepicker table tr td span.active.disabled:active,
246
+ .datepicker table tr td span.active.disabled:hover:active,
247
+ .datepicker table tr td span.active.active,
248
+ .datepicker table tr td span.active:hover.active,
249
+ .datepicker table tr td span.active.disabled.active,
250
+ .datepicker table tr td span.active.disabled:hover.active,
251
+ .datepicker table tr td span.active.disabled,
252
+ .datepicker table tr td span.active:hover.disabled,
253
+ .datepicker table tr td span.active.disabled.disabled,
254
+ .datepicker table tr td span.active.disabled:hover.disabled,
255
+ .datepicker table tr td span.active[disabled],
256
+ .datepicker table tr td span.active:hover[disabled],
257
+ .datepicker table tr td span.active.disabled[disabled],
258
+ .datepicker table tr td span.active.disabled:hover[disabled] {
259
+ background-color: #0044cc;
260
+ }
261
+ .datepicker table tr td span.active:active,
262
+ .datepicker table tr td span.active:hover:active,
263
+ .datepicker table tr td span.active.disabled:active,
264
+ .datepicker table tr td span.active.disabled:hover:active,
265
+ .datepicker table tr td span.active.active,
266
+ .datepicker table tr td span.active:hover.active,
267
+ .datepicker table tr td span.active.disabled.active,
268
+ .datepicker table tr td span.active.disabled:hover.active {
269
+ background-color: #003399 \9;
270
+ }
271
+ .datepicker table tr td span.old {
272
+ color: #999999;
273
+ }
274
+ .datepicker th.switch {
275
+ width: 145px;
276
+ }
277
+ .datepicker thead tr:first-child th,
278
+ .datepicker tfoot tr:first-child th {
279
+ cursor: pointer;
280
+ }
281
+ .datepicker thead tr:first-child th:hover,
282
+ .datepicker tfoot tr:first-child th:hover {
283
+ background: #eeeeee;
284
+ }
285
+ .datepicker .cw {
286
+ font-size: 10px;
287
+ width: 12px;
288
+ padding: 0 2px 0 5px;
289
+ vertical-align: middle;
290
+ }
291
+ .datepicker thead tr:first-child th.cw {
292
+ cursor: default;
293
+ background-color: transparent;
294
+ }
295
+ .input-append.date .add-on i,
296
+ .input-prepend.date .add-on i {
297
+ display: block;
298
+ cursor: pointer;
299
+ width: 16px;
300
+ height: 16px;
301
+ }
@@ -0,0 +1,86 @@
1
+ /*! jQuery UI - v1.10.0 - 2013-02-08
2
+ * http://jqueryui.com
3
+ * Includes: jquery.ui.core.css
4
+ * Copyright (c) 2013 jQuery Foundation and other contributors Licensed MIT */
5
+
6
+ /* Layout helpers
7
+ ----------------------------------*/
8
+ .ui-helper-hidden {
9
+ display: none;
10
+ }
11
+ .ui-helper-hidden-accessible {
12
+ border: 0;
13
+ clip: rect(0 0 0 0);
14
+ height: 1px;
15
+ margin: -1px;
16
+ overflow: hidden;
17
+ padding: 0;
18
+ position: absolute;
19
+ width: 1px;
20
+ }
21
+ .ui-helper-reset {
22
+ margin: 0;
23
+ padding: 0;
24
+ border: 0;
25
+ outline: 0;
26
+ line-height: 1.3;
27
+ text-decoration: none;
28
+ font-size: 100%;
29
+ list-style: none;
30
+ }
31
+ .ui-helper-clearfix:before,
32
+ .ui-helper-clearfix:after {
33
+ content: "";
34
+ display: table;
35
+ }
36
+ .ui-helper-clearfix:after {
37
+ clear: both;
38
+ }
39
+ .ui-helper-clearfix {
40
+ min-height: 0; /* support: IE7 */
41
+ }
42
+ .ui-helper-zfix {
43
+ width: 100%;
44
+ height: 100%;
45
+ top: 0;
46
+ left: 0;
47
+ position: absolute;
48
+ opacity: 0;
49
+ filter:Alpha(Opacity=0);
50
+ }
51
+
52
+ .ui-front {
53
+ z-index: 100;
54
+ }
55
+
56
+
57
+ /* Interaction Cues
58
+ ----------------------------------*/
59
+ .ui-state-disabled {
60
+ cursor: default !important;
61
+ }
62
+
63
+
64
+ /* Icons
65
+ ----------------------------------*/
66
+
67
+ /* states and images */
68
+ .ui-icon {
69
+ display: block;
70
+ text-indent: -99999px;
71
+ overflow: hidden;
72
+ background-repeat: no-repeat;
73
+ }
74
+
75
+
76
+ /* Misc visuals
77
+ ----------------------------------*/
78
+
79
+ /* Overlays */
80
+ .ui-widget-overlay {
81
+ position: fixed;
82
+ top: 0;
83
+ left: 0;
84
+ width: 100%;
85
+ height: 100%;
86
+ }