diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9f8793a4dd623b715487d65852190f424997a927..6c5edfc8c00129e450b4a65cfee6504948d38548 100755
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,22 +1,46 @@
# This file is a template, and might need editing before it works on your project.
# Full project: https://gitlab.com/pages/plain-html
-pages:
- variables:
- EXPORT_PAGES_DIR: "/opt/tomcat9/webapps/ROOT/"
+
+variables:
+ JAVA_HOME: "/opt/jdk-12"
+ EXPORT_PAGES_DIR: "/opt/tomcat9/webapps/ROOT/"
+
+pages-master:
stage: deploy
script:
- - echo $EXPORT_PAGES_DIR
- - mkdir .public
- - cp -r css .public
- - cp -r images .public
- - cp -r js .public
- - cp -r includes .public
- - cp *.html .public
- - mv .public public
- - cp -r public/* "$EXPORT_PAGES_DIR"
+ - echo $EXPORT_PAGES_DIR
+ - mkdir .public
+ - cp -r css .public
+ - cp -r images .public
+ - cp -r js .public
+ - cp -r includes .public
+ - cp *.html .public
+ - mv .public public
+ - cp -r public/* "$EXPORT_PAGES_DIR"
artifacts:
paths:
- - public
+ - public
+ tags:
+ - production
only:
- - master
+ - master
+pages-devel:
+ stage: deploy
+ script:
+ - echo $EXPORT_PAGES_DIR
+ - mkdir .public
+ - cp -r css .public
+ - cp -r images .public
+ - cp -r js .public
+ - cp -r includes .public
+ - cp *.html .public
+ - mv .public public
+ - cp -r public/* "$EXPORT_PAGES_DIR"
+ artifacts:
+ paths:
+ - public
+ tags:
+ - testing
+ only:
+ - testing
diff --git a/images/demo/Innovative_Hochschule_Initiative_BMBF_GWK_RGB.jpg b/images/demo/Innovative_Hochschule_Initiative_BMBF_GWK_RGB.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..fc940bfd2495a52b2cb092c2f703bccbe71a559c
Binary files /dev/null and b/images/demo/Innovative_Hochschule_Initiative_BMBF_GWK_RGB.jpg differ
diff --git a/index.html b/index.html
index fb63b14c39dd69955063f9e967fb4f33589229e7..7d28de6ae7da6bfd9e8f4304d8c7ee5bb17d653a 100755
--- a/index.html
+++ b/index.html
@@ -37,7 +37,7 @@ Dabei verknüpfen wir unsere Expertise mit Partnern innerhalb und außerhalb der
<h2>Willst du dabei sein?</h2>
Dann findest du unter <span onclick="event.stopPropagation();hint_navbar('0')" ><i class="fas fa-chevron-right"></i> Informationen</span> mehr über unsere Expertise, Projekte, Publikationen und Lösungen.<br>
-Erfahre mehr über unsere <span onclick="event.stopPropagation();hint_navbar('2')" ><i class="fas fa-chevron-right"></i> Events</span> und über die Möglichkeiten zur <span onclick="event.stopPropagation();hint_navbar('1')" ><i class="fas fa-chevron-right"></i> Zusammenarbeit</span>. Oder mache direkt bei laufenden Projekten unter <span onclick="event.stopPropagation();hint_navbar('3')" ><i class="fas fa-chevron-right"></i> Bürgerbeteiligung</span> mit.
+Erfahre mehr über unsere <span onclick="event.stopPropagation();hint_navbar('2')" ><i class="fas fa-chevron-right"></i> Events</span> und über die Möglichkeiten zur <span onclick="event.stopPropagation();hint_navbar('1')" ><i class="fas fa-chevron-right"></i> Zusammenarbeit</span>.
</p>
</div>
</div>
diff --git a/js/headfoot.js b/js/headfoot.js
index 8d2b692ac3b54f980f0088be4803dd335f438e8d..bd3702a927bfc2bab283e770ed1d259e03b71116 100755
--- a/js/headfoot.js
+++ b/js/headfoot.js
@@ -1,10 +1,11 @@
-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':'/videoconference.html'}, {'name':'...', 'link':'#'}], 'type':'dropdown', 'link':'#'},{'name':'Events', 'combos':[{'name':'Veranstaltungen der HfT', 'link':'http://www.hft-stuttgart.de/Aktuell/Veranstaltungen/'}, {'name':'...', 'link':'#'}], 'type':'dropdown', 'link':'#'},{'name':'Bürgerbeteiligung', 'combos':[{'name':'...', 'link':'#'}, {'name':'...', 'link':'#'}], 'type':'dropdown', 'link':'#'},{'name':'Login', 'combos':[], 'type':'loginbutton', 'link':'/auth-server-DRAFT/login'}];
+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':'/videoconference.html'},/* {'name':'...', 'link':'#'}*/], 'type':'dropdown', 'link':'#'},{'name':'Events', 'combos':[{'name':'Veranstaltungen der HfT', 'link':'http://www.hft-stuttgart.de/Aktuell/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 hft_links = [{'url':'#', 'name':'Kontakt'},{'url':'#', 'name':'Impressum'},{'url':'#', 'name':'Datenschutz'}]
-var socialmedias = [{'url':'https://twitter.com/HFT_Presse', 'name': 'fa-twitter'}, {'url':'https://www.facebook.com/HfTStuttgart/', 'name': 'fa-facebook-square'}, {'url':'https://www.instagram.com/hft_stuttgart/', 'name': 'fa-instagram'}, {'url':'https://de.linkedin.com/school/hochschule-f%C3%BCr-technik-stuttgart-%E2%80%93-university-of-applied-sciences/', 'name': 'fa-linkedin'}, {'url':'https://www.youtube.com/channel/UCi0_JfF2qMZbOhOnNH5PyHA', 'name': 'fa-youtube'}];
+var hft_links = [{'url':'http://www.hft-stuttgart.de/Forschung/M4-Lab/Team/index.html/de', 'name':'Kontakt'},{'url':'http://www.hft-stuttgart.de/Hochschule/Impressum.html/de', 'name':'Impressum'},{'url':'http://www.hft-stuttgart.de/Einrichtungen/Datenschutz/Datenschutz-Homepage', 'name':'Datenschutz'}]
-var footer_images = [{'src':'/images/demo/bbf_logo.png', 'alt':'BMBF'}, {'src':'/images/demo/ihs_logo.jpg', 'alt':'Innovative Hochschule'}]
+var socialmedias = [{'url':'https://twitter.com/InnolabM4', 'name': 'fa-twitter'}, {'url':'https://www.facebook.com/HfTStuttgart/', 'name': 'fa-facebook-square'}, {'url':'https://www.instagram.com/m4_lab/', 'name': 'fa-instagram'}, {'url':'https://de.linkedin.com/school/hochschule-f%C3%BCr-technik-stuttgart-%E2%80%93-university-of-applied-sciences/', 'name': 'fa-linkedin'}, {'url':'https://www.youtube.com/channel/UCi0_JfF2qMZbOhOnNH5PyHA', 'name': 'fa-youtube'}];
+
+var footer_images = [/*{'src':'/images/demo/bbf_logo.png', 'alt':'BMBF'},*/ {'src':'/images/demo/Innovative_Hochschule_Initiative_BMBF_GWK_RGB.jpg', 'alt':'Innovative Hochschule'}]
function prependChild(parent,child){
parent.insertBefore(child, parent.childNodes[0]);
@@ -14,7 +15,7 @@ function userAuthenticated(){
let params = new URLSearchParams(window.location.search);
if(params.get('isAuthenticatedUser')){
return true;
- }else if(document.getElementById('loginswitch')){
+ }else if(document.getElementById('loginswitch')){ //relikt login via OAuth
if(document.getElementById('loginswitch').getAttribute('authenticated') == '1'){
return true;
}
@@ -111,7 +112,7 @@ function head(){
for(let k = 0; k< menu[j].combos.length; k++){
let combolink = document.createElement('a');
combolink.classList.add("dropdown-item");
- if(userAuthenticated()){
+ if(userAuthenticated() || typeof user !== 'undefined'){ //either logged in the old way or logged in using SAML
if(menu[j].combos[k].link.includes('?')){
combolink.href = menu[j].combos[k].link + "&isAuthenticatedUser=true";
}else{
@@ -136,7 +137,7 @@ function head(){
headitem.appendChild(headlink);
navelements.appendChild(headitem);
}
- let searchitem = document.createElement('li');
+/* let searchitem = document.createElement('li');
searchitem.classList.add("nav-item");
let searchinput = document.createElement('input');
searchinput.value='Suche...'
@@ -153,7 +154,7 @@ function head(){
magnifier.id="sf_submit";
magnifier.value="search";
searchitem.appendChild(magnifier);
- navelements.appendChild(searchitem);
+ navelements.appendChild(searchitem);*/
navbardiv.appendChild(navelements);
fluiddiv.appendChild(navbardiv);
navbar.appendChild(fluiddiv);
@@ -223,8 +224,8 @@ function foot(){
for (let k = 0; k< footer_images.length; k++){
let image = document.createElement('img');
image.src = footer_images[k].src;
- image.width="100";
- image.height= "50";
+ image.width="300";
+ image.height= "73";
image.alt = footer_images[k].alt;
imagediv.appendChild(image);
}