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 1/6] 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 2/6] 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 3/6] 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 4/6] 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":"AAAA;;GAEG;AAGH,OAAO,EAAC,SAAS,EAAE,YAAY,EAAE,cAAc,EAAC,MAAM,aAAa,CAAC;AACpE,OAAO,EAAC,qCAAqC,EAA6D,MAAM,cAAc,CAAC;AAC/H,OAAO,EAAC,UAAU,EAAC,MAAM,cAAc,CAAC;AACxC,OAAO,EAAC,cAAc,EAAC,MAAM,WAAW,CAAC;AAEzC,uDAAuD;AACvD,OAAO,EAAC,cAAc,EAAC,MAAM,aAAa,CAAC;AAqC3C;;GAEG;AACH,MAAM,OAAO,SAAU,SAAQ,YAAY;IAazC,YAA6B,OAA0B,EAAE,UAA6B,EAAE;QACtF,KAAK,EAAE,CAAC;QADmB,YAAO,GAAP,OAAO,CAAmB;QARtC,YAAO,GAAsB;YAC5C,SAAS,EAAE,SAAS;YACpB,QAAQ;YACR,KAAK,EAAE,KAAK;SACb,CAAC;QAMA,SAAS,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;QACvC,IAAI,CAAC,UAAU,GAAG,cAAc,CAAC,WAAW,EAAE,CAAC,WAAW,CAAC,qCAAqC,CAAC,CAAC;QAClG,IAAI,CAAC,IAAI,GAAG,IAAI,CAAC,IAAI,EAAE,CAAC;QACxB,IAAI,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE;YACtB,cAAc,CAAC,aAAa,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;SACnD;IACH,CAAC;IAEO,IAAI;QACV,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;QAClC,MAAM,EAAE,GAAG,GAAG,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QACnC,EAAE,CAAC,SAAS,CAAC,GAAG,CAAC,YAAY,EAAE,cAAc,CAAC,CAAC;QAC/C,EAAE,CAAC,SAAS,GAAG;;;;;;;;2FAQwE,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,+BAA+B,CAAC;;mEAE5F,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,oCAAoC,CAAC;;YAEhI,CAAC;QAGT,EAAE,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC,gBAAgB,CAAC,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE;YACjE,GAAG,CAAC,cAAc,EAAE,CAAC;YACrB,GAAG,CAAC,eAAe,EAAE,CAAC;YACtB,IAAI,CAAC,MAAM,EAAE,CAAC;QAChB,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAAG,IAAI,CAAC,eAAe,CAAC,EAAE,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;QAE3D,IAAI,CAAC,aAAa,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QAE/B,OAAO,EAAE,CAAC;IACZ,CAAC;IAEO,MAAM;QACZ,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;QAClC,IAAI,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;QACpB,UAAU,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE;YAC5B,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,gBAAgB,CAAC,CAAC;YACtC,MAAM,QAAQ,GAAgB,GAAG,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;YAC9D,IAAI,QAAQ,EAAE;gBACZ,QAAQ,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;aACjC;YACa,IAAI,CAAC,IAAI,CAAC,aAAa,CAAC,aAAa,CAAE,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;YAC3E,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,iBAAiB,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAc,EAAE,EAAE;gBAC7E,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;YACH,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;QACvB,CAAC,CAAC,CAAC;IACL,CAAC;IAEO,aAAa,CAAC,IAAiB,EAAE,MAAmB;QAC1D,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,MAAoC,EAAE,EAAE;YAC9F,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;IACL,CAAC;IAED,eAAe;QACb,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;QAClC,MAAM,WAAW,GAAgB,GAAG,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;QACrD,WAAW,CAAC,aAAa,CAAC,0BAA0B,CAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,IAAI,CAAC,CAAC,CAAC,6BAA6B;QAChI,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,cAAc,EAAE,iBAAiB,CAAC,CAAC;IACjE,CAAC;IAEO,eAAe,CAAC,IAAiB;QAEvC,IAAI,SAAS,GAAG,IAAI,CAAC,OAAO,CAAC,SAAS,CAAC;QACvC,IAAI,CAAC,SAAS,EAAE;YACd,MAAM,CAAC,GAAG,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC;YAC1D,IAAI,CAAC,EAAE;gBACL,SAAS,GAAG,CAAC,CAAC,QAAQ,CAAC;aACxB;iBAAM;gBACL,SAAS,GAAG,UAAU,CAAC,gBAAgB,EAAE,CAAC;aAC3C;SACF;QACD,IAAI,CAAC,kBAAkB,CAAC,WAAW,EAAE;;;;;;sCAMH,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,6BAA6B,CAAC;4FACZ,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,mCAAmC,CAAC;;;8DAGtG,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,oCAAoC,CAAC;6DAC1E,cAAc,CAAC,WAAW,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,6CAA6C,CAAC;gBAC/H,SAAS;;;;aAIZ,CAAC,CAAC;QAEX,MAAM,MAAM,GAAmB,IAAI,CAAC,aAAa,CAAC,cAAc,CAAC,CAAC;QAClE,MAAM,IAAI,GAAoB,MAAM,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC;QAC3D,UAAU,CAAC,aAAa,CAAC,IAAI,EAAE,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE;YAC7C,MAAM,OAAO,GAAG,CAAC,KAAK,IAAI,IAAI,CAAC;YAC/B,IAAI,CAAC,OAAO,EAAE;gBACZ,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,CAAC;gBACrB,IAAI,KAAK,KAAK,eAAe,EAAE;oBAC7B,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC;iBACrC;qBAAM;oBACL,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;oBACvC,MAAM,CAAC,SAAS,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;iBACnC;gBACD,OAAO;aACR;YAED,IAAI,CAAC,IAAI,CAAC,SAAS,CAAC,eAAe,CAAC,CAAC;YACrC,MAAM,GAAG,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC;YAElC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;YAEpD,MAAM,QAAQ,GAAgB,GAAG,CAAC,aAAa,CAAC,YAAY,CAAC,CAAC;YAC9D,IAAI,QAAQ,EAAE;gBACZ,QAAQ,CAAC,KAAK,CAAC,OAAO,GAAG,IAAI,CAAC;gBAC9B,MAAM,QAAQ,GAAgB,QAAQ,CAAC,aAAa,CAAC,sBAAsB,CAAC,CAAC;gBAC7E,IAAI,QAAQ,EAAE;oBACZ,QAAQ,CAAC,WAAW,GAAG,IAAI,CAAC,IAAI,CAAC;iBAClC;aACF;YAEa,GAAG,CAAC,aAAa,CAAC,aAAa,CAAE,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;YACvE,yCAAyC;YACzC,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,gBAAgB,CAAC,0BAA0B,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAc,EAAE,EAAE;gBACtF,CAAC,CAAC,SAAS,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC;gBAC/B,CAAC,CAAC,YAAY,CAAC,UAAU,EAAE,IAAI,CAAC,CAAC;YACnC,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC;QAC1C,CAAC,EAAE,GAAG,EAAE;YACN,cAAc;YACd,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,EAAE,aAAa,CAAC,CAAC;QACtD,CAAC,CAAC,CAAC;QAEH,OAAO,MAAM,CAAC;IAChB,CAAC;;AA5Je,yBAAe,GAAG,UAAU,CAAC;AAC7B,0BAAgB,GAAG,WAAW,CAAC"}
\ 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 5/6] 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 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 6/6] 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>`;