diff --git a/app/assets/stylesheets/application.scss b/app/assets/stylesheets/application.scss index df35cd6..1a3f5d9 100644 --- a/app/assets/stylesheets/application.scss +++ b/app/assets/stylesheets/application.scss @@ -29,4 +29,6 @@ @import "dmproadmap/accordions"; @import "dmproadmap/modals"; @import "dmproadmap/tables"; -@import "dmproadmap/forms"; \ No newline at end of file +@import "dmproadmap/forms"; + +@import "overrides"; \ No newline at end of file diff --git a/app/assets/stylesheets/dmproadmap.scss b/app/assets/stylesheets/dmproadmap.scss index 86aec57..c929fef 100644 --- a/app/assets/stylesheets/dmproadmap.scss +++ b/app/assets/stylesheets/dmproadmap.scss @@ -14,7 +14,10 @@ $medium-grey: #827D7E; $light-grey: #CCC; +$border-radius: 0; + $primary-color: #4f5253; +$primary-reverse-color: $white; /* Typically used for the font color when using $primary-color as the background-color */ $highlight-color: $black; $highlight-background-color: #F36F24; diff --git a/app/views/static_pages/about_us.html.erb b/app/views/static_pages/about_us.html.erb index 4c50c50..ebd9579 100644 --- a/app/views/static_pages/about_us.html.erb +++ b/app/views/static_pages/about_us.html.erb @@ -2,61 +2,58 @@
-
- -
-
- -

<%= raw _("Funding bodies increasingly require their grant-holders to produce Data Management Plans(DMP), both during the bid-preparation stage and after funding has been secured. %{application_name} has been produced by the %{organisation_name} to help research teams respond to this requirement, and any expectations that their institution or others may apply.") % {:organisation_name => Rails.configuration.branding[:organisation][:name], - :application_name => Rails.configuration.branding[:application][:name]} %>

-

<%= raw _("The %{organisation_abbreviation} worked closely with research funders and universities to produce a tool that assists researchers to produce an effective data management plan (DMP) to cater for the whole lifecycle of a project, from bid-preparation stage through to completion.") % {:organisation_abbreviation => Rails.configuration.branding[:organisation][:abbreviation]} %>

-

<%= _('How the tool works') %>

-

<%= _("There are a number of templates within the tool that represent the requirements of different funders and institutions. Users are asked three questions at the outset so we can determine the appropriate template to display (e.g. the ESRC template when applying for an ESRC grant). Guidance is provided to help you interpret and answer the questions. This guidance is provided by researcher funders, universities and disciplines.") %>

-

<%= _('Getting Started') %>

-

<%= _("If you have an account please sign in and start creating or editing your DMP.") %>

-

<%= _("If you do not have a %{application_name} account, click on") % {:application_name => Rails.configuration.branding[:application][:name]} %> <%= _('Sign up') %> <%= _("on the homepage.") %>

-

<%= _("Please visit the") %> '<%= _('Help') %>' <%= _("page for guidance.") %>

-

<%= _("Additional Information") %>

-

<%= _("We are constantly improving the user interface and functionality of %{application_name}. If you would like to contribute with feedback and suggestions, please contact us by emailing") % {:application_name => Rails.configuration.branding[:application][:name]} %> <%= Rails.configuration.branding[:organisation][:email] %>. <%= _("You can also report bugs and request new features directly on") %> <%= _('GitHub') %>

-
- - + + +
+
+

<%= raw _("Funding bodies increasingly require their grant-holders to produce Data Management Plans(DMP), both during the bid-preparation stage and after funding has been secured. %{application_name} has been produced by the %{organisation_name} to help research teams respond to this requirement, and any expectations that their institution or others may apply.") % {:organisation_name => Rails.configuration.branding[:organisation][:name], + :application_name => Rails.configuration.branding[:application][:name]} %>

+

<%= raw _("The %{organisation_abbreviation} worked closely with research funders and universities to produce a tool that assists researchers to produce an effective data management plan (DMP) to cater for the whole lifecycle of a project, from bid-preparation stage through to completion.") % {:organisation_abbreviation => Rails.configuration.branding[:organisation][:abbreviation]} %>

+

<%= _('How the tool works') %>

+

<%= _("There are a number of templates within the tool that represent the requirements of different funders and institutions. Users are asked three questions at the outset so we can determine the appropriate template to display (e.g. the ESRC template when applying for an ESRC grant). Guidance is provided to help you interpret and answer the questions. This guidance is provided by researcher funders, universities and disciplines.") %>

+

<%= _('Getting Started') %>

+

<%= _("If you have an account please sign in and start creating or editing your DMP.") %>

+

<%= _("If you do not have a %{application_name} account, click on") % {:application_name => Rails.configuration.branding[:application][:name]} %> <%= _('Sign up') %> <%= _("on the homepage.") %>

+

<%= _("Please visit the") %> '<%= _('Help') %>' <%= _("page for guidance.") %>

+

<%= _("Additional Information") %>

+

<%= _("We are constantly improving the user interface and functionality of %{application_name}. If you would like to contribute with feedback and suggestions, please contact us by emailing") % {:application_name => Rails.configuration.branding[:application][:name]} %> <%= Rails.configuration.branding[:organisation][:email] %>. <%= _("You can also report bugs and request new features directly on") %> <%= _('GitHub') %>

+
+ +
+

<%= raw _('%{application_name} stories from the %{organisation_abbreviation} website') % { + :organisation_abbreviation => Rails.configuration.branding[:organisation][:abbreviation], + :application_name => Rails.configuration.branding[:application][:name] } %>

+ <% news_left = @dcc_news_feed.entries.count %> + <% @dcc_news_feed.entries.each do |entry| %> +

<%= entry.title.sanitize %>

+ <% summary = entry.summary.sanitize %> + <% summary = summary.gsub(/\A])+>/, "") %> + <% summary = summary.gsub(/\A])+>/, "") %> + <% name = summary[/\A[\s\w]*([^,])/].strip %> + <% summary = summary.gsub(/\A.*div>/, "") %> + <% summary = summary.gsub(/

.*\z/, "") %> +

<%= raw summary.strip %>

+ <% author = entry.author.blank? ? 'anonymous' : entry.author %> +

<%= _('By ') %> <%= author %> <%= _(' on ') %> <%= entry.published.strftime("%d/%m/%Y") %>

+

<%= _('Read more on the ') %><%= link_to 'DCC Website', entry.url %>

+ + <%if news_left.to_i > 1 then %> +
+ <%else%> +
+ <%end%> + <% news_left = news_left - 1 %> + <% end %>
+
\ No newline at end of file