From cc3b6a9c37b7282f39ad98c7cedde5b7925223a3 Mon Sep 17 00:00:00 2001
From: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date: Wed, 1 May 2024 09:22:22 +0200
Subject: [PATCH 1/4] Add time2learn link configurable with flavor

---
 .../book-navigation/ContentNavigation.vue     | 20 +++++++++++++++++--
 client/src/helpers/app-flavor.constants.ts    |  5 +++++
 client/src/helpers/types.ts                   |  1 +
 3 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/client/src/components/book-navigation/ContentNavigation.vue b/client/src/components/book-navigation/ContentNavigation.vue
index a098d158..b10e19d2 100644
--- a/client/src/components/book-navigation/ContentNavigation.vue
+++ b/client/src/components/book-navigation/ContentNavigation.vue
@@ -78,6 +78,19 @@
           Portfolio
         </router-link>
       </div>
+      <div
+        class="content-navigation__item content-navigation__item--secondary"
+        v-if="showTime2Learn"
+      >
+        <a
+          active-class="content-navigation__link--active"
+          class="content-navigation__link content-navigation__link--secondary"
+          href="https://app.time2learn.ch/app/login.aspx "
+          target="_blank"
+        >
+          time2learn
+        </a>
+      </div>
       <div
         class="content-navigation__item content-navigation__item--secondary"
         v-if="isSidebar"
@@ -121,6 +134,9 @@ export default {
     showPortfolio() {
       return this.$flavor.showPortfolio;
     },
+    showTime2Learn() {
+      return this.$flavor.showTime2Learn;
+    },
   },
 
   methods: {
@@ -169,8 +185,8 @@ export default {
     justify-self: center;
 
     /*
-      * For IE10+
-      */
+        * For IE10+
+        */
     -ms-grid-column: 2;
     -ms-grid-row-align: center;
     -ms-grid-column-align: center;
diff --git a/client/src/helpers/app-flavor.constants.ts b/client/src/helpers/app-flavor.constants.ts
index 17476ee1..a862dd49 100644
--- a/client/src/helpers/app-flavor.constants.ts
+++ b/client/src/helpers/app-flavor.constants.ts
@@ -22,6 +22,7 @@ export const defaultFlavorValues: FlavorValues = {
   showInstrumentFilterSidebar: true,
   showInstrumentSubCategories: true,
   showPortfolio: true,
+  showTime2Learn: false,
   showEHB: true,
   helloIllustration: 'HelloIllustration',
   showModuleFilter: false,
@@ -50,6 +51,7 @@ export const myKvValues: FlavorValues = {
   showObjectivesTitle: false,
   showInstrumentFilterSidebar: true,
   showPortfolio: true,
+  showTime2Learn: true,
   showInstrumentSubCategories: false,
   showEHB: false,
   helloIllustration: 'HelloMyKVIllustration',
@@ -66,6 +68,7 @@ export const dhaValues: FlavorValues = Object.assign({}, myKvValues, {
   textAppName: 'myDHA',
   helloIllustration: 'HelloMyDHAIllustration',
   showLanguageFilter: false,
+  showTime2Learn: true,
 });
 
 export const dhfValues: FlavorValues = Object.assign({}, myKvValues, {
@@ -76,4 +79,6 @@ export const dhfValues: FlavorValues = Object.assign({}, myKvValues, {
   textAppName: 'myDHF',
   helloIllustration: 'HelloMyDHFIllustration',
   showLanguageFilter: false,
+  showTime2Learn: true,
+
 });
diff --git a/client/src/helpers/types.ts b/client/src/helpers/types.ts
index 9d19b709..1353ad53 100644
--- a/client/src/helpers/types.ts
+++ b/client/src/helpers/types.ts
@@ -16,6 +16,7 @@ export interface FlavorValues {
   showInstrumentFilterSidebar: boolean;
   showInstrumentSubCategories: boolean;
   showPortfolio: boolean;
+  showTime2Learn: boolean;
   showEHB: boolean;
   helloIllustration: string;
   showModuleFilter: boolean;

From e7ac0522871fb8d29f38e479853df513b5029222 Mon Sep 17 00:00:00 2001
From: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date: Wed, 1 May 2024 09:41:26 +0200
Subject: [PATCH 2/4] Change breakpoint to hide navigation at 1300px to prevent
 wrapping of navigation items

---
 client/src/components/book-navigation/ContentNavigation.vue | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/client/src/components/book-navigation/ContentNavigation.vue b/client/src/components/book-navigation/ContentNavigation.vue
index b10e19d2..a2ddb552 100644
--- a/client/src/components/book-navigation/ContentNavigation.vue
+++ b/client/src/components/book-navigation/ContentNavigation.vue
@@ -171,7 +171,9 @@ export default {
     display: none;
     flex-direction: row;
 
-    @include desktop {
+    //@include desktop
+    // Overwrite desktop breakpoint, with time2learn link enabled navigation items start to wrap
+    @media (min-width: 1300px) {
       display: flex;
     }
   }

From 673863431e1c1eb88f94956dbf81c90b9ad75f5a Mon Sep 17 00:00:00 2001
From: Lorenz Padberg <lorenz.padberg@iterativ.ch>
Date: Wed, 1 May 2024 09:45:21 +0200
Subject: [PATCH 3/4] Disable time2learn in MyKV

---
 client/src/helpers/app-flavor.constants.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/client/src/helpers/app-flavor.constants.ts b/client/src/helpers/app-flavor.constants.ts
index a862dd49..564a8333 100644
--- a/client/src/helpers/app-flavor.constants.ts
+++ b/client/src/helpers/app-flavor.constants.ts
@@ -22,7 +22,7 @@ export const defaultFlavorValues: FlavorValues = {
   showInstrumentFilterSidebar: true,
   showInstrumentSubCategories: true,
   showPortfolio: true,
-  showTime2Learn: false,
+  showTime2Learn: true,
   showEHB: true,
   helloIllustration: 'HelloIllustration',
   showModuleFilter: false,
@@ -51,7 +51,6 @@ export const myKvValues: FlavorValues = {
   showObjectivesTitle: false,
   showInstrumentFilterSidebar: true,
   showPortfolio: true,
-  showTime2Learn: true,
   showInstrumentSubCategories: false,
   showEHB: false,
   helloIllustration: 'HelloMyKVIllustration',

From bbda6637cf72533a0bacaaf32051bc7d8f1d576b Mon Sep 17 00:00:00 2001
From: Ramon Wenger <ramon.wenger@iterativ.ch>
Date: Thu, 2 May 2024 08:42:55 +0200
Subject: [PATCH 4/4] Fix word wrap on navigation near desktop breakpoint

---
 client/src/components/book-navigation/ContentNavigation.vue | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/client/src/components/book-navigation/ContentNavigation.vue b/client/src/components/book-navigation/ContentNavigation.vue
index a2ddb552..e8967e39 100644
--- a/client/src/components/book-navigation/ContentNavigation.vue
+++ b/client/src/components/book-navigation/ContentNavigation.vue
@@ -164,6 +164,7 @@ export default {
   &__link {
     padding: 0 24px;
     @include navigation-link;
+    white-space: nowrap;
   }
 
   &__primary,
@@ -171,9 +172,7 @@ export default {
     display: none;
     flex-direction: row;
 
-    //@include desktop
-    // Overwrite desktop breakpoint, with time2learn link enabled navigation items start to wrap
-    @media (min-width: 1300px) {
+    @include desktop {
       display: flex;
     }
   }