diff --git a/app/views/contact_us/contacts/new.html.erb b/app/views/contact_us/contacts/new.html.erb index ea2e845..73562ec 100644 --- a/app/views/contact_us/contacts/new.html.erb +++ b/app/views/contact_us/contacts/new.html.erb @@ -7,7 +7,13 @@ <%= t("contact_page.title") %>

- <%= raw t("contact_page.intro_text_html") %> + <%= raw t("contact_page.intro_text_html", + organisation_name: Rails.configuration.branding[:organisation][:name], + organisation_email: Rails.configuration.branding[:organisation][:email], + organisation_url: Rails.configuration.branding[:organisation][:url], + application_name: Rails.configuration.branding[:application][:name], + application_url: Rails.configuration.branding[:application][:url], + application_issue_list_url: Rails.configuration.branding[:application][:issue_list_url]) %> <%= raw t("contact_page.github_text_html") %>

@@ -94,7 +100,10 @@
- <%= raw t("contact_page.address_text_html") %> + <%= raw t("contact_page.address_text_html", + organisation_name: Rails.configuration.branding[:organisation][:name], + organisation_email: Rails.configuration.branding[:organisation][:email], + application_name: Rails.configuration.branding[:application][:name],) %>
diff --git a/app/views/static_pages/help.html.erb b/app/views/static_pages/help.html.erb index 9e566c2..528370c 100644 --- a/app/views/static_pages/help.html.erb +++ b/app/views/static_pages/help.html.erb @@ -19,14 +19,15 @@
- <%= raw t('help_page.body_text_tab_1_html')%> + <%= raw t('help_page.body_text_tab_1_html', + application_name: Rails.configuration.branding[:application][:name])%>
<%= raw t('help_page.body_text_tab_2_html')%> diff --git a/app/views/static_pages/roadmap.html.erb b/app/views/static_pages/roadmap.html.erb index c52ec8e..904db80 100644 --- a/app/views/static_pages/roadmap.html.erb +++ b/app/views/static_pages/roadmap.html.erb @@ -38,9 +38,11 @@ <%= raw t("roadmap_page.body_text_tab_2_html", organisation_name: Rails.configuration.branding[:organisation][:name], organisation_email: Rails.configuration.branding[:organisation][:email], + organisation_url: Rails.configuration.branding[:organisation][:url], organisation_abbreviation: Rails.configuration.branding[:organisation][:abbreviation], application_name: Rails.configuration.branding[:application][:name], - application_url: Rails.configuration.branding[:application][:url])%> + application_url: Rails.configuration.branding[:application][:url], + application_user_group_subscription_url: Rails.configuration.branding[:application][:user_group_subscription_url])%>
\ No newline at end of file diff --git a/app/views/static_pages/termsuse.html.erb b/app/views/static_pages/termsuse.html.erb index 190e7db..3ebb29a 100644 --- a/app/views/static_pages/termsuse.html.erb +++ b/app/views/static_pages/termsuse.html.erb @@ -2,4 +2,7 @@ <%= t('terms_page.title')%> -<%= raw t('terms_page.body_text_html')%> +<%= raw t('terms_page.body_text_html', + organisation_name: Rails.configuration.branding[:organisation][:name], + organisation_abbreviation: Rails.configuration.branding[:organisation][:abbreviation], + application_name: Rails.configuration.branding[:application][:name])%> diff --git a/config/branding.yml b/config/branding.yml index ae42ddf..a469d8b 100644 --- a/config/branding.yml +++ b/config/branding.yml @@ -11,6 +11,8 @@ url: 'https://github.com/DMPRoadmap/roadmap' version: '0.1.0' release_notes_url: 'https://github.com/DMPRoadmap/roadmap/wiki/Releases' + issue_list_url: 'https://github.com/DMPRoadmap/roadmap/issues' + user_group_subscription_url: 'http://listserv.ucop.edu/cgi-bin/wa.exe?SUBED1=ROADMAP-L&A=1' development: <<: *defaults diff --git a/config/locales/en-UK.yml b/config/locales/en-UK.yml index c629df8..bbddd3e 100644 --- a/config/locales/en-UK.yml +++ b/config/locales/en-UK.yml @@ -2,7 +2,7 @@ # [+Description:+] This file contains all the text present on DMPonline that is not being retrieve from the database. # [+Copyright:+] Digital Curation Centre and University of California Curation Center -en-US: +en-UK: date: formats: # Use the strftime parameters for formats. @@ -552,9 +552,9 @@ project_details_editing_text_html: "Please fill in the basic project details below and click 'Update' to save" confirm_delete_text: "Are you sure you wish to delete this plan? If the plan is being shared with other users, by deleting it from your list, the plan will be deleted from their plan list as well" confirmation_text: "Confirm plan details" - confirmation_text_desc: "Where your funder or institution doesn't have specific requirements (or if you left these options blank), you will see the %{organisation_abbreviation} Checklist. This offers a generic set of DMP questions and guidance. For more details see: DMP checklist 2013." + confirmation_text_desc: "Where your funder or institution doesn't have specific requirements (or if you left these options blank), you will see the %{organisation_abbreviation} Checklist. This offers a generic set of DMP questions and guidance. For more details see: DMP checklist 2013." confirmation_button_text: "Yes, create plan" - default_confirmation_text_desc: "You have selected the Default DMP, which is based on the %{organisation_abbreviation} Checklist. This offers a generic set of DMP questions and guidance. For more details see: DMP checklist 2013." + default_confirmation_text_desc: "You have selected the Default DMP, which is based on the %{organisation_abbreviation} Checklist. This offers a generic set of DMP questions and guidance. For more details see: DMP checklist 2013." default_confirmation_button_text: "Create plan" alert_default_template_text_html: "Please note: %{org_name} provides a DMP template. If you wish to use it select 'Cancel', otherwise select 'Create plan'" share: @@ -698,7 +698,7 @@ body_text_tab_2_html: "

Useful resources on Data Management Planning

Example Data Management Plans

@@ -720,7 +720,7 @@ A DMP submitted by a researcher from the University of Bristol, also including comments from the reviewers
  • - Two social science DMPs [PDF, 7 pages]
    + Two social science DMPs [PDF, 7 pages]
    Example plans from researchers at the University of Leeds, shared as part of the Leeds RoaDMaP training materials
  • @@ -728,7 +728,7 @@ Example DMP produced by the DATUM for Health RDM training project
  • - Psychology DMP [PDF, 11 pages]
    + Psychology DMP [PDF, 11 pages]
    A very detailed, fictional psychology DMP produced by the DMTpsych RDM training project, based on a seminal psychology experiment
  • @@ -755,15 +755,15 @@ A guide by the UK Data Service covering a range of topics including data formats, documentaion, ethics, copyright and data sharing.
  • - How to Cite Datasets and Link to Publications [PDF, 12 pages]
    + How to Cite Datasets and Link to Publications [PDF, 12 pages]
    A guide by the %{organisation_name} giving practical guidelines on how to cite data and the different tools and infrastructure that can be used to support data citation.
  • - How to License Research Data [PDF, 16 pages]
    + How to License Research Data [PDF, 16 pages]
    A guide by the %{organisation_name} that outlines different types of licenses, the pros and cons of each and how they can be applied.
  • - How to Appraise and Select Research Data for Curation [PDF, 8 pages]
    + How to Appraise and Select Research Data for Curation [PDF, 8 pages]
    A guide by ANDS and the %{organisation_abbreviation} on how to select which data to keep for long-term preservation, sharing and reuse. The guide puts forward several criteria to aid selection decisions.
  • @@ -792,8 +792,8 @@ contact_page: title: "Contact us" - intro_text_html: "

    %{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 enter your query in the form below or email %{organisation_email}.

    " - github_text_html: "

    If you have a feature request or think you have found a bug, please check out the list of issues on GitHub. If your issue isn't listed there, please add it; if it is, please add a comment if you have more information or just to let us know how important it is to you. This will help us to help us prioritise future developments.

    " + intro_text_html: "

    %{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 enter your query in the form below or email %{organisation_email}.

    " + github_text_html: "

    If you have a feature request or think you have found a bug, please check out the list of issues on GitHub. If your issue isn't listed there, please add it; if it is, please add a comment if you have more information or just to let us know how important it is to you. This will help us to help us prioritise future developments.

    " address_text_html: "
    • %{organisation_name}
    • Level 7, Appleton Tower
      • @@ -830,7 +830,7 @@ body_text_tab_2_html: "

      %{application_name} is developed and maintained by the UK %{organisation_name}. We’re a small team, and are happy to collaborate with others. There are various ways you can get involved:

      Join the user group

      -

      We run a listserv for the %{application_name} user group that you can request to join. We also host periodic meetings to consult on our plans. Being part of the user group gives you the opportunity to be informed about future developments and to provide feedback to help shape our plans.

      +

      We run a listserv for the %{application_name} user group that you can request to join. We also host periodic meetings to consult on our plans. Being part of the user group gives you the opportunity to be informed about future developments and to provide feedback to help shape our plans.

      Our user group sessions are usually focused around a certain topic (e.g. fleshing out use cases for an API) so invites are sent based on your areas of expertise. It is helpful for us to know your role and interests to invite relevant people to each session. Please introduce yourself on the list and share your ideas.

      Notes from previous user group sessions are provided below:

        @@ -841,7 +841,7 @@

        Customise %{application_name}

        %{application_name} can be customised by institutions and disciplines. You can add templates for users in your organisation and tailored guidance that explains local support and services. Example answers can also be offered to help users understand what to write in a Data Management Plan. To do this you’ll need to request admin access, so please email us on %{organisation_email}.

        -

        Futher guidance on customising %{application_name} is available on the %{organisation_abbreviation} website.

        +

        Futher guidance on customising %{application_name} is available on the %{organisation_abbreviation} website.


        Contribute to the code

        %{application_name} is a Ruby on Rails application. The source code is made available under a GNU Affero General Public License. This permits others to reuse the code freely, but obligates you to share the source code for any extensions in the same way. Please inform us if you install an instance of %{application_name} and offer your contributions back to the community.

        @@ -879,7 +879,7 @@

    • Cookies

    -

    Please note that %{application_name} uses Cookies. Further information about Cookies and how we use them is available on the main %{organisation_abbreviation} website.

    +

    Please note that %{application_name} uses Cookies. Further information about Cookies and how we use them is available on the main %{organisation_abbreviation} website.