Skip to content

Commit 6c8ad2e

Browse files
bistlinebistline
authored
Merge pull request #100 from broadinstitute/development
Updates to branding group form
2 parents 2ca79c0 + f613518 commit 6c8ad2e

File tree

4 files changed

+43
-18
lines changed

4 files changed

+43
-18
lines changed

‎app/helpers/branding_groups_helper.rb

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,29 @@
11
module BrandingGroupsHelper
2+
3+
def web_safe_fonts
4+
[
5+
['Sans-serif',
6+
[
7+
['Arial', 'Arial, sans-serif'], ['Arial Narrow', 'Arial Narrow, sans-serif'], ['Arial Rounded MT Bold','Arial Rounded MT Bold, sans-serif'],
8+
['Calibri', 'Calibri, sans-serif'], ['Candara','Candara, sans-serif'], ['Century Gothic','Century Gothic, sans-serif'],
9+
['Gill Sans','Gill Sans, sans-serif'], ['Helvetica','Helvetica, sans-serif'], ['Helvetica Neue','Helvetica Neue, sans-serif'],
10+
['Tahoma','Tahoma, sans-serif'], ['Trebuchet MS','Trebuchet MS, sans-serif'], ['Verdana','Verdana, sans-serif']
11+
]
12+
],
13+
['Serif',
14+
[
15+
['Baskerville','Baskerville, serif'], ['Book Antiqua','Book Antiqua, serif'], ['Calisto MT','Calisto MT, serif'],
16+
['Cambria','Cambria, serif'], ['Garamond','Garamond, serif'], ['Georgia','Georgia, serif'], ['Goudy Old Style','Goudy Old Style, serif'],
17+
['Lucida Bright','Lucida Bright, serif'], ['Palatino','Palatino, serif'], ['Times New Roman','Times New Roman, serif']
18+
]
19+
],
20+
['Monospace',
21+
[
22+
['Andale Mono','Andale Mono, monospace'], ['Consolas','Consolas, monospace'], ['Courier New','Courier New, monospace'],
23+
['Lucida Console','Lucida Console, monospace'], ['Lucida Sans Typewriter','Lucida Sans Typewriter, monospace'],
24+
['Monaco','Monaco, monospace']
25+
]
26+
]
27+
]
28+
end
229
end

‎app/models/branding_group.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class BrandingGroup
77
field :name_as_id, type: String
88
field :tag_line, type: String
99
field :background_color, type: String
10-
field :font_family, type: String, default: 'Helvetica Neue'
10+
field :font_family, type: String, default: 'Helvetica Neue, sans-serif'
1111
field :font_color, type: String, default: '#333333'
1212

1313
has_many :studies

‎app/views/branding_groups/_form.html.erb

Lines changed: 13 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -17,21 +17,21 @@
1717
<%= f.text_field :name, class: 'form-control' %>
1818
</div>
1919
<div class="col-md-6">
20-
<%= f.label :tag_line %><br>
20+
<%= f.label :tag_line, 'Tag Line' %><br>
2121
<%= f.text_field :tag_line, class: 'form-control' %>
2222
</div>
2323
</div>
2424
<div class="form-group row">
2525
<div class="col-md-3">
26-
<%= f.label :background_color %><br>
26+
<%= f.label :background_color, 'Background Color' %><br>
2727
<%= f.color_field :background_color, class: 'form-control' %>
2828
</div>
2929
<div class="col-md-3">
30-
<%= f.label :font_family %><br>
31-
<%= f.text_field :font_family, class: 'form-control' %>
30+
<%= f.label :font_family, "Font Family #{link_to "<i class='fa fa-fw fa-eye'></i>".html_safe, 'https://www.cssfontstack.com', title: 'View Options', data: {toggle: 'tooltip'}, target: :_blank}".html_safe %><br>
31+
<%= f.select :font_family, grouped_options_for_select(web_safe_fonts, @branding_group.font_family), {}, class: 'form-control' %>
3232
</div>
3333
<div class="col-md-3">
34-
<%= f.label :font_color %><br>
34+
<%= f.label :font_color, 'Font Color' %><br>
3535
<%= f.color_field :font_color, class: 'form-control' %>
3636
</div>
3737
<div class="col-md-3">
@@ -41,16 +41,14 @@
4141
</div>
4242
</div>
4343
<div class="form-group row">
44-
<div class="col-md-12">
45-
<div class="col-md-3">
46-
<%= f.label :splash_image, 'Splash Image' %><br/>
47-
<%= f.file_field :splash_image, class: 'btn btn-default fileinput-button' %>
48-
<% if @branding_group.splash_image.present? %>
49-
<p class="help-block">Current file: <%= link_to "<i class='fa fa-download'></i> #{@branding_group.splash_image_file_name} (#{ number_to_human_size @branding_group.splash_image_file_size})".html_safe,
50-
@branding_group.splash_image.url, download: @branding_group.splash_image_file_name,
51-
class: 'btn btn-xs btn-primary' %></p>
52-
<% end %>
53-
</div>
44+
<div class="col-md-3">
45+
<%= f.label :splash_image, 'Splash Image' %><br/>
46+
<%= f.file_field :splash_image, class: 'btn btn-default fileinput-button' %>
47+
<% if @branding_group.splash_image.present? %>
48+
<p class="help-block">Current file: <%= link_to "<i class='fa fa-download'></i> #{@branding_group.splash_image_file_name} (#{ number_to_human_size @branding_group.splash_image_file_size})".html_safe,
49+
@branding_group.splash_image.url, download: @branding_group.splash_image_file_name,
50+
class: 'btn btn-xs btn-primary' %></p>
51+
<% end %>
5452
</div>
5553
</div>
5654

‎app/views/branding_groups/show.html.erb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11

22
<div id="branding-group-demo" style="font-family: <%= @branding_group.font_family %> !important; color: <%= @branding_group.font_color %> !important; background-color: <%= @branding_group.background_color %> !important;">
3-
<h1><span id="branding_group_name"><%= @branding_group.name %></span> <%= link_to "<i class='fa fa-eye'></i> View Live".html_safe, site_path(brand: @branding_group.name_as_id), class: 'btn btn-default' %></h1>
3+
<h1><span id="branding_group_name"><%= @branding_group.name %></span> <%= link_to "<i class='fa fa-eye'></i> View Live".html_safe, site_path(scpbr: @branding_group.name_as_id), class: 'btn btn-default' %></h1>
44
<p class="lead" id="branding_group_tag_line"><%= @branding_group.tag_line %></p>
55
<div class="row">
66
<div class="col-md-3">
@@ -9,7 +9,7 @@
99
<p>Background color: <span id="branding_group_background_color"><%= @branding_group.background_color %></span></p>
1010
</div>
1111
<div class="col-md-9">
12-
<p>Splash Image <span id="branding_group_splash_image"><%= @branding_group.splash_image_file_name %></span></p>
12+
<p>Splash Image: <span id="branding_group_splash_image"><%= @branding_group.splash_image_file_name %></span></p>
1313
<%= image_tag @branding_group.splash_image.url, class: 'img-thumbnail' %>
1414
</div>
1515
</div>

0 commit comments

Comments
 (0)