From 75d355117b3c867297f5f95fb8591fff542493c5 Mon Sep 17 00:00:00 2001
From: Wolfgang Knopki <wolfgang.knopki@hft-stuttgart.de>
Date: Fri, 20 Mar 2020 17:15:12 +0100
Subject: [PATCH] simplified project list with dynamic header
---
routes/routes-project.js | 5 ++-
views/DE/project/project-simplified.pug | 48 ++++++++++++++++++++++++-
views/DE/project/project.html | 27 +-------------
3 files changed, 52 insertions(+), 28 deletions(-)
diff --git a/routes/routes-project.js b/routes/routes-project.js
index 3816d36f..6536e77d 100644
--- a/routes/routes-project.js
+++ b/routes/routes-project.js
@@ -93,7 +93,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) {
diff --git a/views/DE/project/project-simplified.pug b/views/DE/project/project-simplified.pug
index 0e16cae0..5fa716cf 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="https://transfer.hft-stuttgart.de/js/headfoot.js")
\ No newline at end of file
diff --git a/views/DE/project/project.html b/views/DE/project/project.html
index 6c25dbe8..df461962 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
--
GitLab