From 49cca3166ac78d589a26ccb16e2093bfb44bdb95 Mon Sep 17 00:00:00 2001 From: mcampourcy Date: Fri, 13 Dec 2024 10:56:00 +0100 Subject: [PATCH 1/2] =?UTF-8?q?=E2=9C=8F=EF=B8=8F=20feat(orga):=20Update?= =?UTF-8?q?=20educational=20documentation=20button=20text=20in=20mission?= =?UTF-8?q?=20details?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- orga/app/components/mission/details.gjs | 5 ++++- orga/app/styles/pages/authenticated/mission.scss | 11 +++++------ orga/translations/en.json | 2 +- orga/translations/fr.json | 2 +- orga/translations/nl.json | 2 +- 5 files changed, 12 insertions(+), 10 deletions(-) diff --git a/orga/app/components/mission/details.gjs b/orga/app/components/mission/details.gjs index f60b020ea04..7cb9dcbbe81 100644 --- a/orga/app/components/mission/details.gjs +++ b/orga/app/components/mission/details.gjs @@ -1,4 +1,5 @@ import PixButtonLink from '@1024pix/pix-ui/components/pix-button-link'; +import PixIcon from '@1024pix/pix-ui/components/pix-icon'; import { service } from '@ember/service'; import Component from '@glimmer/component'; import { t } from 'ember-intl'; @@ -37,7 +38,9 @@ export default class MissionDetails extends Component { @href={{@mission.documentationUrl}} target="_blank " > - {{t "pages.missions.mission.details.button-label"}} + + {{t "pages.missions.mission.details.button-label"}} + {{/if}} diff --git a/orga/app/styles/pages/authenticated/mission.scss b/orga/app/styles/pages/authenticated/mission.scss index aae803c7ff2..c462b2f4984 100644 --- a/orga/app/styles/pages/authenticated/mission.scss +++ b/orga/app/styles/pages/authenticated/mission.scss @@ -68,6 +68,8 @@ } &__documentation-button { + display: flex; + gap: var(--pix-spacing-4x); width: fit-content; margin: var(--pix-spacing-4x); } @@ -77,8 +79,9 @@ .mission-header-objectives { @extend %pix-body-l; - display: flex; - justify-content: space-between; + display: grid; + gap: var(--pix-spacing-8x); + grid-template-columns: 2fr 1fr; margin-top: var(--pix-spacing-8x); h2 { @@ -86,10 +89,6 @@ text-decoration: underline; } - &__competence { - margin-left: 100px; - } - &__list { margin-top: var(--pix-spacing-2x); margin-left: var(--pix-spacing-6x); diff --git a/orga/translations/en.json b/orga/translations/en.json index dfb70d856c4..f369afdc9a2 100644 --- a/orga/translations/en.json +++ b/orga/translations/en.json @@ -959,7 +959,7 @@ "mission": { "title": "Mission's information", "details": { - "button-label": "View the mission documentation", + "button-label": "See the educational sheet", "competence": { "title": "Targeted DigComp competence :" }, diff --git a/orga/translations/fr.json b/orga/translations/fr.json index d6ea915d606..afc61303408 100644 --- a/orga/translations/fr.json +++ b/orga/translations/fr.json @@ -965,7 +965,7 @@ "mission": { "title": "Détails d'une mission", "details": { - "button-label": "Voir la fiche mission", + "button-label": "Voir la fiche pédagogique", "competence": { "title": "Compétence du CRCN travaillée :" }, diff --git a/orga/translations/nl.json b/orga/translations/nl.json index 6f145b8ba72..8bfdef2f218 100644 --- a/orga/translations/nl.json +++ b/orga/translations/nl.json @@ -957,7 +957,7 @@ }, "mission": { "details": { - "button-label": "Bekijk de functieomschrijving", + "button-label": "Bekijk het educatieve blad", "competence": { "title": "Vaardigheden waaraan is gewerkt :" }, From 9c3e54234615873d7c16bb6f4aaf57eccfff0e2c Mon Sep 17 00:00:00 2001 From: mcampourcy Date: Fri, 13 Dec 2024 11:49:47 +0100 Subject: [PATCH 2/2] =?UTF-8?q?=F0=9F=8E=A8=20feat(orga):=20Improve=20navi?= =?UTF-8?q?gation=20tabs=20in=20mission=20page?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- orga/app/components/mission/navigation.gjs | 21 ++++++---------- orga/app/styles/app.scss | 1 + .../components/campaign/list-header.scss | 4 +-- .../styles/components/mission/navigation.scss | 25 +++++++++++++++++++ .../styles/pages/authenticated/mission.scss | 2 +- 5 files changed, 36 insertions(+), 17 deletions(-) create mode 100644 orga/app/styles/components/mission/navigation.scss diff --git a/orga/app/components/mission/navigation.gjs b/orga/app/components/mission/navigation.gjs index 5afb7816e57..129f7d38c22 100644 --- a/orga/app/components/mission/navigation.gjs +++ b/orga/app/components/mission/navigation.gjs @@ -2,19 +2,12 @@ import { LinkTo } from '@ember/routing'; import { t } from 'ember-intl'; diff --git a/orga/app/styles/app.scss b/orga/app/styles/app.scss index 2f30e8c10aa..7667eef3276 100644 --- a/orga/app/styles/app.scss +++ b/orga/app/styles/app.scss @@ -33,6 +33,7 @@ @import 'components/layout/sidebar'; @import 'components/layout/topbar'; @import 'components/layout/user-logged-menu'; +@import 'components/mission/navigation'; @import 'components/mission/result-table'; @import 'components/organization-learner'; @import 'components/pagination-control'; diff --git a/orga/app/styles/components/campaign/list-header.scss b/orga/app/styles/components/campaign/list-header.scss index cca036bda49..652101dc7e3 100644 --- a/orga/app/styles/components/campaign/list-header.scss +++ b/orga/app/styles/components/campaign/list-header.scss @@ -3,7 +3,7 @@ display: flex; flex-direction: column; align-items: center; - + @include device-is('tablet') { flex-direction: row; margin: 1em 0 2.4em; @@ -34,7 +34,7 @@ .navbar-item { height: 100%; - } + } @include device-is('tablet') { ul li { diff --git a/orga/app/styles/components/mission/navigation.scss b/orga/app/styles/components/mission/navigation.scss new file mode 100644 index 00000000000..bd72c36fa5a --- /dev/null +++ b/orga/app/styles/components/mission/navigation.scss @@ -0,0 +1,25 @@ +.mission-navigation { + &__tabs { + display: flex; + gap: 8px; + width: fit-content; + margin-bottom: 20px; + padding: var(--pix-spacing-2x); + background-color: var(--pix-neutral-0); + border-radius: 8px; + + .navbar-item { + padding: var(--pix-spacing-2x) var(--pix-spacing-4x); + font-weight: var(--pix-font-normal); + border-bottom: none; + border-radius: 8px; + + &.active { + color: inherit; + font-weight: var(--pix-font-medium); + background: var(--pix-orga-50); + border-bottom: none; + } + } + } +} diff --git a/orga/app/styles/pages/authenticated/mission.scss b/orga/app/styles/pages/authenticated/mission.scss index c462b2f4984..64bef7e14a3 100644 --- a/orga/app/styles/pages/authenticated/mission.scss +++ b/orga/app/styles/pages/authenticated/mission.scss @@ -80,8 +80,8 @@ @extend %pix-body-l; display: grid; - gap: var(--pix-spacing-8x); grid-template-columns: 2fr 1fr; + gap: var(--pix-spacing-8x); margin-top: var(--pix-spacing-8x); h2 {