fixing /projectOverview

routes/routes-project.js

@@ -329,15 +329,14 @@ module.exports = function (app) {
       },
       // 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);
+        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(),

views/DE/project/projectOverview.pug

@@ -4,59 +4,32 @@ html(lang="de")
     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", type="text/css", href="https://transfer.hft-stuttgart.de/css/bootstrap.min.css")
+    link(rel="stylesheet", type="text/css", href="https://transfer.hft-stuttgart.de/css/m4lab.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
+    div(class="container")
         for project in projectOV
-            div(class="flex-container")
-                div(class="main")
+            div(class="row")
+                div(class="col-sm-8 pt-3")
                     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
+                    h2(class="pt-4") Projektüberblick
                     p !{project.overview}
                     br
                     b keywords:
                     span #{project.keywords}
-                    br
-                    h2 Fragestellung
+                    h2(class="pt-4") Fragestellung
                     p !{project.question}
-                    p
-                    h2 Vorgehensweise
+                    h2(class="pt-4") Vorgehensweise
                     p !{project.approach}
-                    br
-                    br
-                    h2 Ergebnis und Nutzung
+                    h2(class="pt-4") Ergebnis und Nutzung
                     p !{project.result}
-                div(class="side")
+                div(class="col-sm-4 pt-3" style="background-color: #f1f1f1")
                     for image in projectImgs
                         if image.pos == '2' || image.pos == '3'
                             div(class="projectimg")
@@ -141,11 +114,9 @@ html(lang="de")
                             br
                             span !{project.further_details}
 
+                    if project.pname == 'M4LAB'
                         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%")
@@ -153,8 +124,7 @@ html(lang="de")
                             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%")
+                            img(src="./images/M4_LAB_Projekt/Innovative_Hochschule_Initiative_BMBF_GWK_RGB.png" width="100%")
 
     //jQuery
     script(src="https://code.jquery.com/jquery-3.3.1.min.js")
@@ -162,7 +132,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")
     // Header
-    if isUserAuthenticated
-        script(src="https://m4lab.hft-stuttgart.de/js/headfootLogout.js")
+    script(src="https://transfer.hft-stuttgart.de/js/headfoot.js")
\ No newline at end of file
-    else
-        script(src="https://m4lab.hft-stuttgart.de/js/headfoot.js")
\ No newline at end of file