From c16ddf93c5b0c45604329c508555c8dac024d11e Mon Sep 17 00:00:00 2001
From: Rosanny <rosanny.sihombing@hft-stuttgart.de>
Date: Fri, 10 Jul 2020 14:19:08 +0200
Subject: [PATCH] fixing views
---
views/DE/project/addProjectOverview.pug | 25 +----
views/DE/project/manageProjectOverview.pug | 124 +++++++++++++++++++++
views/DE/project/projects.pug | 112 +++++++++++++------
views/DE/project/projects_.pug | 51 +++++++++
views/DE/project/updateProjectOverview.pug | 0
5 files changed, 254 insertions(+), 58 deletions(-)
create mode 100644 views/DE/project/manageProjectOverview.pug
create mode 100644 views/DE/project/projects_.pug
delete mode 100644 views/DE/project/updateProjectOverview.pug
diff --git a/views/DE/project/addProjectOverview.pug b/views/DE/project/addProjectOverview.pug
index 5d34233..44a17b6 100644
--- a/views/DE/project/addProjectOverview.pug
+++ b/views/DE/project/addProjectOverview.pug
@@ -4,31 +4,12 @@ html(lang="de")
title= "Add Project Overview"
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")
// jQuery UI - Datepicker
link(rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css")
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;
@@ -134,7 +115,7 @@ 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
- script(src="https://m4lab.hft-stuttgart.de/js/headfootLogout.js")
+ script(src="https://transfer.hft-stuttgart.de/js/headfoot.js")
script.
$( function() {
$.datepicker.setDefaults( $.datepicker.regional["de"] );
diff --git a/views/DE/project/manageProjectOverview.pug b/views/DE/project/manageProjectOverview.pug
new file mode 100644
index 0000000..1219324
--- /dev/null
+++ b/views/DE/project/manageProjectOverview.pug
@@ -0,0 +1,124 @@
+doctype html
+html(lang="de")
+ head
+ title= "Manage Project Overview"
+ 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.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")
+ // jQuery UI - Datepicker
+ link(rel="stylesheet" href="//code.jquery.com/ui/1.12.1/themes/base/jquery-ui.css")
+ style.
+ .warning {
+ color: red;
+ font-size: 11px;
+ }
+ body
+ div(class="container-fluid")
+ div(class="row")
+ div(class="col-md-6 offset-md-2")
+ h4(class="mb-3 font-weight-bold") Manage Project
+ div(class="col-md-6 offset-md-3")
+ if errors
+ for error, i in errors
+ div.alert.alert-danger.alert-dismissible.fade.show #{ error }
+ a(class="close", href="#", data-dismiss="alert", aria-label="close") ×
+ form(method="POST" encType="multipart/form-data")
+ div(class='form-row')
+ div(class='form-group col-md-12')
+ input#inputPname(name="title" class="form-control" type="text" placeholder="Projekttitel*" value=overview.title required)
+ div(class="form-group col-md-12")
+ input#inputTitle(name="pname" class="form-control" type="text" placeholder="Akronym*" value=overview.pname required)
+ div(class="form-group col-md-12")
+ input#inputSummary(name="summary" class="form-control" type="text" placeholder="Kurzbeschreibung")
+ div(class='form-group col-md-12')
+ select#inputCategory(name="category", class="form-control")
+ option(value="") - Projektkategorie -
+ option(value="Experten-Gruppe") Experten-Gruppe
+ option(value="Student-Projekt") Student-Projekt
+ option(value="Lehr Projekt") Lehr Projekt
+ option(value="Transfer-projekt") Transfer-projekt
+ div(class="form-group col-md-12")
+ div(class='form-group row')
+ label(for="projectLogo" class="col-sm-3 col-form-label") Projektlogo (max. 1 MB)
+ div(class="col-md-9")
+ input#inputLogo(name="logo" class="form-control" type="file")
+ div(class="form-group col-md-12")
+ div(class="input-group mb-3")
+ input#inputGitlabURL(name="gitlabURL" type="text" class="form-control" placeholder="M4_LAB GitLab Project URL, z.B. https://transfer.hft-stuttgart.de/gitlab/username/projectname")
+ div(class="input-group-prepend")
+ div(class="input-group-text")
+ input#inputWiki(name="wiki" type="checkbox")
+ | Wiki
+
+ h5(class="mb-3 font-weight-bold") Inhalte
+ div(class='form-row')
+ div(class='form-group col-md-12')
+ textarea#inputOverview(name="overview" class="form-control" type="text" rows="5" placeholder="Projektüberblick")
+ div(class="form-group col-md-12")
+ textarea#inputQuestion(name="question" class="form-control" type="text" rows="5" placeholder="Fragestellung")
+ div(class='form-group col-md-12')
+ textarea#inputApproach(name="approach" class="form-control" type="text" rows="5" placeholder="Vorgehensweise")
+ div(class="form-group col-md-12")
+ textarea#inputResult(name="result" class="form-control" type="text" rows="5" placeholder="Ergebnis und Nutzung")
+ div(class="form-group col-md-12")
+ input#inputKeywords(name="keywords" class="form-control" type="text" placeholder="keywords" value=overview.keywords)
+ h5(class="mb-3 font-weight-bold") Projektinformationen
+ div(class='form-row')
+ div(class='form-group col-md-12')
+ input#inputAnnouncement(name="announcement" class="form-control" type="text" rows="5" placeholder="Ausschreibung")
+ div(class="form-group col-md-12")
+ div(class='form-group row')
+ label(for="projectLogo" class="col-sm-2 col-form-label") Laufzeit
+ div(class="col-md-5")
+ input#inputTermFrom(name="termForm" class="form-control" type="text" placeholder="von (dd.mm.yyyy)")
+ div(class="col-md-5")
+ input#inputTermTo(name="termTo" class="form-control" type="text" placeholder="bis (dd.mm.yyyy)")
+ div(class='form-group col-md-12')
+ textarea#inputFurtherDetails(name="furtherDetails" class="form-control" type="text" rows="5" placeholder="Weitere Informationen (bspw. Links zu Berichten)")
+ div(class="form-group col-md-12")
+ input#inputWebsite(name="website" class="form-control" type="text" placeholder="Projekt-Website")
+ h5(class="mb-3 font-weight-bold") Bilder
+ div(class='form-row')
+ div(class="form-group col-md-12")
+ div(class='form-group row')
+ label(for="projectPicture" class="col-sm-3 col-form-label") Projektbild (max. 1 MB)
+ div(class="col-md-9")
+ input#inputSrc(name="src" class="form-control" type="file")
+ div(class="form-group col-md-12")
+ input#inputCaption(name="caption" class="form-control" type="text" placeholder="Bildunterschrift/Bildquelle")
+ h5(class="mb-3 font-weight-bold") Kontakt
+ div(class='form-row')
+ div(class="form-group col-md-2")
+ <p class="font-weight-normal">Ansprechperson</p>
+ div(class="form-group col-md-5")
+ input#inputContactName(name="contactName" class="form-control" type="text" placeholder="Anrede, Titel, Vorname, Nachname")
+ div(class="form-group col-md-5")
+ input#inputContactEmail(name="contactEmail" class="form-control" type="email" placeholder="E-Mail-Adresse" value=overview.contact_email)
+ div(class="form-group col-md-2")
+ <p class="font-weight-normal">Projektleitung</p>
+ div(class="form-group col-md-5")
+ input#inputLeaderName(name="leaderName" class="form-control" type="text" placeholder="Anrede, Titel, Vorname, Nachname")
+ div(class="form-group col-md-5")
+ input#inputLeaderEmail(name="leaderEmail" class="form-control" type="email" placeholder="E-Mail-Adresse" value=overview.leader_email)
+ p <em><small>* Pflichtfeld</small></em>
+ input#submitBtn(type="submit", class="btn btn-outline-dark btn-block", value="Submit")
+
+ // 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")
+ // jQuery UI - Datepicker
+ script(src="https://code.jquery.com/ui/1.12.1/jquery-ui.js")
+ script(src="/js/jquery-ui/i18n/datepicker-de.js")
+ //script(src="i18n/datepicker-de.js")
+ // Bootstrap
+ script(src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous")
+ // Header
+ script(src="https://transfer.hft-stuttgart.de/js/headfootLogout.js")
+ script.
+ $( function() {
+ $.datepicker.setDefaults( $.datepicker.regional["de"] );
+ $("#inputTermFrom").datepicker();
+ $("#inputTermTo").datepicker();
+ });
\ No newline at end of file
diff --git a/views/DE/project/projects.pug b/views/DE/project/projects.pug
index 2e9006a..55682c0 100644
--- a/views/DE/project/projects.pug
+++ b/views/DE/project/projects.pug
@@ -4,48 +4,88 @@ 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.
- .help .card-title > a:before {
- float: right !important;
- content: "-";
- padding-right: 5px;
- }
- .help .card-title > a.collapsed:before {
- float: right !important;
- content: "+";
- }
- .help h3 > a {
- color: #8a348b;
- text-decoration: none;
- display: block;
- }
- .help a {
- display: inline;
- }
- .help .card > .card-header {
- color: #fff;
- }
- .card-title {
- margin-bottom: 0.5rem;
- margin-top: 0.5rem;
- }
- #infoicon {
- color: #8a348b;
- }
- body
- include project.html
+ body
+ div(class="container-fluid")
+ if isUserAuthenticated
+ p Auf dieser Seite sehen Sie die Liste der über dieses Portal veröffentlichten Projekte.
+ a(href="/addprojectoverview" class="btn btn-primary" role="button" aria-pressed="true") Projekt anlegen
+ else
+ p Auf dieser Seite sehen Sie die Liste der über dieses Portal veröffentlichten Projekte.
+ p Möchten Sie ein neues Projekt anlegen, dann klicken Sie bitte auf #[a(href="/addprojectoverview") Anmelden und Projekt anlegen]
+ if successes
+ for success in successes
+ div.alert.alert-success.alert-dismissible #{ success }
+ a(class="close", href="#", data-dismiss="alert", aria-label="close") ×
+ // Active projects
+ h3(class="mb-3 font-weight-bold") Aktive Projekte
+ table(class="table table-striped")
+ thead
+ tr
+ th Logo
+ th Akronym
+ th Title
+ th Kernziel
+ th Kategorie
+ th Ansprechpartner
+ th Projektinhalte
+ tbody
+ for item in active
+ tr
+ //td #{item.status}
+ td
+ img(src=item.logo, width="40", height="40")
+ td #{item.akronym}
+ td #{item.title}
+ td #{item.summary}
+ td #{item.category}
+ 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="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
+ br
+ // Non-active projects
+ h3(class="mb-3 font-weight-bold") Abgeschlossene Projekte
+ table(class="table table-striped")
+ thead
+ tr
+ th Logo
+ th Akronym
+ th Title
+ th Kernziel
+ th Kategorie
+ th Ansprechpartner
+ th Projektinhalte
+ tbody
+ for item in nonActive
+ tr
+ //td #{item.status}
+ td
+ img(src=item.logo, width="40", height="40")
+ td #{item.akronym}
+ td #{item.title}
+ td #{item.summary}
+ td #{item.category}
+ 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="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
// 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")
+ script(src="https://transfer.hft-stuttgart.de/js/headfoot.js")
\ No newline at end of file
diff --git a/views/DE/project/projects_.pug b/views/DE/project/projects_.pug
new file mode 100644
index 0000000..2e9006a
--- /dev/null
+++ b/views/DE/project/projects_.pug
@@ -0,0 +1,51 @@
+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.
+ .help .card-title > a:before {
+ float: right !important;
+ content: "-";
+ padding-right: 5px;
+ }
+ .help .card-title > a.collapsed:before {
+ float: right !important;
+ content: "+";
+ }
+ .help h3 > a {
+ color: #8a348b;
+ text-decoration: none;
+ display: block;
+ }
+ .help a {
+ display: inline;
+ }
+ .help .card > .card-header {
+ color: #fff;
+ }
+ .card-title {
+ margin-bottom: 0.5rem;
+ margin-top: 0.5rem;
+ }
+ #infoicon {
+ color: #8a348b;
+ }
+ 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")
diff --git a/views/DE/project/updateProjectOverview.pug b/views/DE/project/updateProjectOverview.pug
deleted file mode 100644
index e69de29..0000000
--
GitLab