contour 2.1.0.beta1 → 2.1.0.beta2
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 +3 -0
- data/app/assets/javascripts/external/typeahead.js +1139 -0
- data/app/assets/stylesheets/bootstrap-overrides.css.erb +44 -13
- data/app/assets/stylesheets/contour.css +1 -0
- data/app/assets/stylesheets/typeahead.js-bootstrap.css +71 -0
- data/app/helpers/contour_helper.rb +1 -1
- data/app/views/contour/layouts/_per_page.html.erb +5 -7
- data/app/views/kaminari/contour-large/_paginator.html.erb +12 -14
- data/app/views/kaminari/contour-small/_paginator.html.erb +12 -14
- data/app/views/kaminari/contour/_paginator.html.erb +12 -14
- data/lib/contour/version.rb +1 -1
- metadata +4 -9
- data/app/views/kaminari/contour-mini/_first_page.html.erb +0 -11
- data/app/views/kaminari/contour-mini/_gap.html.erb +0 -8
- data/app/views/kaminari/contour-mini/_last_page.html.erb +0 -11
- data/app/views/kaminari/contour-mini/_next_page.html.erb +0 -11
- data/app/views/kaminari/contour-mini/_page.html.erb +0 -12
- data/app/views/kaminari/contour-mini/_paginator.html.erb +0 -25
- data/app/views/kaminari/contour-mini/_prev_page.html.erb +0 -11
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
/* bootstrap-base-overrides.css */
|
|
2
2
|
/* These overrides come after bootstrap.css */
|
|
3
3
|
|
|
4
|
-
.navbar-brand {
|
|
4
|
+
.navbar-inverse .navbar-brand {
|
|
5
5
|
color: #ffffff;
|
|
6
6
|
}
|
|
7
7
|
|
|
@@ -48,12 +48,9 @@ dt, dd {
|
|
|
48
48
|
z-index: 1000;
|
|
49
49
|
}
|
|
50
50
|
|
|
51
|
-
.btn-danger-inverse.active {
|
|
52
|
-
color: rgba(255, 255, 255, 0.75);
|
|
53
|
-
}
|
|
54
|
-
|
|
55
51
|
.btn-danger-inverse {
|
|
56
|
-
color: #
|
|
52
|
+
color: #d43f3a;
|
|
53
|
+
border-color: #ffe3e3;
|
|
57
54
|
}
|
|
58
55
|
|
|
59
56
|
.btn-danger-inverse:hover,
|
|
@@ -63,11 +60,45 @@ dt, dd {
|
|
|
63
60
|
.btn-danger-inverse.disabled,
|
|
64
61
|
.btn-danger-inverse[disabled] {
|
|
65
62
|
color: #fff;
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
63
|
+
background-color: #d43f3a;
|
|
64
|
+
border-color: #c9302c;
|
|
65
|
+
}
|
|
66
|
+
|
|
67
|
+
.btn-cancel {
|
|
68
|
+
color: #777;
|
|
69
|
+
background-color: #ededed;;
|
|
70
|
+
}
|
|
71
|
+
|
|
72
|
+
.btn-cancel:hover,
|
|
73
|
+
.btn-cancel:focus,
|
|
74
|
+
.btn-cancel:active,
|
|
75
|
+
.btn-cancel.active,
|
|
76
|
+
.btn-cancel.disabled,
|
|
77
|
+
.btn-cancel[disabled] {
|
|
78
|
+
color: #fff;
|
|
79
|
+
background-color: #777;
|
|
80
|
+
border-color: #777;
|
|
81
|
+
}
|
|
82
|
+
|
|
83
|
+
|
|
84
|
+
.btn-cancel-inverse {
|
|
85
|
+
border: 1px solid #ededed;
|
|
86
|
+
color: #777;
|
|
87
|
+
}
|
|
88
|
+
|
|
89
|
+
.btn-cancel-inverse:hover,
|
|
90
|
+
.btn-cancel-inverse:focus,
|
|
91
|
+
.btn-cancel-inverse:active,
|
|
92
|
+
.btn-cancel-inverse.active,
|
|
93
|
+
.btn-cancel-inverse.disabled,
|
|
94
|
+
.btn-cancel-inverse[disabled] {
|
|
95
|
+
color: #fff;
|
|
96
|
+
background-color: #777;
|
|
97
|
+
border-color: #777;
|
|
98
|
+
}
|
|
99
|
+
|
|
100
|
+
.form-inline select,
|
|
101
|
+
.form-inline input[type="text"],
|
|
102
|
+
.form-inline input[type="password"] {
|
|
103
|
+
width: 180px;
|
|
73
104
|
}
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
.twitter-typeahead {
|
|
2
|
+
display: inline-block;
|
|
3
|
+
width: 100%;
|
|
4
|
+
height: 38px;
|
|
5
|
+
/*padding: 8px 12px;*/
|
|
6
|
+
font-size: 14px;
|
|
7
|
+
line-height: 1.428571429;
|
|
8
|
+
color: #555555;
|
|
9
|
+
vertical-align: middle;
|
|
10
|
+
background-color: #ffffff;
|
|
11
|
+
/*border: 1px solid #cccccc;*/
|
|
12
|
+
border-radius: 4px;
|
|
13
|
+
/*-webkit-box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);*/
|
|
14
|
+
/*box-shadow: inset 0 1px 1px rgba(0, 0, 0, 0.075);*/
|
|
15
|
+
/*-webkit-transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;*/
|
|
16
|
+
/*transition: border-color ease-in-out 0.15s, box-shadow ease-in-out 0.15s;*/
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
.twitter-typeahead .tt-query,
|
|
20
|
+
.twitter-typeahead .tt-hint {
|
|
21
|
+
margin-bottom: 0;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
.tt-dropdown-menu {
|
|
25
|
+
min-width: 160px;
|
|
26
|
+
margin-top: 2px;
|
|
27
|
+
padding: 5px 0;
|
|
28
|
+
background-color: #fff;
|
|
29
|
+
border: 1px solid #ccc;
|
|
30
|
+
border: 1px solid rgba(0,0,0,.2);
|
|
31
|
+
*border-right-width: 2px;
|
|
32
|
+
*border-bottom-width: 2px;
|
|
33
|
+
-webkit-border-radius: 6px;
|
|
34
|
+
-moz-border-radius: 6px;
|
|
35
|
+
border-radius: 6px;
|
|
36
|
+
-webkit-box-shadow: 0 5px 10px rgba(0,0,0,.2);
|
|
37
|
+
-moz-box-shadow: 0 5px 10px rgba(0,0,0,.2);
|
|
38
|
+
box-shadow: 0 5px 10px rgba(0,0,0,.2);
|
|
39
|
+
-webkit-background-clip: padding-box;
|
|
40
|
+
-moz-background-clip: padding;
|
|
41
|
+
background-clip: padding-box;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
.tt-suggestion {
|
|
45
|
+
display: block;
|
|
46
|
+
padding: 3px 20px;
|
|
47
|
+
}
|
|
48
|
+
|
|
49
|
+
.tt-suggestion.tt-is-under-cursor {
|
|
50
|
+
color: #fff;
|
|
51
|
+
background-color: #0081c2;
|
|
52
|
+
background-image: -moz-linear-gradient(top, #0088cc, #0077b3);
|
|
53
|
+
background-image: -webkit-gradient(linear, 0 0, 0 100%, from(#0088cc), to(#0077b3));
|
|
54
|
+
background-image: -webkit-linear-gradient(top, #0088cc, #0077b3);
|
|
55
|
+
background-image: -o-linear-gradient(top, #0088cc, #0077b3);
|
|
56
|
+
background-image: linear-gradient(to bottom, #0088cc, #0077b3);
|
|
57
|
+
background-repeat: repeat-x;
|
|
58
|
+
filter: progid:DXImageTransform.Microsoft.gradient(startColorstr='#ff0088cc', endColorstr='#ff0077b3', GradientType=0)
|
|
59
|
+
}
|
|
60
|
+
|
|
61
|
+
.tt-suggestion.tt-is-under-cursor a {
|
|
62
|
+
color: #fff;
|
|
63
|
+
}
|
|
64
|
+
|
|
65
|
+
.tt-suggestion p {
|
|
66
|
+
margin: 0;
|
|
67
|
+
}
|
|
68
|
+
|
|
69
|
+
.tt-hint {
|
|
70
|
+
display: none;
|
|
71
|
+
}
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
module ContourHelper
|
|
2
2
|
|
|
3
3
|
def cancel
|
|
4
|
-
link_to 'Cancel', URI.parse(request.referer.to_s).path.blank? ? root_path : (URI.parse(request.referer.to_s).path), class: 'btn'
|
|
4
|
+
link_to 'Cancel', URI.parse(request.referer.to_s).path.blank? ? root_path : (URI.parse(request.referer.to_s).path), class: 'btn btn-cancel-inverse'
|
|
5
5
|
end
|
|
6
6
|
|
|
7
7
|
def sort_field_helper(order, sort_field, display_name, search_form_id = 'search_form')
|
|
@@ -1,7 +1,5 @@
|
|
|
1
|
-
<
|
|
2
|
-
<
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
</ul>
|
|
7
|
-
</div>
|
|
1
|
+
<ul class="pagination pull-right <%= "pagination-#{pagination_size}" if defined?(pagination_size) and ['large', 'small'].include?(pagination_size) %>">
|
|
2
|
+
<li class="disabled"><span>Per Page</span></li>
|
|
3
|
+
<li class="active per_page"><%= link_to (defined?(per_page) and per_page ? per_page : 20), "#" %></li>
|
|
4
|
+
<% if defined?(object_count) and object_count %><li class="disabled"><span>out of <%= object_count %></span></li><% end %>
|
|
5
|
+
</ul>
|
|
@@ -7,19 +7,17 @@
|
|
|
7
7
|
paginator: the paginator that renders the pagination tags inside
|
|
8
8
|
-%>
|
|
9
9
|
<%= paginator.render do -%>
|
|
10
|
-
<
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
<%
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
<%= gap_tag %>
|
|
19
|
-
<% end -%>
|
|
10
|
+
<ul class="pagination pagination-centered pagination-large">
|
|
11
|
+
<%= first_page_tag %> <%# unless current_page.first? %>
|
|
12
|
+
<%= prev_page_tag %> <%# unless current_page.first? %>
|
|
13
|
+
<% each_page do |page| -%>
|
|
14
|
+
<% if page.left_outer? || page.right_outer? || page.inside_window? -%>
|
|
15
|
+
<%= page_tag page %>
|
|
16
|
+
<% elsif !page.was_truncated? -%>
|
|
17
|
+
<%= gap_tag %>
|
|
20
18
|
<% end -%>
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
</
|
|
19
|
+
<% end -%>
|
|
20
|
+
<%= next_page_tag %> <%# unless current_page.last? %>
|
|
21
|
+
<%= last_page_tag %> <%# unless current_page.last? %>
|
|
22
|
+
</ul>
|
|
25
23
|
<% end -%>
|
|
@@ -7,19 +7,17 @@
|
|
|
7
7
|
paginator: the paginator that renders the pagination tags inside
|
|
8
8
|
-%>
|
|
9
9
|
<%= paginator.render do -%>
|
|
10
|
-
<
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
<%
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
<%= gap_tag %>
|
|
19
|
-
<% end -%>
|
|
10
|
+
<ul class="pagination pagination-centered pagination-small">
|
|
11
|
+
<%= first_page_tag %> <%# unless current_page.first? %>
|
|
12
|
+
<%= prev_page_tag %> <%# unless current_page.first? %>
|
|
13
|
+
<% each_page do |page| -%>
|
|
14
|
+
<% if page.left_outer? || page.right_outer? || page.inside_window? -%>
|
|
15
|
+
<%= page_tag page %>
|
|
16
|
+
<% elsif !page.was_truncated? -%>
|
|
17
|
+
<%= gap_tag %>
|
|
20
18
|
<% end -%>
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
</
|
|
19
|
+
<% end -%>
|
|
20
|
+
<%= next_page_tag %> <%# unless current_page.last? %>
|
|
21
|
+
<%= last_page_tag %> <%# unless current_page.last? %>
|
|
22
|
+
</ul>
|
|
25
23
|
<% end -%>
|
|
@@ -7,19 +7,17 @@
|
|
|
7
7
|
paginator: the paginator that renders the pagination tags inside
|
|
8
8
|
-%>
|
|
9
9
|
<%= paginator.render do -%>
|
|
10
|
-
<
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
<%
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
<%= gap_tag %>
|
|
19
|
-
<% end -%>
|
|
10
|
+
<ul class="pagination pagination-centered">
|
|
11
|
+
<%= first_page_tag %> <%# unless current_page.first? %>
|
|
12
|
+
<%= prev_page_tag %> <%# unless current_page.first? %>
|
|
13
|
+
<% each_page do |page| -%>
|
|
14
|
+
<% if page.left_outer? || page.right_outer? || page.inside_window? -%>
|
|
15
|
+
<%= page_tag page %>
|
|
16
|
+
<% elsif !page.was_truncated? -%>
|
|
17
|
+
<%= gap_tag %>
|
|
20
18
|
<% end -%>
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
</
|
|
19
|
+
<% end -%>
|
|
20
|
+
<%= next_page_tag %> <%# unless current_page.last? %>
|
|
21
|
+
<%= last_page_tag %> <%# unless current_page.last? %>
|
|
22
|
+
</ul>
|
|
25
23
|
<% end -%>
|
data/lib/contour/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
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.beta2
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Remo Mueller
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2013-
|
|
11
|
+
date: 2013-08-02 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|
|
@@ -226,6 +226,7 @@ files:
|
|
|
226
226
|
- app/assets/javascripts/external/bootstrap-timepicker.js
|
|
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
|
+
- app/assets/javascripts/external/typeahead.js
|
|
229
230
|
- app/assets/javascripts/twitter-bootstrap/bootstrap-scroll-modal.js
|
|
230
231
|
- app/assets/javascripts/twitter-bootstrap/bootstrap.js.coffee
|
|
231
232
|
- app/assets/stylesheets/bootstrap/bootstrap-glyphicons.css
|
|
@@ -240,6 +241,7 @@ files:
|
|
|
240
241
|
- app/assets/stylesheets/spinner.css.erb
|
|
241
242
|
- app/assets/stylesheets/timepicker.css
|
|
242
243
|
- app/assets/stylesheets/twitter-bootstrap/bootstrap-scroll-modal.css
|
|
244
|
+
- app/assets/stylesheets/typeahead.js-bootstrap.css
|
|
243
245
|
- app/controllers/contour/authentications_controller.rb
|
|
244
246
|
- app/controllers/contour/confirmations_controller.rb
|
|
245
247
|
- app/controllers/contour/passwords_controller.rb
|
|
@@ -282,13 +284,6 @@ files:
|
|
|
282
284
|
- app/views/kaminari/contour-large/_page.html.erb
|
|
283
285
|
- app/views/kaminari/contour-large/_paginator.html.erb
|
|
284
286
|
- app/views/kaminari/contour-large/_prev_page.html.erb
|
|
285
|
-
- app/views/kaminari/contour-mini/_first_page.html.erb
|
|
286
|
-
- app/views/kaminari/contour-mini/_gap.html.erb
|
|
287
|
-
- app/views/kaminari/contour-mini/_last_page.html.erb
|
|
288
|
-
- app/views/kaminari/contour-mini/_next_page.html.erb
|
|
289
|
-
- app/views/kaminari/contour-mini/_page.html.erb
|
|
290
|
-
- app/views/kaminari/contour-mini/_paginator.html.erb
|
|
291
|
-
- app/views/kaminari/contour-mini/_prev_page.html.erb
|
|
292
287
|
- app/views/kaminari/contour-small/_first_page.html.erb
|
|
293
288
|
- app/views/kaminari/contour-small/_gap.html.erb
|
|
294
289
|
- app/views/kaminari/contour-small/_last_page.html.erb
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
<%# Link to the "First" page
|
|
2
|
-
- available local variables
|
|
3
|
-
url: url to the first page
|
|
4
|
-
current_page: a page object for the currently displayed page
|
|
5
|
-
num_pages: total number of pages
|
|
6
|
-
per_page: number of items to fetch per page
|
|
7
|
-
remote: data-remote
|
|
8
|
-
-%>
|
|
9
|
-
<li class="first">
|
|
10
|
-
<%= link_to raw(t 'views.pagination.first'), url, :remote => remote %>
|
|
11
|
-
</li>
|
|
@@ -1,8 +0,0 @@
|
|
|
1
|
-
<%# Non-link tag that stands for skipped pages...
|
|
2
|
-
- available local variables
|
|
3
|
-
current_page: a page object for the currently displayed page
|
|
4
|
-
num_pages: total number of pages
|
|
5
|
-
per_page: number of items to fetch per page
|
|
6
|
-
remote: data-remote
|
|
7
|
-
-%>
|
|
8
|
-
<li class="page gap disabled"><%= link_to raw(t 'views.pagination.truncate'), '#' %></li>
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
<%# Link to the "Last" page
|
|
2
|
-
- available local variables
|
|
3
|
-
url: url to the last page
|
|
4
|
-
current_page: a page object for the currently displayed page
|
|
5
|
-
num_pages: total number of pages
|
|
6
|
-
per_page: number of items to fetch per page
|
|
7
|
-
remote: data-remote
|
|
8
|
-
-%>
|
|
9
|
-
<li class="last">
|
|
10
|
-
<%= link_to raw(t 'views.pagination.last'), url, {:remote => remote} %>
|
|
11
|
-
</li>
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
<%# Link to the "Next" page
|
|
2
|
-
- available local variables
|
|
3
|
-
url: url to the next page
|
|
4
|
-
current_page: a page object for the currently displayed page
|
|
5
|
-
num_pages: total number of pages
|
|
6
|
-
per_page: number of items to fetch per page
|
|
7
|
-
remote: data-remote
|
|
8
|
-
-%>
|
|
9
|
-
<li class="next">
|
|
10
|
-
<%= link_to raw(t 'views.pagination.next'), url, :rel => 'next', :remote => remote %>
|
|
11
|
-
</li>
|
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
<%# Link showing page number
|
|
2
|
-
- available local variables
|
|
3
|
-
page: a page object for "this" page
|
|
4
|
-
url: url to this page
|
|
5
|
-
current_page: a page object for the currently displayed page
|
|
6
|
-
num_pages: total number of pages
|
|
7
|
-
per_page: number of items to fetch per page
|
|
8
|
-
remote: data-remote
|
|
9
|
-
-%>
|
|
10
|
-
<li class="page<%= ' active' if page.current? %>">
|
|
11
|
-
<%= link_to page, url, opts = {:remote => remote, :rel => page.next? ? 'next' : page.prev? ? 'prev' : nil} %>
|
|
12
|
-
</li>
|
|
@@ -1,25 +0,0 @@
|
|
|
1
|
-
<%# The container tag
|
|
2
|
-
- available local variables
|
|
3
|
-
current_page: a page object for the currently displayed page
|
|
4
|
-
num_pages: total number of pages
|
|
5
|
-
per_page: number of items to fetch per page
|
|
6
|
-
remote: data-remote
|
|
7
|
-
paginator: the paginator that renders the pagination tags inside
|
|
8
|
-
-%>
|
|
9
|
-
<%= paginator.render do -%>
|
|
10
|
-
<nav class="pagination pagination-centered pagination-mini">
|
|
11
|
-
<ul>
|
|
12
|
-
<%= first_page_tag %> <%# unless current_page.first? %>
|
|
13
|
-
<%= prev_page_tag %> <%# unless current_page.first? %>
|
|
14
|
-
<% each_page do |page| -%>
|
|
15
|
-
<% if page.left_outer? || page.right_outer? || page.inside_window? -%>
|
|
16
|
-
<%= page_tag page %>
|
|
17
|
-
<% elsif !page.was_truncated? -%>
|
|
18
|
-
<%= gap_tag %>
|
|
19
|
-
<% end -%>
|
|
20
|
-
<% end -%>
|
|
21
|
-
<%= next_page_tag %> <%# unless current_page.last? %>
|
|
22
|
-
<%= last_page_tag %> <%# unless current_page.last? %>
|
|
23
|
-
</ul>
|
|
24
|
-
</nav>
|
|
25
|
-
<% end -%>
|
|
@@ -1,11 +0,0 @@
|
|
|
1
|
-
<%# Link to the "Previous" page
|
|
2
|
-
- available local variables
|
|
3
|
-
url: url to the previous page
|
|
4
|
-
current_page: a page object for the currently displayed page
|
|
5
|
-
num_pages: total number of pages
|
|
6
|
-
per_page: number of items to fetch per page
|
|
7
|
-
remote: data-remote
|
|
8
|
-
-%>
|
|
9
|
-
<li class="prev">
|
|
10
|
-
<%= link_to raw(t 'views.pagination.previous'), url, :rel => 'prev', :remote => remote %>
|
|
11
|
-
</li>
|