Branding changes (#24)
- Removed the description field from organisation
- Added a contact email field to organization
- Added an email address validator
- Updated organisation logo upload so that the system will resize the image to the correct height rather than forcing the user to provide a 100x100 image
- Change how the organisation logo is displayed 

* updated organisation edit page's error messages so that errors are placed in the alert text section. Updated wording in locale files to reflect the 160x160 file size.

* removed height and width constraints to logo upload function. Added method that will resize the uploaded logo so that the width is 160px (maintaining aspect ratio) so that the logo fits within the layout properly

* changed logo size to a height of 100 and moved logo so that it appears alongside the DMPRoadmap logo per the current specifications

* Removed description field from organisation. Add contact email to the organisation. Change the way the logo is displayed on the organisation screen.
dev
1 parent 13eb204 commit 8f296fefb8ff8cfe4bd8cc3ed2658dd4b9186055
@Brian Riley Brian Riley authored on 22 Aug 2016
GitHub committed on 22 Aug 2016
Showing 16 changed files
View
app/assets/stylesheets/admin.css.less
View
app/controllers/organisations_controller.rb
View
app/models/organisation.rb
View
app/validators/email_validator.rb 0 → 100644
View
app/views/layouts/_dmponline_header.html.erb
View
app/views/layouts/_dmponline_org_branding.html.erb
View
app/views/organisations/admin_edit.html.erb
View
app/views/organisations/admin_show.html.erb
View
config/initializers/dragonfly.rb
View
config/locales/de.yml
View
config/locales/en-UK.yml
View
config/locales/en-US.yml
View
config/locales/fr.yml
View
db/migrate/20160822130601_remove_description_from_organisation.rb 0 → 100644
View
db/migrate/20160822130701_add_contact_email_to_organisation.rb 0 → 100644
View
db/schema.rb