diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a22bda541d0c5b25d54f55a85e2bdf3ff64865f3..273c37c201f929bfc816bdecc014e0b205da7be9 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -8,4 +8,5 @@ pages-devel:
tags:
- testing
only:
- - testing
\ No newline at end of file
+ - testing
+ - test_logoutbutton
\ No newline at end of file
diff --git a/routes/helpers.js b/routes/helpers.js
new file mode 100644
index 0000000000000000000000000000000000000000..4645aec75363bf4110ce33f65b8615dc60902f60
--- /dev/null
+++ b/routes/helpers.js
@@ -0,0 +1,11 @@
+var helpers = {
+ stringToArray: function (input){
+ if(input != null){
+ return input.split(',');
+ }else{
+ return null;
+ }
+ }
+};
+
+module.exports = helpers;
\ No newline at end of file
diff --git a/routes/methods.js b/routes/methods.js
index af8cad75b8813f4c56b6fefd4166c083d970e116..9864273b4322e89b4d4e3093f1979b4b8b01986b 100644
--- a/routes/methods.js
+++ b/routes/methods.js
@@ -149,7 +149,19 @@ var methods = {
dbconn.project.query('CALL getAllLists', function (err, rows, fields){
if (err) throw err;
callback(rows[0], err);
- })
+ })
+ },
+ getProjectOverviewById: function(projectId, callback) {
+ dbconn.project.query('CALL GetProjectInformationByProjectID(' + projectId+ ')', function (err, rows, fields){
+ if (err) throw err;
+ callback(rows[0], err);
+ })
+ },
+ getProjectImagesById: function(projectId, callback) {
+ dbconn.project.query('CALL getImagesByProjectID(' + projectId+ ')', function (err, rows, fields){
+ if (err) throw err;
+ callback(rows[0], err);
+ })
},
addProjectOverview: function(data, callback) {
dbconn.project.query('INSERT INTO project_overview SET ?', data, function (err, results, fields){
diff --git a/routes/routes-account.js b/routes/routes-account.js
index 41af5110d8e760a8a87cdd26bde2f00997e20d2b..e075f04db589014da99cba9178f870144f39e322 100644
--- a/routes/routes-account.js
+++ b/routes/routes-account.js
@@ -373,8 +373,8 @@ module.exports = function (app, config, passport, i18n) {
"Thanks,\nM4_LAB Team" */
var emailContent = "Lieber Nutzer,\n\n"+
"wir haben Ihre Anfrage zur Erneuerung Ihres Passwortes erhalten. Falls Sie diese Anfrage nicht gesendet haben, ignorieren Sie bitte diese E-Mail.\n\n"+
- //"Sie können Ihr Passwort mit dem Klick auf diesen Link ändern: http://m4lab.hft-stuttgart.de/account/reset/" + token + "\n" + // test server
- "Sie können Ihr Passwort mit dem Klick auf diesen Link ändern: http://localhost:9989/reset/" + token + "\n" + // localhost
+ "Sie können Ihr Passwort mit dem Klick auf diesen Link ändern: http://m4lab.hft-stuttgart.de/account/reset/" + token + "\n" + // test server
+ //"Sie können Ihr Passwort mit dem Klick auf diesen Link ändern: http://localhost:9989/reset/" + token + "\n" + // localhost
"Dieser Link ist aus Sicherheitsgründen nur für 1 Stunde gültig.\n\n"+mailSignature
var credentialData = {
diff --git a/routes/routes-project.js b/routes/routes-project.js
index acf57fb1c44bad0f56ad2ad5d39802d869534bc0..5cc700e09463c20b1e1c0a4a164df75b4830e753 100644
--- a/routes/routes-project.js
+++ b/routes/routes-project.js
@@ -1,5 +1,7 @@
const methods = require('./methods')
const async = require('async')
+const helpers = require('./helpers')
+
const pictSizeLimit = 1000000 // 1 MB
module.exports = function (app) {
@@ -93,7 +95,10 @@ module.exports = function (app) {
})
app.get('/project_', function (req, res) {
- res.render(lang+'/project/project-simplified');
+ res.render(lang+'/project/project-simplified', {
+ isUserAuthenticated: req.isAuthenticated(),
+ user: req.user
+ });
})
app.get('/addprojectoverview', function (req, res) {
@@ -277,5 +282,63 @@ module.exports = function (app) {
app.post('/updateprojectoverview', function (req, res) {
// only their own project
})
-
+
+ app.get('/projectoverview', function(req, res){
+ async.waterfall([
+ function(done) {
+ methods.getProjectOverviewById(req.query.projectID, function(projectOverview, err) {
+ if (!err) {
+ done(err, projectOverview)
+ }
+ })
+ },
+ function(projectOverview,done){
+ methods.getProjectImagesById(req.query.projectID, function(projectImages, err) {
+ if (!err) {
+ done(err, projectImages, projectOverview)
+ }
+ })
+ },
+ // render projectOverview page
+ function(projectImages, projectOverview, done) {
+
+ console.log(projectImages);
+ partnerWebsites = helpers.stringToArray(projectOverview[0].partner_website);
+ partnerNames = helpers.stringToArray(projectOverview[0].partner_name);
+ awardSites = helpers.stringToArray(projectOverview[0].award_website);
+ awardNames = helpers.stringToArray(projectOverview[0].award_name);
+ sponsorWebsites = helpers.stringToArray(projectOverview[0].sponsor_website);
+ sponsorImgs = helpers.stringToArray(projectOverview[0].sponsor_img);
+ sponsorNames = helpers.stringToArray(projectOverview[0].sponsor_name);
+
+ res.render(lang+'/project/projectOverview', {
+ isUserAuthenticated: req.isAuthenticated(),
+ user: req.user,
+ projectOV: projectOverview,
+ projectImgs: projectImages,
+ partnerWS: partnerWebsites,
+ partnerN: partnerNames,
+ awardWS: awardSites,
+ awardN: awardNames,
+ sponsorWS: sponsorWebsites,
+ sponsorIMG: sponsorImgs,
+ sponsorN: sponsorNames
+ });
+ }
+ ])
+ })
+
+ app.get('/videoconferences', function(req, res){
+ res.render(lang+'/project/videoconferences', {
+ isUserAuthenticated: req.isAuthenticated(),
+ user: req.user,
+ });
+ })
+
+ app.get('/landingpage', function(req, res){
+ res.render(lang+'/project/landingpage', {
+ isUserAuthenticated: req.isAuthenticated(),
+ user: req.user,
+ });
+ })
};
\ No newline at end of file
diff --git a/views/DE/account/forgotPwd.pug b/views/DE/account/forgotPwd.pug
index 8a6b8c567acc795d9a1550ef89f39a1e1beb0013..46210a02d8c8cbbafed3ed8e9b65b3c086ad8246 100644
--- a/views/DE/account/forgotPwd.pug
+++ b/views/DE/account/forgotPwd.pug
@@ -53,4 +53,4 @@ html(lang="de")
// Bootstrap
script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
// M4_LAB
- script(src="https://transfer.hft-stuttgart.de/js/headfoot.js")
+ script(src="/js/headfoot.js")
diff --git a/views/DE/account/home.pug b/views/DE/account/home.pug
index 58b2427c3063a835f93a8be4ad87515929121978..5a19d9bc2e267b21414f62498700c2cfa65a6221 100644
--- a/views/DE/account/home.pug
+++ b/views/DE/account/home.pug
@@ -37,6 +37,7 @@ html(lang="de")
a(class="nav-link" href="/profile" aria-selected="true") Benutzerprofil
a(class="nav-link" href="/security" aria-selected="false") Sicherheitseinstellungen
a(class="nav-link" href="/services" aria-selected="false") Projekte und Dienste
+ a(class="nav-link" href="/logout" aria-selected="false") Logout
div(class="col-sm-9")
p content goes here
diff --git a/views/DE/account/profile.pug b/views/DE/account/profile.pug
index 1f73274856754bac468681482f15c7cbe19ba25a..999fc3c7dd72b035511a9683611f892ffbe46ff9 100644
--- a/views/DE/account/profile.pug
+++ b/views/DE/account/profile.pug
@@ -37,6 +37,7 @@ html(lang="de")
a(class="nav-link" href="#" aria-selected="true") Benutzerprofil
a(class="nav-link" href="/security" aria-selected="false") Sicherheitseinstellungen
a(class="nav-link" href="/services" aria-selected="false") Projekte und Dienste
+ a(class="nav-link" href="/logout" aria-selected="false") Logout
div(class="col-sm-9")
if successes
for success in successes
diff --git a/views/DE/account/registration.pug b/views/DE/account/registration.pug
index b50a6aff150f238fd49bf11b1fcb7baffc4cee08..3de3ed5a731a614fc8baa4eea95465e98a6df82f 100644
--- a/views/DE/account/registration.pug
+++ b/views/DE/account/registration.pug
@@ -81,7 +81,7 @@ html(lang="de")
p <em><small>* Pflichtfeld</small></em>
input#submitBtn(type="submit", class="btn btn-outline-dark btn-block", value="Senden" disabled)
br
- p(class="text-center") Sie haben bereits ein Benutzerkonto? <a href="/login">Melden Sie sich hier an</a>.
+ p(class="text-center") Sie haben bereits ein Benutzerkonto? <a href="/account/">Melden Sie sich hier an</a>.
// jQuery
@@ -94,4 +94,4 @@ html(lang="de")
// M4_LAB
script(src="/js/generalFunction.js")
script(src="/js/registration.js")
- script(src="https://transfer.hft-stuttgart.de/js/headfoot.js")
\ No newline at end of file
+ script(src="/js/headfoot.js")
\ No newline at end of file
diff --git a/views/DE/account/reset.pug b/views/DE/account/reset.pug
index 8f2d8f4c38dec514e9fc5ce1483625ecc395b496..56aa2d9220f06e178f93b0f985d187d61938828c 100644
--- a/views/DE/account/reset.pug
+++ b/views/DE/account/reset.pug
@@ -57,4 +57,4 @@ html(lang="de")
// M4_LAB
script(src="/js/security.js")
script(src="/js/generalFunction.js")
- script(src="https://transfer.hft-stuttgart.de/js/headfoot.js")
+ script(src="/js/headfoot.js")
diff --git a/views/DE/account/security.pug b/views/DE/account/security.pug
index 7df0964e91dc7c5ce494a23ced5b032a0a6df703..fde244aae036a39a3dabc9e4ebfe29b2fd5e1610 100644
--- a/views/DE/account/security.pug
+++ b/views/DE/account/security.pug
@@ -40,6 +40,7 @@ html(lang="de")
a(class="nav-link" href="/profile" aria-selected="true") Benutzerprofil
a(class="nav-link" href="#" aria-selected="false") Sicherheitseinstellungen
a(class="nav-link" href="/services" aria-selected="false") Projekte und Dienste
+ a(class="nav-link" href="/logout" aria-selected="false") Logout
div(class="col-sm-9")
if successes
for success in successes
diff --git a/views/DE/account/services.pug b/views/DE/account/services.pug
index 55f5a1b66458fb86a0bd9a6e2069da57a4d370ea..38d109d09321a411dab8daadd02b71d8382e1edf 100644
--- a/views/DE/account/services.pug
+++ b/views/DE/account/services.pug
@@ -37,6 +37,7 @@ html(lang="de")
a(class="nav-link" href="/profile" aria-selected="true") Benutzerprofil
a(class="nav-link" href="/security" aria-selected="false") Sicherheitseinstellungen
a(class="nav-link" href="#" aria-selected="false") Projekte und Dienste
+ a(class="nav-link" href="/logout" aria-selected="false") Logout
div(class="col-sm-9")
if successes
for success in successes
diff --git a/views/DE/project/landingpage.html b/views/DE/project/landingpage.html
new file mode 100644
index 0000000000000000000000000000000000000000..d9c19d49a9b7381e7a43cd7d7d6842e22663945f
--- /dev/null
+++ b/views/DE/project/landingpage.html
@@ -0,0 +1,68 @@
+ <!-- content -->
+
+ <div class="flex-container" style="align-items:flex-start">
+
+ <div id="Textblock-startseite" class="text" style="flex-basis:600px">
+ <div style="flex-grow: 1">
+ <p>
+ <h1>Als innovative Hochschule wollen wir den Wandel in der Gesellschaft zukunftsfähig und verantwortungsvoll mitgestalten.</h1>
+ <br/>
+ <h2>Unser Ziel ist die Beantwortung gesellschaftlich relevanter Zukunftsfragen.</h2>
+
+ Diese bearbeiten wir durch Forschungs-, Innovations- und Transferprojekte und entwickeln dabei anwendungsbezogene Lösungen.
+ Als Impulsgeber ermöglichen wir den Transfer innovativer Ideen, indem wir Kooperationen fördern und Räume für kreativen Austausch schaffen.
+ <br/>
+ Dabei verknüpfen wir unsere Expertise mit Partnern innerhalb und außerhalb der Region Stuttgart. Wir informieren und involvieren Interessierte und Beteiligte durch die unterschiedlichsten Events und Formate.
+ <br/>
+ <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>.
+ </p>
+ </div>
+ </div>
+
+
+ <div id="carouselExampleIndicators" class="carousel slide" data-ride="carousel" style="flex-basis: 50%" style="flex-grow: 1">
+ <ol class="carousel-indicators">
+ <li data-target="#carouselExampleIndicators" data-slide-to="0"></li>
+ <li data-target="#carouselExampleIndicators" data-slide-to="1" class="active"></li>
+ <li data-target="#carouselExampleIndicators" data-slide-to="2"></li>
+ </ol>
+ <a class="carousel-control-prev" href="#carouselExampleIndicators" role="button" data-slide="prev">
+ <i class="fas fa-chevron-left"></i>
+ <!-- <span class="carousel-control-prev-icon" aria-hidden="true"></span>-->
+ <span class="sr-only">Previous</span>
+ </a>
+ <div class="carousel-inner" role="listbox">
+ <div class="carousel-item">
+ <img class="d-block w-100" src="/images/3DModell_Wermelskirchen_Startseite.jpg" alt="First slide">
+ <div id="Bildunterschrift-slide1" class="Bildunterschrift">
+ <br>
+ <p><a href="/projectoverview?projectID=3" ><i class="fas fa-chevron-right"></i> AG Qualität zur Definition von 3D-Stadtmodellen</a></p> 
+ </div>
+ </div>
+ <div class="carousel-item active">
+ <img class="d-block w-100" src="/images/M4_LAB_Vision.gif" alt="Second slide">
+ <div id="Bildunterschrift-slide2" class="Bildunterschrift">
+ <br>
+ <p><a href="/projectoverview?projectID=1" ><i class="fas fa-chevron-right"></i> Innovationslabor M4_LAB</a></p> 
+ </div>
+ </div>
+ <div class="carousel-item">
+ <img class="d-block w-100" src="/images/SmartPollen_Projekt/SmartPollenM2GIF.gif" alt="Third slide">
+ <div id="Bildunterschrift-slide3" class="Bildunterschrift">
+ <br>
+ <p><a href="/projectoverview?projectID=2" ><i class="fas fa-chevron-right"></i> Studierendenprojekt Smart-Pollen</a></p> 
+ </div>
+ </div>
+ </div>
+ <a class="carousel-control-next" href="#carouselExampleIndicators" role="button" data-slide="next">
+ <i class="fas fa-chevron-right"></i>
+ <!-- <span class="carousel-control-next-icon" aria-hidden="true"></span>-->
+ <span class="sr-only">Next</span>
+ </a>
+ </div>
+
+ </div>
\ No newline at end of file
diff --git a/views/DE/project/landingpage.pug b/views/DE/project/landingpage.pug
new file mode 100644
index 0000000000000000000000000000000000000000..a835ec04d9823d0f847956b9bf6012eaf92b083f
--- /dev/null
+++ b/views/DE/project/landingpage.pug
@@ -0,0 +1,47 @@
+doctype html
+html(lang="de")
+ head
+ title= "Project List"
+ meta(charset="UTF-8")
+ meta(name="viewport", content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no")
+ link(rel="stylesheet", type="text/css", href="https://transfer.hft-stuttgart.de/css/bootstrap/bootstrap.css")
+ link(rel="stylesheet", href="https://use.fontawesome.com/releases/v5.8.2/css/all.css", integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay", crossorigin="anonymous")
+ style.
+ .collapse {
+ display: none;
+ }
+ .collapse.in {
+ display: block;
+ }
+ .collapsing {
+ position: relative;
+ height: 0;
+ overflow: hidden;
+ -webkit-transition-timing-function: ease;
+ -o-transition-timing-function: ease;
+ transition-timing-function: ease;
+ -webkit-transition-duration: .35s;
+ -o-transition-duration: .35s;
+ transition-duration: .35s;
+ -webkit-transition-property: height,visibility;
+ -o-transition-property: height,visibility;
+ transition-property: height,visibility;
+ }
+ .warning {
+ color: red;
+ font-size: 11px;
+ }
+ body
+ include landingpage.html
+
+
+ // jQuery
+ script(src="https://code.jquery.com/jquery-3.3.1.min.js")
+ script(src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js", integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1", crossorigin="anonymous")
+ // Bootstrap
+ script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
+ // Header
+ if isUserAuthenticated
+ script(src="/js/headfootLogout.js")
+ else
+ script(src="/js/headfoot.js")
\ No newline at end of file
diff --git a/views/DE/project/mailinglists.pug b/views/DE/project/mailinglists.pug
index 677d0f32d9ce58ecb0168f48ea42a1eab047dac9..1bc8f5c2c30b1c97c2a1f4bbe859532afd28295f 100644
--- a/views/DE/project/mailinglists.pug
+++ b/views/DE/project/mailinglists.pug
@@ -58,4 +58,4 @@ html(lang="de")
if isUserAuthenticated
script(src="/js/headfootLogout.js")
else
- script(src="https://transfer.hft-stuttgart.de/js/headfoot.js")
\ No newline at end of file
+ script(src="/js/headfoot.js")
\ No newline at end of file
diff --git a/views/DE/project/project-simplified.pug b/views/DE/project/project-simplified.pug
index 0e16cae022289a70870818a2b92ffefa48544937..6dead87fc997ba03a27b908f3246c1fd91d9522d 100644
--- a/views/DE/project/project-simplified.pug
+++ b/views/DE/project/project-simplified.pug
@@ -1 +1,47 @@
-include project.html
\ No newline at end of file
+doctype html
+html(lang="de")
+ head
+ title= "Project List"
+ meta(charset="UTF-8")
+ meta(name="viewport", content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no")
+ link(rel="stylesheet", type="text/css", href="https://transfer.hft-stuttgart.de/css/bootstrap/bootstrap.css")
+ link(rel="stylesheet", href="https://use.fontawesome.com/releases/v5.8.2/css/all.css", integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay", crossorigin="anonymous")
+ style.
+ .collapse {
+ display: none;
+ }
+ .collapse.in {
+ display: block;
+ }
+ .collapsing {
+ position: relative;
+ height: 0;
+ overflow: hidden;
+ -webkit-transition-timing-function: ease;
+ -o-transition-timing-function: ease;
+ transition-timing-function: ease;
+ -webkit-transition-duration: .35s;
+ -o-transition-duration: .35s;
+ transition-duration: .35s;
+ -webkit-transition-property: height,visibility;
+ -o-transition-property: height,visibility;
+ transition-property: height,visibility;
+ }
+ .warning {
+ color: red;
+ font-size: 11px;
+ }
+ body
+ include project.html
+
+
+ // jQuery
+ script(src="https://code.jquery.com/jquery-3.3.1.min.js")
+ script(src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js", integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1", crossorigin="anonymous")
+ // Bootstrap
+ script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
+ // Header
+ if isUserAuthenticated
+ script(src="/js/headfootLogout.js")
+ else
+ script(src="/js/headfoot.js")
\ No newline at end of file
diff --git a/views/DE/project/project.html b/views/DE/project/project.html
index 6c25dbe8f06d48d1ebdce67cba4ac777c10d38c6..df461962e13ae4c15eb13caa79d5e4a948d96260 100644
--- a/views/DE/project/project.html
+++ b/views/DE/project/project.html
@@ -1,19 +1,3 @@
-<!DOCTYPE html>
-<html>
- <head>
- <title>Project List</title>
- <meta charset="UTF-8">
- <meta name="viewport", content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no">
- <link rel="stylesheet" href="https://transfer.hft-stuttgart.de/css/bootstrap/bootstrap.css" type="text/css">
- <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous">
- <style>
- .collapse {display: none;}
- .collapse.in {display: block;}
- .collapsing {position: relative;height: 0;overflow: hidden;-webkit-transition-timing-function: ease;-o-transition-timing-function: ease;transition-timing-function: ease;-webkit-transition-duration: .35s;-o-transition-duration: .35s;transition-duration: .35s;-webkit-transition-property: height,visibility;-o-transition-property: height,visibility;transition-property: height,visibility;}
- </style>
- </head>
-
- <body>
<div class="container">
<hr />
<!-- text: Zweck dieser Seite / purpose of this page -->
@@ -83,13 +67,4 @@
</ol>
<!-- / content body -->
- </div>
-
- <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
- <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js" integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1" crossorigin="anonymous"></script>
- <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
- <!-- M4_LAB -->
- <script src="https://transfer.hft-stuttgart.de/js/headfoot.js"></script>
- </body>
-
-</html>
\ No newline at end of file
+ </div>
\ No newline at end of file
diff --git a/views/DE/project/projectOverview.pug b/views/DE/project/projectOverview.pug
new file mode 100644
index 0000000000000000000000000000000000000000..7cf545fb6210357de971c9550079ac7210ca1314
--- /dev/null
+++ b/views/DE/project/projectOverview.pug
@@ -0,0 +1,168 @@
+doctype html
+html(lang="de")
+ head
+ title= "Project List"
+ meta(charset="UTF-8")
+ meta(name="viewport", content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no")
+ link(rel="stylesheet", type="text/css", href="https://transfer.hft-stuttgart.de/css/bootstrap/bootstrap.css")
+ link(rel="stylesheet", href="https://use.fontawesome.com/releases/v5.8.2/css/all.css", integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay", crossorigin="anonymous")
+ style.
+ .collapse {
+ display: none;
+ }
+ .collapse.in {
+ display: block;
+ }
+ .collapsing {
+ position: relative;
+ height: 0;
+ overflow: hidden;
+ -webkit-transition-timing-function: ease;
+ -o-transition-timing-function: ease;
+ transition-timing-function: ease;
+ -webkit-transition-duration: .35s;
+ -o-transition-duration: .35s;
+ transition-duration: .35s;
+ -webkit-transition-property: height,visibility;
+ -o-transition-property: height,visibility;
+ transition-property: height,visibility;
+ }
+ .warning {
+ color: red;
+ font-size: 11px;
+ }
+ body
+ div
+ for project in projectOV
+ div(class="flex-container")
+ div(class="main")
+ h1 #{project.title}
+ div(style="float:right; margin-left:30px; margin-bottom:0px; width:50%;")
+ img(src=project.src, width="100%")
+ p(style="text-align:right") #{project.caption}
+
+ h2 Projektüberblick
+ p !{project.overview}
+ br
+ b keywords:
+ span #{project.keywords}
+ br
+ h2 Fragestellung
+ p !{project.question}
+ p
+ h2 Vorgehensweise
+ p !{project.approach}
+ br
+ br
+ h2 Ergebnis und Nutzung
+ p !{project.result}
+ div(class="side")
+ for image in projectImgs
+ if image.pos == '2' || image.pos == '3'
+ div(class="projectimg")
+ <img src="#{image.src}", width="100%">
+ if image.caption
+ span #{image.caption}
+ </img>
+
+ div(class="fakeimg")
+ if project.leader_lastname
+ p
+ b Projektleitung HfT:
+ <a href="mailto: #{project.leader_email}">#{project.leader_lastname}</a>
+ div(class="fakeimg")
+ if project.contact_lastname
+ p
+ b Ansprechperson:
+ <a href="mailto: #{project.contact_email}">#{project.contact_lastname} </a>
+ div(class="fakeimg")
+ if project.announcement
+ p
+ b Ausschreibung:
+ span !{project.announcement}
+
+ div(class="fakeimg")
+ if project.partner_name
+ p
+ b Projektpartner:
+ br
+ for website, i in partnerWS
+ if website
+ <a href="#{website}">#{partnerN[i]}</a>
+ br
+ else
+ #{partnerN[i]}
+ br
+
+ div(class="fakeimg")
+ if project.term
+ p
+ b Projektlaufzeit:
+ span #{project.term}
+
+ div(class="fakeimg")
+ if project.award_name
+ p
+ b Preise:
+ br
+ for awardsite, i in awardWS
+ if awardsite
+ <a href="#{awardsite}">#{awardN[i]}</a>
+ br
+ else
+ #{awardN[i]}
+ br
+
+ div(class="fakeimg")
+ if project.administrator
+ p
+ b Projektträger:
+ span #{project.administrator}
+
+ div(class="fakeimg")
+ if project.sponsor_name
+ p
+ b Geldgeber:
+ br
+ for website, i in sponsorWS
+ if website
+ <a href="#{website}">#{sponsorN[i]}</a>
+ br
+ else
+ #{sponsorN[i]}
+ br
+
+ div(class="fakeimg")
+ if project.website || project.further_details
+ p
+ b Mehr Informationen:
+ if project.website
+ <a href="#{project.website}">#{project.website}</a>
+ br
+ span !{project.further_details}
+
+ div(class="Downloads" style="height:200px;")
+ h5 Downloads
+ p
+ i(class="fas fa-file-download")
+ a(href="./images/M4_LAB_Projekt/transferstrategie.pdf" download target="_blank") Transferstrategie der HfT Stuttgart
+
+ div(class="Projektlogos")
+ img(src="./images/M4_LAB_Projekt/WRS_Logo.jpg" width="32%")
+ img(src="./images/M4_LAB_Projekt/IBA2027_Logo.jpg" width="32%")
+ img(src="./images/M4_LAB_Projekt/GWK_Logo.jpg" width="32%")
+ br
+ br
+ img(src="./images/M4_LAB_Projekt/bbf_logo.png" width="32%")
+ img(src="./images/M4_LAB_Projekt/ihs_logo.jpg" width="32%")
+
+ //jQuery
+ script(src="https://code.jquery.com/jquery-3.3.1.min.js")
+ script(src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js", integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1", crossorigin="anonymous")
+ // Bootstrap
+ script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
+ // Header
+ if isUserAuthenticated
+ script(src="/js/headfootLogout.js")
+ else
+ script(src="/js/headfoot.js")
\ No newline at end of file
diff --git a/views/DE/project/projects.pug b/views/DE/project/projects.pug
index 56f65c10de4655b786ec93a865b6e57adc5f5e10..78a12ecfa73a2435d13067a944440feae19ecaaa 100644
--- a/views/DE/project/projects.pug
+++ b/views/DE/project/projects.pug
@@ -68,8 +68,8 @@ html(lang="de")
td #[a(class="nav-link", href="mailto:"+ item.cp) #{item.cp}]
td #[a(class="nav-link", href="https://m4lab.hft-stuttgart.de/projectoverview?projectID="+item.id) Zur Projektübersicht]
if item.gitlab
- a(class="nav-link", href=item.gitlab+"/tree/master") Projektdateien
- a(class="nav-link", href=item.gitlab+"/wikis/home") Projektwiki
+ a(class="nav-link", href="https://transfer.hft-stuttgart.de/gitlab/"+item.gitlab+"/tree/master") Projektdateien
+ a(class="nav-link", href="https://transfer.hft-stuttgart.de/gitlab/"+item.gitlab+"/wikis/home") Projektwiki
else
a(class="nav-link", href="#") Projektdateien
a(class="nav-link", href="#") Projektwiki
@@ -114,4 +114,4 @@ html(lang="de")
if isUserAuthenticated
script(src="/js/headfootLogout.js")
else
- script(src="https://transfer.hft-stuttgart.de/js/headfoot.js")
\ No newline at end of file
+ script(src="/js/headfoot.js")
\ No newline at end of file
diff --git a/views/DE/project/videoconferences.pug b/views/DE/project/videoconferences.pug
new file mode 100644
index 0000000000000000000000000000000000000000..12fc17a9e3cc681096f35dcc1790bf36f1db7450
--- /dev/null
+++ b/views/DE/project/videoconferences.pug
@@ -0,0 +1,70 @@
+doctype html
+html(lang="de")
+ head
+ title= "Project List"
+ meta(charset="UTF-8")
+ meta(name="viewport", content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no")
+ link(rel="stylesheet", type="text/css", href="https://transfer.hft-stuttgart.de/css/bootstrap/bootstrap.css")
+ link(rel="stylesheet", href="https://use.fontawesome.com/releases/v5.8.2/css/all.css", integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay", crossorigin="anonymous")
+ style.
+ .collapse {
+ display: none;
+ }
+ .collapse.in {
+ display: block;
+ }
+ .collapsing {
+ position: relative;
+ height: 0;
+ overflow: hidden;
+ -webkit-transition-timing-function: ease;
+ -o-transition-timing-function: ease;
+ transition-timing-function: ease;
+ -webkit-transition-duration: .35s;
+ -o-transition-duration: .35s;
+ transition-duration: .35s;
+ -webkit-transition-property: height,visibility;
+ -o-transition-property: height,visibility;
+ transition-property: height,visibility;
+ }
+ .warning {
+ color: red;
+ font-size: 11px;
+ }
+ body
+ div(class="flex-container")
+ div(class="main")
+ h1 Videokonferenzen
+
+ p Wir bieten grundsätzlich zwei Möglichkeiten an, Viodeokonferenzen abzuhalten:
+
+ h2 Jitsi
+
+ p
+ <a href="https://jitsi.org">Jitsi</a> ist ein Opensource Videokonferenz-System, welches es ermöglicht, direkt über den Browser Videokonferenzen abzuhalten.
+ br
+ span Da die Hauptlast bei diesem System Clientseitig getragen wird, raten wir zu einer Nutzung auf Desktopsystemen bzw. Laptops.
+
+ p Um eine Videokonferenz starten zu können, muss sich zunächst ein Organisator am Portal anmelden und die Videokonferenz eröffnen. Weitere Teilnehmer können dann ohne Anmeldung einfach über einen Link hinzugefügt werden.
+
+ p Der Zugang zu Jitsi findet sich <a href="https://telemeeting.hft-stuttgart.de">hier</a>
+
+ h2 GoToMeeting
+
+ p Eine weitere Option, die wir anbieten werden, ist die Organisation von Videokonferenzen via GoToMeeting
+
+ p Mehr Informationen darüber erhalten Sie zu gegebener Zeit an dieser Stelle
+
+
+
+
+ //jQuery
+ script(src="https://code.jquery.com/jquery-3.3.1.min.js")
+ script(src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.7/umd/popper.min.js", integrity="sha384-UO2eT0CpHqdSJQ6hJty5KVphtPhzWj9WO1clHTMGa3JDZwrnQq4sF86dIHNDz0W1", crossorigin="anonymous")
+ // Bootstrap
+ script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
+ // Header
+ if isUserAuthenticated
+ script(src="/js/headfootLogout.js")
+ else
+ script(src="/js/headfoot.js")
\ No newline at end of file