From cd6241617d58667186d3ae98c2c4ce509d508d1b Mon Sep 17 00:00:00 2001 From: Aline Date: Tue, 13 Apr 2021 12:04:54 +0200 Subject: [PATCH 01/13] Create "Course" page --- assets/components/base.scss | 1 + .../study-plan-course/study-plan-course.scss | 17 ++ .../study-plan-course/study-plan-course.twig | 223 ++++++++++++++++++ .../study-plan-course/study-plan-course.yml | 2 + 4 files changed, 243 insertions(+) create mode 100644 assets/components/pages/study-plan-course/study-plan-course.scss create mode 100644 assets/components/pages/study-plan-course/study-plan-course.twig create mode 100644 assets/components/pages/study-plan-course/study-plan-course.yml diff --git a/assets/components/base.scss b/assets/components/base.scss index 93edc169e..c352ff62d 100644 --- a/assets/components/base.scss +++ b/assets/components/base.scss @@ -128,3 +128,4 @@ // pages: @import 'pages/people-detail/people-detail'; @import 'pages/blog-single/blog-single'; +@import 'pages/study-plan-course/study-plan-course'; diff --git a/assets/components/pages/study-plan-course/study-plan-course.scss b/assets/components/pages/study-plan-course/study-plan-course.scss new file mode 100644 index 000000000..44921b4a8 --- /dev/null +++ b/assets/components/pages/study-plan-course/study-plan-course.scss @@ -0,0 +1,17 @@ +@charset 'utf-8'; + +.course-details { + position: relative; + + @include media-breakpoint-up(xl) { + &:after { + content: ""; + border-right: 1px solid $gray-300; + position: absolute; + top: 0; + right: -3rem; + bottom: 0; + left: auto; + } + } +} \ No newline at end of file diff --git a/assets/components/pages/study-plan-course/study-plan-course.twig b/assets/components/pages/study-plan-course/study-plan-course.twig new file mode 100644 index 000000000..ec7a9c469 --- /dev/null +++ b/assets/components/pages/study-plan-course/study-plan-course.twig @@ -0,0 +1,223 @@ +{% set isSpecial = true %} + +{% extends "@templates/base/base.twig" %} + +{% block header %} + +{% endblock %} + +{% block breadcrumb %} +
+ +
+{% endblock %} + +{% block content %} + +
+
+

Art et architecture

+ +
+
+
+
+

AR-153 / Section AR

+

Enseignant‧es: Gargiani Roberto, Profs divers

+

Langue(s): Français

+

Retrait: Il n’est pas autorisé de se retirer de cette matière après le délai d’inscription.

+

Remarques: Inscription faite par la section.

+
+
+
+

Résumé

+

Le cours vise à approfondir les principales questions liées aux processus créatifs, aux matériaux et aux technologies expérimentés par les artistes et les architectes depuis les années soixante jusqu’à aujourd’hui.

+
+
+

Contenu du cours

+ + +
+
+

Mots-clés

+

Architecture, Arts, Matériel, Immatériel, Contemporain

+
+
+

Acquis de formation

+

A la fin de ce cours l’étudiant doit être capable de:

+
    +
  • Interpréter de façon critique les processus créatifs communs à l’art et à l’architecture de la seconde moitié du Novecento jusqu’à aujourd’hui
    • +
  • Evaluer les différents aspects qui caractérisent les formes artistiques analysées
    • +
  • Reconnaitre le contexte culturel de la période historique concernée
    • +
+
+
+

Méthode d’enseignement

+

Cours ex-cathedra, séminaires

+
+
+

Méthode d’évaluation

+

L’examen consiste en une épreuve orale pour vérifier les connaissances acquises par l’étudiant durant les cours et par l’étude de la bibliographie obligatoire. Les conditions sine qua non pour réussir l’examen sont que l’étudiant démontre qu’il a étudié parfaitement la bibliographie et qu’il a acquis une connaissance critique des thèmes abordés dans les cours.

+
+
+

Ressources

+

Ressources en bibliothèque:

+ +

Sites web:

+ +

Liens Moodle:

+ +
+
+ +
+
+

Dans les plans d'études

+ + + +
+
    +
  • Semestre: Printemps
    • +
  • Examen: Oral (session d’été)
    • +
  • Crédits: 10
    • +
  • Matière examinée: Art et Architecture
    • +
  • Cours: 2 heures hebdo x 14 semaines
    • +
  • Projet: 4 heures hebdo x 14 semaines
    • +
+
+ + + +
+
    +
  • Semestre: Printemps
    • +
  • Examen: Oral (session d’été)
    • +
  • Crédits: 10
    • +
  • Matière examinée: Art et Architecture
    • +
  • Cours: 2 heures hebdo x 14 semaines
    • +
  • Projet: 4 heures hebdo x 14 semaines
    • +
+
+ + + +
+
    +
  • Semestre: Printemps
    • +
  • Examen: Oral (session d’été)
    • +
  • Crédits: 10
    • +
  • Matière examinée: Art et Architecture
    • +
  • Cours: 2 heures hebdo x 14 semaines
    • +
  • Projet: 4 heures hebdo x 14 semaines
    • +
+
+ +
+ +
+

Semaine de référence

+
+ +
+ +
+
+ +{% endblock %} + +{% block footer_container %} +
+
+ {% block footer %} + {% include '@organisms/footer/footer-light.twig' %} + {% endblock %} +
+
+{% endblock %} \ No newline at end of file diff --git a/assets/components/pages/study-plan-course/study-plan-course.yml b/assets/components/pages/study-plan-course/study-plan-course.yml new file mode 100644 index 000000000..04dfb2e19 --- /dev/null +++ b/assets/components/pages/study-plan-course/study-plan-course.yml @@ -0,0 +1,2 @@ +name: study-plan-course +title: Study Plan – Course From 0a9166b96fc1c6c709982b68da347f8085bba027 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 20 Apr 2021 00:47:49 +0000 Subject: [PATCH 02/13] Bump ssri from 6.0.1 to 6.0.2 Bumps [ssri](https://github.com/npm/ssri) from 6.0.1 to 6.0.2. - [Release notes](https://github.com/npm/ssri/releases) - [Changelog](https://github.com/npm/ssri/blob/v6.0.2/CHANGELOG.md) - [Commits](https://github.com/npm/ssri/compare/v6.0.1...v6.0.2) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index c8ac1479a..aa5df08c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10204,9 +10204,9 @@ sshpk@^1.7.0: tweetnacl "~0.14.0" ssri@^6.0.1: - version "6.0.1" - resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.1.tgz#2a3c41b28dd45b62b63676ecb74001265ae9edd8" - integrity sha512-3Wge10hNcT1Kur4PDFwEieXSCMCJs/7WvSACcrMYrNp+b8kDL1/0wJch5Ni2WrtwEa2IO8OsVfeKIciKCDx/QA== + version "6.0.2" + resolved "https://registry.yarnpkg.com/ssri/-/ssri-6.0.2.tgz#157939134f20464e7301ddba3e90ffa8f7728ac5" + integrity sha512-cepbSq/neFK7xB6A50KHN0xHDotYzq58wWCa5LeWqnPrHG8GzfEjO/4O8kpmcGW+oaxkvhEJCWgbgNk4/ZV93Q== dependencies: figgy-pudding "^3.5.1" From ba1ba5fd998de01bcb412fb805b4aee7153cc599 Mon Sep 17 00:00:00 2001 From: Aline Date: Wed, 5 May 2021 11:35:15 +0200 Subject: [PATCH 03/13] Update 'coursebook' components --- .../coursebook/coursebook-program.twig | 281 ++++-------------- .../content-types/coursebook/coursebook.scss | 156 +++++++--- .../content-types/coursebook/coursebook.twig | 57 ++-- .../content-types/coursebook/coursebook.yml | 3 - assets/images/icons/icon-course-exercise.svg | 3 + assets/images/icons/icon-course-project.svg | 3 + 6 files changed, 221 insertions(+), 282 deletions(-) create mode 100644 assets/images/icons/icon-course-exercise.svg create mode 100644 assets/images/icons/icon-course-project.svg diff --git a/assets/components/content-types/coursebook/coursebook-program.twig b/assets/components/content-types/coursebook/coursebook-program.twig index 1db3723a3..ef93316c1 100644 --- a/assets/components/content-types/coursebook/coursebook-program.twig +++ b/assets/components/content-types/coursebook/coursebook-program.twig @@ -1,216 +1,65 @@ -
-

In the programs

- -
-
+ + +
+
    +
  • Semestre: Printemps
    • +
  • Examen: Oral (session d’été)
    • +
  • Matière examinée: Art et Architecture
    • +
  • Cours: 2 heures hebdo x 14 semaines
    • +
  • Projet: 4 heures hebdo x 14 semaines
    • +
+
+ + + +
+
    +
  • Semestre: Printemps
    • +
  • Examen: Oral (session d’été)
    • +
  • Matière examinée: Art et Architecture
    • +
  • Cours: 2 heures hebdo x 14 semaines
    • +
  • Projet: 4 heures hebdo x 14 semaines
    • +
+
+ + + +
+
    +
  • Semestre: Printemps
    • +
  • Examen: Oral (session d’été)
    • +
  • Matière examinée: Art et Architecture
    • +
  • Cours: 2 heures hebdo x 14 semaines
    • +
  • Projet: 4 heures hebdo x 14 semaines
    • +
+
\ No newline at end of file diff --git a/assets/components/content-types/coursebook/coursebook.scss b/assets/components/content-types/coursebook/coursebook.scss index b0e8e38f1..8f9c12822 100644 --- a/assets/components/content-types/coursebook/coursebook.scss +++ b/assets/components/content-types/coursebook/coursebook.scss @@ -65,68 +65,146 @@ /** * Reference week **/ + +.taken { + color: white; + vertical-align: middle; + text-align: center; + + a { + color: white !important; + text-decoration-color: $white; + + &:hover { + font-weight: bold; + } + } +} + +.coursebook-reference-week > div > div { + // these are the items out of the table + width: auto !important; + margin-right: 0.9rem; + font-size: $font-size-sm * 1.07; +} + .semaineDeRef { @extend .table, .table-boxed; - + position: relative; + border: 0; + + &:before, + &:after { + content: ""; + border-bottom: 1px solid $gray-200; + position: absolute; + right: 0; + left: 0; + } + + &:before { + top: calc(2rem - 2px); + bottom: auto; + } + + &:after { + top: auto; + bottom: -1px; + } + tbody { + tr:first-child { th { padding: ($spacer * 0.12) ($spacer * 0.66); - background: $table-head-bg; - border-left: 1px solid gray('200'); - border-bottom: 3px solid gray('200'); - text-transform: uppercase; - color: $table-head-color; - } - th:first-child { - background: $white; } } - tr { - .time { - font-weight: bold; - } td { - padding: ($spacer * 0.15) ($spacer * 0.45) + padding: ($spacer * 0.15) ($spacer * 0.45); + transition: background-color .3s ease-in-out; + } + + &:hover { + td { + background: $gray-200; + } } } - } -} + + td, + th { + width: 16.6667%; + } -.local-color { - background: theme-color("primary"); -} + th { + height: 2rem; + background: transparent; + border: solid $gray-200; + border-width: 1px 0; + text-align: center; + } -.local-color-light { - background: darken(theme-color("warning"), 5.2); -} + td { + height: 2rem; + background: $gray-100; + border: 2px solid #fff; + } -.local-color-dark { - background: theme-color("info"); -} + td.time { + background: transparent; + color: $black; + padding-left: 0; + } + + td.taken { + color: #fff; -.taken { - color: white; - vertical-align: middle; - text-align: center; + a { + color: #fff; + } - a { - color: white !important; - text-decoration-color: $white; + &.cours { + background: $red; + } - &:hover { - font-weight: bold; + &.exercice { + background: $red-dark url(../images/icons/icon-course-exercise.svg) no-repeat 4px 4px; + } + + &.projet { + background: #8e0000 url(../images/icons/icon-course-project.svg) no-repeat 4px 4px; + } } } } -.coursebook-reference-week > div > div { - // these are the items out of the table - width: auto !important; - margin-right: 0.9rem; - font-size: $font-size-sm * 1.07; +.coursebook-week-caption { + .caption { + font-size: 1rem; + margin-bottom: .5rem; + + .caption-icon { + display: inline-block; + width: 2rem; + height: 2rem; + margin-right: .25rem; + vertical-align: middle; + } + } + + .caption-cours .caption-icon { + background: $red; + } + + .caption-exercice .caption-icon { + background: $red-dark url(../images/icons/icon-course-exercise.svg) no-repeat .5rem .5rem; + } + + .caption-projet .caption-icon { + background: #8e0000 url(../images/icons/icon-course-project.svg) no-repeat .5rem .5rem; + } } /** diff --git a/assets/components/content-types/coursebook/coursebook.twig b/assets/components/content-types/coursebook/coursebook.twig index 3f02e1fd1..5a1c5d085 100644 --- a/assets/components/content-types/coursebook/coursebook.twig +++ b/assets/components/content-types/coursebook/coursebook.twig @@ -1,5 +1,4 @@ -
-

Reference week

+ @@ -12,8 +11,10 @@ - - + + @@ -23,12 +24,10 @@ - - - + @@ -38,9 +37,6 @@ - - @@ -48,12 +44,11 @@ - + - + @@ -65,7 +60,6 @@ - @@ -73,7 +67,6 @@ - @@ -81,7 +74,6 @@ - @@ -89,7 +81,6 @@ - @@ -97,7 +88,6 @@ - @@ -125,9 +115,28 @@
8-9    + CM5 +            INF1
10-11              BC01
BC04
12-13     BC01
BC04		 
13-14              
15-16      
16-17      
17-18      
18-19      
19-20
-
 
-
      Lecture
-
      Exercise, TP
-
      Project, other
-
-
+ + + + + +
+

Lundi, 8h – 12h: Projet, autre

+

Lundi, 13h – 19h: Projet, autre

+

Mardi, 8h – 10h: Cours, bâtiment CM5

+

Mardi, 10h – 12h: Exercice, TP

+
diff --git a/assets/components/content-types/coursebook/coursebook.yml b/assets/components/content-types/coursebook/coursebook.yml index 7e82c4b04..35053dbce 100644 --- a/assets/components/content-types/coursebook/coursebook.yml +++ b/assets/components/content-types/coursebook/coursebook.yml @@ -9,8 +9,5 @@ variants: title: Légende wrapper: coursebook-legend col-md-5 notes: | -

- -
### Reference week diff --git a/assets/images/icons/icon-course-exercise.svg b/assets/images/icons/icon-course-exercise.svg new file mode 100644 index 000000000..b8cf25c5b --- /dev/null +++ b/assets/images/icons/icon-course-exercise.svg @@ -0,0 +1,3 @@ + + + diff --git a/assets/images/icons/icon-course-project.svg b/assets/images/icons/icon-course-project.svg new file mode 100644 index 000000000..940270132 --- /dev/null +++ b/assets/images/icons/icon-course-project.svg @@ -0,0 +1,3 @@ + + + From 9d16ea17d0f374cdeff11813727ff688841803e5 Mon Sep 17 00:00:00 2001 From: Aline Date: Wed, 5 May 2021 11:36:09 +0200 Subject: [PATCH 04/13] Remove section and add credits to the main content area --- .../components/pages/study-plan-course/study-plan-course.twig | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/assets/components/pages/study-plan-course/study-plan-course.twig b/assets/components/pages/study-plan-course/study-plan-course.twig index ec7a9c469..da89a6b9f 100644 --- a/assets/components/pages/study-plan-course/study-plan-course.twig +++ b/assets/components/pages/study-plan-course/study-plan-course.twig @@ -50,7 +50,8 @@
-

AR-153 / Section AR

+

AR-153

+

10 crédits

Enseignant‧es: Gargiani Roberto, Profs divers

Langue(s): Français

Retrait: Il n’est pas autorisé de se retirer de cette matière après le délai d’inscription.

From 9a41c2db992ab96e5c71d73bd676e0cbedd0ce7f Mon Sep 17 00:00:00 2001 From: Aline Date: Wed, 5 May 2021 11:37:12 +0200 Subject: [PATCH 05/13] Replace 'study-plans' section with 'coursebook-program' component --- .../study-plan-course/study-plan-course.twig | 69 +------------------ 1 file changed, 1 insertion(+), 68 deletions(-) diff --git a/assets/components/pages/study-plan-course/study-plan-course.twig b/assets/components/pages/study-plan-course/study-plan-course.twig index da89a6b9f..03a6b46ec 100644 --- a/assets/components/pages/study-plan-course/study-plan-course.twig +++ b/assets/components/pages/study-plan-course/study-plan-course.twig @@ -131,74 +131,7 @@

Dans les plans d'études

- - -
-
    -
  • Semestre: Printemps
    • -
  • Examen: Oral (session d’été)
    • -
  • Crédits: 10
    • -
  • Matière examinée: Art et Architecture
    • -
  • Cours: 2 heures hebdo x 14 semaines
    • -
  • Projet: 4 heures hebdo x 14 semaines
    • -
-
- - - -
-
    -
  • Semestre: Printemps
    • -
  • Examen: Oral (session d’été)
    • -
  • Crédits: 10
    • -
  • Matière examinée: Art et Architecture
    • -
  • Cours: 2 heures hebdo x 14 semaines
    • -
  • Projet: 4 heures hebdo x 14 semaines
    • -
-
- - - -
-
    -
  • Semestre: Printemps
    • -
  • Examen: Oral (session d’été)
    • -
  • Crédits: 10
    • -
  • Matière examinée: Art et Architecture
    • -
  • Cours: 2 heures hebdo x 14 semaines
    • -
  • Projet: 4 heures hebdo x 14 semaines
    • -
-
+ {% include '@content-types/coursebook/coursebook-program.twig' %}
From e7543ddbe15cb77c1824b0587e1b30c7cd9c6bfa Mon Sep 17 00:00:00 2001 From: Aline Date: Wed, 5 May 2021 11:37:41 +0200 Subject: [PATCH 06/13] Add week schedule --- .../pages/study-plan-course/study-plan-course.twig | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/assets/components/pages/study-plan-course/study-plan-course.twig b/assets/components/pages/study-plan-course/study-plan-course.twig index 03a6b46ec..c4358a7c2 100644 --- a/assets/components/pages/study-plan-course/study-plan-course.twig +++ b/assets/components/pages/study-plan-course/study-plan-course.twig @@ -135,8 +135,11 @@
-
+

Semaine de référence

+ + {% include '@content-types/coursebook/coursebook.twig' %} +
From 6d4bbcc5851e7ab4be20fe39b9359ceb0c84b48b Mon Sep 17 00:00:00 2001 From: Aline Date: Wed, 5 May 2021 11:38:49 +0200 Subject: [PATCH 07/13] Minor layout improvement --- .../components/pages/study-plan-course/study-plan-course.twig | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/assets/components/pages/study-plan-course/study-plan-course.twig b/assets/components/pages/study-plan-course/study-plan-course.twig index c4358a7c2..e2a0afdc3 100644 --- a/assets/components/pages/study-plan-course/study-plan-course.twig +++ b/assets/components/pages/study-plan-course/study-plan-course.twig @@ -50,8 +50,7 @@
-

AR-153

-

10 crédits

+

AR-153 / 10 crédits

Enseignant‧es: Gargiani Roberto, Profs divers

Langue(s): Français

Retrait: Il n’est pas autorisé de se retirer de cette matière après le délai d’inscription.

From 735570fb81fed1715d5fc17eb9354f8103e700e6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 6 May 2021 23:28:06 +0000 Subject: [PATCH 08/13] Bump ua-parser-js from 0.7.21 to 0.7.28 Bumps [ua-parser-js](https://github.com/faisalman/ua-parser-js) from 0.7.21 to 0.7.28. - [Release notes](https://github.com/faisalman/ua-parser-js/releases) - [Commits](https://github.com/faisalman/ua-parser-js/compare/0.7.21...0.7.28) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index c8ac1479a..788fe4cf7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -11119,9 +11119,9 @@ typedarray@^0.0.6: integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= ua-parser-js@^0.7.18: - version "0.7.21" - resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.21.tgz#853cf9ce93f642f67174273cc34565ae6f308777" - integrity sha512-+O8/qh/Qj8CgC6eYBVBykMrNtp5Gebn4dlGD/kKXVkJNDwyrAwSIqwz8CDf+tsAIWVycKcku6gIXJ0qwx/ZXaQ== + version "0.7.28" + resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31" + integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g== uglify-js@^3.0.5: version "3.10.1" From 19d19188ca862d6cc5640a5f4b5d934e810d83af Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 27 May 2021 11:13:05 +0000 Subject: [PATCH 09/13] Bump dns-packet from 1.3.1 to 1.3.4 Bumps [dns-packet](https://github.com/mafintosh/dns-packet) from 1.3.1 to 1.3.4. - [Release notes](https://github.com/mafintosh/dns-packet/releases) - [Changelog](https://github.com/mafintosh/dns-packet/blob/master/CHANGELOG.md) - [Commits](https://github.com/mafintosh/dns-packet/compare/v1.3.1...v1.3.4) Signed-off-by: dependabot[bot] --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index c8ac1479a..044a54c7e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3552,9 +3552,9 @@ dns-equal@^1.0.0: integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0= dns-packet@^1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a" - integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg== + version "1.3.4" + resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f" + integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA== dependencies: ip "^1.1.0" safe-buffer "^5.0.1" From 2b03936060068f0166a6922129100154db61ff97 Mon Sep 17 00:00:00 2001 From: Aline Date: Tue, 1 Jun 2021 16:36:08 +0200 Subject: [PATCH 10/13] Update study plan toggle js MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit En espérant que ça fonctionne mieux ainsi 🤷🏻‍♀️ --- assets/components/base.js | 1 + .../content-types/study-plan/study-plan.js | 17 ++++++++++------- 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/assets/components/base.js b/assets/components/base.js index 5f83823ff..be6d9162f 100644 --- a/assets/components/base.js +++ b/assets/components/base.js @@ -49,6 +49,7 @@ const init = () => { backToTopBtn(); rangeSlider(); restauration(); + studyplan(); guide(); anchors(); diff --git a/assets/components/content-types/study-plan/study-plan.js b/assets/components/content-types/study-plan/study-plan.js index a46e54724..1e0f24a9c 100644 --- a/assets/components/content-types/study-plan/study-plan.js +++ b/assets/components/content-types/study-plan/study-plan.js @@ -1,12 +1,15 @@ /* global $ */ -$(document).ready(function($){ +export default () => { - $(".line .btn-collapse").click(function(){ - $(this).parent(".line").toggleClass('open'); - $(this).find("span").toggleClass('show'); + $('.btn-collapse').click(function(){ + + const parent = $(this).parent(".line"); + const toggleIcon = $(this).find("span") + + parent.toggleClass('open'); + toggleIcon.toggleClass('show'); }); - - $('html').addClass('testjs'); -}); +}; + \ No newline at end of file From a5d509e86eb9fa98c31d0e45b28498f9d7440e73 Mon Sep 17 00:00:00 2001 From: Aline Date: Tue, 1 Jun 2021 16:53:24 +0200 Subject: [PATCH 11/13] Update study plan layouts --- .../content-types/study-plan/study-plan.scss | 42 ++++++++++++++++++- 1 file changed, 41 insertions(+), 1 deletion(-) diff --git a/assets/components/content-types/study-plan/study-plan.scss b/assets/components/content-types/study-plan/study-plan.scss index c37922d12..a851b7ec7 100644 --- a/assets/components/content-types/study-plan/study-plan.scss +++ b/assets/components/content-types/study-plan/study-plan.scss @@ -3,10 +3,19 @@ $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-0-semesters: minmax(300px, 4fr) 1fr minmax(auto, 2fr) 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; - +$study-plan-5-semesters: minmax(300px, 4fr) 1fr 2fr 2fr 2fr 2fr 2fr minmax(200px, 3fr) 1fr; + +$study-plan-master-0-semesters: minmax(250px, 3fr) 1fr minmax(140px, 3fr) 1fr; +$study-plan-master-1-semesters: minmax(250px, 3fr) 1fr 2fr minmax(140px, 3fr) 1fr; +$study-plan-master-2-semesters: minmax(250px, 3fr) 1fr 2fr 2fr minmax(140px, 3fr) 1fr; +$study-plan-master-3-semesters: minmax(250px, 3fr) 1fr 2fr 2fr 2fr minmax(140px, 3fr) 1fr; +$study-plan-master-4-semesters: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr minmax(140px, 3fr) 1fr; +$study-plan-master-5-semesters: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr 2fr minmax(140px, 3fr) 1fr; $study-plan-master: minmax(250px, 3fr) 1fr 2fr 2fr minmax(170px, 3fr) minmax(140px, 3fr) 1fr; $study-plan-master-pdm: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr minmax(140px, 3fr) 1fr; @@ -350,7 +359,13 @@ $study-plan-master-pdm: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr minmax(140px, 3fr } } +.study-plan-0-semesters { + --table-columns: #{$study-plan-0-semesters}; +} +.study-plan-1-semesters { + --table-columns: #{$study-plan-1-semesters}; +} .study-plan-2-semesters { --table-columns: #{$study-plan-2-semesters}; } @@ -361,6 +376,31 @@ $study-plan-master-pdm: minmax(250px, 3fr) 1fr 2fr 2fr 2fr 2fr minmax(140px, 3fr --table-columns: #{$study-plan-4-semesters}; } +.study-plan-5-semesters { + --table-columns: #{$study-plan-5-semesters}; +} + +.study-plan-master-0-semesters { + --table-columns: #{$study-plan-master-0-semesters}; +} + +.study-plan-master-1-semesters { + --table-columns: #{$study-plan-master-1-semesters}; +} +.study-plan-master-2-semesters { + --table-columns: #{$study-plan-master-2-semesters}; +} +.study-plan-master-3-semesters { + --table-columns: #{$study-plan-master-3-semesters}; +} +.study-plan-master-4-semesters { + --table-columns: #{$study-plan-master-4-semesters}; +} + +.study-plan-master-5-semesters { + --table-columns: #{$study-plan-master-5-semesters}; +} + .study-plan-master-pdm { --table-columns: #{$study-plan-master-pdm}; } From 84ac59d56d150c4a8a8fefb13575f771bf860723 Mon Sep 17 00:00:00 2001 From: Aline Date: Tue, 1 Jun 2021 17:09:20 +0200 Subject: [PATCH 12/13] Add alert --- .../pages/study-plan-course/study-plan-course.twig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/assets/components/pages/study-plan-course/study-plan-course.twig b/assets/components/pages/study-plan-course/study-plan-course.twig index e2a0afdc3..068549c43 100644 --- a/assets/components/pages/study-plan-course/study-plan-course.twig +++ b/assets/components/pages/study-plan-course/study-plan-course.twig @@ -47,6 +47,12 @@ Télécharger la fiche de cours (PDF) +
+ {% include "@atoms/alert/alert.twig" with { + type: "info", + content: "Attention, ce contenu correspond à la fiche de cours de l'année passée." + } %} +
From e2a819a3a02550a8e8d89f400f35f4dc9e3c4598 Mon Sep 17 00:00:00 2001 From: Julien Delasoie Date: Wed, 30 Jun 2021 10:18:42 +0200 Subject: [PATCH 13/13] Bump version --- CHANGELOG.md | 3 +++ VERSION | 2 +- package.json | 2 +- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 477507b54..37e5eb655 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # CHANGELOG +*2.26.0* (2021-06-30) +- Add 'study plan: course' page template #508 + *2.25.0* (2021-06-17) - Dependency overhaul - 0 critical, 6 high vulnerabilities found by `yarn audit` (compared to 361 high and 2 critical) - No functional changes diff --git a/VERSION b/VERSION index 5c18f9195..7a25c70f9 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -2.25.0 +2.26.0 diff --git a/package.json b/package.json index b1f2fc820..2ab48d44c 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "epfl-elements", - "version": "2.25.0", + "version": "2.26.0", "license": "MIT", "main": "index.html", "repository": {