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/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/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

- -
-
+ + +
+ +
+ + + +
+ +
+ + + +
+ +
\ 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/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 diff --git a/assets/components/content-types/study-plan/study-plan.scss b/assets/components/content-types/study-plan/study-plan.scss index 6c4977563..0909b0bc8 100644 --- a/assets/components/content-types/study-plan/study-plan.scss +++ b/assets/components/content-types/study-plan/study-plan.scss @@ -3,11 +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; @@ -351,6 +359,9 @@ $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}; } @@ -364,6 +375,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}; } 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..068549c43 --- /dev/null +++ b/assets/components/pages/study-plan-course/study-plan-course.twig @@ -0,0 +1,165 @@ +{% set isSpecial = true %} + +{% extends "@templates/base/base.twig" %} + +{% block header %} + +{% endblock %} + +{% block breadcrumb %} +
+ +
+{% endblock %} + +{% block content %} + +
+
+

Art et architecture

+ +
+
+ {% include "@atoms/alert/alert.twig" with { + type: "info", + content: "Attention, ce contenu correspond à la fiche de cours de l'année passée." + } %} +
+
+
+
+

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.

+

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

+ + {% include '@content-types/coursebook/coursebook-program.twig' %} + +
+ +
+

Semaine de référence

+ + {% include '@content-types/coursebook/coursebook.twig' %} + +
+ +
+ +
+
+ +{% 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 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 @@ + + +