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} %>
-<%= _("Do you have a %{application_name} account?") % { application_name: Rails.configuration.branding[:application][:name]} %> - -
+
+
<%= _("This will link your existing account to your credentials.") %> @@ -24,17 +30,17 @@
<%= _("No %{application_name} account?") % { application_name: Rails.configuration.branding[:application][:name]} %> - +
<%= _("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') %>
<%= 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 @@ -<%= _('Instructions') %> <%= _('Write plan') %> - +
<%= _('Principal Investigator') %>
><%= _('Data Contact Person') %>
<%= _('Copy link') %> - +
<%= _('Create plan') %>
<%= _('Would you like to create a plan based on the "%{name}" template?') % { name: @template.title }%>
diff --git a/app/views/shared/_modal.html.erb b/app/views/shared/_modal.html.erb index f0787c4..699d378 100644 --- a/app/views/shared/_modal.html.erb +++ b/app/views/shared/_modal.html.erb @@ -8,9 +8,9 @@- <%= _('or') %> -
<%= _("Scholarly researchers today are increasingly required to engage in a range of data management activities to comply with organisational policies, or as a precondition for publication or grant funding. To aid researchers in creating effective Data Management Plans (DMPs), we have worked closely with funders and universities to develop an online application: DMPRoadmap. The tool provides detailed guidance and links to general and organisational resources and walks a researcher through the process of generating a comprehensive plan tailored to specific DMP requirements.") %>
-<%= _("The Digital Curation Centre and UC3 team at the California Digital Library have developed and delivered tools for data management planning since the advent of open data policies in 2011. ")%> <%= link_to "DMPonline", "https://DMPonline.dcc.ac.uk/" %><%=_(" (DCC-UK) and ") %><%= link_to "DMPTool", "https://dmptool.org/" %> @@ -28,15 +28,15 @@ <%= _(" in the project. You can also report bugs and request new features via ") %> <%= _('GitHub Issues') %><%= _('Opens in new window') %>
-<%= _("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.") %>
-<%= _("Organisations can customise the tool to highlight local requirements, resources, and services. Organisational templates can be added to address local DMP requirements, and additional sections and questions can be included in funder templates. Users from participating organisations that configure the tool for single sign-on can log in with their own organisational accounts.")%>
<%= _("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.") %>
-<%= _("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.'") %>
-<%= _("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.") %>
+<%= _("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.") %>
-<%= _("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.") %>
-<%= _("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.") %>
- -<%= _("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.") %>
+ +<%= _("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.") %>
-<%= _("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.
") %><%= _("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] } %>
-<%= _("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 ('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 )) %><%= user_count.to_i %> Total users
<%= plan_count.to_i %> Total plans
* <%= _('Move the mouse pointer over the bars of a chart to see numbers.') %>
@@ -14,7 +15,7 @@<%= _('No. users joined during last year') %>
<%= _('No. plans during last year') %>
<%= _('No. plans by template') %>