diff --git a/app/assets/stylesheets/utils/_colours.scss b/app/assets/stylesheets/utils/_colours.scss index 5616249..eb7e455 100644 --- a/app/assets/stylesheets/utils/_colours.scss +++ b/app/assets/stylesheets/utils/_colours.scss @@ -1,3 +1,8 @@ .red { color: $color-text-red; } + +//default colour used on headings +.color-heading-text{ + color: $color-heading-text; +} diff --git a/app/assets/stylesheets/utils/_font_size.scss b/app/assets/stylesheets/utils/_font_size.scss new file mode 100644 index 0000000..18ea8b9 --- /dev/null +++ b/app/assets/stylesheets/utils/_font_size.scss @@ -0,0 +1,18 @@ + +//similar font size as an h2 tag +.fontsize-h2{ + font-size: 24 px; + +} + +//similar font size as an h3 tag +.fontsize-h3{ + font-size: 18.72 px; + +} + +//similar font size as an h4 tag +.fontsize-h4{ + font-size: 16 px; + +} diff --git a/app/views/answers/_locking.html.erb b/app/views/answers/_locking.html.erb index 5018ff9..ed8ee29 100644 --- a/app/views/answers/_locking.html.erb +++ b/app/views/answers/_locking.html.erb @@ -1,6 +1,9 @@ +

<%= _('The following answer cannot be saved') %>

<%# We do not need to re-show example answers in this lock conflict section so leave template nil %> <%= render partial: '/answers/new_edit', locals: { template: nil, question: question, answer: answer, readonly: true, locking: true } %>

<%= _('since %{name} saved the answer below while you were editing. Please, combine your changes and then save the answer again.') % { name: user.name} %>

-
\ No newline at end of file + diff --git a/app/views/answers/_status.html.erb b/app/views/answers/_status.html.erb index f842fb0..3b317d8 100644 --- a/app/views/answers/_status.html.erb +++ b/app/views/answers/_status.html.erb @@ -1,5 +1,7 @@ <%# locals: { answer } %> - + <% if answer.answered? %> @@ -7,4 +9,4 @@ <%= _('Answered')%> <%= _(' by %{user_name}') %{ :user_name => answer.user.name } if answer.user.present? %> -<% end %> \ No newline at end of file +<% end %> diff --git a/app/views/devise/registrations/_password_confirmation.html.erb b/app/views/devise/registrations/_password_confirmation.html.erb index ae39abb..26768c4 100644 --- a/app/views/devise/registrations/_password_confirmation.html.erb +++ b/app/views/devise/registrations/_password_confirmation.html.erb @@ -2,7 +2,7 @@ \ No newline at end of file + diff --git a/app/views/devise/registrations/new.html.erb b/app/views/devise/registrations/new.html.erb index 5a8390a..ca5a3bd 100644 --- a/app/views/devise/registrations/new.html.erb +++ b/app/views/devise/registrations/new.html.erb @@ -1,19 +1,25 @@
+
+

<%= _('Sign in or Create account') %>

+
+
+ +
<% unless session["devise.shibboleth_data"].nil? %> <% cookies[:show_shib_link] = { value: 'show_shib_link', expires: 3.hours.from_now } %>
-

+

<%= _("Do you have a %{application_name} account?") % { application_name: Rails.configuration.branding[:application][:name]} %> -

-

+

+

- <%= _("Sign in") %> + <%= _("Sign in") %>

<%= _("This will link your existing account to your credentials.") %> @@ -24,17 +30,17 @@

-

+

<%= _("No %{application_name} account?") % { application_name: Rails.configuration.branding[:application][:name]} %> -

+

- <%= _("Create account") %> + <%= _("Create account") %>

<%= _("This will create an account and link it to your credentials.") %> diff --git a/app/views/guidances/admin_index.html.erb b/app/views/guidances/admin_index.html.erb index d7fc08b..15a7eb3 100644 --- a/app/views/guidances/admin_index.html.erb +++ b/app/views/guidances/admin_index.html.erb @@ -1,3 +1,4 @@ + <% title _('Guidance') %>

@@ -46,4 +47,3 @@
- diff --git a/app/views/layouts/_branding.html.erb b/app/views/layouts/_branding.html.erb index f951d53..f3ee708 100644 --- a/app/views/layouts/_branding.html.erb +++ b/app/views/layouts/_branding.html.erb @@ -15,7 +15,7 @@ class: "org-logo", title: current_user.org.name) %> <% else %> - + <% end %> <% end %>
diff --git a/app/views/org_admin/questions/_form.html.erb b/app/views/org_admin/questions/_form.html.erb index bbe8f59..6560c74 100644 --- a/app/views/org_admin/questions/_form.html.erb +++ b/app/views/org_admin/questions/_form.html.erb @@ -1,8 +1,8 @@ <% question_default_value_tooltip = _('Anything you enter here will display in the answer box. If you want an answer in a certain format (e.g. tables), you can enter that style here.') %> -

+

<%= question.id.present? ? _('Question %{number}:') % { number: question.number } : _('New question:') %> -

+

<%= form_for(question, url: url, namespace: question.id.present? ? question.id : 'new_question', diff --git a/app/views/orgs/_departments.html.erb b/app/views/orgs/_departments.html.erb index 5a4f020..aa6e5aa 100644 --- a/app/views/orgs/_departments.html.erb +++ b/app/views/orgs/_departments.html.erb @@ -1,4 +1,4 @@ -

<%=_('Schools/Departments') %>

+

<%=_('Schools/Departments') %>

<%= paginable_renderise( partial: '/paginable/departments/index', diff --git a/app/views/paginable/guidance_groups/_index.html.erb b/app/views/paginable/guidance_groups/_index.html.erb index 2d7b8b1..fe87c31 100644 --- a/app/views/paginable/guidance_groups/_index.html.erb +++ b/app/views/paginable/guidance_groups/_index.html.erb @@ -1,3 +1,4 @@ +
@@ -54,4 +55,4 @@ <% end %>
-
\ No newline at end of file +
diff --git a/app/views/paginable/guidances/_index.html.erb b/app/views/paginable/guidances/_index.html.erb index e72720a..7f5214c 100644 --- a/app/views/paginable/guidances/_index.html.erb +++ b/app/views/paginable/guidances/_index.html.erb @@ -1,3 +1,4 @@ +
@@ -68,4 +69,4 @@ <% end %>
-
\ No newline at end of file +
diff --git a/app/views/paginable/users/_index.html.erb b/app/views/paginable/users/_index.html.erb index 024f6ab..7b27a71 100644 --- a/app/views/paginable/users/_index.html.erb +++ b/app/views/paginable/users/_index.html.erb @@ -37,7 +37,6 @@ <%= user.email %> <%= user.department.nil? ? '' : user.department.name %> - <%= user.org.name if user.org.present? %> <% if !user.created_at.nil? %> diff --git a/app/views/phases/_edit_plan_answers.html.erb b/app/views/phases/_edit_plan_answers.html.erb index 0981d9d..cee3685 100644 --- a/app/views/phases/_edit_plan_answers.html.erb +++ b/app/views/phases/_edit_plan_answers.html.erb @@ -96,7 +96,7 @@
<% if i != section.questions.length - 1 %> -
+
<% end %> <% end %> diff --git a/app/views/phases/_overview.html.erb b/app/views/phases/_overview.html.erb index 89b9b01..5339d50 100644 --- a/app/views/phases/_overview.html.erb +++ b/app/views/phases/_overview.html.erb @@ -1,10 +1,10 @@ <%# locals: { phase } %>
-

+

<%= _('Instructions') %> <%= _('Write plan') %> -

+

<%= sanitize(phase.description) %> diff --git a/app/views/plans/_show_details.html.erb b/app/views/plans/_show_details.html.erb index 8f31806..01ba3ba 100644 --- a/app/views/plans/_show_details.html.erb +++ b/app/views/plans/_show_details.html.erb @@ -11,7 +11,7 @@
<%= plan.identifier %>

-

<%= _('Principal Investigator') %>

+

<%= _('Principal Investigator') %>

<%= _('Name') %>
<%= plan.principal_investigator %>
@@ -21,7 +21,7 @@
<%= plan.principal_investigator_email %>

-

<%= _('Data Contact Person') %>

+

><%= _('Data Contact Person') %>

<%= _('Name') %>
<%= plan.data_contact %>
diff --git a/app/views/shared/_copy_link_modal.html.erb b/app/views/shared/_copy_link_modal.html.erb index c9c8d07..7c454c7 100644 --- a/app/views/shared/_copy_link_modal.html.erb +++ b/app/views/shared/_copy_link_modal.html.erb @@ -2,9 +2,9 @@ \ No newline at end of file +
diff --git a/app/views/static_pages/help.html.erb b/app/views/static_pages/help.html.erb index 450cfda..e581de3 100644 --- a/app/views/static_pages/help.html.erb +++ b/app/views/static_pages/help.html.erb @@ -8,46 +8,46 @@
-

<%= _("When you log in to DMPRoadmap you will be directed to the 'My Dashboard' page. From here you can edit, share, download, copy or remove any of your plans. You will also see plans that have been shared with you by others.") %>

+

<%= _("When you log in to DMPRoadmap you will be directed to the 'My Dashboard' page. From here you can edit, share, download, copy or remove any of your plans. You will also see plans that have been shared with you by others.") %>

-

<%= _("Create a plan") %>

+

<%= _("Create a plan") %>

-

<%= _("To create a plan, click the 'Create plan' button from the 'My Dashboard' page or the top menu. Select options from the menus and tickboxes to determine what questions and guidance you should be presented with. Confirm your selection by clicking 'Create plan.'") %>

+

<%= _("To create a plan, click the 'Create plan' button from the 'My Dashboard' page or the top menu. Select options from the menus and tickboxes to determine what questions and guidance you should be presented with. Confirm your selection by clicking 'Create plan.'") %>

-

<%= _("Write your plan") %>

+

<%= _("Write your plan") %>

-

<%= _("The tabbed interface allows you to navigate through different functions when editing your plan.") %>

-
    +

    <%= _("The tabbed interface allows you to navigate through different functions when editing your plan.") %>

    +
    • <%= _("'Project Details' includes basic administrative details.") %>
    • -
    • <%= _("'Plan Overview' tells you what template and guidance your plan is based on and gives you an overview to the questions that you will be asked.") %>
    • -
    • <%= _("The following tab(s) present the questions to answer. There may be more than one tab if your funder or university asks different sets of questions at different stages e.g. at grant application and post-award.") %>
    • -
    • <%= _("'Share' allows you to invite others to read or contribute to your plan.") %>
    • +
    • <%= _("'Plan Overview' tells you what template and guidance your plan is based on and gives you an overview to the questions that you will be asked.") %>
    • +
    • <%= _("The following tab(s) present the questions to answer. There may be more than one tab if your funder or university asks different sets of questions at different stages e.g. at grant application and post-award.") %>
    • +
    • <%= _("'Share' allows you to invite others to read or contribute to your plan.") %>
    • <%= _("'Download' allows you to download your plan in various formats. This may be useful if you need to submit your plan as part of a grant application.") %>
    • -
    +
-

<%= _("When viewing any of the question tabs, you will see the different sections of your plan displayed. Click into these in turn to answer the questions. You can format your responses using the text editing buttons.") %>

+

<%= _("When viewing any of the question tabs, you will see the different sections of your plan displayed. Click into these in turn to answer the questions. You can format your responses using the text editing buttons.") %>

-

<%= _("Guidance is displayed in the right-hand panel. If you need more guidance or find there is too much, you can make adjustments on the ‘Project Details’ tab.") %>

+

<%= _("Guidance is displayed in the right-hand panel. If you need more guidance or find there is too much, you can make adjustments on the ‘Project Details’ tab.") %>

-

<%= _("Share plans") %>

+

<%= _("Share plans") %>

-

<%= _("Insert the email address of any collaborators you would like to invite to read or edit your plan. Set the level of permissions you would like to grant them via the radio buttons and click to 'Add collaborator.' Adjust permissions or remove collaborators at any time via the drop-down options.") %>

+

<%= _("Insert the email address of any collaborators you would like to invite to read or edit your plan. Set the level of permissions you would like to grant them via the radio buttons and click to 'Add collaborator.' Adjust permissions or remove collaborators at any time via the drop-down options.") %>

<%= _("The ‘Share’ tab is also where you can set your plan visibility.") %>

-
    +
    • <%= _("Private: restricted to you and your collaborators.") %>
    • -
    • <%= _("Organisational: anyone at your organisation can view your plan.") %>
    • -
    • <%= _("Public: anyone can view your plan in the Public DMPs list.") %>
    • -
    +
  • <%= _("Organisational: anyone at your organisation can view your plan.") %>
  • +
  • <%= _("Public: anyone can view your plan in the Public DMPs list.") %>
  • +

<%= _("By default all new and test plans will be set to ‘Private’ visibility. ‘Public’ and ‘Organisational’ visibility are intended for finished plans. You must answer at least 50% of the questions to enable these options.") %>

- -

<%= _("Request feedback") %>

-

<%= _("There may also be an option to request feedback on your plan. This is available when research support staff at your organisation have enabled this service. Click to ‘Request feedback’ and your local administrators will be alerted to your request. Their comments will be visible in the ‘Comments’ field adjacent to each question. You will be notified by email when an administrator provides feedback.") %>

+ +

<%= _("Request feedback") %>

+

<%= _("There may also be an option to request feedback on your plan. This is available when research support staff at your organisation have enabled this service. Click to ‘Request feedback’ and your local administrators will be alerted to your request. Their comments will be visible in the ‘Comments’ field adjacent to each question. You will be notified by email when an administrator provides feedback.") %>

-

<%= _("Download plans") %>

+

<%= _("Download plans") %>

<%= _("From here you can download your plan in various formats. This may be useful if you need to submit your plan as part of a grant application. Choose what format you would like to view/download your plan in and click to download. You can also adjust the formatting (font type, size and margins) for PDF files, which may be helpful if working to page limits.

") %>
-
\ No newline at end of file +
diff --git a/app/views/static_pages/privacy.html.erb b/app/views/static_pages/privacy.html.erb index 12270ab..a3b4f8f 100644 --- a/app/views/static_pages/privacy.html.erb +++ b/app/views/static_pages/privacy.html.erb @@ -7,7 +7,7 @@
-

<%= _("Information about you: how we use it and with whom we share it") %>

+

<%= _("Information about you: how we use it and with whom we share it") %>

<%= _("The information you provide will be used by the %{org_name} to offer you access to and personalisation of the %{application_name} service.") % { :application_name => Rails.configuration.branding[:application][:name], :org_name => Rails.configuration.branding[:organisation][:name] } %>

<%= _("The %{org_name} processes the personal data of %{application_name} users in order to deliver and improve the %{application_name} service in a customised manner and to ensure each user receives relevant information.") % @@ -25,7 +25,7 @@ { :application_name => Rails.configuration.branding[:application][:name] } %>

<%= sanitize _("If you have any questions, please contact the %{application_name} team at: %{helpdesk_email}") % { :application_name => Rails.configuration.branding[:application][:name], :helpdesk_email => Rails.configuration.branding[:organisation][:helpdesk_email] } %>

-

Revisions

+

Revisions

<%= _("This statement was last revised on %{revdate} and may be revised at any time with prior notice.") % { :revdate => "May 21st, 2018" }%>

diff --git a/app/views/static_pages/termsuse.html.erb b/app/views/static_pages/termsuse.html.erb index 2fcbcfb..eccaf43 100644 --- a/app/views/static_pages/termsuse.html.erb +++ b/app/views/static_pages/termsuse.html.erb @@ -11,7 +11,7 @@

The <%= link_to 'Digital Curation Centre', 'https://dmponline.dcc.ac.uk/' %> (DCC) and <%= link_to 'California Digital Library', 'http://www.cdlib.org/' %> <%= _("(CDL) are consortia supported by the University of Edinburgh and the University of California, respectively. Our primary constituency is the research community. We provide services to the UK, US and international higher education sector. ") %>

-

<%= _('DMPRoadmap') %>

+

<%= _('DMPRoadmap') %>

<%= _("DMPRoadmap ('the tool', 'the system') is a tool developed by the DCC and CDL as a shared resource for the research community. It is hosted at CDL by the University of California Curation Center.") %>

@@ -47,4 +47,4 @@ tags: %w( a h3 p span em )) %>
-
\ No newline at end of file +
diff --git a/app/views/super_admin/notifications/edit.html.erb b/app/views/super_admin/notifications/edit.html.erb index ffcec89..63e1148 100644 --- a/app/views/super_admin/notifications/edit.html.erb +++ b/app/views/super_admin/notifications/edit.html.erb @@ -1,8 +1,8 @@ <% title _('Editing Notification') %> -

+

<%= _('Editing Notification') %> <%= link_to(_('View all notifications'), super_admin_notifications_path, class: 'btn btn-default pull-right', role: 'button') %> -

+ <%= render 'form' %> diff --git a/app/views/super_admin/notifications/index.html.erb b/app/views/super_admin/notifications/index.html.erb index 216d7ee..f55c619 100644 --- a/app/views/super_admin/notifications/index.html.erb +++ b/app/views/super_admin/notifications/index.html.erb @@ -1,7 +1,7 @@ <% title _('Notifications') %>
-

<%= _('Notifications') %>

+

<%= _('Notifications') %>

diff --git a/app/views/super_admin/notifications/new.html.erb b/app/views/super_admin/notifications/new.html.erb index 7acb055..a35eeda 100644 --- a/app/views/super_admin/notifications/new.html.erb +++ b/app/views/super_admin/notifications/new.html.erb @@ -1,8 +1,8 @@ <% title _('New notification') %> -

+

<%= _('New Notification') %> <%= link_to(_('View all notifications'), super_admin_notifications_path, class: 'btn btn-default pull-right', role: 'button') %> -

+ <%= render 'form' %> diff --git a/app/views/super_admin/themes/edit.html.erb b/app/views/super_admin/themes/edit.html.erb index 98d2975..29a9f38 100644 --- a/app/views/super_admin/themes/edit.html.erb +++ b/app/views/super_admin/themes/edit.html.erb @@ -1,6 +1,6 @@ -

+

<%= @theme.title %> <%= link_to(_('View all themes'), super_admin_themes_path, class: 'btn btn-default pull-right', role: 'button') %> -

-<%= render partial: 'form' %> \ No newline at end of file + +<%= render partial: 'form' %> diff --git a/app/views/super_admin/themes/index.html.erb b/app/views/super_admin/themes/index.html.erb index 917e48a..ebc567d 100644 --- a/app/views/super_admin/themes/index.html.erb +++ b/app/views/super_admin/themes/index.html.erb @@ -1,7 +1,7 @@ <% title _('Themes') %>
-

<%= _('Themes') %>

+

<%= _('Themes') %>

@@ -13,9 +13,9 @@ <%= paginable_renderise( partial: '/paginable/themes/index', controller: 'paginable/themes', - action: 'index', + action: 'index', scope: themes, - query_params: { sort_field: 'themes.title', sort_direction: :asc }) + query_params: { sort_field: 'themes.title', sort_direction: :asc }) %>
diff --git a/app/views/super_admin/themes/new.html.erb b/app/views/super_admin/themes/new.html.erb index 000c53b..40682ee 100644 --- a/app/views/super_admin/themes/new.html.erb +++ b/app/views/super_admin/themes/new.html.erb @@ -1,6 +1,6 @@ -

+

<%= _("New theme") %> <%= link_to(_('View all themes'), super_admin_themes_path, class: 'btn btn-default pull-right', role: 'button') %> -

-<%= render partial: 'form' %> \ No newline at end of file + +<%= render partial: 'form' %> diff --git a/app/views/usage/_filter.html.erb b/app/views/usage/_filter.html.erb index eff2765..c1de3f2 100644 --- a/app/views/usage/_filter.html.erb +++ b/app/views/usage/_filter.html.erb @@ -8,7 +8,7 @@
-

<%= _('Run your own filter') %>

+

<%= _('Run your own filter') %>

<%= form_for :usage, url: usage_filter_path, remote: true do |f| %>
@@ -58,4 +58,4 @@
-
\ No newline at end of file + diff --git a/app/views/usage/_total_usage.html.erb b/app/views/usage/_total_usage.html.erb index af55d29..854bc85 100644 --- a/app/views/usage/_total_usage.html.erb +++ b/app/views/usage/_total_usage.html.erb @@ -24,11 +24,11 @@
-

<%= user_count.to_i %> Total users

+

<%= user_count.to_i %> Total users

-

<%= plan_count.to_i %> Total plans

+

<%= plan_count.to_i %> Total plans

diff --git a/app/views/usage/index.html.erb b/app/views/usage/index.html.erb index a42a560..7ed3381 100644 --- a/app/views/usage/index.html.erb +++ b/app/views/usage/index.html.erb @@ -5,6 +5,7 @@ <%= render partial: 'usage/filter' %> +

* <%= _('Move the mouse pointer over the bars of a chart to see numbers.') %>

@@ -14,7 +15,7 @@
-

<%= _('No. users joined during last year') %>

+

<%= _('No. users joined during last year') %>

<%= link_to usage_yearly_users_path(sep: ","), class: 'stat btn btn-default', role: 'button', target: '_blank' do %> @@ -29,7 +30,7 @@
-

<%= _('No. plans during last year') %>

+

<%= _('No. plans during last year') %>

<%= link_to usage_yearly_plans_path(sep: ","), class: 'stat btn btn-default', role: 'button', target: '_blank' do %> @@ -52,7 +53,7 @@
-

<%= _('No. plans by template') %>

+

<%= _('No. plans by template') %>