contour 2.1.0.beta15 → 2.1.0.beta16
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/app/helpers/contour_helper.rb +2 -1
- data/app/views/contour/confirmations/new.html.erb +1 -1
- data/app/views/contour/passwords/edit.html.erb +1 -1
- data/app/views/contour/passwords/new.html.erb +1 -1
- data/app/views/contour/registrations/edit.html.erb +1 -1
- data/app/views/contour/registrations/new.html.erb +1 -1
- data/app/views/contour/samples/index.html.erb +1 -5
- data/app/views/contour/sessions/new.html.erb +16 -7
- data/app/views/contour/unlocks/new.html.erb +1 -1
- data/lib/contour/version.rb +1 -1
- data/lib/generators/contour/scaffold/templates/_form.html.erb +10 -5
- data/lib/generators/contour/scaffold/templates/_paginate.html.erb +1 -1
- data/lib/generators/contour/scaffold/templates/show.html.erb +1 -1
- metadata +2 -3
- data/app/views/contour/authentications/_login_table.html.erb +0 -14
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 01903d7f529481bbc3a19c40a784ba83f789a216
|
|
4
|
+
data.tar.gz: 0b2c9921b085b594d803f99cd5f18f76b4e10b56
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: bd4d7d442b3642d68c417aa6f4608bf4ad315732409a9a5fa5f45ccf68abde3669228dc92f80b19cb54c96d2512ea40b0df985982249b7f32e41fdef61ff696e
|
|
7
|
+
data.tar.gz: 1f4f848faeaf2402c1ebb5d4d1f1c57782c73381e18f65a1d976eae7f5a018afc8f9f1aaa04e55798a23ecc0732db82ccda7d3dd93b512bb9d18006a2c27b3a9
|
|
@@ -28,7 +28,8 @@ module ContourHelper
|
|
|
28
28
|
# From Twitter-Bootstrap-Rails
|
|
29
29
|
def flash_container(type, message)
|
|
30
30
|
type = 'success' if type.to_s == 'notice'
|
|
31
|
-
type = '
|
|
31
|
+
type = 'danger' if ['alert', 'error'].include?(type.to_s)
|
|
32
|
+
|
|
32
33
|
content_tag(:div, class: "navbar-alert alert alert-#{type}") do
|
|
33
34
|
content_tag(:a, raw("×"), href: '#', class: 'close', data: { dismiss: 'alert' }) + message
|
|
34
35
|
end.html_safe
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
</div>
|
|
15
15
|
|
|
16
16
|
<div class="form-group">
|
|
17
|
-
<div class="col-md-
|
|
17
|
+
<div class="col-md-offset-2 col-md-10">
|
|
18
18
|
<%= f.submit "Send me reset password instructions", class: 'btn btn-primary' %>
|
|
19
19
|
<%= render partial: 'contour/links' %>
|
|
20
20
|
</div>
|
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
<% @title = 'Sign in' %>
|
|
2
2
|
|
|
3
3
|
<div class="row">
|
|
4
|
-
<div class="
|
|
4
|
+
<div class="col-md-8">
|
|
5
5
|
<div class="page-header">
|
|
6
6
|
<h1><%= @title %></h1>
|
|
7
7
|
</div>
|
|
@@ -23,24 +23,33 @@
|
|
|
23
23
|
|
|
24
24
|
<% if devise_mapping.rememberable? -%>
|
|
25
25
|
<div class="form-group">
|
|
26
|
-
<div class="col-md-10
|
|
27
|
-
|
|
26
|
+
<div class="col-md-offset-2 col-md-10">
|
|
27
|
+
<div class="checkbox">
|
|
28
|
+
<label>
|
|
29
|
+
<%= f.check_box :remember_me %>
|
|
30
|
+
Remember me
|
|
31
|
+
</label>
|
|
32
|
+
</div>
|
|
28
33
|
</div>
|
|
29
34
|
</div>
|
|
30
35
|
<% end -%>
|
|
31
36
|
|
|
32
37
|
<div class="form-group">
|
|
33
|
-
<div class="col-md-
|
|
38
|
+
<div class="col-md-offset-2 col-md-10">
|
|
34
39
|
<%= f.submit "Sign in", class: 'btn btn-primary' %>
|
|
35
40
|
<%= render partial: 'contour/links' %>
|
|
41
|
+
<% PROVIDERS.each do |provider| %>
|
|
42
|
+
<a href="<%= request.script_name + "/" + OmniAuth.config.path_prefix.split('/').last.to_s + "/" + provider.to_s.downcase %>" class="btn btn-large btn-default" style="white-space:nowrap">
|
|
43
|
+
<%= image_tag "contour/#{provider.to_s.downcase}_32.png", align: 'absmiddle' %>
|
|
44
|
+
</a>
|
|
45
|
+
<% end %>
|
|
36
46
|
</div>
|
|
37
47
|
</div>
|
|
38
|
-
|
|
39
|
-
<%= render partial: 'contour/authentications/login_table' %>
|
|
40
48
|
<% end %>
|
|
49
|
+
|
|
41
50
|
</div>
|
|
42
51
|
|
|
43
|
-
<div class="
|
|
52
|
+
<div class="col-md-4">
|
|
44
53
|
<%= render partial: 'contour/layouts/latest_news' %>
|
|
45
54
|
</div>
|
|
46
55
|
</div>
|
data/lib/contour/version.rb
CHANGED
|
@@ -17,22 +17,27 @@
|
|
|
17
17
|
|
|
18
18
|
<%- columns.each do |column| -%>
|
|
19
19
|
<div class="form-group">
|
|
20
|
-
|
|
21
|
-
<div class="col-md-10">
|
|
20
|
+
<% unless column.field_type == :check_box %><%%= f.label :<%= column.name %>, nil, class: 'col-md-2 control-label' %><% end %>
|
|
21
|
+
<div class="<%- if column.field_type == :check_box %>col-md-offset-2 <%- end -%>col-md-10">
|
|
22
22
|
<%- if column.name.split('_').last == 'id' -%>
|
|
23
23
|
<%%= f.select :<%= column.name %>, [['---', nil]] + <%= column.name.split('_')[0..-2].join('_').camelize %>.current.collect{|<%= column.name.first %>| [<%= column.name.first %>.name, <%= column.name.first %>.id]}, {}, class: 'form-control' %>
|
|
24
24
|
<%- elsif column.field_type == :date_select -%>
|
|
25
25
|
<%%= f.text_field :<%= column.name %>, class: 'datepicker form-control', value: @<%= resource_name %>.<%= column.name %> ? @<%= resource_name %>.<%= column.name %>.strftime('%m/%d/%Y') : '' %>
|
|
26
|
+
<%- elsif column.field_type == :check_box -%>
|
|
27
|
+
<div class="checkbox">
|
|
28
|
+
<label>
|
|
29
|
+
<%%= f.check_box :<%= column.name %> %> <%= column.name.humanize %>
|
|
30
|
+
</label>
|
|
31
|
+
</div>
|
|
26
32
|
<%- else -%>
|
|
27
|
-
<%%= f.<%= column.field_type %> :<%= column.name %><%= ", rows: 7
|
|
33
|
+
<%%= f.<%= column.field_type %> :<%= column.name %><%= ", rows: 7" if column.field_type == :text_area %>, class: 'form-control' %>
|
|
28
34
|
<%- end -%>
|
|
29
35
|
</div>
|
|
30
36
|
</div>
|
|
31
37
|
|
|
32
38
|
<%- end -%>
|
|
33
|
-
|
|
34
39
|
<div class="form-group">
|
|
35
|
-
<div class="col-md-
|
|
40
|
+
<div class="col-md-offset-2 col-md-10">
|
|
36
41
|
<%%= f.submit nil, class: 'btn btn-primary' %>
|
|
37
42
|
<%%= cancel %>
|
|
38
43
|
</div>
|
|
@@ -20,7 +20,7 @@
|
|
|
20
20
|
<%- end -%>
|
|
21
21
|
<%- end -%>
|
|
22
22
|
<td>
|
|
23
|
-
<%%= link_to 'Edit', edit_<%= resource_name %>_path(<%= resource_name %>), class: 'btn btn-xs' %>
|
|
23
|
+
<%%= link_to 'Edit', edit_<%= resource_name %>_path(<%= resource_name %>), class: 'btn btn-xs btn-default' %>
|
|
24
24
|
<%%= link_to 'Delete', <%= resource_name %>, method: :delete, class: 'btn btn-xs btn-danger-inverse', data: { confirm: "Are you sure you want to delete <%= resource_title %> #{<%= resource_name %>.name}?" } %>
|
|
25
25
|
</td>
|
|
26
26
|
</tr>
|
|
@@ -2,7 +2,7 @@
|
|
|
2
2
|
<div class="page-header">
|
|
3
3
|
<h1>
|
|
4
4
|
<%%= link_to "<%= resource_title_plural %>", <%= resource_name_plural %>_path %> · <%%= @title %>
|
|
5
|
-
<%%= link_to "Edit <%= resource_title %>", edit_<%= resource_name %>_path(@<%= resource_name %>), class: 'btn btn-xs' %>
|
|
5
|
+
<%%= link_to "Edit <%= resource_title %>", edit_<%= resource_name %>_path(@<%= resource_name %>), class: 'btn btn-xs btn-default' %>
|
|
6
6
|
<%%= link_to "Delete <%= resource_title %>", @<%= resource_name %>, method: :delete, class: 'btn btn-xs btn-danger-inverse', data: { confirm: "Are you sure you want to delete <%= resource_title %> #{@<%= resource_name %>.name}?" } %>
|
|
7
7
|
</h1>
|
|
8
8
|
</div>
|
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.beta16
|
|
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-08-
|
|
11
|
+
date: 2013-08-21 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: rails
|
|
@@ -253,7 +253,6 @@ files:
|
|
|
253
253
|
- app/models/concerns/contourable.rb
|
|
254
254
|
- app/views/contour/_links.html.erb
|
|
255
255
|
- app/views/contour/authentications/_index.html.erb
|
|
256
|
-
- app/views/contour/authentications/_login_table.html.erb
|
|
257
256
|
- app/views/contour/authentications/_menu.html.erb
|
|
258
257
|
- app/views/contour/authentications/index.html.erb
|
|
259
258
|
- app/views/contour/confirmations/new.html.erb
|
|
@@ -1,14 +0,0 @@
|
|
|
1
|
-
<% if PROVIDERS.size > 0 %>
|
|
2
|
-
<div class="form-group">
|
|
3
|
-
<label class="control-label">Sign in with</label>
|
|
4
|
-
<div class="col-md-10">
|
|
5
|
-
<% PROVIDERS.each do |provider| %>
|
|
6
|
-
<% provider_name = OmniAuth.config.camelizations[provider.to_s.downcase] || provider.to_s.titleize %>
|
|
7
|
-
<% image_name = provider.to_s.downcase %>
|
|
8
|
-
<a href="<%= request.script_name %><%= "/" + OmniAuth.config.path_prefix.split('/').last.to_s %><%= "/" + provider.to_s.downcase %>" class="btn" style="white-space:nowrap">
|
|
9
|
-
<%= image_tag "contour/#{image_name}_32.png", align: 'absmiddle', height: "28px" %>
|
|
10
|
-
</a>
|
|
11
|
-
<% end %>
|
|
12
|
-
</div>
|
|
13
|
-
</div>
|
|
14
|
-
<% end %>
|