From 8fe902fd9286b2f6ac1d45e54c3148a093b407df Mon Sep 17 00:00:00 2001
From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de>
Date: Thu, 16 Jul 2020 08:51:11 +0200
Subject: [PATCH] added bmbf logo and improved pipeline with tests for default
values
---
.gitlab-ci.yml | 11 +++++++++++
public/settings.js | 19 ++++++++++++++-----
2 files changed, 25 insertions(+), 5 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f48e8a1..d98c2aa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,17 @@
variables:
EXPORT_DIR: "/var/www/html/pages"
+stages:
+ - test
+ - deploy
+
+pages-test:
+ stage: test
+ script:
+ - (! grep 'projektname= ""' public/settings.js)
+ - (! grep 'projektseitenlink= ""' public/settings.js)
+ - (! grep 'Max Mustermann' public/kontakt.html)
+
pages-master:
stage: deploy
script:
diff --git a/public/settings.js b/public/settings.js
index 00aca7e..0c8162b 100644
--- a/public/settings.js
+++ b/public/settings.js
@@ -1,10 +1,9 @@
//TODO Projektnamen setzen:
-let projectname= ""
+let projektname= ""
// TODO Link zur Projektseite setzen
let projektseitenlink= ""
// TODO URL zum Projektlogo setzen
-let projectlogourl = ""
-
+let projektlogourl = ""
// KEINE ÄNDERUNG NACH DIESER ZEILE!
@@ -25,9 +24,14 @@ let newslink = document.createElement("a");
newslink.href="aktuelles.html"
newslink.innerHTML="Aktuelles"
menu.appendChild(newslink);
+//link4: Kontakt
+let contactlink = document.createElement("a");
+contactlink.href="kontakt.html"
+contactlink.innerHTML="Kontakt"
+menu.appendChild(contactlink);
//set projectname
-document.getElementById("projectname").innerHTML=projectname;
+document.getElementById("projectname").innerHTML=projektname;
let hftlogo = document.createElement("a");
let topbar = document.getElementById("topbar");
@@ -37,6 +41,11 @@ topbar.insertBefore(hftlogo,menu);
if(projectlogourl != ""){
let projectlogo = document.createElement("a");
projectlogo.href=projektseitenlink;
- projectlogo.innerHTML="<img src='" + projectlogourl + "'/>";
+ projectlogo.innerHTML="<img src='" + projektlogourl + "'/>";
topbar.insertBefore(projectlogo,menu);
}
+
+//footer: add logo innovatice Hochschule
+let bmbf = document.createElement('div');
+bmbf.innerHTML = "<img src='https://transfer.hft-stuttgart.de/img/footer/Innovative_Hochschule_Initiative_BMBF_GWK_RGB.png' alt='Innovative Hochschule' style='height:90px'/>"
+document.body.appendChild(bmbf);
--
GitLab