Add section Open Research

.travis.yml

@@ -19,6 +19,7 @@ script:
 - yamale -s schemaSoftware.yaml _data/software
 - yamale -s schemaStandard.yaml _data/standard
 - yamale -s schemaPartnership.yaml _data/partnership
+- yamale -s schemaResearch.yaml _data/research
 - npm test
 - yamllint -d configYamlLint.yml _data
 

_data/forms/config-research.yml

@@ -0,0 +1,28 @@
+---
+
+id: research
+
+formGroups:
+  - preset: empty
+    title: administrations
+    param: {start: true}
+  - preset: adminCode
+  - preset: selectResearch
+  - preset: description
+    param: {model: true}
+  - preset: category
+  - preset: tags
+  - preset: homepageURL
+    param: {type: url}
+  - preset: team
+  - preset: empty
+    title: uses
+    param: {start: true}
+  - preset: contact
+    param: {phone: false}
+  - widget: string
+    title: date
+    param: {type: date, rule: dateISO}
+  - preset: empty
+  - preset: empty
+

_data/i18n/form.yml

@@ -803,6 +803,95 @@ partnership:
       fr: Information à propos de chacun des projects
 
 # Future project form specifics
+research:
+  name:
+    title:
+      en: Research Name
+      fr: Nom de la recherche
+    label:
+      en:
+        en: English research Name
+        fr: Nom de la recherche en anglais
+      fr:
+        en: French research Name
+        fr: Nom de la recherche en français
+      schema:
+        en: Research Name
+        fr: Nom de la recherche
+    labels:
+      select:
+        en: If you wish to update information of a research that already exists in our library, please select it below
+        fr: Si vous souhaitez mettre à jour les données d'une recherche déjà ajouté au catalogue, veuillez le sélectionner de la liste
+    infobulle:
+      en: Add the name of the open research
+      fr: Ajouter le nom de la recherche libre
+  date:
+    title:
+      en: Published date
+      fr: Date de publication
+    label:
+      en: Published date
+      fr: Date de publication
+    infobulle:
+      en: Select the date when the research was published.
+      fr: Choisir la date lorsque la recherche a été publié.
+  administrations: *administrations
+  uses:
+    title:
+      en: Informations about research participants
+      fr: Information à propos des participants à la recherche
+    infobulle:
+      en: Information concerning the participations on this research
+      fr: Information à propos des participations à cette recherche
+  description:
+    title:
+      en: Description
+      fr: Description
+    labels:
+      whatItDoes:
+        subtitle:
+          en: Research subject
+          fr: Sujet de recherche
+        en:
+          en: English
+          fr: Anglais
+        fr:
+          en: French
+          fr: Français
+        schema:
+          en: Research subject
+          fr: Sujet de recherche
+      howItWorks:
+        subtitle:
+          en: Abstract
+          fr: Résumé
+        en:
+          en: English
+          fr: Anglais
+        fr:
+          en: French
+          fr: Français
+        schema:
+          en: Abstract
+          fr: Résumé
+    label:
+      schema:
+        en: Description
+        fr: Description
+    charactersLimit:
+      en: (200 characters limit)
+      fr: (limite de 200 caractères)
+    infobulle:
+      en: Add a brief description of the research.
+      fr: Ajoutez une brève description de la recherche.
+    titles:
+      whatItDoes:
+        en: Description of the research's subject
+        fr: Description du sujet de la recherche
+      howItWorks:
+        en: Description of the abstract's research 
+        fr: Description du résumé de la recherche
+# Future project form specifics
 design:
   name:
     title:

_data/i18n/general.yml

@@ -80,6 +80,12 @@ nav:
     link:
       en: https://www.canada.ca/en.html
       fr: https://www.canada.ca/fr.html
+  research:
+    en: Open Research
+    fr: Recherche Libre
+    link:
+      en: ./open-researches.html
+      fr: ./recherches-libres.html
 
 footer:
   AboutGovernment:

_data/schemaResearch.yaml

@@ -0,0 +1,35 @@
+---
+schemaVersion: str()
+adminCode: str()
+projects:
+  - contact:
+      email: str()
+      name: str(required=False)
+      phone: str(required=False)
+    category: str()
+    date:
+      closed: str()
+      started: str()
+      metadataLastUpdated: str()
+    description:
+      whatItDoes:
+        en: str()
+        fr: str()
+      howItWorks:
+        en: str(required=False)
+        fr: str(required=False)
+    name:
+      en: str()
+      fr: str()
+    partners:
+      - adminCode: str(required=False)
+        email: str(required=False)
+        name: str(required=False)
+    tags:
+      en:
+        - str(required=False)
+      fr:
+        - str(required=False)
+    team:
+      en: str(required=False)
+      fr: str(required=False)

_includes/footer.html

@@ -73,6 +73,10 @@ <h2 class="wb-inv">{{ site.data.i18n.general.footer.AboutSite[page.lang] }}</h2>
 <script src="../assets/js/src/adminForm.js"></script>
 <script src="../assets/js/src/softwareForm.js"></script>
 {%- endif %}
+{%- if page.ref == "researchForm" -%}
+<script src="../assets/js/src/adminForm.js"></script>
+<script src="../assets/js/src/researchForm.js"></script>
+{%- endif %}
 {%- if page.ref == "designForm" -%}
 <script src="../assets/js/src/adminForm.js"></script>
 <script src="../assets/js/src/designForm.js"></script>

_includes/form/presets/description.html

@@ -1,14 +1,44 @@
 {%- assign title = "description" -%}
-{%- include form/components/title.html id=include.idPreset title=title -%}
+
+{%- if include.param.model -%}
+    {%- include form/components/title.html
+    id="research" title=title -%}
+    {%- assign descriptionPosition = "research" -%}
+    {%- else -%}
+    {%- include form/components/title.html
+        id=include.idPreset title=title -%} 
+    {%- assign descriptionPosition = include.idPreset -%}
+{%- endif -%}
 <div class="row">
-<div class="col-sm-6">
-<h3>{{ site.data.i18n.form.presets.description.labels.whatItDoes.subtitle[page.lang] }} </h3>
-<p><small style="font-size: 75%">{{ site.data.i18n.form.presets.description.charactersLimit[page.lang] }}</small> </p>
-{%- include form/components/textarea-i18n.html id=include.idPreset title=title group="whatItDoes" -%}
-</div>
-<div class="col-sm-6">
-<h3>{{ site.data.i18n.form.presets.description.labels.howItWorks.subtitle[page.lang] }} </h3>
-<p><small style="font-size: 75%">{{ site.data.i18n.form.presets.description.charactersLimit[page.lang] }}</small></p>
-{%- include form/components/textarea-i18n.html id=include.idPreset title=title group="howItWorks" param=site.data.forms.param.required_false -%}
-</div>
+  <div class="col-sm-6">
+    <h3>
+      {{
+      site.data.i18n.form[descriptionPosition][title].labels.whatItDoes.subtitle[page.lang]
+      }}
+    </h3>
+    <p>
+      <small style="font-size: 75%"
+        >{{ site.data.i18n.form[descriptionPosition][title].charactersLimit[page.lang]
+        }}</small
+      >
+    </p>
+    {%- include form/components/textarea-i18n.html id=include.idPreset
+    title=title group="whatItDoes" -%}
+  </div>
+  <div class="col-sm-6">
+    <h3>
+      {{
+      site.data.i18n.form[descriptionPosition][title].labels.howItWorks.subtitle[page.lang]
+      }}
+    </h3>
+    <p>
+      <small style="font-size: 75%"
+        >{{ site.data.i18n.form[descriptionPosition][title].charactersLimit[page.lang]
+        }}</small
+      >
+    </p>
+    {%- include form/components/textarea-i18n.html id=include.idPreset
+    title=title group="howItWorks" param=site.data.forms.param.required_false
+    -%}
+  </div>
 </div>

_includes/form/presets/selectResearch.html

@@ -0,0 +1,3 @@
+
+{%- include form/presets/name.html id=include.id -%}
+

_includes/header.html

@@ -46,6 +46,7 @@ <h2 class="wb-inv">Menu</h2>
         <li role="presentation"><a role="menuitem" href="{{ site.data.i18n.general.nav.code.link[page.lang] }}">{{ site.data.i18n.general.nav.code[page.lang] }}</a></li>
         <li role="presentation"><a role="menuitem" href="{{ site.data.i18n.general.nav.design.link[page.lang] }}">{{ site.data.i18n.general.nav.design[page.lang] }}</a></li>
         <li role="presentation"><a role="menuitem" href="{{ site.data.i18n.general.nav.software.link[page.lang] }}">{{ site.data.i18n.general.nav.software[page.lang] }}</a></li>
+        <li role="presentation"><a role="menuitem" href="{{ site.data.i18n.general.nav.research.link[page.lang] }}">{{ site.data.i18n.general.nav.research[page.lang] }}</a></li>
         <li role="presentation"><a role="menuitem" href="{{ site.data.i18n.general.nav.standard.link[page.lang] }}">{{ site.data.i18n.general.nav.standard[page.lang] }}</a></li>
         <li role="presentation"><a role="menuitem" href="{{ site.data.i18n.general.nav.partnership.link[page.lang] }}">{{ site.data.i18n.general.nav.partnership[page.lang] }}</a></li>
         <li role="presentation"><a role="menuitem" href="{{ site.data.i18n.general.nav.doc.link[page.lang] }}">{{ site.data.i18n.general.nav.doc[page.lang] }}</a></li>