diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index 3ea21db..df35cd6 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -10,6 +10,8 @@ * * require jquery.ui.all *= require_self + * + *= require bootstrap/dist/css/bootstrap */ /* CSSs files for jquery-ui. TODO, remove when bootstrap is re-introduced diff --git a/app/views/contact_us/contacts/new.html.erb b/app/views/contact_us/contacts/new.html.erb index 141a4c5..bff54e4 100644 --- a/app/views/contact_us/contacts/new.html.erb +++ b/app/views/contact_us/contacts/new.html.erb @@ -1,17 +1,19 @@ <% javascript "views/contacts/new_contact.js" %> +
+
+

<%= _("Contact Us") %>

+

+ <%= raw _('%{application_name} is provided by the %{organisation_name}.
You can find out more about us on our website. If you would like to contact us about %{application_name}, please fill out the form below.') % {organisation_name: Rails.configuration.branding[:organisation][:name], + organisation_url: Rails.configuration.branding[:organisation][:url], + application_name: Rails.configuration.branding[:application][:name]} %> +

+
+
-

- <%= _("Contact Us") %> -

-

- <%= raw _('%{application_name} is provided by the %{organisation_name}.
You can find out more about us on our website. If you would like to contact us about %{application_name}, please fill out the form below.') % {organisation_name: Rails.configuration.branding[:organisation][:name], - organisation_url: Rails.configuration.branding[:organisation][:url], - application_name: Rails.configuration.branding[:application][:name]} %> -

- -
- -
+
+ +
+ <%= form_for @contact, url: contacts_path, html: {class: "roadmap-form"} do |f| %>
<% if ContactUs.require_name %> @@ -20,20 +22,20 @@ <%= f.text_field(:name, class: "left-indent required input-large", value: current_user.nil? ? '' : current_user.name(false), readonly: !current_user.nil?) %>
<% end %> - +
<%= f.label(:email, _('Email'), class: 'required') %> <%= f.text_field(:email, class: "left-indent required input-large", value: current_user.nil? ? '' : current_user.email, readonly: !current_user.nil?) %>
- + <% if ContactUs.require_subject %>
<%= f.label(:subject, _('Subject'), class: 'required') %> <%= f.text_field(:subject, class: "left-indent required input-large") %>
<% end %> - +
<%= f.label(:message, _('Message'), class: "align-top required") %> <%= f.text_area(:message, class: "required input-large", rows: 10, style: "height: 160px;") %> @@ -46,7 +48,7 @@
<% end %> - +
 
<%= render partial: 'shared/accessible_submit_button', @@ -56,12 +58,12 @@ tooltip: _('Fill in the required fields')} %>
- <% end %> -
+ +
- -
+ +
- +

<%= "#{_('Helpline')} #{Rails.configuration.branding[:organisation][:telephone]}" %>

<%= _('Email') %> <%= Rails.configuration.branding[:organisation][:email] %>

@@ -84,6 +86,5 @@
-
- - + + \ No newline at end of file diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb index ae609df..ac6511e 100644 --- a/app/views/home/index.html.erb +++ b/app/views/home/index.html.erb @@ -1,9 +1,8 @@ <%= javascript 'views/home/index.js' %> +
+
+

<%= _('Welcome.')%>

-

<%= _('Welcome.')%>

- -
-
<%= raw _('

%{application_name} has been jointly developed by the %{organisation_name} to help you write data management plans.

') % {:application_name => Rails.configuration.branding[:application][:name], :organisation_name => Rails.configuration.branding[:organisation][:name]} %>

<%= _('Screencast on how to use %{application_name}') % {:application_name => Rails.configuration.branding[:application][:name]} %>

@@ -23,7 +22,7 @@
-
+
<%= render partial: 'shared/signin' %>
-
+
\ No newline at end of file diff --git a/app/views/layouts/_footer.html.erb b/app/views/layouts/_footer.html.erb index 0afb421..3d0e76d 100644 --- a/app/views/layouts/_footer.html.erb +++ b/app/views/layouts/_footer.html.erb @@ -1,5 +1,5 @@ - -
+ +
-
+

<%= link_to( image_tag("dcc_logo.png", alt: 'Digital Curation Centre'), "http://www.dcc.ac.uk/", title: "Digital Curation Centre") %> <%= link_to( image_tag("uc3_logo.jpg", class: "footer_logo", alt: 'University of California Curation Center'), "http://www.cdlib.org/uc3/", title: "University of California Curation Center", id: "footer_right_uc3", ) %>

diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 0344e8b..a0cb493 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -1,5 +1,5 @@ - -
+ +
<% if user_signed_in? && !current_user.org.nil? && current_user.org.logo.present? %> <% end %>
-
+
+

Placeholder text to help visual column layout

<%= render "layouts/branding" %>
@@ -19,6 +20,6 @@ <%= render "layouts/navigation" %>
-