From 53b8c6853d26c46722ec7f1bba2a7f43e6dc8d35 Mon Sep 17 00:00:00 2001
From: Holger Stitz <holger.stitz@datavisyn.io>
Date: Thu, 7 Jan 2021 12:28:18 +0100
Subject: [PATCH 01/27] Apply Bootstrap 4 navbar styles

See https://getbootstrap.com/docs/4.5/components/navbar/
---
 dist/base/LoginMenu.js     | 25 +++++++++++++------------
 dist/base/LoginMenu.js.map |  2 +-
 src/base/LoginMenu.ts      | 25 +++++++++++++------------
 3 files changed, 27 insertions(+), 25 deletions(-)

diff --git a/dist/base/LoginMenu.js b/dist/base/LoginMenu.js
index 421e000..b703827 100644
--- a/dist/base/LoginMenu.js
+++ b/dist/base/LoginMenu.js
@@ -29,19 +29,20 @@ export class LoginMenu extends EventHandler {
     init() {
         const doc = this.options.document;
         const ul = doc.createElement('ul');
-        ul.classList.add('nav', 'navbar-nav', 'navbar-right');
+        ul.classList.add('navbar-nav', 'navbar-right');
         ul.innerHTML = `
-      <li id="login_menu">
-        <a data-toggle="modal" data-target="#loginDialog" href="#">
-        <i class="fas fa-user fa-fw" aria-hidden="true"></i>
-        </a></li>
-        <li style="display: none" class="dropdown" id="user_menu">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
-               aria-expanded="false"><i class="fas fa-user" aria-hidden="true"></i> <span>${I18nextManager.getInstance().i18n.t('phovea:security_flask.unknown')}</span></a>
-            <ul class="dropdown-menu">
-                <li><a href="#" id="logout_link">${I18nextManager.getInstance().i18n.t('phovea:security_flask.logoutButton')}</a></li>
-            </ul>
-        </li>`;
+      <li class="nav-item" id="login_menu">
+        <a class="nav-link" data-toggle="modal" data-target="#loginDialog" href="#">
+          <i class="fas fa-user fa-fw" aria-hidden="true"></i>
+        </a>
+      </li>
+      <li style="display: none" class="nav-item" id="user_menu">
+          <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" id="userMenuDropdown"
+              aria-expanded="false"><i class="fas fa-user" aria-hidden="true"></i> <span>${I18nextManager.getInstance().i18n.t('phovea:security_flask.unknown')}</span></a>
+          <ul class="dropdown-menu aria-labelledby="userMenuDropdown">
+              <li><a href="#" id="logout_link">${I18nextManager.getInstance().i18n.t('phovea:security_flask.logoutButton')}</a></li>
+          </ul>
+      </li>`;
         ul.querySelector('#logout_link').addEventListener('click', (evt) => {
             evt.preventDefault();
             evt.stopPropagation();
diff --git a/dist/base/LoginMenu.js.map b/dist/base/LoginMenu.js.map
index a5c65c2..a3c8bdd 100644
--- a/dist/base/LoginMenu.js.map
+++ b/dist/base/LoginMenu.js.map
@@ -1 +1 @@
-{"version":3,"file":"LoginMenu.js","sourceRoot":"","sources":["../../src/base/LoginMenu.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"LoginMenu.js","sourceRoot":"","sources":["../../src/base/LoginMenu.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/src/base/LoginMenu.ts b/src/base/LoginMenu.ts
index 45e0511..f817dbb 100644
--- a/src/base/LoginMenu.ts
+++ b/src/base/LoginMenu.ts
@@ -75,19 +75,20 @@ export class LoginMenu extends EventHandler {
   private init() {
     const doc = this.options.document;
     const ul = doc.createElement('ul');
-    ul.classList.add('nav', 'navbar-nav', 'navbar-right');
+    ul.classList.add('navbar-nav', 'navbar-right');
     ul.innerHTML = `
-      <li id="login_menu">
-        <a data-toggle="modal" data-target="#loginDialog" href="#">
-        <i class="fas fa-user fa-fw" aria-hidden="true"></i>
-        </a></li>
-        <li style="display: none" class="dropdown" id="user_menu">
-            <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true"
-               aria-expanded="false"><i class="fas fa-user" aria-hidden="true"></i> <span>${I18nextManager.getInstance().i18n.t('phovea:security_flask.unknown')}</span></a>
-            <ul class="dropdown-menu">
-                <li><a href="#" id="logout_link">${I18nextManager.getInstance().i18n.t('phovea:security_flask.logoutButton')}</a></li>
-            </ul>
-        </li>`;
+      <li class="nav-item" id="login_menu">
+        <a class="nav-link" data-toggle="modal" data-target="#loginDialog" href="#">
+          <i class="fas fa-user fa-fw" aria-hidden="true"></i>
+        </a>
+      </li>
+      <li style="display: none" class="nav-item" id="user_menu">
+          <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" id="userMenuDropdown"
+              aria-expanded="false"><i class="fas fa-user" aria-hidden="true"></i> <span>${I18nextManager.getInstance().i18n.t('phovea:security_flask.unknown')}</span></a>
+          <ul class="dropdown-menu aria-labelledby="userMenuDropdown">
+              <li><a href="#" id="logout_link">${I18nextManager.getInstance().i18n.t('phovea:security_flask.logoutButton')}</a></li>
+          </ul>
+      </li>`;
 
 
     ul.querySelector('#logout_link').addEventListener('click', (evt) => {

From 5dcf4f3c14c3c0c15994ad087112e0dce509526b Mon Sep 17 00:00:00 2001
From: dvvanessastoiber <vanessa.stoiber@datavisyn.io>
Date: Thu, 4 Feb 2021 10:25:59 +0100
Subject: [PATCH 02/27] update codeowner

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 9836a90..725f3b4 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-*   @thinkh
+*   @anita-steiner

From 4799561531b5042c92d77e2dc657189904717ba6 Mon Sep 17 00:00:00 2001
From: anita-steiner <anita.steiner@datavisyn.io>
Date: Fri, 12 Feb 2021 14:19:09 +0100
Subject: [PATCH 03/27] changes for release 7.0.0

---
 package.json     | 4 ++--
 requirements.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 4590f72..5fdd92f 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "phovea_security_flask",
   "description": "",
-  "version": "7.0.0",
+  "version": "7.0.1-SNAPSHOT",
   "author": {
     "name": "The Caleydo Team",
     "email": "contact@caleydo.org",
@@ -74,7 +74,7 @@
     "node": ">= 12.13"
   },
   "dependencies": {
-    "phovea_core": "^6.0.0"
+    "phovea_core": "github:phovea/phovea_core#develop"
   },
   "devDependencies": {
     "@types/jest": "~26.0.20",
diff --git a/requirements.txt b/requirements.txt
index 96d9725..0fb85fa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
 flask-login==0.5.0
-phovea_server>=7.0.0,<8.0.0
\ No newline at end of file
+-e git+https://github.com/phovea/phovea_server.git@develop#egg=phovea_server
\ No newline at end of file

From d91c7306aabec3d2544853c4b7535465fbc37907 Mon Sep 17 00:00:00 2001
From: anita-steiner <anita.steiner@datavisyn.io>
Date: Fri, 12 Feb 2021 14:21:23 +0100
Subject: [PATCH 04/27] changes for develop

---
 .circleci/config.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 919e982..c296a3e 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -59,13 +59,13 @@ jobs:
           path: dist
           destination: dist-python
       - persist_to_workspace:
-          root: ~/phovea
+          root: ~/phovea-python
           paths: .
   python-publish:
     executor: python-executor
     steps:
       - attach_workspace:
-          at: ~/phovea
+          at: ~/phovea-python
       - run:
           name: Install twine
           command: |
@@ -118,13 +118,13 @@ jobs:
           path: dist
           destination: dist-web
       - persist_to_workspace:
-          root: ~/phovea
+          root: ~/phovea-web
           paths: .
   web-publish:
     executor: node-executor
     steps:
       - attach_workspace:
-          at: ~/phovea
+          at: ~/phovea-web
       - run:
           name: Authentication
           command:  |

From fc9218ff80066a815df720bfef76ad4ebe96a8c0 Mon Sep 17 00:00:00 2001
From: Anita Steiner <anita.steiner@datavisyn.io>
Date: Fri, 12 Feb 2021 14:27:58 +0100
Subject: [PATCH 05/27] Update config.yml

---
 .circleci/config.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index c296a3e..656030a 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -2,11 +2,11 @@ version: 2.1
 
 executors:
   python-executor:
-    working_directory: ~/phovea
+    working_directory: ~/phovea-python
     docker:
       - image: circleci/python:3.7-buster-node-browsers # for node version see Dockerfile on https://hub.docker.com/r/circleci/python
   node-executor:
-    working_directory: ~/phovea
+    working_directory: ~/phovea-web
     docker:
       - image: circleci/node:12.13-buster-browsers
 

From 06b4860e87dba5b8b72f9757e0a8ebba070d3230 Mon Sep 17 00:00:00 2001
From: dvvanessastoiber <vanessa.stoiber@datavisyn.io>
Date: Mon, 15 Feb 2021 09:31:42 +0100
Subject: [PATCH 06/27] update .circleci config

---
 .circleci/config.yml | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 656030a..187d070 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -50,6 +50,10 @@ jobs:
       - run:
           name: Show installed pip packages
           command: pip list || true
+      - run:
+          name: Remove all from dist folder
+          command: |
+            rm -rf dist && mkdir dist          
       - run:
           name: Build
           command: |
@@ -59,13 +63,14 @@ jobs:
           path: dist
           destination: dist-python
       - persist_to_workspace:
-          root: ~/phovea-python
-          paths: .
+          root: ~/.
+          paths: phovea-python
   python-publish:
     executor: python-executor
     steps:
       - attach_workspace:
-          at: ~/phovea-python
+          at: ~/.
+      - run: ls -a    
       - run:
           name: Install twine
           command: |
@@ -118,13 +123,14 @@ jobs:
           path: dist
           destination: dist-web
       - persist_to_workspace:
-          root: ~/phovea-web
-          paths: .
+          root: ~/.
+          paths: phovea-web
   web-publish:
     executor: node-executor
     steps:
       - attach_workspace:
-          at: ~/phovea-web
+          at: ~/.
+      - run: ls -a    
       - run:
           name: Authentication
           command:  |
@@ -190,4 +196,4 @@ workflows:
               branches:
                 ignore: /.*/
               tags:
-                only: /^v.*/
+                only: /^v.*/
\ No newline at end of file

From 80b2b3a4e6c5be26c4d562a8a91ae7a82c813fe5 Mon Sep 17 00:00:00 2001
From: oltionchampari <oltion.champari@datavisyn.io>
Date: Tue, 16 Feb 2021 12:55:50 +0100
Subject: [PATCH 07/27] Adapt login menu to bootstrap 4

---
 dist/base/LoginMenu.js     | 2 +-
 dist/base/LoginMenu.js.map | 2 +-
 src/base/LoginMenu.ts      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dist/base/LoginMenu.js b/dist/base/LoginMenu.js
index b703827..f859d3b 100644
--- a/dist/base/LoginMenu.js
+++ b/dist/base/LoginMenu.js
@@ -96,9 +96,9 @@ export class LoginMenu extends EventHandler {
         <div class="modal-dialog modal-sm">
           <div class="modal-content">
             <div class="modal-header">
+            <h5 class="modal-title">${I18nextManager.getInstance().i18n.t('phovea:security_flask.title')}</h5>
               <button type="button" class="close" data-dismiss="modal" aria-label="${I18nextManager.getInstance().i18n.t('phovea:security_flask.closeButton')}"><span
                 aria-hidden="true">&times;</span></button>
-              <h4 class="modal-title">${I18nextManager.getInstance().i18n.t('phovea:security_flask.title')}</h4>
             </div>
             <div class="modal-body">
               <div class="alert alert-warning" role="alert">${I18nextManager.getInstance().i18n.t('phovea:security_flask.alert')}</div>
diff --git a/dist/base/LoginMenu.js.map b/dist/base/LoginMenu.js.map
index a3c8bdd..3c22830 100644
--- a/dist/base/LoginMenu.js.map
+++ b/dist/base/LoginMenu.js.map
@@ -1 +1 @@
-{"version":3,"file":"LoginMenu.js","sourceRoot":"","sources":["../../src/base/LoginMenu.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"LoginMenu.js","sourceRoot":"","sources":["../../src/base/LoginMenu.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/src/base/LoginMenu.ts b/src/base/LoginMenu.ts
index f817dbb..e031b49 100644
--- a/src/base/LoginMenu.ts
+++ b/src/base/LoginMenu.ts
@@ -151,9 +151,9 @@ export class LoginMenu extends EventHandler {
         <div class="modal-dialog modal-sm">
           <div class="modal-content">
             <div class="modal-header">
+            <h5 class="modal-title">${I18nextManager.getInstance().i18n.t('phovea:security_flask.title')}</h5>
               <button type="button" class="close" data-dismiss="modal" aria-label="${I18nextManager.getInstance().i18n.t('phovea:security_flask.closeButton')}"><span
                 aria-hidden="true">&times;</span></button>
-              <h4 class="modal-title">${I18nextManager.getInstance().i18n.t('phovea:security_flask.title')}</h4>
             </div>
             <div class="modal-body">
               <div class="alert alert-warning" role="alert">${I18nextManager.getInstance().i18n.t('phovea:security_flask.alert')}</div>

From 2c2b545ae7c8e8aefc86a746a081646085db3107 Mon Sep 17 00:00:00 2001
From: Holger Stitz <holger.stitz@datavisyn.io>
Date: Fri, 26 Feb 2021 17:39:45 +0100
Subject: [PATCH 08/27] Update dropdowns to BS4

---
 dist/base/LoginMenu.js     | 8 ++++----
 dist/base/LoginMenu.js.map | 2 +-
 src/base/LoginMenu.ts      | 8 ++++----
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/dist/base/LoginMenu.js b/dist/base/LoginMenu.js
index f859d3b..65d5449 100644
--- a/dist/base/LoginMenu.js
+++ b/dist/base/LoginMenu.js
@@ -36,12 +36,12 @@ export class LoginMenu extends EventHandler {
           <i class="fas fa-user fa-fw" aria-hidden="true"></i>
         </a>
       </li>
-      <li style="display: none" class="nav-item" id="user_menu">
+      <li style="display: none" class="nav-item dropdown" id="user_menu">
           <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" id="userMenuDropdown"
               aria-expanded="false"><i class="fas fa-user" aria-hidden="true"></i> <span>${I18nextManager.getInstance().i18n.t('phovea:security_flask.unknown')}</span></a>
-          <ul class="dropdown-menu aria-labelledby="userMenuDropdown">
-              <li><a href="#" id="logout_link">${I18nextManager.getInstance().i18n.t('phovea:security_flask.logoutButton')}</a></li>
-          </ul>
+          <div class="dropdown-menu dropdown-menu-right" aria-labelledby="userMenuDropdown">
+              <a class="dropdown-item" href="#" id="logout_link">${I18nextManager.getInstance().i18n.t('phovea:security_flask.logoutButton')}</a>
+          </div>
       </li>`;
         ul.querySelector('#logout_link').addEventListener('click', (evt) => {
             evt.preventDefault();
diff --git a/dist/base/LoginMenu.js.map b/dist/base/LoginMenu.js.map
index 3c22830..ecfc4ef 100644
--- a/dist/base/LoginMenu.js.map
+++ b/dist/base/LoginMenu.js.map
@@ -1 +1 @@
-{"version":3,"file":"LoginMenu.js","sourceRoot":"","sources":["../../src/base/LoginMenu.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"LoginMenu.js","sourceRoot":"","sources":["../../src/base/LoginMenu.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/src/base/LoginMenu.ts b/src/base/LoginMenu.ts
index e031b49..2276f0a 100644
--- a/src/base/LoginMenu.ts
+++ b/src/base/LoginMenu.ts
@@ -82,12 +82,12 @@ export class LoginMenu extends EventHandler {
           <i class="fas fa-user fa-fw" aria-hidden="true"></i>
         </a>
       </li>
-      <li style="display: none" class="nav-item" id="user_menu">
+      <li style="display: none" class="nav-item dropdown" id="user_menu">
           <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" id="userMenuDropdown"
               aria-expanded="false"><i class="fas fa-user" aria-hidden="true"></i> <span>${I18nextManager.getInstance().i18n.t('phovea:security_flask.unknown')}</span></a>
-          <ul class="dropdown-menu aria-labelledby="userMenuDropdown">
-              <li><a href="#" id="logout_link">${I18nextManager.getInstance().i18n.t('phovea:security_flask.logoutButton')}</a></li>
-          </ul>
+          <div class="dropdown-menu dropdown-menu-right" aria-labelledby="userMenuDropdown">
+              <a class="dropdown-item" href="#" id="logout_link">${I18nextManager.getInstance().i18n.t('phovea:security_flask.logoutButton')}</a>
+          </div>
       </li>`;
 
 

From 0ab4911944ae527e90766a9ccb096a3f58423d0c Mon Sep 17 00:00:00 2001
From: dvvanessastoiber <vanessa.stoiber@datavisyn.io>
Date: Tue, 30 Mar 2021 16:27:06 +0200
Subject: [PATCH 09/27] update control labels and buttons

---
 dist/base/LoginUtils.js     | 6 +++---
 dist/base/LoginUtils.js.map | 2 +-
 src/base/LoginUtils.ts      | 6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/dist/base/LoginUtils.js b/dist/base/LoginUtils.js
index ec98fb5..d35ca2c 100644
--- a/dist/base/LoginUtils.js
+++ b/dist/base/LoginUtils.js
@@ -86,11 +86,11 @@ export class LoginUtils {
 }
 LoginUtils.defaultLoginForm = () => (`<form class="form-signin" action="/login" method="post">
     <div class="form-group">
-      <label class="control-label" for="login_username">${I18nextManager.getInstance().i18n.t('phovea:security_flask.username')}</label>
+      <label class="col-form-label" for="login_username">${I18nextManager.getInstance().i18n.t('phovea:security_flask.username')}</label>
       <input type="text" class="form-control" id="login_username" placeholder="${I18nextManager.getInstance().i18n.t('phovea:security_flask.username')}" required="required" autofocus="autofocus" autocomplete="username">
     </div>
     <div class="form-group">
-      <label class="control-label" for="login_password"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.password')}</label>
+      <label class="col-form-label" for="login_password"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.password')}</label>
       <input type="password" class="form-control" id="login_password" placeholder="${I18nextManager.getInstance().i18n.t('phovea:security_flask.password')}" required="required" autocomplete="current-password">
     </div>
     <div class="checkbox">
@@ -98,7 +98,7 @@ LoginUtils.defaultLoginForm = () => (`<form class="form-signin" action="/login"
         <input type="checkbox" id="login_remember"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.rememberMe')}
       </label>
     </div>
-    <button type="submit" class="btn btn-default"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.submit')}</button>
+    <button type="submit" class="btn btn-secondary"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.submit')}</button>
     </form>
     `);
 //# sourceMappingURL=LoginUtils.js.map
\ No newline at end of file
diff --git a/dist/base/LoginUtils.js.map b/dist/base/LoginUtils.js.map
index 79f8267..0b09b21 100644
--- a/dist/base/LoginUtils.js.map
+++ b/dist/base/LoginUtils.js.map
@@ -1 +1 @@
-{"version":3,"file":"LoginUtils.js","sourceRoot":"","sources":["../../src/base/LoginUtils.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"LoginUtils.js","sourceRoot":"","sources":["../../src/base/LoginUtils.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/src/base/LoginUtils.ts b/src/base/LoginUtils.ts
index 7a926cd..74a2962 100644
--- a/src/base/LoginUtils.ts
+++ b/src/base/LoginUtils.ts
@@ -8,11 +8,11 @@ export class LoginUtils {
 
   static defaultLoginForm = () => (`<form class="form-signin" action="/login" method="post">
     <div class="form-group">
-      <label class="control-label" for="login_username">${I18nextManager.getInstance().i18n.t('phovea:security_flask.username')}</label>
+      <label class="col-form-label" for="login_username">${I18nextManager.getInstance().i18n.t('phovea:security_flask.username')}</label>
       <input type="text" class="form-control" id="login_username" placeholder="${I18nextManager.getInstance().i18n.t('phovea:security_flask.username')}" required="required" autofocus="autofocus" autocomplete="username">
     </div>
     <div class="form-group">
-      <label class="control-label" for="login_password"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.password')}</label>
+      <label class="col-form-label" for="login_password"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.password')}</label>
       <input type="password" class="form-control" id="login_password" placeholder="${I18nextManager.getInstance().i18n.t('phovea:security_flask.password')}" required="required" autocomplete="current-password">
     </div>
     <div class="checkbox">
@@ -20,7 +20,7 @@ export class LoginUtils {
         <input type="checkbox" id="login_remember"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.rememberMe')}
       </label>
     </div>
-    <button type="submit" class="btn btn-default"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.submit')}</button>
+    <button type="submit" class="btn btn-secondary"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.submit')}</button>
     </form>
     `)
 

From 43bb85ec46a93bf073e3d69c6280512594137373 Mon Sep 17 00:00:00 2001
From: dvvanessastoiber <vanessa.stoiber@datavisyn.io>
Date: Fri, 9 Apr 2021 09:39:57 +0200
Subject: [PATCH 10/27] update checkbox

---
 dist/base/LoginUtils.js     | 7 +++----
 dist/base/LoginUtils.js.map | 2 +-
 src/base/LoginUtils.ts      | 7 +++----
 3 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/dist/base/LoginUtils.js b/dist/base/LoginUtils.js
index d35ca2c..965c28d 100644
--- a/dist/base/LoginUtils.js
+++ b/dist/base/LoginUtils.js
@@ -93,10 +93,9 @@ LoginUtils.defaultLoginForm = () => (`<form class="form-signin" action="/login"
       <label class="col-form-label" for="login_password"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.password')}</label>
       <input type="password" class="form-control" id="login_password" placeholder="${I18nextManager.getInstance().i18n.t('phovea:security_flask.password')}" required="required" autocomplete="current-password">
     </div>
-    <div class="checkbox">
-      <label>
-        <input type="checkbox" id="login_remember"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.rememberMe')}
-      </label>
+    <div class="checkbox form-check">
+      <input type="checkbox" class="form-check-input" id="login_remember">
+      <label class="form-check-label" for="login_remember">${I18nextManager.getInstance().i18n.t('phovea:security_flask.rememberMe')}</label>
     </div>
     <button type="submit" class="btn btn-secondary"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.submit')}</button>
     </form>
diff --git a/dist/base/LoginUtils.js.map b/dist/base/LoginUtils.js.map
index 0b09b21..539ff7f 100644
--- a/dist/base/LoginUtils.js.map
+++ b/dist/base/LoginUtils.js.map
@@ -1 +1 @@
-{"version":3,"file":"LoginUtils.js","sourceRoot":"","sources":["../../src/base/LoginUtils.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"LoginUtils.js","sourceRoot":"","sources":["../../src/base/LoginUtils.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/src/base/LoginUtils.ts b/src/base/LoginUtils.ts
index 74a2962..39b9188 100644
--- a/src/base/LoginUtils.ts
+++ b/src/base/LoginUtils.ts
@@ -15,10 +15,9 @@ export class LoginUtils {
       <label class="col-form-label" for="login_password"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.password')}</label>
       <input type="password" class="form-control" id="login_password" placeholder="${I18nextManager.getInstance().i18n.t('phovea:security_flask.password')}" required="required" autocomplete="current-password">
     </div>
-    <div class="checkbox">
-      <label>
-        <input type="checkbox" id="login_remember"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.rememberMe')}
-      </label>
+    <div class="checkbox form-check">
+      <input type="checkbox" class="form-check-input" id="login_remember">
+      <label class="form-check-label" for="login_remember">${I18nextManager.getInstance().i18n.t('phovea:security_flask.rememberMe')}</label>
     </div>
     <button type="submit" class="btn btn-secondary"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.submit')}</button>
     </form>

From 64ef1ac36b926ff7c8d3cdc24132b80e3a8418d9 Mon Sep 17 00:00:00 2001
From: dvvanessastoiber <vanessa.stoiber@datavisyn.io>
Date: Wed, 21 Apr 2021 13:57:09 +0200
Subject: [PATCH 11/27] update handling of warning and errors

---
 dist/base/LoginMenu.js                  | 5 +++--
 dist/base/LoginMenu.js.map              | 2 +-
 dist/locales/en/phovea.json             | 3 ++-
 dist/scss/components/_login_dialog.scss | 6 +++++-
 src/base/LoginMenu.ts                   | 5 +++--
 src/locales/en/phovea.json              | 3 ++-
 src/scss/components/_login_dialog.scss  | 6 +++++-
 7 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/dist/base/LoginMenu.js b/dist/base/LoginMenu.js
index 65d5449..f54a495 100644
--- a/dist/base/LoginMenu.js
+++ b/dist/base/LoginMenu.js
@@ -76,7 +76,7 @@ export class LoginMenu extends EventHandler {
     forceShowDialog() {
         const doc = this.options.document;
         const loginDialog = doc.querySelector('#loginDialog');
-        loginDialog.querySelector('.modal-header .close').classList.add('hidden'); // disable closing the dialog
+        loginDialog.querySelector('.modal-header .close').setAttribute('hidden', null); // disable closing the dialog
         this.adapter.showAndFocusOn('#loginDialog', '#login_username');
     }
     initLoginDialog(body) {
@@ -101,7 +101,8 @@ export class LoginMenu extends EventHandler {
                 aria-hidden="true">&times;</span></button>
             </div>
             <div class="modal-body">
-              <div class="alert alert-warning" role="alert">${I18nextManager.getInstance().i18n.t('phovea:security_flask.alert')}</div>
+              <div class="alert alert-warning" role="alert">${I18nextManager.getInstance().i18n.t('phovea:security_flask.alertOffline')}</div>
+              <div class="alert alert-danger" role="alert">${I18nextManager.getInstance().i18n.t('phovea:security_flask.alertWrongCredentials')}</div>
               ${loginForm}
             </div>
           </div>
diff --git a/dist/base/LoginMenu.js.map b/dist/base/LoginMenu.js.map
index ecfc4ef..aa88fb7 100644
--- a/dist/base/LoginMenu.js.map
+++ b/dist/base/LoginMenu.js.map
@@ -1 +1 @@
-{"version":3,"file":"LoginMenu.js","sourceRoot":"","sources":["../../src/base/LoginMenu.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"LoginMenu.js","sourceRoot":"","sources":["../../src/base/LoginMenu.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/dist/locales/en/phovea.json b/dist/locales/en/phovea.json
index cda43fa..3dd11a4 100644
--- a/dist/locales/en/phovea.json
+++ b/dist/locales/en/phovea.json
@@ -8,6 +8,7 @@
         "logoutButton": "Logout",
         "closeButton": "Close",
         "title": "Please login",
-        "alert": "The server seems to be offline! Login not possible. Try again later."
+        "alertOffline": "The server seems to be offline! Login not possible. Try again later.",
+        "alertWrongCredentials": "Username or password incorrect. Please check again."
     }
 }
diff --git a/dist/scss/components/_login_dialog.scss b/dist/scss/components/_login_dialog.scss
index a57686b..8000a02 100644
--- a/dist/scss/components/_login_dialog.scss
+++ b/dist/scss/components/_login_dialog.scss
@@ -20,7 +20,11 @@
     display: none;
   }
 
-  &.has-warning .modal-body > div.alert {
+  &.has-warning .modal-body > div.alert-warning {
+    display: block;
+  }
+
+  &.has-error .modal-body > div.alert-danger {
     display: block;
   }
 }
diff --git a/src/base/LoginMenu.ts b/src/base/LoginMenu.ts
index 2276f0a..4ae04cb 100644
--- a/src/base/LoginMenu.ts
+++ b/src/base/LoginMenu.ts
@@ -130,7 +130,7 @@ export class LoginMenu extends EventHandler {
   forceShowDialog() {
     const doc = this.options.document;
     const loginDialog = <HTMLElement>doc.querySelector('#loginDialog');
-    (<HTMLElement>loginDialog.querySelector('.modal-header .close')).classList.add('hidden'); // disable closing the dialog
+    (<HTMLElement>loginDialog.querySelector('.modal-header .close')).setAttribute('hidden', null); // disable closing the dialog
     this.adapter.showAndFocusOn('#loginDialog', '#login_username');
   }
 
@@ -156,7 +156,8 @@ export class LoginMenu extends EventHandler {
                 aria-hidden="true">&times;</span></button>
             </div>
             <div class="modal-body">
-              <div class="alert alert-warning" role="alert">${I18nextManager.getInstance().i18n.t('phovea:security_flask.alert')}</div>
+              <div class="alert alert-warning" role="alert">${I18nextManager.getInstance().i18n.t('phovea:security_flask.alertOffline')}</div>
+              <div class="alert alert-danger" role="alert">${I18nextManager.getInstance().i18n.t('phovea:security_flask.alertWrongCredentials')}</div>
               ${loginForm}
             </div>
           </div>
diff --git a/src/locales/en/phovea.json b/src/locales/en/phovea.json
index f53e459..932b9d9 100644
--- a/src/locales/en/phovea.json
+++ b/src/locales/en/phovea.json
@@ -8,6 +8,7 @@
     "logoutButton": "Logout",
     "closeButton": "Close",
     "title": "Please login",
-    "alert": "The server seems to be offline! Login not possible. Try again later."
+    "alertOffline": "The server seems to be offline! Login not possible. Try again later.",
+    "alertWrongCredentials": "Username or password incorrect. Please check again."
   }
 }
diff --git a/src/scss/components/_login_dialog.scss b/src/scss/components/_login_dialog.scss
index a57686b..8000a02 100644
--- a/src/scss/components/_login_dialog.scss
+++ b/src/scss/components/_login_dialog.scss
@@ -20,7 +20,11 @@
     display: none;
   }
 
-  &.has-warning .modal-body > div.alert {
+  &.has-warning .modal-body > div.alert-warning {
+    display: block;
+  }
+
+  &.has-error .modal-body > div.alert-danger {
     display: block;
   }
 }

From 1959138a94ba39490c8208054b2598030e526a2a Mon Sep 17 00:00:00 2001
From: Holger Stitz <holger.stitz@datavisyn.io>
Date: Sun, 25 Apr 2021 16:53:02 +0200
Subject: [PATCH 12/27] Switch dialog button color

---
 dist/base/LoginUtils.js     | 2 +-
 dist/base/LoginUtils.js.map | 2 +-
 src/base/LoginUtils.ts      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dist/base/LoginUtils.js b/dist/base/LoginUtils.js
index 965c28d..1988a91 100644
--- a/dist/base/LoginUtils.js
+++ b/dist/base/LoginUtils.js
@@ -97,7 +97,7 @@ LoginUtils.defaultLoginForm = () => (`<form class="form-signin" action="/login"
       <input type="checkbox" class="form-check-input" id="login_remember">
       <label class="form-check-label" for="login_remember">${I18nextManager.getInstance().i18n.t('phovea:security_flask.rememberMe')}</label>
     </div>
-    <button type="submit" class="btn btn-secondary"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.submit')}</button>
+    <button type="submit" class="btn btn-primary"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.submit')}</button>
     </form>
     `);
 //# sourceMappingURL=LoginUtils.js.map
\ No newline at end of file
diff --git a/dist/base/LoginUtils.js.map b/dist/base/LoginUtils.js.map
index 539ff7f..9a06c19 100644
--- a/dist/base/LoginUtils.js.map
+++ b/dist/base/LoginUtils.js.map
@@ -1 +1 @@
-{"version":3,"file":"LoginUtils.js","sourceRoot":"","sources":["../../src/base/LoginUtils.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"LoginUtils.js","sourceRoot":"","sources":["../../src/base/LoginUtils.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/src/base/LoginUtils.ts b/src/base/LoginUtils.ts
index 39b9188..5f56824 100644
--- a/src/base/LoginUtils.ts
+++ b/src/base/LoginUtils.ts
@@ -19,7 +19,7 @@ export class LoginUtils {
       <input type="checkbox" class="form-check-input" id="login_remember">
       <label class="form-check-label" for="login_remember">${I18nextManager.getInstance().i18n.t('phovea:security_flask.rememberMe')}</label>
     </div>
-    <button type="submit" class="btn btn-secondary"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.submit')}</button>
+    <button type="submit" class="btn btn-primary"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.submit')}</button>
     </form>
     `)
 

From ca4d79a3e35d7b637413e9606d03492121debde5 Mon Sep 17 00:00:00 2001
From: Holger Stitz <holger.stitz@datavisyn.io>
Date: Sun, 25 Apr 2021 16:53:08 +0200
Subject: [PATCH 13/27] Fix checkbox spacing

---
 dist/base/LoginUtils.js     | 8 +++++---
 dist/base/LoginUtils.js.map | 2 +-
 src/base/LoginUtils.ts      | 8 +++++---
 3 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/dist/base/LoginUtils.js b/dist/base/LoginUtils.js
index 1988a91..77729be 100644
--- a/dist/base/LoginUtils.js
+++ b/dist/base/LoginUtils.js
@@ -93,9 +93,11 @@ LoginUtils.defaultLoginForm = () => (`<form class="form-signin" action="/login"
       <label class="col-form-label" for="login_password"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.password')}</label>
       <input type="password" class="form-control" id="login_password" placeholder="${I18nextManager.getInstance().i18n.t('phovea:security_flask.password')}" required="required" autocomplete="current-password">
     </div>
-    <div class="checkbox form-check">
-      <input type="checkbox" class="form-check-input" id="login_remember">
-      <label class="form-check-label" for="login_remember">${I18nextManager.getInstance().i18n.t('phovea:security_flask.rememberMe')}</label>
+    <div class="form-group">
+      <div class="checkbox form-check">
+        <input type="checkbox" class="form-check-input" id="login_remember">
+        <label class="form-check-label" for="login_remember">${I18nextManager.getInstance().i18n.t('phovea:security_flask.rememberMe')}</label>
+      </div>
     </div>
     <button type="submit" class="btn btn-primary"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.submit')}</button>
     </form>
diff --git a/dist/base/LoginUtils.js.map b/dist/base/LoginUtils.js.map
index 9a06c19..70dbba8 100644
--- a/dist/base/LoginUtils.js.map
+++ b/dist/base/LoginUtils.js.map
@@ -1 +1 @@
-{"version":3,"file":"LoginUtils.js","sourceRoot":"","sources":["../../src/base/LoginUtils.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"LoginUtils.js","sourceRoot":"","sources":["../../src/base/LoginUtils.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAC,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,WAAW,EAAQ,MAAM,aAAa,CAAC;AAGjF,MAAM,OAAO,UAAU;IAsBrB;;;;;;OAMG;IACH,MAAM,CAAC,KAAK,CAAC,QAAgB,EAAE,QAAgB,EAAE,QAAQ,GAAG,KAAK;QAC/D,WAAW,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,CAAC;QAClC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAC,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YAClF,WAAW,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACtC,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,qCAAqC;QACrC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACX,WAAW,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,CAAC;QACrC,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,CAAC;IACX,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,MAAM;QACX,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE;YACrC,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;gBAChD,WAAW,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,CAAC;YACrC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;gBACZ,WAAW,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,CAAC;YACrC,CAAC,CAAC,CAAC;SACJ;QACD,WAAW,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,CAAC;QACnC,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,UAAU;QACf,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,EAAE,MAAM,CAAC;aACxC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,IAAI,IAAI,KAAK,mBAAmB,IAAI,IAAI,CAAC,IAAI,EAAE;gBAC7C,OAAO,IAAI,CAAC;aACb;YACD,OAAO,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,aAAa,CAAC,IAAqB,EAAE,QAA0C,EAAE,QAAqB;QAC3G,WAAW,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,CAAC;QAClC,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE;YACrC,UAAU,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBACpC,WAAW,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACtC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACvB,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;gBACZ,0BAA0B;YAC5B,CAAC,CAAC,CAAC;SACJ;QACD,IAAI,CAAC,QAAQ,GAAG,CAAC,KAAK,EAAE,EAAE;YACxB,IAAI,QAAQ,EAAE;gBACZ,QAAQ,EAAE,CAAC;aACZ;YACD,MAAM,QAAQ,GAAS,IAAK,CAAC,cAAc,CAAC,KAAK,CAAC;YAClD,MAAM,QAAQ,GAAS,IAAK,CAAC,cAAc,CAAC,KAAK,CAAC;YAClD,MAAM,UAAU,GAAS,IAAK,CAAC,cAAc,CAAC,OAAO,CAAC;YACtD,UAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC;iBAC7C,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;iBACpC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACf,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,EAAE,qBAAqB;oBAC1E,cAAc;oBACd,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;iBACjC;qBAAM;oBACL,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;iBACvB;YACH,CAAC,CAAC,CAAC;YACL,KAAK,CAAC,eAAe,EAAE,CAAC;YACxB,KAAK,CAAC,cAAc,EAAE,CAAC;QACzB,CAAC,CAAC;IACJ,CAAC;;AArGM,2BAAgB,GAAG,GAAG,EAAE,CAAC,CAAC;;2DAEwB,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,gCAAgC,CAAC;iFAC/C,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,gCAAgC,CAAC;;;4DAG1F,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,gCAAgC,CAAC;qFAC5C,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,gCAAgC,CAAC;;;;;+DAK3F,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,kCAAkC,CAAC;;;qDAGjF,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,8BAA8B,CAAC;;KAEnH,CAAC,CAAA"}
\ No newline at end of file
diff --git a/src/base/LoginUtils.ts b/src/base/LoginUtils.ts
index 5f56824..bc6ea2f 100644
--- a/src/base/LoginUtils.ts
+++ b/src/base/LoginUtils.ts
@@ -15,9 +15,11 @@ export class LoginUtils {
       <label class="col-form-label" for="login_password"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.password')}</label>
       <input type="password" class="form-control" id="login_password" placeholder="${I18nextManager.getInstance().i18n.t('phovea:security_flask.password')}" required="required" autocomplete="current-password">
     </div>
-    <div class="checkbox form-check">
-      <input type="checkbox" class="form-check-input" id="login_remember">
-      <label class="form-check-label" for="login_remember">${I18nextManager.getInstance().i18n.t('phovea:security_flask.rememberMe')}</label>
+    <div class="form-group">
+      <div class="checkbox form-check">
+        <input type="checkbox" class="form-check-input" id="login_remember">
+        <label class="form-check-label" for="login_remember">${I18nextManager.getInstance().i18n.t('phovea:security_flask.rememberMe')}</label>
+      </div>
     </div>
     <button type="submit" class="btn btn-primary"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.submit')}</button>
     </form>

From 5cb60ea646c2fd0a1aeee93d087e8ccbf31564cd Mon Sep 17 00:00:00 2001
From: dvvanessastoiber <vanessa.stoiber@datavisyn.io>
Date: Wed, 5 May 2021 11:41:05 +0200
Subject: [PATCH 14/27] switch branches

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 39beefb..48c6805 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "node": ">= 12.13"
   },
   "dependencies": {
-    "phovea_core": "github:phovea/phovea_core#develop"
+    "phovea_core": "github:phovea/phovea_core#vstoiber/bootstrap_v4"
   },
   "devDependencies": {
     "@types/jest": "~26.0.20",

From 3966981f23bec017edfc73bf44c3d4727a6eac4b Mon Sep 17 00:00:00 2001
From: dvvanessastoiber <vanessa.stoiber@datavisyn.io>
Date: Wed, 19 May 2021 14:04:21 +0200
Subject: [PATCH 15/27] switch branches

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 48c6805..7632924 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "node": ">= 12.13"
   },
   "dependencies": {
-    "phovea_core": "github:phovea/phovea_core#vstoiber/bootstrap_v4"
+    "phovea_core": "github:phovea/phovea_core#vstoiber/bootstrap_v5"
   },
   "devDependencies": {
     "@types/jest": "~26.0.20",

From b07d00fcd585101d5a1ce5a44f2ce10eda999d11 Mon Sep 17 00:00:00 2001
From: dvvanessastoiber <vanessa.stoiber@datavisyn.io>
Date: Thu, 20 May 2021 15:32:56 +0200
Subject: [PATCH 16/27] update data attribute

---
 dist/base/LoginMenu.js | 6 +++---
 src/base/LoginMenu.ts  | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/dist/base/LoginMenu.js b/dist/base/LoginMenu.js
index f54a495..c73e9e1 100644
--- a/dist/base/LoginMenu.js
+++ b/dist/base/LoginMenu.js
@@ -32,14 +32,14 @@ export class LoginMenu extends EventHandler {
         ul.classList.add('navbar-nav', 'navbar-right');
         ul.innerHTML = `
       <li class="nav-item" id="login_menu">
-        <a class="nav-link" data-toggle="modal" data-target="#loginDialog" href="#">
+        <a class="nav-link" data-bs-toggle="modal" data-target="#loginDialog" href="#">
           <i class="fas fa-user fa-fw" aria-hidden="true"></i>
         </a>
       </li>
       <li style="display: none" class="nav-item dropdown" id="user_menu">
-          <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" id="userMenuDropdown"
+          <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" role="button" aria-haspopup="true" id="userMenuDropdown"
               aria-expanded="false"><i class="fas fa-user" aria-hidden="true"></i> <span>${I18nextManager.getInstance().i18n.t('phovea:security_flask.unknown')}</span></a>
-          <div class="dropdown-menu dropdown-menu-right" aria-labelledby="userMenuDropdown">
+          <div class="dropdown-menu dropdown-menu-right" data-bs-popper="none" aria-labelledby="userMenuDropdown">
               <a class="dropdown-item" href="#" id="logout_link">${I18nextManager.getInstance().i18n.t('phovea:security_flask.logoutButton')}</a>
           </div>
       </li>`;
diff --git a/src/base/LoginMenu.ts b/src/base/LoginMenu.ts
index 4ae04cb..0edce99 100644
--- a/src/base/LoginMenu.ts
+++ b/src/base/LoginMenu.ts
@@ -78,14 +78,14 @@ export class LoginMenu extends EventHandler {
     ul.classList.add('navbar-nav', 'navbar-right');
     ul.innerHTML = `
       <li class="nav-item" id="login_menu">
-        <a class="nav-link" data-toggle="modal" data-target="#loginDialog" href="#">
+        <a class="nav-link" data-bs-toggle="modal" data-target="#loginDialog" href="#">
           <i class="fas fa-user fa-fw" aria-hidden="true"></i>
         </a>
       </li>
       <li style="display: none" class="nav-item dropdown" id="user_menu">
-          <a href="#" class="nav-link dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" id="userMenuDropdown"
+          <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" role="button" aria-haspopup="true" id="userMenuDropdown"
               aria-expanded="false"><i class="fas fa-user" aria-hidden="true"></i> <span>${I18nextManager.getInstance().i18n.t('phovea:security_flask.unknown')}</span></a>
-          <div class="dropdown-menu dropdown-menu-right" aria-labelledby="userMenuDropdown">
+          <div class="dropdown-menu dropdown-menu-right" data-bs-popper="none" aria-labelledby="userMenuDropdown">
               <a class="dropdown-item" href="#" id="logout_link">${I18nextManager.getInstance().i18n.t('phovea:security_flask.logoutButton')}</a>
           </div>
       </li>`;

From 4885658b5120bef7d5dd2590cef4364ffb0acdea Mon Sep 17 00:00:00 2001
From: dvvanessastoiber <vanessa.stoiber@datavisyn.io>
Date: Thu, 27 May 2021 09:34:20 +0200
Subject: [PATCH 17/27] update layout

---
 dist/base/LoginUtils.js                   | 12 ++++++------
 dist/base/LoginUtils.js.map               |  2 +-
 phovea_security_flask/flask_login_impl.py |  6 +++---
 src/base/LoginUtils.ts                    | 12 ++++++------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/dist/base/LoginUtils.js b/dist/base/LoginUtils.js
index 77729be..949e625 100644
--- a/dist/base/LoginUtils.js
+++ b/dist/base/LoginUtils.js
@@ -85,18 +85,18 @@ export class LoginUtils {
     }
 }
 LoginUtils.defaultLoginForm = () => (`<form class="form-signin" action="/login" method="post">
-    <div class="form-group">
-      <label class="col-form-label" for="login_username">${I18nextManager.getInstance().i18n.t('phovea:security_flask.username')}</label>
+    <div class="mb-3">
+      <label class="form-label" for="login_username">${I18nextManager.getInstance().i18n.t('phovea:security_flask.username')}</label>
       <input type="text" class="form-control" id="login_username" placeholder="${I18nextManager.getInstance().i18n.t('phovea:security_flask.username')}" required="required" autofocus="autofocus" autocomplete="username">
     </div>
-    <div class="form-group">
-      <label class="col-form-label" for="login_password"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.password')}</label>
+    <div class="mb-3">
+      <label class="form-label" for="login_password"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.password')}</label>
       <input type="password" class="form-control" id="login_password" placeholder="${I18nextManager.getInstance().i18n.t('phovea:security_flask.password')}" required="required" autocomplete="current-password">
     </div>
-    <div class="form-group">
+    <div class="mb-3">
       <div class="checkbox form-check">
         <input type="checkbox" class="form-check-input" id="login_remember">
-        <label class="form-check-label" for="login_remember">${I18nextManager.getInstance().i18n.t('phovea:security_flask.rememberMe')}</label>
+        <label class="form-label form-check-label" for="login_remember">${I18nextManager.getInstance().i18n.t('phovea:security_flask.rememberMe')}</label>
       </div>
     </div>
     <button type="submit" class="btn btn-primary"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.submit')}</button>
diff --git a/dist/base/LoginUtils.js.map b/dist/base/LoginUtils.js.map
index 70dbba8..3978c35 100644
--- a/dist/base/LoginUtils.js.map
+++ b/dist/base/LoginUtils.js.map
@@ -1 +1 @@
-{"version":3,"file":"LoginUtils.js","sourceRoot":"","sources":["../../src/base/LoginUtils.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,OAAO,EAAC,IAAI,EAAE,UAAU,EAAE,cAAc,EAAE,WAAW,EAAQ,MAAM,aAAa,CAAC;AAGjF,MAAM,OAAO,UAAU;IAsBrB;;;;;;OAMG;IACH,MAAM,CAAC,KAAK,CAAC,QAAgB,EAAE,QAAgB,EAAE,QAAQ,GAAG,KAAK;QAC/D,WAAW,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,CAAC;QAClC,MAAM,CAAC,GAAG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,EAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAC,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YAClF,WAAW,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;YACtC,OAAO,IAAI,CAAC;QACd,CAAC,CAAC,CAAC;QACH,qCAAqC;QACrC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;YACX,WAAW,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,CAAC;QACrC,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,CAAC;IACX,CAAC;IAED;;;OAGG;IACH,MAAM,CAAC,MAAM;QACX,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE;YACrC,OAAO,IAAI,CAAC,IAAI,CAAC,SAAS,EAAE,EAAE,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,EAAE;gBAChD,WAAW,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,CAAC;YACrC,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;gBACZ,WAAW,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,CAAC;YACrC,CAAC,CAAC,CAAC;SACJ;QACD,WAAW,CAAC,WAAW,EAAE,CAAC,MAAM,EAAE,CAAC;QACnC,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,MAAM,CAAC,UAAU;QACf,OAAO,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,EAAE,MAAM,CAAC;aACxC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACb,IAAI,IAAI,KAAK,mBAAmB,IAAI,IAAI,CAAC,IAAI,EAAE;gBAC7C,OAAO,IAAI,CAAC;aACb;YACD,OAAO,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,CAAC;QACnC,CAAC,CAAC,CAAC;IACP,CAAC;IAED;;;;OAIG;IACH,MAAM,CAAC,aAAa,CAAC,IAAqB,EAAE,QAA0C,EAAE,QAAqB;QAC3G,WAAW,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,CAAC;QAClC,IAAI,CAAC,UAAU,CAAC,WAAW,EAAE,CAAC,OAAO,EAAE;YACrC,UAAU,CAAC,UAAU,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBACpC,WAAW,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;gBACtC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;YACvB,CAAC,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;gBACZ,0BAA0B;YAC5B,CAAC,CAAC,CAAC;SACJ;QACD,IAAI,CAAC,QAAQ,GAAG,CAAC,KAAK,EAAE,EAAE;YACxB,IAAI,QAAQ,EAAE;gBACZ,QAAQ,EAAE,CAAC;aACZ;YACD,MAAM,QAAQ,GAAS,IAAK,CAAC,cAAc,CAAC,KAAK,CAAC;YAClD,MAAM,QAAQ,GAAS,IAAK,CAAC,cAAc,CAAC,KAAK,CAAC;YAClD,MAAM,UAAU,GAAS,IAAK,CAAC,cAAc,CAAC,OAAO,CAAC;YACtD,UAAU,CAAC,KAAK,CAAC,QAAQ,EAAE,QAAQ,EAAE,UAAU,CAAC;iBAC7C,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;iBACpC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACf,IAAI,KAAK,CAAC,QAAQ,IAAI,KAAK,CAAC,QAAQ,CAAC,MAAM,KAAK,GAAG,EAAE,EAAE,qBAAqB;oBAC1E,cAAc;oBACd,QAAQ,CAAC,eAAe,EAAE,IAAI,CAAC,CAAC;iBACjC;qBAAM;oBACL,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;iBACvB;YACH,CAAC,CAAC,CAAC;YACL,KAAK,CAAC,eAAe,EAAE,CAAC;YACxB,KAAK,CAAC,cAAc,EAAE,CAAC;QACzB,CAAC,CAAC;IACJ,CAAC;;AArGM,2BAAgB,GAAG,GAAG,EAAE,CAAC,CAAC;;2DAEwB,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,gCAAgC,CAAC;iFAC/C,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,gCAAgC,CAAC;;;4DAG1F,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,gCAAgC,CAAC;qFAC5C,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,gCAAgC,CAAC;;;;;+DAK3F,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,kCAAkC,CAAC;;;qDAGjF,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,8BAA8B,CAAC;;KAEnH,CAAC,CAAA"}
\ No newline at end of file
+{"version":3,"file":"LoginUtils.js","sourceRoot":"","sources":["../../src/base/LoginUtils.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/phovea_security_flask/flask_login_impl.py b/phovea_security_flask/flask_login_impl.py
index 0ce18f9..07b20b3 100644
--- a/phovea_security_flask/flask_login_impl.py
+++ b/phovea_security_flask/flask_login_impl.py
@@ -81,9 +81,9 @@ def login():
       <html>
       <body>
         <form name="login" action="/login" method="post" accept-charset="utf-8">
-          <div><label for="username">User name: </label><input type="text" name="username" placeholder="name" required="required"></div>
-          <div><label for="password">Password</label><input type="password" name="password" placeholder="password" required="required"></div>
-          <div><label for="remember"><input type="checkbox" name="remember" value="True" required="required"></label></div>
+          <div><label for="username" class="form-label">User name: </label><input type="text" name="username" placeholder="name" required="required"></div>
+          <div><label for="password" class="form-label">Password</label><input type="password" name="password" placeholder="password" required="required"></div>
+          <div><label for="remember" class="form-label"><input type="checkbox" name="remember" value="True" required="required"></label></div>
           <div><input type="reset" value="Reset"><input type="submit" value="Login"></div>
         </form>
       </body>
diff --git a/src/base/LoginUtils.ts b/src/base/LoginUtils.ts
index bc6ea2f..ce15212 100644
--- a/src/base/LoginUtils.ts
+++ b/src/base/LoginUtils.ts
@@ -7,18 +7,18 @@ import {Ajax, AppContext, I18nextManager, UserSession, IUser} from 'phovea_core'
 export class LoginUtils {
 
   static defaultLoginForm = () => (`<form class="form-signin" action="/login" method="post">
-    <div class="form-group">
-      <label class="col-form-label" for="login_username">${I18nextManager.getInstance().i18n.t('phovea:security_flask.username')}</label>
+    <div class="mb-3">
+      <label class="form-label" for="login_username">${I18nextManager.getInstance().i18n.t('phovea:security_flask.username')}</label>
       <input type="text" class="form-control" id="login_username" placeholder="${I18nextManager.getInstance().i18n.t('phovea:security_flask.username')}" required="required" autofocus="autofocus" autocomplete="username">
     </div>
-    <div class="form-group">
-      <label class="col-form-label" for="login_password"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.password')}</label>
+    <div class="mb-3">
+      <label class="form-label" for="login_password"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.password')}</label>
       <input type="password" class="form-control" id="login_password" placeholder="${I18nextManager.getInstance().i18n.t('phovea:security_flask.password')}" required="required" autocomplete="current-password">
     </div>
-    <div class="form-group">
+    <div class="mb-3">
       <div class="checkbox form-check">
         <input type="checkbox" class="form-check-input" id="login_remember">
-        <label class="form-check-label" for="login_remember">${I18nextManager.getInstance().i18n.t('phovea:security_flask.rememberMe')}</label>
+        <label class="form-label form-check-label" for="login_remember">${I18nextManager.getInstance().i18n.t('phovea:security_flask.rememberMe')}</label>
       </div>
     </div>
     <button type="submit" class="btn btn-primary"> ${I18nextManager.getInstance().i18n.t('phovea:security_flask.submit')}</button>

From 2539d2bea90779ee5450e486edb16a11adca200a Mon Sep 17 00:00:00 2001
From: dvvanessastoiber <vanessa.stoiber@datavisyn.io>
Date: Mon, 31 May 2021 15:41:17 +0200
Subject: [PATCH 18/27] update login menu

---
 dist/base/LoginMenu.js     | 5 ++---
 dist/base/LoginMenu.js.map | 2 +-
 src/base/LoginMenu.ts      | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/dist/base/LoginMenu.js b/dist/base/LoginMenu.js
index c73e9e1..828e5dc 100644
--- a/dist/base/LoginMenu.js
+++ b/dist/base/LoginMenu.js
@@ -76,7 +76,7 @@ export class LoginMenu extends EventHandler {
     forceShowDialog() {
         const doc = this.options.document;
         const loginDialog = doc.querySelector('#loginDialog');
-        loginDialog.querySelector('.modal-header .close').setAttribute('hidden', null); // disable closing the dialog
+        loginDialog.querySelector('.modal-header .btn-close').setAttribute('hidden', null); // disable closing the dialog
         this.adapter.showAndFocusOn('#loginDialog', '#login_username');
     }
     initLoginDialog(body) {
@@ -97,8 +97,7 @@ export class LoginMenu extends EventHandler {
           <div class="modal-content">
             <div class="modal-header">
             <h5 class="modal-title">${I18nextManager.getInstance().i18n.t('phovea:security_flask.title')}</h5>
-              <button type="button" class="close" data-dismiss="modal" aria-label="${I18nextManager.getInstance().i18n.t('phovea:security_flask.closeButton')}"><span
-                aria-hidden="true">&times;</span></button>
+              <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="${I18nextManager.getInstance().i18n.t('phovea:security_flask.closeButton')}"></button>
             </div>
             <div class="modal-body">
               <div class="alert alert-warning" role="alert">${I18nextManager.getInstance().i18n.t('phovea:security_flask.alertOffline')}</div>
diff --git a/dist/base/LoginMenu.js.map b/dist/base/LoginMenu.js.map
index aa88fb7..5b4cb30 100644
--- a/dist/base/LoginMenu.js.map
+++ b/dist/base/LoginMenu.js.map
@@ -1 +1 @@
-{"version":3,"file":"LoginMenu.js","sourceRoot":"","sources":["../../src/base/LoginMenu.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
+{"version":3,"file":"LoginMenu.js","sourceRoot":"","sources":["../../src/base/LoginMenu.ts"],"names":[],"mappings":"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"}
\ No newline at end of file
diff --git a/src/base/LoginMenu.ts b/src/base/LoginMenu.ts
index 0edce99..ee7a73e 100644
--- a/src/base/LoginMenu.ts
+++ b/src/base/LoginMenu.ts
@@ -130,7 +130,7 @@ export class LoginMenu extends EventHandler {
   forceShowDialog() {
     const doc = this.options.document;
     const loginDialog = <HTMLElement>doc.querySelector('#loginDialog');
-    (<HTMLElement>loginDialog.querySelector('.modal-header .close')).setAttribute('hidden', null); // disable closing the dialog
+    (<HTMLElement>loginDialog.querySelector('.modal-header .btn-close')).setAttribute('hidden', null); // disable closing the dialog
     this.adapter.showAndFocusOn('#loginDialog', '#login_username');
   }
 
@@ -152,8 +152,7 @@ export class LoginMenu extends EventHandler {
           <div class="modal-content">
             <div class="modal-header">
             <h5 class="modal-title">${I18nextManager.getInstance().i18n.t('phovea:security_flask.title')}</h5>
-              <button type="button" class="close" data-dismiss="modal" aria-label="${I18nextManager.getInstance().i18n.t('phovea:security_flask.closeButton')}"><span
-                aria-hidden="true">&times;</span></button>
+              <button type="button" class="btn-close" data-bs-dismiss="modal" aria-label="${I18nextManager.getInstance().i18n.t('phovea:security_flask.closeButton')}"></button>
             </div>
             <div class="modal-body">
               <div class="alert alert-warning" role="alert">${I18nextManager.getInstance().i18n.t('phovea:security_flask.alertOffline')}</div>

From 0c14999e41379face6c76c01e8a666e3ad60451b Mon Sep 17 00:00:00 2001
From: dvvanessastoiber <vanessa.stoiber@datavisyn.io>
Date: Mon, 7 Jun 2021 12:36:52 +0200
Subject: [PATCH 19/27] update data attribute

---
 dist/base/LoginMenu.js | 2 +-
 src/base/LoginMenu.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/base/LoginMenu.js b/dist/base/LoginMenu.js
index 828e5dc..1730ef5 100644
--- a/dist/base/LoginMenu.js
+++ b/dist/base/LoginMenu.js
@@ -32,7 +32,7 @@ export class LoginMenu extends EventHandler {
         ul.classList.add('navbar-nav', 'navbar-right');
         ul.innerHTML = `
       <li class="nav-item" id="login_menu">
-        <a class="nav-link" data-bs-toggle="modal" data-target="#loginDialog" href="#">
+        <a class="nav-link" data-bs-toggle="modal" data-bs-target="#loginDialog" href="#">
           <i class="fas fa-user fa-fw" aria-hidden="true"></i>
         </a>
       </li>
diff --git a/src/base/LoginMenu.ts b/src/base/LoginMenu.ts
index ee7a73e..31290f1 100644
--- a/src/base/LoginMenu.ts
+++ b/src/base/LoginMenu.ts
@@ -78,7 +78,7 @@ export class LoginMenu extends EventHandler {
     ul.classList.add('navbar-nav', 'navbar-right');
     ul.innerHTML = `
       <li class="nav-item" id="login_menu">
-        <a class="nav-link" data-bs-toggle="modal" data-target="#loginDialog" href="#">
+        <a class="nav-link" data-bs-toggle="modal" data-bs-target="#loginDialog" href="#">
           <i class="fas fa-user fa-fw" aria-hidden="true"></i>
         </a>
       </li>

From 521fd1b03d4d71b3de6597d1de15e7d71640a2f4 Mon Sep 17 00:00:00 2001
From: dvvanessastoiber <vanessa.stoiber@datavisyn.io>
Date: Wed, 7 Jul 2021 10:12:38 +0200
Subject: [PATCH 20/27] prepare release 7.0.0-alpha.0

---
 package.json     | 4 ++--
 requirements.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 48c6805..c2158ed 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "phovea_security_flask",
   "description": "",
-  "version": "6.0.1-SNAPSHOT",
+  "version": "7.0.0-alpha.0",
   "author": {
     "name": "The Caleydo Team",
     "email": "contact@caleydo.org",
@@ -74,7 +74,7 @@
     "node": ">= 12.13"
   },
   "dependencies": {
-    "phovea_core": "github:phovea/phovea_core#vstoiber/bootstrap_v4"
+    "phovea_core": "^6.0.0"
   },
   "devDependencies": {
     "@types/jest": "~26.0.20",
diff --git a/requirements.txt b/requirements.txt
index 397df69..d1ec014 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
 flask-login==0.5.0
--e git+https://github.com/phovea/phovea_server.git@develop#egg=phovea_server
+phovea_server>=6.0.0,<7.0.0

From bd1290069b255f6484c22cef7a995617b54f4e3d Mon Sep 17 00:00:00 2001
From: dvvanessastoiber <vanessa.stoiber@datavisyn.io>
Date: Wed, 7 Jul 2021 10:13:55 +0200
Subject: [PATCH 21/27] use correct version

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index c2158ed..2af9e40 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "phovea_security_flask",
   "description": "",
-  "version": "7.0.0-alpha.0",
+  "version": "8.0.0-alpha.0",
   "author": {
     "name": "The Caleydo Team",
     "email": "contact@caleydo.org",

From 623f857182035a5ddffaa175e24731796a4a23fd Mon Sep 17 00:00:00 2001
From: dvvanessastoiber <vanessa.stoiber@datavisyn.io>
Date: Thu, 8 Jul 2021 08:40:21 +0200
Subject: [PATCH 22/27] reset repo to use bootstrap branches

---
 package.json     | 4 ++--
 requirements.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 2af9e40..e086948 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "phovea_security_flask",
   "description": "",
-  "version": "8.0.0-alpha.0",
+  "version": "7.0.1-SNAPSHOT",
   "author": {
     "name": "The Caleydo Team",
     "email": "contact@caleydo.org",
@@ -74,7 +74,7 @@
     "node": ">= 12.13"
   },
   "dependencies": {
-    "phovea_core": "^6.0.0"
+    "phovea_core": "github:phovea/phovea_core#vstoiber/bootstrap_v4"
   },
   "devDependencies": {
     "@types/jest": "~26.0.20",
diff --git a/requirements.txt b/requirements.txt
index d1ec014..397df69 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
 flask-login==0.5.0
-phovea_server>=6.0.0,<7.0.0
+-e git+https://github.com/phovea/phovea_server.git@develop#egg=phovea_server

From 5100833553734d56f7a04e455fa48bfef39fa4aa Mon Sep 17 00:00:00 2001
From: dvvanessastoiber <vanessa.stoiber@datavisyn.io>
Date: Thu, 29 Jul 2021 15:19:26 +0200
Subject: [PATCH 23/27] fix dropdown menu alignment

---
 dist/base/LoginMenu.js | 2 +-
 src/base/LoginMenu.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/base/LoginMenu.js b/dist/base/LoginMenu.js
index 1730ef5..bb96e6a 100644
--- a/dist/base/LoginMenu.js
+++ b/dist/base/LoginMenu.js
@@ -39,7 +39,7 @@ export class LoginMenu extends EventHandler {
       <li style="display: none" class="nav-item dropdown" id="user_menu">
           <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" role="button" aria-haspopup="true" id="userMenuDropdown"
               aria-expanded="false"><i class="fas fa-user" aria-hidden="true"></i> <span>${I18nextManager.getInstance().i18n.t('phovea:security_flask.unknown')}</span></a>
-          <div class="dropdown-menu dropdown-menu-right" data-bs-popper="none" aria-labelledby="userMenuDropdown">
+          <div class="dropdown-menu dropdown-menu-end" data-bs-popper="none" aria-labelledby="userMenuDropdown">
               <a class="dropdown-item" href="#" id="logout_link">${I18nextManager.getInstance().i18n.t('phovea:security_flask.logoutButton')}</a>
           </div>
       </li>`;
diff --git a/src/base/LoginMenu.ts b/src/base/LoginMenu.ts
index 31290f1..1a2483d 100644
--- a/src/base/LoginMenu.ts
+++ b/src/base/LoginMenu.ts
@@ -85,7 +85,7 @@ export class LoginMenu extends EventHandler {
       <li style="display: none" class="nav-item dropdown" id="user_menu">
           <a href="#" class="nav-link dropdown-toggle" data-bs-toggle="dropdown" role="button" aria-haspopup="true" id="userMenuDropdown"
               aria-expanded="false"><i class="fas fa-user" aria-hidden="true"></i> <span>${I18nextManager.getInstance().i18n.t('phovea:security_flask.unknown')}</span></a>
-          <div class="dropdown-menu dropdown-menu-right" data-bs-popper="none" aria-labelledby="userMenuDropdown">
+          <div class="dropdown-menu dropdown-menu-end" data-bs-popper="none" aria-labelledby="userMenuDropdown">
               <a class="dropdown-item" href="#" id="logout_link">${I18nextManager.getInstance().i18n.t('phovea:security_flask.logoutButton')}</a>
           </div>
       </li>`;

From 1a2f37bbca60549392266ca862dd36a8f4abcad9 Mon Sep 17 00:00:00 2001
From: dvvanessastoiber <vanessa.stoiber@datavisyn.io>
Date: Wed, 4 Aug 2021 09:42:04 +0200
Subject: [PATCH 24/27] use develop branch for phovea_core

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index ae3a4a8..5fdd92f 100644
--- a/package.json
+++ b/package.json
@@ -74,7 +74,7 @@
     "node": ">= 12.13"
   },
   "dependencies": {
-    "phovea_core": "github:phovea/phovea_core#vstoiber/bootstrap_v5"
+    "phovea_core": "github:phovea/phovea_core#develop"
   },
   "devDependencies": {
     "@types/jest": "~26.0.20",

From 325a999692dfb681a193f3106ff9e34d0922a7b9 Mon Sep 17 00:00:00 2001
From: dvvanessastoiber <vanessa.stoiber@datavisyn.io>
Date: Thu, 5 Aug 2021 11:35:11 +0200
Subject: [PATCH 25/27] fix data attribute

---
 dist/base/LoginMenu.js | 2 +-
 src/base/LoginMenu.ts  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/dist/base/LoginMenu.js b/dist/base/LoginMenu.js
index bb96e6a..50aa7a3 100644
--- a/dist/base/LoginMenu.js
+++ b/dist/base/LoginMenu.js
@@ -92,7 +92,7 @@ export class LoginMenu extends EventHandler {
         }
         body.insertAdjacentHTML('beforeend', `
       <!--login dialog-->
-      <div class="modal fade" id="loginDialog" tabindex="-1" role="dialog" aria-labelledby="loginDialog" data-keyboard="false" data-backdrop="static">
+      <div class="modal fade" id="loginDialog" tabindex="-1" role="dialog" aria-labelledby="loginDialog" data-keyboard="false" data-bs-backdrop="static">
         <div class="modal-dialog modal-sm">
           <div class="modal-content">
             <div class="modal-header">
diff --git a/src/base/LoginMenu.ts b/src/base/LoginMenu.ts
index 1a2483d..d416a28 100644
--- a/src/base/LoginMenu.ts
+++ b/src/base/LoginMenu.ts
@@ -147,7 +147,7 @@ export class LoginMenu extends EventHandler {
     }
     body.insertAdjacentHTML('beforeend', `
       <!--login dialog-->
-      <div class="modal fade" id="loginDialog" tabindex="-1" role="dialog" aria-labelledby="loginDialog" data-keyboard="false" data-backdrop="static">
+      <div class="modal fade" id="loginDialog" tabindex="-1" role="dialog" aria-labelledby="loginDialog" data-keyboard="false" data-bs-backdrop="static">
         <div class="modal-dialog modal-sm">
           <div class="modal-content">
             <div class="modal-header">

From ce3ff1ef772f34a8edc31ec916a6f42ba0a178d0 Mon Sep 17 00:00:00 2001
From: Vanessa Stoiber <52395160+dvvanessastoiber@users.noreply.github.com>
Date: Wed, 8 Sep 2021 09:31:05 +0200
Subject: [PATCH 26/27] Update CODEOWNERS

---
 .github/CODEOWNERS | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/CODEOWNERS b/.github/CODEOWNERS
index 725f3b4..ab31662 100644
--- a/.github/CODEOWNERS
+++ b/.github/CODEOWNERS
@@ -1 +1 @@
-*   @anita-steiner
+*   @phovea/core @phovea/datavisyn-core

From 7e8c6d8ccc6fef2dfbcb61f008a7c9599d48eaac Mon Sep 17 00:00:00 2001
From: dvvanessastoiber <vanessa.stoiber@datavisyn.io>
Date: Wed, 8 Sep 2021 09:31:35 +0200
Subject: [PATCH 27/27] prepare release_8.0.0

---
 package.json     | 4 ++--
 requirements.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package.json b/package.json
index 5fdd92f..3ebbfb1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "phovea_security_flask",
   "description": "",
-  "version": "7.0.1-SNAPSHOT",
+  "version": "8.0.0",
   "author": {
     "name": "The Caleydo Team",
     "email": "contact@caleydo.org",
@@ -74,7 +74,7 @@
     "node": ">= 12.13"
   },
   "dependencies": {
-    "phovea_core": "github:phovea/phovea_core#develop"
+    "phovea_core": "^7.0.0"
   },
   "devDependencies": {
     "@types/jest": "~26.0.20",
diff --git a/requirements.txt b/requirements.txt
index 0fb85fa..f359433 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
 flask-login==0.5.0
--e git+https://github.com/phovea/phovea_server.git@develop#egg=phovea_server
\ No newline at end of file
+phovea_server>=7.2.0,<8.0.0
\ No newline at end of file