diff --git a/app/views/branded/home/_welcome.html.erb b/app/views/branded/home/_welcome.html.erb index cdb6e83..35e8a03 100644 --- a/app/views/branded/home/_welcome.html.erb +++ b/app/views/branded/home/_welcome.html.erb @@ -1,6 +1,51 @@ -
-

<%= _('Welcome.')%>

-

- <%= raw _('

%{application_name} has been developed by the %{organisation_name} to help you write data management plans.

') % {:application_name => Rails.configuration.branding[:application][:name], :organisation_name => Rails.configuration.branding[:organisation][:name]} %> -

+
+
+

+ <%= d_('dmpopidor', 'Welcome!') %> +

+
+
+
+ <%= d_('dmpopidor', '%{tool_name} guides you through your research project by helping you create software and data management plans') % { tool_name: Rails.configuration.branding[:application][:name] } %> +
+
+ + <%= d_('dmpopidor', 'Accessible by any member of the ESR research community and their partners from France and outside') %> +
+
+ + <%= d_('dmpopidor', 'Customizable by any research organisation aiming at setting up a data policy') %> +
+
+ + <%= d_('dmpopidor', 'Enriched with examples and guidances designed the your research environment') %> +
+
+ + <%= d_('dmpopidor', 'Collaborative: make sharing easier between the partners of the same project') %> +
+ +
+ <%= d_('dmpopidor', 'Your feedback helps %{tool_name} to evolve. The development is part of an international collaboration with DMPRoadmap, an open source software.') % { tool_name: Rails.configuration.branding[:application][:name] } %> +
+ +
+ +
+
+

<%= d_('dmpopidor', 'Join the %{tool_name} community') % { tool_name: Rails.configuration.branding[:application][:name] } %>

+
+
+ <%= d_('dmpopidor', 'Create an account, Log in and Let you guide!') %> +
+
+ +
+
+ <%= link_to d_('dmpopidor', 'Discover %{tool_name}') % { tool_name: Rails.configuration.branding[:application][:name] }, + tutorials_path %> +
+
+ +
diff --git a/app/views/branded/layouts/_footer.html.erb b/app/views/branded/layouts/_footer.html.erb index a2dfbc4..f7cc222 100644 --- a/app/views/branded/layouts/_footer.html.erb +++ b/app/views/branded/layouts/_footer.html.erb @@ -14,6 +14,7 @@
  • <%= _('About') %>
  • <%= _('Terms of use') %>
  • +
  • <%= d_('dmpopidor', 'Tutorials') %>
  • <%= _('Contact us') %>
  • @@ -32,4 +33,4 @@
    - + \ No newline at end of file diff --git a/app/views/branded/layouts/_navigation.html.erb b/app/views/branded/layouts/_navigation.html.erb index 107ff88..041cd21 100644 --- a/app/views/branded/layouts/_navigation.html.erb +++ b/app/views/branded/layouts/_navigation.html.erb @@ -42,10 +42,6 @@ <%= link_to _('DMP Templates'), public_templates_path %> <% end %> - -
  • > - <%= link_to d_('dmpopidor', 'Tutorials'), tutorials_path %> -
  • > <%= link_to _('Help'), help_path %> diff --git a/app/views/branded/plans/new.html.erb b/app/views/branded/plans/new.html.erb new file mode 100644 index 0000000..a080e55 --- /dev/null +++ b/app/views/branded/plans/new.html.erb @@ -0,0 +1,93 @@ +
    +
    + <%= form_for Plan.new, url: plans_path do |f| %> + +

    <%= _('Project title') %>

    +
    +
    + <%= f.text_field(:title, class: 'form-control', 'aria-describedby': 'project-title', 'aria-required': 'true', + 'data-toggle': 'tooltip', + title: _('If applying for funding, state the project title exactly as in the proposal.')) %> +
    +
     
    +
    + <%= label_tag(:is_test, raw("#{check_box_tag(:is_test, "1", false)} #{ d_('dmpopidor', 'Plan for testing, practice, or educational purposes')}")) %> +
    +
    + + +

    <%= d_('dmpopidor', 'Choose a template') %>

    +

    + <%= d_('dmpopidor', 'Several template types are available:') %> +

      +
    • <%= d_('dmpopidor', 'Organisation templates: Select the organisation and check "No funder"') %>
    • +
    • <%= d_('dmpopidor', 'Funder templates: Check "No organisation" and select the funder') %>
    • +
    • <%= d_('dmpopidor', 'Funder templates customized by an organisation: Select the organisation and select the funder') %>
    • +
    • <%= raw("#{ d_('dmpopidor', 'Default template')} H2020 FAIR DMP (anglais): #{ d_('dmpopidor', 'Check "No organisation" and check "No funder"')}") %> +
    + <%= link_to d_('dmpopidor', 'Find the list of the available template'), public_templates_path, :target => "_blank" %> +

    +

    <%= d_('dmpopidor', 'Select a research organisation:') %>

    +
    +
    + <%= render partial: "shared/accessible_combobox", + locals: {name: 'plan[org_name]', + id: 'plan_org_name', + default_selection: @default_org, + models: @orgs, + attribute: 'name', + required: true, + error: _('You must select a research organisation from the list.'), + tooltip: _('Please select a valid research organisation from the list.')} %> +
    +
    - <%= _('or') %> -
    +
    +
    + <%= label_tag(:plan_no_org, raw("#{check_box_tag(:plan_no_org)} #{ d_('dmpopidor', 'No research organisation')}")) %> +
    +
    +
    + + +

    <%= d_('dmpopidor', 'Select a funder:') %>

    +
    +
    + <%= render partial: "shared/accessible_combobox", + locals: {name: 'plan[funder_name]', + id: 'plan_funder_name', + default_selection: nil, + models: @funders, + attribute: 'name', + required: true, + error: _('You must select a funding organisation from the list.'), + tooltip: _('Please select a valid funding organisation from the list.')} %> +
    +
    - <%= _('or') %> -
    +
    +
    + <%= label_tag(:plan_no_funder, raw("#{check_box_tag(:plan_no_funder)} #{ d_('dmpopidor', 'No funder associated with this plan')}")) %> +
    +
    +
    + + +
    + <%= hidden_field_tag 'template-option-target', org_admin_template_options_path %> +

    <%= d_('dmpopidor', 'Select a template:') %>

    +
    +
    + <%= select_tag(:plan_template_id, "", name: 'plan[template_id]', + class: 'form-control', 'aria-describedby': 'template-selection') %> +
    +
    + <%= d_('dmpopidor', 'We found multiple DMP templates corresponding to your choices.') %> +
    +
    +
    + + <%= f.hidden_field(:visibility, value: @is_test ? 'is_test' : Rails.application.config.default_plan_visibility) %> + <%= f.button(_('Create plan'), class: "btn btn-primary", type: "submit") %> + <%= link_to _('Cancel'), plans_path, class: 'btn btn-default' %> + <% end %> +
    +
    diff --git a/config/locale/dmpopidor.pot b/config/locale/dmpopidor.pot index 1c2c837..a436753 100644 --- a/config/locale/dmpopidor.pot +++ b/config/locale/dmpopidor.pot @@ -72,3 +72,87 @@ msgid "Administrator" msgstr "" +msgid "Organisation Type" +msgstr "" + +msgid "Background" +msgstr "" + +msgid "Latest news" +msgstr "" + +msgid "Welcome!" +msgstr "" + +msgid "%{tool_name} guides you through your research project by helping you create software and data management plans" +msgstr "" + +msgid "Accessible by any member of the ESR research community and their partners from France and outside" +msgstr "" + +msgid "Customizable by any research organisation aiming at setting up a data policy" +msgstr "" + +msgid "Enriched with examples and guidances designed the your research environment" +msgstr "" + +msgid "Collaborative: make sharing easier between the partners of the same project" +msgstr "" + +msgid "Your feedback helps %{tool_name} to evolve. The development is part of an international collaboration with DMPRoadmap, an open source software." +msgstr "" + +msgid "Join the %{tool_name} community" +msgstr "" + +msgid "Create an account, Log in and Let you guide!" +msgstr "" + +msgid "Discover %{tool_name}" +msgstr "" + +msgid "Choose a template" +msgstr "" + +msgid "Select a research organisation:" +msgstr "" + +msgid "Select a funder:" +msgstr "" + +msgid "Select a template:" +msgstr "" + +msgid "No research organisation" +msgstr "" + +msgid "No funder associated with this plan" +msgstr "" + +msgid "We found multiple DMP templates corresponding to your choices." +msgstr "" + +msgid "Several template types are available:" +msgstr "" + +msgid "Organisation templates: Select the organisation and check \"No funder\"" +msgstr "" + +msgid "Funder templates: Check \"No organisation\" and select the funder" +msgstr "" + +msgid "Funder templates customized by an organisation: Select the organisation and select the funder" +msgstr "" + +msgid "Default template" +msgstr "" + +msgid "Check \"No organisation\" and check "No funder"" +msgstr "" + +msgid "Find the list of the available template" +msgstr "" + +msgid "Plan for testing, practice, or educational purposes" +msgstr "" + diff --git a/config/locale/en_GB/dmpopidor.po b/config/locale/en_GB/dmpopidor.po index dc2eca3..24dc477 100644 --- a/config/locale/en_GB/dmpopidor.po +++ b/config/locale/en_GB/dmpopidor.po @@ -78,3 +78,78 @@ msgid "Latest news" msgstr "Latest news" + +msgid "Welcome!" +msgstr "Welcome!" + +msgid "%{tool_name} guides you through your research project by helping you create software and data management plans" +msgstr "%{tool_name} guides you through your research project by helping you create software and data management plans" + +msgid "Accessible by any member of the ESR research community and their partners from France and outside" +msgstr "Accessible by any member of the ESR research community and their partners from France and outside" + +msgid "Customizable by any research organisation aiming at setting up a data policy" +msgstr "Customizable by any research organisation aiming at setting up a data policy" + +msgid "Enriched with examples and guidances designed the your research environment" +msgstr "Enriched with examples and guidances designed the your research environment" + +msgid "Collaborative: make sharing easier between the partners of the same project" +msgstr "Collaborative: make sharing easier between the partners of the same project" + +msgid "Your feedback helps %{tool_name} to evolve. The development is part of an international collaboration with DMPRoadmap, an open source software." +msgstr "Your feedback helps %{tool_name} to evolve. The development is part of an international collaboration with DMPRoadmap, an open source software." + +msgid "Join the %{tool_name} community" +msgstr "Join the %{tool_name} community" + +msgid "Create an account, Log in and Let you guide!" +msgstr "Create an account, Log in and Let you guide !" + +msgid "Discover %{tool_name}" +msgstr "Discover %{tool_name}" + +msgid "Choose a template" +msgstr "Choose a template" + +msgid "Select a research organisation:" +msgstr "Select a research organisation:" + +msgid "Select a funder:" +msgstr "Select a funder:" + +msgid "Select a template:" +msgstr "Select a template:" + +msgid "No research organisation" +msgstr "No research organisation" + +msgid "No funder associated with this plan" +msgstr "No funder associated with this plan" + +msgid "We found multiple DMP templates corresponding to your choices." +msgstr "We found multiple DMP templates corresponding to your choices." + +msgid "Several template types are available:" +msgstr "Several template types are available:" + +msgid "Organisation templates: Select the organisation and check \"No funder\"" +msgstr "Organisation templates: Select the organisation and check \"No funder\"" + +msgid "Funder templates: Check \"No organisation\" and select the funder" +msgstr "Funder templates: Check \"No organisation\" and select the funder" + +msgid "Funder templates customized by an organisation: Select the organisation and select the funder" +msgstr "Funder templates customized by an organisation: Select the organisation and select the funder" + +msgid "Default template" +msgstr "Default template" + +msgid "Check \"No organisation\" and check "No funder"" +msgstr "Check \"No organisation\" and check "No funder"" + +msgid "Find the list of the available template" +msgstr "Find the list of the available template" + +msgid "Plan for testing, practice, or educational purposes" +msgstr "Plan for testing, practice, or educational purposes" \ No newline at end of file diff --git a/config/locale/fr_FR/dmpopidor.po b/config/locale/fr_FR/dmpopidor.po index c2ec22a..1decdc5 100644 --- a/config/locale/fr_FR/dmpopidor.po +++ b/config/locale/fr_FR/dmpopidor.po @@ -78,4 +78,79 @@ msgid "Latest news" msgstr "Dernières Nouvelles" +msgid "Welcome!" +msgstr "Bienvenue !" + +msgid "%{tool_name} guides you through your research project by helping you create software and data management plans" +msgstr "%{tool_name} vous accompagne tout au long d’un projet de recherche dans l’élaboration de plans de gestion de données et de logiciels" + +msgid "Accessible by any member of the ESR research community and their partners from France and outside" +msgstr "Accessible à la communauté scientifique de l’ESR et à ses partenaires français ou étrangers" + +msgid "Customizable by any research organisation aiming at setting up a data policy" +msgstr "Personnalisable par tout organisme de recherche pour la mise en place de sa politique de données" + +msgid "Enriched with examples and guidances designed the your research environment" +msgstr "Enrichi par des exemples et des recommandations adaptés à l’environnement de recherche" + +msgid "Collaborative: make sharing easier between the partners of the same project" +msgstr "Collaboratif pour faciliter les échanges entre partenaires d’un même projet" + +msgid "Your feedback helps %{tool_name} to evolve. The development is part of an international collaboration with DMPRoadmap, an open source software." +msgstr "%{tool_name} évolue grâce à vos retours. Les développements s’inscrivent dans le cadre d’une collaboration internationale autour du logiciel open source DMPRoadmap" + +msgid "Join the %{tool_name} community" +msgstr "Rejoignez la communauté %{tool_name}" + +msgid "Create an account, Log in and Let you guide!" +msgstr "Créez un compte, connectez-vous et laissez-vous guider !" + +msgid "Discover %{tool_name}" +msgstr "Découvrez %{tool_name}" + +msgid "Choose a template" +msgstr "Choisissez un modèle" + +msgid "Select a research organisation:" +msgstr "Selectionnez un organisme de recherche :" + +msgid "Select a funder:" +msgstr "Selectionnez un financeur :" + +msgid "Select a template:" +msgstr "Selectionnez un modèle :" + +msgid "No research organisation" +msgstr "Pas d'organisme de recherche" + +msgid "No funder associated with this plan" +msgstr "Pas de financeur associé à ce plan" + +msgid "We found multiple DMP templates corresponding to your choices." +msgstr "Nous avons trouvé plusieurs modèles correspondants à vos choix." + +msgid "Several template types are available:" +msgstr "Différents type de modèles sont disponibles :" + +msgid "Organisation templates: Select the organisation and check \"No funder\"" +msgstr "Modèles proposés par les organismes : Sélectionner l’organisme et cocher \"Pas de financeur\"" + +msgid "Funder templates: Check \"No organisation\" and select the funder" +msgstr "Modèles proposés par les financeurs : Cocher \"Pas d’organisme\" et sélectionner un financeur" + +msgid "Funder templates customized by an organisation: Select the organisation and select the funder" +msgstr "Modèles de financeurs personnalisés par les organismes : sélectionner l’organisme puis le financeur" + +msgid "Default template" +msgstr "Modèle par défaut" + +msgid "Check \"No organisation\" and check "No funder"" +msgstr "Cocher \"Pas d’organisme\" et cocher \"Pas de financeur\"" + +msgid "Find the list of the available template" +msgstr "Retrouvez la liste des modèles disponibles" + +msgid "Plan for testing, practice, or educational purposes" +msgstr "Plan de test, d'entrainement ou créé en vue d'une formation" + diff --git a/lib/assets/stylesheets/dmpopidor.scss b/lib/assets/stylesheets/dmpopidor.scss index 8bfafdc..fb3b985 100644 --- a/lib/assets/stylesheets/dmpopidor.scss +++ b/lib/assets/stylesheets/dmpopidor.scss @@ -66,7 +66,7 @@ a, a:active,a:focus,a:visited { color: $white; } - a:hover { + a:hover, a:focus { color: $white; background-color: $blue; } @@ -526,4 +526,39 @@ border-left: 2px solid $rust; } +} + + +/* + FRONT PAGE +*/ +.dmpopidor-front-page { + .main-title { + padding-bottom: 10px; + } + .join-div { + margin-top: 20px; + padding-bottom: 10px; + border-left: 4px solid #d6604d; + border-bottom: 2px solid #edf5fa; + border-top: 2px solid #edf5fa; + border-right: 2px solid #edf5fa; + } + .discover-div { + float: right; + } + + .front-page-list-item { + font-size: 1.2em; + } + .front-page-text { + font-size: 1.2em; + } + .icon { + padding: 20px 0; + font-size: 2em; + } + .text { + padding: 20px 0; + } } \ No newline at end of file