From fb991a715f0fddf576ffd2a93ac5b7db93822760 Mon Sep 17 00:00:00 2001
From: Rosanny <rosanny.sihombing@hft-stuttgart.de>
Date: Fri, 6 Mar 2020 14:43:02 +0100
Subject: [PATCH] minor updates
---
views/DE/account/home.pug | 6 +-
views/DE/account/profile.pug | 4 +-
views/DE/account/security.pug | 4 +-
views/DE/account/services.pug | 4 +-
views/DE/{ => project}/mailinglists.pug | 0
views/EN/{ => account}/forgotPwd.pug | 0
views/EN/{ => account}/home.pug | 8 +-
views/EN/{ => account}/profile.pug | 4 +-
views/EN/{ => account}/registration.pug | 0
views/EN/{ => account}/reset.pug | 0
views/EN/{ => account}/security.pug | 4 +-
views/EN/{ => account}/services.pug | 4 +-
views/EN/project/addProjectOverview.pug | 115 +++++++++++++++++++++++
views/EN/{ => project}/mailinglists.pug | 2 +-
views/EN/project/projects.pug | 117 ++++++++++++++++++++++++
15 files changed, 252 insertions(+), 20 deletions(-)
rename views/DE/{ => project}/mailinglists.pug (100%)
rename views/EN/{ => account}/forgotPwd.pug (100%)
rename views/EN/{ => account}/home.pug (84%)
rename views/EN/{ => account}/profile.pug (96%)
rename views/EN/{ => account}/registration.pug (100%)
rename views/EN/{ => account}/reset.pug (100%)
rename views/EN/{ => account}/security.pug (96%)
rename views/EN/{ => account}/services.pug (94%)
create mode 100644 views/EN/project/addProjectOverview.pug
rename views/EN/{ => project}/mailinglists.pug (99%)
create mode 100644 views/EN/project/projects.pug
diff --git a/views/DE/account/home.pug b/views/DE/account/home.pug
index f08d9ee7..58b2427c 100644
--- a/views/DE/account/home.pug
+++ b/views/DE/account/home.pug
@@ -34,9 +34,9 @@ html(lang="de")
h5
span #{user.firstname} #{user.lastname}
div(class="nav flex-column nav-pills", id="v-pills-tab", role="tablist", aria-orientation="vertical")
- a(class="nav-link" href="/account/profile" aria-selected="true") Benutzerprofil
- a(class="nav-link" href="/account/security" aria-selected="false") Sicherheitseinstellungen
- a(class="nav-link" href="/account/services" aria-selected="false") Projekte und Dienste
+ 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
div(class="col-sm-9")
p content goes here
diff --git a/views/DE/account/profile.pug b/views/DE/account/profile.pug
index e4d7e260..32a2aff1 100644
--- a/views/DE/account/profile.pug
+++ b/views/DE/account/profile.pug
@@ -35,8 +35,8 @@ html(lang="de")
span #{user.firstname} #{user.lastname}
div(class="nav flex-column nav-pills", id="v-pills-tab", role="tablist", aria-orientation="vertical")
a(class="nav-link" href="#" aria-selected="true") Benutzerprofil
- a(class="nav-link" href="/account/security" aria-selected="false") Sicherheitseinstellungen
- a(class="nav-link" href="/account/services" aria-selected="false") Projekte und Dienste
+ a(class="nav-link" href="/security" aria-selected="false") Sicherheitseinstellungen
+ a(class="nav-link" href="/services" aria-selected="false") Projekte und Dienste
div(class="col-sm-9")
if successes
for success in successes
diff --git a/views/DE/account/security.pug b/views/DE/account/security.pug
index 6db09112..560d32bc 100644
--- a/views/DE/account/security.pug
+++ b/views/DE/account/security.pug
@@ -37,9 +37,9 @@ html(lang="de")
h5
span #{user.firstName} #{user.lastName}
div(class="nav flex-column nav-pills", id="v-pills-tab", role="tablist", aria-orientation="vertical")
- a(class="nav-link" href="/account/profile" aria-selected="true") Benutzerprofil
+ a(class="nav-link" href="/profile" aria-selected="true") Benutzerprofil
a(class="nav-link" href="#" aria-selected="false") Sicherheitseinstellungen
- a(class="nav-link" href="/account/services" aria-selected="false") Projekte und Dienste
+ a(class="nav-link" href="/services" aria-selected="false") Projekte und Dienste
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 6ab101f3..55f5a1b6 100644
--- a/views/DE/account/services.pug
+++ b/views/DE/account/services.pug
@@ -34,8 +34,8 @@ html(lang="de")
h5
span #{user.firstName} #{user.lastName}
div(class="nav flex-column nav-pills", id="v-pills-tab", role="tablist", aria-orientation="vertical")
- a(class="nav-link" href="/account/profile" aria-selected="true") Benutzerprofil
- a(class="nav-link" href="/account/security" aria-selected="false") Sicherheitseinstellungen
+ 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
div(class="col-sm-9")
if successes
diff --git a/views/DE/mailinglists.pug b/views/DE/project/mailinglists.pug
similarity index 100%
rename from views/DE/mailinglists.pug
rename to views/DE/project/mailinglists.pug
diff --git a/views/EN/forgotPwd.pug b/views/EN/account/forgotPwd.pug
similarity index 100%
rename from views/EN/forgotPwd.pug
rename to views/EN/account/forgotPwd.pug
diff --git a/views/EN/home.pug b/views/EN/account/home.pug
similarity index 84%
rename from views/EN/home.pug
rename to views/EN/account/home.pug
index 050c1bf9..d2f3875a 100644
--- a/views/EN/home.pug
+++ b/views/EN/account/home.pug
@@ -32,11 +32,11 @@ html(lang="en")
div(class="row")
div(class="col-3")
h5
- span #{greeting}
+ span #{user.firstname} #{user.lastname}
div(class="nav flex-column nav-pills", id="v-pills-tab", role="tablist", aria-orientation="vertical")
- a(class="nav-link" href="#" aria-selected="true") #{i18n.__(Profile)}
- a(class="nav-link" href="/account/security" aria-selected="false") Security
- a(class="nav-link" href="/account/services" aria-selected="false") Services
+ a(class="nav-link" href="/profile" aria-selected="true") Profile
+ a(class="nav-link" href="/security" aria-selected="false") Security
+ a(class="nav-link" href="/services" aria-selected="false") Services
div(class="col-sm-9")
p content goes here
diff --git a/views/EN/profile.pug b/views/EN/account/profile.pug
similarity index 96%
rename from views/EN/profile.pug
rename to views/EN/account/profile.pug
index d6edd221..47c1f7e8 100644
--- a/views/EN/profile.pug
+++ b/views/EN/account/profile.pug
@@ -35,8 +35,8 @@ html(lang="en")
span #{user.firstname} #{user.lastname}
div(class="nav flex-column nav-pills", id="v-pills-tab", role="tablist", aria-orientation="vertical")
a(class="nav-link" href="#" aria-selected="true") Profile
- a(class="nav-link" href="/account/security" aria-selected="false") Security
- a(class="nav-link" href="/account/services" aria-selected="false") Services
+ a(class="nav-link" href="/security" aria-selected="false") Security
+ a(class="nav-link" href="/services" aria-selected="false") Services
div(class="col-sm-9")
if successes
for success in successes
diff --git a/views/EN/registration.pug b/views/EN/account/registration.pug
similarity index 100%
rename from views/EN/registration.pug
rename to views/EN/account/registration.pug
diff --git a/views/EN/reset.pug b/views/EN/account/reset.pug
similarity index 100%
rename from views/EN/reset.pug
rename to views/EN/account/reset.pug
diff --git a/views/EN/security.pug b/views/EN/account/security.pug
similarity index 96%
rename from views/EN/security.pug
rename to views/EN/account/security.pug
index cbe435cd..2a5c248c 100644
--- a/views/EN/security.pug
+++ b/views/EN/account/security.pug
@@ -37,9 +37,9 @@ html(lang="en")
h5
span #{user.firstName} #{user.lastName}
div(class="nav flex-column nav-pills", id="v-pills-tab", role="tablist", aria-orientation="vertical")
- a(class="nav-link" href="/account/profile" aria-selected="true") Profile
+ a(class="nav-link" href="/profile" aria-selected="true") Profile
a(class="nav-link" href="#" aria-selected="false") Security
- a(class="nav-link" href="/account/services" aria-selected="false") Services
+ a(class="nav-link" href="/services" aria-selected="false") Services
div(class="col-sm-9")
if successes
for success in successes
diff --git a/views/EN/services.pug b/views/EN/account/services.pug
similarity index 94%
rename from views/EN/services.pug
rename to views/EN/account/services.pug
index a62efed6..f095144b 100644
--- a/views/EN/services.pug
+++ b/views/EN/account/services.pug
@@ -34,8 +34,8 @@ html(lang="en")
h5
span #{user.firstName} #{user.lastName}
div(class="nav flex-column nav-pills", id="v-pills-tab", role="tablist", aria-orientation="vertical")
- a(class="nav-link" href="/account/profile" aria-selected="true") Profile
- a(class="nav-link" href="/account/security" aria-selected="false") Security
+ a(class="nav-link" href="/profile" aria-selected="true") Profile
+ a(class="nav-link" href="/security" aria-selected="false") Security
a(class="nav-link" href="#" aria-selected="false") Services
div(class="col-sm-9")
if successes
diff --git a/views/EN/project/addProjectOverview.pug b/views/EN/project/addProjectOverview.pug
new file mode 100644
index 00000000..7b40b54f
--- /dev/null
+++ b/views/EN/project/addProjectOverview.pug
@@ -0,0 +1,115 @@
+doctype html
+html(lang="de")
+ head
+ 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", 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="container-fluid")
+ div(class="row")
+ div(class="col-md-6 offset-md-2")
+ h4(class="mb-3 font-weight-bold") Neues Projekt
+ 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")
+ div(class='form-row')
+ div(class='form-group col-md-12')
+ input#inputPname(name="pname" class="form-control" type="text" placeholder="human-readable short project name*" required)
+ div(class="form-group col-md-12")
+ input#inputTitle(name="title" class="form-control" type="text" placeholder="official title of the project*" required)
+ div(class="form-group col-md-12")
+ input#inputSummary(name="summary" class="form-control" type="text" placeholder="one line summary of the project")
+ div(class="form-group col-md-12")
+ input#inputCategory(name="category" class="form-control" type="text" placeholder="category of the project")
+ div(class="form-group col-md-12")
+ input#inputLogo(name="logo" class="form-control" type="text" placeholder="official logo of the project")
+ 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") Content
+ div(class='form-row')
+ div(class='form-group col-md-12')
+ textarea#inputOverview(name="overview" class="form-control" type="text" rows="5" placeholder="overview")
+ div(class="form-group col-md-12")
+ textarea#inputQuestion(name="question" class="form-control" type="text" rows="5" placeholder="question")
+ div(class='form-group col-md-12')
+ textarea#inputApproach(name="approach" class="form-control" type="text" rows="5" placeholder="approach")
+ div(class="form-group col-md-12")
+ textarea#inputResult(name="result" class="form-control" type="text" rows="5" placeholder="result")
+ div(class="form-group col-md-12")
+ input#inputKeywords(name="keywords" class="form-control" type="text" placeholder="keywords")
+ h5(class="mb-3 font-weight-bold") Info
+ div(class='form-row')
+ div(class='form-group col-md-12')
+ textarea#inputAnnouncement(name="announcement" class="form-control" type="text" rows="5" placeholder="Ausschreibung")
+ div(class="form-group col-md-12")
+ input#inputTerm(name="term" class="form-control" type="text" placeholder="Laufzeit")
+ div(class='form-group col-md-12')
+ textarea#inputFurtherDetails(name="furtherDetails" class="form-control" type="text" rows="5" placeholder="Mehr informationen")
+ div(class="form-group col-md-12")
+ input#inputWebsite(name="website" class="form-control" type="text" placeholder="website")
+ h5(class="mb-3 font-weight-bold") Images
+ div(class='form-row')
+ div(class="form-group col-md-12")
+ input#inputSrc(name="src" class="form-control" type="text" placeholder="link to the image source")
+ div(class="form-group col-md-12")
+ input#inputCaption(name="caption" class="form-control" type="text" placeholder="caption of the image")
+ h5(class="mb-3 font-weight-bold") Contact
+ div(class='form-row')
+ div(class="form-group col-md-4")
+ input#inputContactFirstname(name="contactFirstname" class="form-control" type="text" placeholder="contact firstname")
+ div(class="form-group col-md-4")
+ input#inputContactLastname(name="contactLastname" class="form-control" type="text" placeholder="contact lastname")
+ div(class="form-group col-md-4")
+ input#inputContactEmail(name="contactEmail" class="form-control" type="email" placeholder="contact email")
+ div(class="form-group col-md-4")
+ input#inputLeaderFirstname(name="leaderFirstname" class="form-control" type="text" placeholder="leader firstname")
+ div(class="form-group col-md-4")
+ input#inputLeaderLastname(name="leaderLastname" class="form-control" type="text" placeholder="leader lastname")
+ div(class="form-group col-md-4")
+ input#inputLeaderEmail(name="leaderEmail" class="form-control" type="email" placeholder="leader email")
+ p <em><small>* Pflichtfeld</small></em>
+ input#submitBtn(type="submit", class="btn btn-outline-dark btn-block", value="Projekt Anlegen")
+
+ // 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
+ script(src="/js/headfootLogout.js")
\ No newline at end of file
diff --git a/views/EN/mailinglists.pug b/views/EN/project/mailinglists.pug
similarity index 99%
rename from views/EN/mailinglists.pug
rename to views/EN/project/mailinglists.pug
index 677d0f32..f2ddbd8b 100644
--- a/views/EN/mailinglists.pug
+++ b/views/EN/project/mailinglists.pug
@@ -1,4 +1,4 @@
-html(lang="de")
+html(lang="en")
head
title= "Mailinglisten"
meta(charset="UTF-8")
diff --git a/views/EN/project/projects.pug b/views/EN/project/projects.pug
new file mode 100644
index 00000000..56f65c10
--- /dev/null
+++ b/views/EN/project/projects.pug
@@ -0,0 +1,117 @@
+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="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=item.gitlab+"/tree/master") Projektdateien
+ a(class="nav-link", href=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="https://transfer.hft-stuttgart.de/js/headfoot.js")
\ No newline at end of file
--
GitLab