Merge branch 'release/2.23.0'

epfl-si · Apr 14, 2021 · 0d38b87 · 0d38b87
2 parents 078dbfa + 79f7a10
commit 0d38b87
Show file tree

Hide file tree

Showing 13 changed files with 229 additions and 39 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,12 @@
 # CHANGELOG
 
+*2.23.0* (2021-04-14)
+- Small german + footer updates #502
+- Allow overflow:visible on the dropdown component #504
+- Add "all events" link underneath a list of events #493
+- Update "study plan" templates #506
+- Update some packages (y18n and elliptic)
+
 *2.22.1* (2021-04-12)
 - Fix gallery nav being unresponsive the first time loaded, by rewriting the JS #505
 

diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-2.22.1
+2.23.0
diff --git a/assets/components/content-types/event/event-highlight-listing.twig b/assets/components/content-types/event/event-highlight-listing.twig
@@ -1,16 +1,10 @@
-<div class="row align-items-center">
-  <div class="col-md-6">
-    <h2>Les prochains événements</h2>
-  </div>
-  <div class="col-md-6 text-right">
-    <a href="#">Voir tous les événements de la faculté</a>
-  </div>
-</div>
+
+<h2>Les prochains événements</h2>
 <div class="row mt-2">
   <div class="col-md-6">
     {% include '@content-types/event/event-highlight.twig' %}
   </div>
   <div class="col-md-6">
-    {% include '@content-types/event/event-listing.twig' %}
+    {% include '@content-types/event/event-listing.twig' with { bottomlink: true } %}
   </div>
 </div>
diff --git a/assets/components/content-types/event/event-listing.twig b/assets/components/content-types/event/event-listing.twig
@@ -33,9 +33,9 @@
     </a>
   {% endfor %}
 
-  {% if bottomlink %}
+  {% if bottomlink|default(true) %}
     <a href="#" class="list-group-teaser-more">
-      Afficher plus d'événements
+      Voir tous les événements
     </a>
   {% endif %}
 </div>
diff --git a/assets/components/content-types/study-plan/study-plan-bachelor.twig b/assets/components/content-types/study-plan/study-plan-bachelor.twig
@@ -1,5 +1,172 @@
 
-<!-- Study Plan Bachelor -->
+<!-- Study Plan 1 semester -->
+
+<div class="study-plan study-plan-1-semesters table-like mb-5">
+  <h3>Bachelor – 1 semestre</h3>
+  <div class="line-up">
+    <div class="first-line">
+      <div class="cours-title">
+        <div class="titre">Cours</div>
+      </div>
+      <div class="langue">
+        <div class="titre">Langue</div>
+      </div>
+      <div class="bachlor">
+        <div class="titre_bachlor bold">Bachelor 1&nbsp;</div>
+        <div class="titre">
+          <div class="cep"><abbr title="Cours">c</abbr></div>
+          <div class="cep"><abbr title="Exercices">e</abbr></div>
+          <div class="cep"><abbr title="Pratiques">p</abbr></div>
+        </div>
+      </div>
+      <div class="examen">
+        <div class="titre_bachlor bold">Examens</div>
+      </div>
+      <div class="credit">
+        <div class="titre_bachlor bold">Crédits</div>
+      </div>
+    </div>
+    <div class="clear">&nbsp;</div>
+  </div>
+
+  <div class="line-down">
+    <div class="line">
+
+      <div class="cours" data-title="Analyse territoriale et urbaine">
+        <div class="cours-name">
+          <a href="#">Analyse territoriale et urbaine</a>
+        </div>
+        <div class="cours-info">AR-153 / Section <abbr title="Architecture">AR</abbr></div>
+        <div class="enseignement-name">
+          <a href="#">Barcelloni Corte</a>, <a href="#">Cavalieri</a>, <a href="#">Viganò</a>
+          &nbsp;
+        </div>
+      </div>
+
+      <div class="langue" data-title="Langue">
+        <div class="langue"><abbr title="Français">FR</abbr></div>
+        &nbsp;
+      </div>
+
+      <div class="bachlor local-color-light bachlor-color" data-title="Bachelor 1">
+        <div class="bachlor-text">
+          <div class="cep"><span class="label sr-only">Cours: </span>1h&nbsp;</div>
+          <div class="cep"><span class="label sr-only">Exercices: </span>2h&nbsp;</div>
+          <div class="cep">–&nbsp;</div>
+        </div>
+      </div>
+
+      <div class="examen" data-title="Examens">
+        <div class="exam-text"><b>Semestre de printemps</b><br>Examens pendant le semestre</div>
+        &nbsp;
+      </div>
+
+      <div class="credit red-color" data-title="Crédits">
+        <div class="credit-time">4</div>
+      </div>
+
+      <button class="btn-collapse">
+        <span class="show">afficher</span>
+        <span class="">masquer</span>
+        {% include '@atoms/icon/icon.twig' with {icon: 'icon-triangle'} %}
+      </button>
+
+    </div>
+  </div>
+
+  <div class="line-down">
+    <div class="line">
+
+      <div class="cours" data-title="Figuration graphique">
+        <div class="cours-name">
+          <a href="#">Figuration graphique</a>
+        </div>
+        <div class="cours-info">AR-113 / Section <abbr title="Architecture">AR</abbr></div>
+        <div class="enseignement-name">
+          <a href="#">Braghieri</a>, <a href="#">Soubeyrand</a>
+          &nbsp;
+        </div>
+      </div>
+
+      <div class="langue" data-title="Langue">
+        <div class="langue"><abbr title="Français">FR</abbr></div>
+        &nbsp;
+      </div>
+
+      <div class="bachlor local-color-light bachlor-color" data-title="Bachelor 2">
+        <div class="bachlor-text">
+          <div class="cep"><span class="label sr-only">Cours: </span>1h&nbsp;</div>
+          <div class="cep"><span class="label sr-only">Exercices: </span>3h&nbsp;</div>
+          <div class="cep">–&nbsp;</div>
+        </div>
+      </div>
+
+      <div class="examen" data-title="Examens">
+        <div class="exam-text"><b>Session d'été</b><br>Examens pendant le semestre</div>
+        &nbsp;
+      </div>
+
+      <div class="credit red-color" data-title="Crédits">
+        <div class="credit-time">4</div>
+      </div>
+
+      <button class="btn-collapse">
+        <span class="show">afficher</span>
+        <span class="">masquer</span>
+        {% include '@atoms/icon/icon.twig' with {icon: 'icon-triangle'} %}
+      </button>
+
+    </div>
+  </div>
+
+  <div class="line-down">
+    <div class="line">
+
+      <div class="cours" data-title="Histoire de l'architecture I">
+        <div class="cours-name">
+          <a href="#">Histoire de l'architecture I</a>
+        </div>
+        <div class="cours-info">AR-123 / Section <abbr title="Architecture">AR</abbr></div>
+        <div class="enseignement-name">
+          <a href="#">Adam</a>
+          &nbsp;
+        </div>
+      </div>
+
+      <div class="langue" data-title="Langue">
+        <div class="langue"><abbr title="Français">FR</abbr></div>
+        &nbsp;
+      </div>
+
+      <div class="bachlor local-color bachlor-color" data-title="Bachelor 1">
+        <div class="bachlor-text">
+          <div class="cep"><span class="label sr-only">Cours: </span>2h&nbsp;</div>
+          <div class="cep">–&nbsp;</div>
+          <div class="cep">–&nbsp;</div>
+        </div>
+      </div>
+
+      <div class="examen" data-title="Examens">
+        <div class="exam-text"><b>Session d'hiver</b><br>Examens écrits</div>
+        &nbsp;
+      </div>
+
+      <div class="credit red-color" data-title="Crédits">
+        <div class="credit-time">2</div>
+      </div>
+
+      <button class="btn-collapse">
+        <span class="show">afficher</span>
+        <span class="">masquer</span>
+        {% include '@atoms/icon/icon.twig' with {icon: 'icon-triangle'} %}
+      </button>
+
+    </div>
+  </div>
+
+</div>
+
+<!-- Study Plan 2 semesters -->
 
 <div class="study-plan study-plan-2-semesters table-like mb-5">
   <h3>Bachelor – 2 semestres</h3>

diff --git a/assets/components/content-types/study-plan/study-plan.scss b/assets/components/content-types/study-plan/study-plan.scss
@@ -3,6 +3,7 @@
 $table-cours-template-columns: minmax(200px, 3fr) minmax(auto, 1fr) minmax(200px, 3fr);
 $table-grid-template-columns: 1fr $table-cours-template-columns 2fr 2fr 2fr minmax(200px, 3fr) 1fr;
 
+$study-plan-1-semesters: minmax(300px, 4fr) 1fr 2fr minmax(200px, 3fr) 1fr;
 $study-plan-2-semesters: minmax(300px, 4fr) 1fr 2fr 2fr minmax(200px, 3fr) 1fr;
 $study-plan-3-semesters: minmax(300px, 4fr) 1fr 2fr 2fr 2fr minmax(200px, 3fr) 1fr;
 $study-plan-4-semesters: minmax(300px, 4fr) 1fr 2fr 2fr 2fr 2fr minmax(200px, 3fr) 1fr;
@@ -350,7 +351,9 @@ $study-plan-master-pdm: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr minmax(140px, 3fr
   }
 }
 
-
+.study-plan-1-semesters {
+  --table-columns: #{$study-plan-1-semesters};
+}
 .study-plan-2-semesters {
   --table-columns: #{$study-plan-2-semesters};
 }

diff --git a/assets/components/content-types/study-plan/study-plan.yml b/assets/components/content-types/study-plan/study-plan.yml
@@ -3,7 +3,7 @@ name: study-plan
 notes: |
   The study plan is a special case of table. The markup cannot be changed and we put in place a CSS Grid layout to display the content.
 
-  Please override the columns width (if they do not fit your needs by using a CSS variable: `<div class="study-plan table-like" style="--table-columns: 1fr minmax(200px, 3fr) minmax(auto, 1fr) minmax(200px, 3fr) 3fr 1fr">`.
+  Please override the columns width (if they do not fit your needs) by using a CSS variable: `<div class="study-plan table-like" style="--table-columns: 1fr minmax(200px, 3fr) minmax(auto, 1fr) minmax(200px, 3fr) 3fr 1fr">`.
 
   The default behaviour is kept on IE, the content stays readable (the table might be a bit wonky when some columns are missing though).
 

diff --git a/assets/components/molecules/list-group/list-group.scss b/assets/components/molecules/list-group/list-group.scss
@@ -33,6 +33,10 @@
     &:hover {
       z-index: $zindex-10;
     }
+
+    & + .list-group-teaser {
+      margin-top: -1px;
+    }
   }
 
   .list-group-teaser-thumbnail{

diff --git a/assets/components/molecules/search/search.twig b/assets/components/molecules/search/search.twig
@@ -18,7 +18,7 @@
       {% endif %}
       {% if language == 'de' %}
       <label for="search" class="sr-only">Forschen</label>
-      <input type="text" class="form-control" name="search" placeholder="Forschen" >
+      <input type="text" class="form-control" name="search" placeholder="Suchen" >
       <button type="submit" class="d-none d-xl-block btn btn-primary input-group-append">Bestätigen</button></div>
       {% endif %}
   </form>

diff --git a/assets/config/data.json b/assets/config/data.json
@@ -639,7 +639,7 @@
           "url_fr": "https://www.epfl.ch/about/campus/fr/",
           "name_en": "Associated campuses",
           "url_en": "https://www.epfl.ch/about/campus/",
-          "name_de": "Assoziierte Campusse",
+          "name_de": "Assoziierte Campus",
           "url_de": "https://www.epfl.ch/about/campus/de/"
         },
         {
@@ -655,7 +655,7 @@
           "url_fr": "https://www.epfl.ch/about/recruiting/fr/",
           "name_en": "Recruiting EPFL talents",
           "url_en": "https://www.epfl.ch/about/recruiting/",
-          "name_de": "Rekrutierung von Talenten durch die EPFL",
+          "name_de": "EPFL Talente",
           "url_de": "https://www.epfl.ch/about/recruiting/"
         },
         {
@@ -680,7 +680,7 @@
           "name_en": "Equality",
           "url_en": "https://www.epfl.ch/about/equality/",
           "name_de": "Chancengleichheit",
-          "url_de": "https://equality.epfl.ch"
+          "url_de": "https://www.epfl.ch/about/equality/"
         },
         {
           "name_fr": "Philanthropie",
@@ -867,6 +867,14 @@
           "url_en": "https://www.epfl.ch/research/awards/",
           "name_de": "Preise und Auszeichnungen",
           "url_de": "https://www.epfl.ch/research/awards/de/"
+        },
+        {
+          "name_fr": "Open Science",
+          "url_fr": "https://www.epfl.ch/research/open-science/fr/",
+          "name_en": "Open Science",
+          "url_en": "https://www.epfl.ch/research/open-science/",
+          "name_de": "Open Science",
+          "url_de": "https://www.epfl.ch/research/open-science/de/"
         }
       ]
     },

diff --git a/assets/config/styleguide.scss b/assets/config/styleguide.scss
@@ -39,6 +39,13 @@
   overflow: hidden;
 }
 
+/*  Dropdown needs `overflow: visible` to allow it to
+    escape its container. */
+.tlbx-item-preview.tlbx-component-dropdown {
+  overflow: visible;
+}
+
+
 .tlbx-sidebar-item-list {
   margin-left: 0;
   padding: 0;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "epfl-elements",
-  "version": "2.22.1",
+  "version": "2.23.0",
   "license": "MIT",
   "main": "index.html",
   "repository": {