Skip to content

Commit

Permalink
minor content and bug fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
jamesmk committed Apr 20, 2018
1 parent ef5debe commit df212f5
Show file tree
Hide file tree
Showing 6 changed files with 12 additions and 11 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2015-2017 FINE Design Group, Inc.
Copyright (c) 2015-2018 FINE Design Group, Inc.

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
Expand Down
4 changes: 2 additions & 2 deletions app/assets/javascripts/fae/form/_validator.js
Original file line number Diff line number Diff line change
Expand Up @@ -214,9 +214,9 @@ Fae.form.validator = {

var $wrapper = $input.closest('.input');
if ($wrapper.children('.error').length) {
$wrapper.children('.error').text(messages.join(','));
$wrapper.children('.error').text(messages.join(', '));
} else {
$wrapper.addClass('field_with_errors').append("<span class='error'>" + messages.join(',') + "</span>");
$wrapper.addClass('field_with_errors').append("<span class='error'>" + messages.join(', ') + "</span>");
}
},

Expand Down
4 changes: 2 additions & 2 deletions app/helpers/fae/form_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -228,9 +228,9 @@ def set_maxlength(f, attribute, options)
def attempt_common_helper_text(attribute)
case attribute
when :seo_title
return 'Company Name | Keyword-driven description of the page section. Approx 65 characters.'
return 'A descriptive page title of ~50-65 characters. Displayed in search engine results.'
when :seo_description
return 'Displayed in search engine results. Under 150 characters.'
return 'A helpful page summary of 320 characters or less. Displayed in search engine results.'
else
''
end
Expand Down
2 changes: 1 addition & 1 deletion app/models/fae/option.rb
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ def self.instance
instance = first

if instance.blank?
instance = Option.new({title: 'My FINE Admin', time_zone: 'Pacific Time (US & Canada)', live_url: 'http://www.wearefine.com'})
instance = Option.new({title: 'My Fae Admin', time_zone: 'Pacific Time (US & Canada)', live_url: 'http://www.wearefine.com'})
instance.singleton_guard = 0
instance.save!
end
Expand Down
4 changes: 2 additions & 2 deletions app/views/fae/images/_image_uploader.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ ruby:
image_name ||= :image
the_image = item.send(image_name)
label ||= image_name.to_s.titleize
alt_label ||= "#{label} alt text"
caption_label ||= "#{label} caption"
alt_label ||= "#{label} Alt Text"
caption_label ||= "#{label} Caption"
helper_text ||= ""
alt_helper_text ||= 'Brief description of image contents, used in hover text and by visually impaired users.'
caption_helper_text ||= ""
Expand Down
7 changes: 4 additions & 3 deletions app/views/fae/pages/home.html.slim
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
header.content-header.js-content-header.-dashboard
i.icon-home>
| &nbsp;&nbsp;Welcome,
strong< = current_user.full_name
div
i.icon-home>
| &nbsp;&nbsp;Hello
strong< = current_user.full_name

== render 'flash_messages'

Expand Down

0 comments on commit df212f5

Please sign in to comment.