diff --git a/app/views/contact_us/contacts/new.html.erb b/app/views/contact_us/contacts/new.html.erb index 73562ec..57596a5 100644 --- a/app/views/contact_us/contacts/new.html.erb +++ b/app/views/contact_us/contacts/new.html.erb @@ -97,18 +97,26 @@ <% end %> + -
-
- <%= 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],) %> - -
- +
+
+ <%= 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], + organisation_telephone: Rails.configuration.branding[:organisation][:telephone], + organisation_address_line1: Rails.configuration.branding[:organisation][:address_line1], + organisation_address_line2: Rails.configuration.branding[:organisation][:address_line2], + organisation_address_line3: Rails.configuration.branding[:organisation][:address_line3], + organisation_address_line4: Rails.configuration.branding[:organisation][:address_line4], + organisation_address_country: Rails.configuration.branding[:organisation][:address_country]) %> + +
+ +
-
+
diff --git a/config/locales/static_pages/de.static.yml.example b/config/locales/static_pages/de.static.yml.example index a7b92c5..af105a5 100644 --- a/config/locales/static_pages/de.static.yml.example +++ b/config/locales/static_pages/de.static.yml.example @@ -147,6 +147,16 @@ title: "Kontakt" intro_text_html: "

DMP Builder is provided by the University of Alberta Libraries. You can find out more about us on our Research Data Management page. If you would like to contact us about DMP Builder, please insert your query into the webform below or email data@ualberta.ca.

Contact Us

" + address_text_html: " +

CDL Helpline: %{organisation_telephone}

+

Email %{organisation_email}

" terms_page: title: "Nutzungsbedingungen" diff --git a/config/locales/static_pages/en-UK.static.yml.example b/config/locales/static_pages/en-UK.static.yml.example index db791d8..9ed7419 100644 --- a/config/locales/static_pages/en-UK.static.yml.example +++ b/config/locales/static_pages/en-UK.static.yml.example @@ -126,15 +126,15 @@ 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 dmponline@dcc.ac.uk.

" 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 prioritise future developments.

" address_text_html: " -

Tel. +44 (0) 131 651 1239

-

Email dmponline@dcc.ac.uk

" +
  • %{organisation_name}
    • +
  • %{organisation_address_line1}
    • +
  • %{organisation_address_line2}
    • +
  • %{organisation_address_line3}
    • +
  • %{organisation_address_line4}
    • +
  • %{organisation_address_country}
    • + +

    CDL Helpline: %{organisation_telephone}

    +

    Email %{organisation_email}

    " roadmap_page: title: "Future plans" diff --git a/config/locales/static_pages/en-US.static.yml.example b/config/locales/static_pages/en-US.static.yml.example index ed79687..ffb60d4 100644 --- a/config/locales/static_pages/en-US.static.yml.example +++ b/config/locales/static_pages/en-US.static.yml.example @@ -126,15 +126,15 @@ 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 dmponline@dcc.ac.uk.

    " 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 prioritise future developments.

    " address_text_html: " -

    Tel. +44 (0) 131 651 1239

    -

    Email dmponline@dcc.ac.uk

    " +
  • %{organisation_name}
    • +
  • %{organisation_address_line1}
    • +
  • %{organisation_address_line2}
    • +
  • %{organisation_address_line3}
    • +
  • %{organisation_address_line4}
    • +
  • %{organisation_address_country}
    • + +

    CDL Helpline: %{organisation_telephone}

    +

    Email %{organisation_email}

    " roadmap_page: title: "Future plans" diff --git a/config/locales/static_pages/fr.static.yml.example b/config/locales/static_pages/fr.static.yml.example index 3bf7021..11fdf18 100644 --- a/config/locales/static_pages/fr.static.yml.example +++ b/config/locales/static_pages/fr.static.yml.example @@ -114,7 +114,17 @@ title: "Communiquez avec nous" intro_text_html: "

    L'Assistant PGD est rendu disponible par les Bibliothèques de l'Université d'Alberta. Pour en savoir plus sur les services offerts par ces bibliothèques, consulter la page suivante : Research Data Management page. Si vous désirez communiquer avec nous concernant l'Assistant PGD, merci de saisir votre message dans le formulaire Web ci-dessous ou nous écrire à portage@carl-abrc.ca.

    Nous joindre

    " - + address_text_html: " +

    CDL Helpline: %{organisation_telephone}

    +

    Email %{organisation_email}

    " + terms_page: title: "Exploitation sous licence et conditions d'utilisation" body_text_html: "