From 670f1b27a28b9a848a44bd915b5deeb1cca3d4cb Mon Sep 17 00:00:00 2001
From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de>
Date: Fri, 27 Mar 2020 16:01:22 +0100
Subject: [PATCH] changed header: added user account button, removed login
button
---
js/headfoot.js | 23 +----------------------
js/headfootLogout.js | 26 +-------------------------
2 files changed, 2 insertions(+), 47 deletions(-)
diff --git a/js/headfoot.js b/js/headfoot.js
index f11a572..60fb894 100755
--- a/js/headfoot.js
+++ b/js/headfoot.js
@@ -1,4 +1,4 @@
-var menu = [{'name':'Informationen', 'combos':[{'name':'Projekte', 'link':'/project'}, {'name':'Über das M4_LAB', 'link':'/projectoverview?projectID=1'}], 'type':'dropdown', 'link':'#'},{'name':'Zusammenarbeit', 'combos':[{'name':'Mailinglisten', 'link':'/mailinglists'},{'name':'Videokonferenzen', 'link':'/videoconferences'},/* {'name':'...', 'link':'#'}*/], 'type':'dropdown', 'link':'#'},{'name':'Events', 'combos':[{'name':'Veranstaltungen der HfT', 'link':'http://www.hft-stuttgart.de/Aktuell/Veranstaltungen/'},{'name':'Veranstaltungen der HfT Forschung', 'link':'https://www.hft-stuttgart.de/forschung/veranstaltungen'}/*,{'name':'...', 'link':'#'}*/], 'type':'dropdown', 'link':'#'},/*{'name':'Bürgerbeteiligung', 'combos':[{'name':'...', 'link':'#'}, {'name':'...', 'link':'#'}], 'type':'dropdown', 'link':'#'},*/{'name':'Login', 'combos':[], 'type':'loginbutton', 'link':'/account/'}];
+var menu = [{'name':'Informationen', 'combos':[{'name':'Projekte', 'link':'/project'}, {'name':'Ãœber das M4_LAB', 'link':'/projectoverview?projectID=1'}], 'type':'dropdown', 'link':'#'},{'name':'Zusammenarbeit', 'combos':[{'name':'Mailinglisten', 'link':'/mailinglists'},{'name':'Videokonferenzen', 'link':'/videoconferences'},/* {'name':'...', 'link':'#'}*/], 'type':'dropdown', 'link':'#'},{'name':'Events', 'combos':[{'name':'Veranstaltungen der HfT', 'link':'http://www.hft-stuttgart.de/Aktuell/Veranstaltungen/'},{'name':'Veranstaltungen der HfT Forschung', 'link':'https://www.hft-stuttgart.de/forschung/veranstaltungen'}], 'type':'dropdown', 'link':'#'},{'name':'Benutzerkonto', 'combos': [], 'type':'', 'link':'/account/'}];
var hft_links = [{'url':'hhttps://www.hft-stuttgart.de/forschung/innovative-hochschule-m4-lab', 'name':'Kontakt'},{'url':'hhttps://www.hft-stuttgart.de/impressum', 'name':'Impressum'},{'url':'https://www.hft-stuttgart.de/datenschutz', 'name':'Datenschutz'}]
@@ -11,19 +11,6 @@ function prependChild(parent,child){
parent.insertBefore(child, parent.childNodes[0]);
}
-function userAuthenticated(){
- let params = new URLSearchParams(window.location.search);
- if(params.get('isAuthenticatedUser')){
- return true;
- }else if(document.getElementById('loginswitch')){ //relikt login via OAuth
- if(document.getElementById('loginswitch').getAttribute('authenticated') == '1'){
- return true;
- }
- }else{
- return false;
- }
-}
-
function readCookie(cname) {
var name = cname + "=";
@@ -125,14 +112,6 @@ function head(){
combodiv.appendChild(combolink);
}
headitem.appendChild(combodiv);
- }else if(itemtype=='loginbutton'){
- if(userAuthenticated()){
- headlink.innerHTML="Account";
- headlink.href="/account/";
- }
- headlink.classList.remove("nav-link");
- headlink.classList.add("btn");
- headlink.classList.add("btn-outline-dark");
}
headitem.appendChild(headlink);
navelements.appendChild(headitem);
diff --git a/js/headfootLogout.js b/js/headfootLogout.js
index 163064a..0f8f16b 100644
--- a/js/headfootLogout.js
+++ b/js/headfootLogout.js
@@ -1,4 +1,4 @@
-var menu = [{'name':'Informationen', 'combos':[{'name':'Projekte', 'link':'/project'}, {'name':'Über das M4_LAB', 'link':'/projectoverview?projectID=1'}], 'type':'dropdown', 'link':'#'},{'name':'Zusammenarbeit', 'combos':[{'name':'Mailinglisten', 'link':'/mailinglists'},{'name':'Videokonferenzen', 'link':'/videoconferences'},/* {'name':'...', 'link':'#'}*/], 'type':'dropdown', 'link':'#'},{'name':'Events', 'combos':[{'name':'Veranstaltungen der HfT', 'link':'http://www.hft-stuttgart.de/Aktuell/Veranstaltungen/'},{'name':'Veranstaltungen der HfT Forschung', 'link':'https://www.hft-stuttgart.de/forschung/veranstaltungen'}/*,{'name':'...', 'link':'#'}*/], 'type':'dropdown', 'link':'#'},/*{'name':'Bürgerbeteiligung', 'combos':[{'name':'...', 'link':'#'}, {'name':'...', 'link':'#'}], 'type':'dropdown', 'link':'#'},*/{'name':'Logout', 'combos':[], 'type':'logoutbutton', 'link':'/logout'}];
+var menu = [{'name':'Informationen', 'combos':[{'name':'Projekte', 'link':'/project'}, {'name':'Ãœber das M4_LAB', 'link':'/projectoverview?projectID=1'}], 'type':'dropdown', 'link':'#'},{'name':'Zusammenarbeit', 'combos':[{'name':'Mailinglisten', 'link':'/mailinglists'},{'name':'Videokonferenzen', 'link':'/videoconferences'},/* {'name':'...', 'link':'#'}*/], 'type':'dropdown', 'link':'#'},{'name':'Events', 'combos':[{'name':'Veranstaltungen der HfT', 'link':'http://www.hft-stuttgart.de/Aktuell/Veranstaltungen/'},{'name':'Veranstaltungen der HfT Forschung', 'link':'https://www.hft-stuttgart.de/forschung/veranstaltungen'}], 'type':'dropdown', 'link':'#'},{'name':'Benutzerkonto', 'combos': [], 'type':'', 'link':'/account/'}];
var hft_links = [{'url':'hhttps://www.hft-stuttgart.de/forschung/innovative-hochschule-m4-lab', 'name':'Kontakt'},{'url':'hhttps://www.hft-stuttgart.de/impressum', 'name':'Impressum'},{'url':'https://www.hft-stuttgart.de/datenschutz', 'name':'Datenschutz'}]
@@ -11,20 +11,6 @@ function prependChild(parent,child){
parent.insertBefore(child, parent.childNodes[0]);
}
-function userAuthenticated(){
- let params = new URLSearchParams(window.location.search);
- if(params.get('isAuthenticatedUser')){
- return true;
- }else if(document.getElementById('loginswitch')){ //relikt login via OAuth
- if(document.getElementById('loginswitch').getAttribute('authenticated') == '1'){
- return true;
- }
- }else{
- return false;
- }
-}
-
-
function readCookie(cname) {
var name = cname + "=";
var decodedCookie = decodeURIComponent(document.cookie);
@@ -125,16 +111,6 @@ function head(){
combodiv.appendChild(combolink);
}
headitem.appendChild(combodiv);
- }else if(itemtype=='logoutbutton'){
- /* if(userAuthenticated()){
- headlink.innerHTML="Account";
- headlink.href="/account/";
- } */
- headlink.innerHTML="Logout";
- headlink.href="/logout";
- headlink.classList.remove("nav-link");
- headlink.classList.add("btn");
- headlink.classList.add("btn-outline-danger");
}
headitem.appendChild(headlink);
navelements.appendChild(headitem);
--
GitLab