diff --git a/views/DE/account/newPages.pug b/views/DE/account/newPages.pug
index b29855995896c0dfa554d82f5f67008ce588e6b2..00f11d21f79353d1a064e0f52b58a94e7201969c 100644
--- a/views/DE/account/newPages.pug
+++ b/views/DE/account/newPages.pug
@@ -4,8 +4,8 @@ html(lang="de")
title= "Setup a new website"
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://m4lab.hft-stuttgart.de/css/bootstrap.min.css")
- link(rel="stylesheet", type="text/css", href="https://m4lab.hft-stuttgart.de/css/m4lab.css")
+ link(rel="stylesheet", type="text/css", href="/css/bootstrap.min.css")
+ link(rel="stylesheet", type="text/css", href="/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")
body
div(class="container")
@@ -16,7 +16,7 @@ html(lang="de")
ul(class="flex-md-column flex-row navbar-nav w-100 justify-content-between")
li(class="nav-item")
a(class="nav-link pl-0 text-nowrap" href="/account/")
- span(class="font-weight-bold" style="color:black;") #{user.firstname} #{user.lastname}
+ span(class="font-weight-bold" style="color:black;") #{user.firstName} #{user.lastName}
li(class="nav-item")
a(class="nav-link pl-0" href="/account/profile")
i(class="fa fa-user fa-fw")
@@ -47,34 +47,49 @@ html(lang="de")
div(class="mx-4")
h4(class="pb-1") Step 1: Setup
p Please fill-in all fields
- //form#newPagesForm(method="POST", action="/newPages", encType="multipart/form-data")
form(method="POST", encType="multipart/form-data")
div(class='form-group row')
- div(class="col-sm-10")
- input#name(name="name", type="text" class="form-control", placeholder="Name", maxlength="75" required)
+ label(for="name", class="col-sm-2") Name
+ div(class="col-sm-8")
+ input#name(name="name", type="text", class="form-control", value=project.name, placeholder="Name", maxlength="75" required)
| <p id="nameInfo" class="font-italic font-weight-light"><small>your website will be published on this URL: <strong>https://transfer.hft-stuttgart.de/pages/<span id="websiteName"></span></strong></small></p>
div(class="form-group row")
- div(class="col-sm-10")
- textarea#description(name="description", type="text", class="form-control", placeholder="Description" maxlength="500" required)
+ label(for="description", class="col-sm-2") Description
+ div(class="col-sm-8")
+ textarea#description(name="description", type="text", class="form-control", placeholder="Description", maxlength="500" required) #{project.description}
div(class="form-group row")
- label(for="logo" class="col-sm-2") Logo
- div(class="col-sm-10")
- input#logo(name="logo", type="file" required)
- p#respInfoSuccess(class="font-italic font-weight-light" style="color: green; display: none;")
- p#respInfoFail(class="font-italic font-weight-light" style="color: red; display: none;")
+ label(for="logo", class="col-sm-2") Logo
+ div(class="col-sm-8")
+ input#logo(name="logo", class="form-control-file", value=project.avatar, type="file" required)
input(type="submit", class="btn btn-primary", value="Set")
hr
- div(class="mx-4")
- h4(class="pb-1") Step 2: Complete
- p Your website has been created, but not yet published. Please make sure you have completed the following before you publish your website.
- ul
- li project name, link, logo: setting.js
- li contact person: kontakt.html
+ if project.webUrl
+ div#step2(class="mx-4")
+ h4(class="pb-1") Step 2: Complete
+ //p Your website has been created, but not yet published. Please make sure you have completed the following before you publish your website.
+ p Please make sure you have completed the following before you publish your website.
+ ul
+ li project name, link, logo: setting.js
+ li contact person: kontakt.html
+ else
+ div#step2(class="mx-4", style="color: gray;")
+ h4(class="pb-1") Step 2: Complete
+ //p Your website has been created, but not yet published. Please make sure you have completed the following before you publish your website.
+ p Please make sure you have completed the following before you publish your website.
+ ul
+ li project name, link, logo: setting.js
+ li contact person: kontakt.html
hr
- div(class="mx-4")
- h4(class="pb-1") Step 3: Publish
- p bla bla bla
- input(type="submit", class="btn btn-primary", value="Publish" disabled)
+ if project.webUrl
+ div#step3(class="mx-4")
+ h4(class="pb-1") Step 3: Publish
+ p bla bla bla
+ input(type="submit", class="btn btn-primary", value="Publish")
+ else
+ div#step3(class="mx-4", style="color: gray;")
+ h4(class="pb-1") Step 3: Publish
+ p bla bla bla
+ input(type="submit", class="btn btn-primary", value="Publish" disabled)
// jQuery
script(src="https://code.jquery.com/jquery-3.3.1.min.js")
@@ -82,7 +97,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")
// M4_LAB
- script(src="https://m4lab.hft-stuttgart.de/js/headfoot.js")
+ script(src="/js/headfoot.js")
script.
function showWebsiteURL() {
if ($("#name").val()) {
diff --git a/views/DE/account/services.pug b/views/DE/account/services.pug
index 8ef010bdc5de6b4f31eef74f460d08ac8def6d5d..305bf02599f1463f76b5bdfde07ee20d13c783c9 100644
--- a/views/DE/account/services.pug
+++ b/views/DE/account/services.pug
@@ -4,8 +4,8 @@ html(lang="de")
title= "User Profile"
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="/css/bootstrap.min.css")
- link(rel="stylesheet", type="text/css", href="/css/m4lab.css")
+ link(rel="stylesheet", type="text/css", href="https://m4lab.hft-stuttgart.de/css/bootstrap.min.css")
+ link(rel="stylesheet", type="text/css", href="https://m4lab.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")
body
div(class="container")
@@ -35,8 +35,48 @@ html(lang="de")
i(class="fa fa-sign-out-alt fa-fw")
span(class="d-none d-md-inline") Logout
main(class="col bg-faded py-3 flex-grow-1")
- p Auf dieser Seite werden in Zukunft Funktionen bereitgestellt, um Ihre Beteiligung an Projekten und Aktivierung von Diensten zu organisieren. Diese Funktionen stehen zurzeit aber noch nicht zur Verfügung.
-
+ div(class="container")
+ h3(class="pb-2") Dienste
+ div(class="col-sm-12")
+ //p Auf dieser Seite werden in Zukunft Funktionen bereitgestellt, um Ihre Beteiligung an Projekten und Aktivierung von Diensten zu organisieren. Diese Funktionen stehen zurzeit aber noch nicht zur Verfügung.
+ p Auf dieser Seite werden in Zukunft Funktionen bereitgestellt, um Ihre Aktivierung von Diensten zu organisieren. Diese Funktionen stehen zurzeit aber noch nicht zur Verfügung.
+ hr
+ div(class="container")
+ h3(class="pb-2") Projekte
+ div(class="col-sm-12")
+ if gitlabPages
+ div(class="container")
+ div(class="row pb-1")
+ div(class="col font-weight-bold") Projektinformationen
+ div(class="col text-right")
+ a(href="/newPages" class="btn btn-sm btn-success" role="button") New Information
+ table(class="table")
+ for item in gitlabPages
+ - var img = item.avatar_url
+ tr
+ td
+ img(src=img, width="45", height="45")
+ td #{item.name}
+ if item.isPublished
+ td published
+ else
+ td not published yet
+ div(class="container")
+ div(class="row pb-1")
+ div(class="col font-weight-bold") Projektcode und -daten
+ div(class="col text-right")
+ button(type="button", class="btn btn-sm btn-success") New Code and Data
+ table(class="table")
+ for item in gitlabRepos
+ - var img = item.avatar_url
+ tr
+ td
+ img(src=img, width="45", height="45")
+ td #{item.name}
+ else
+ p
+ | Please <a href="https://transfer.hft-stuttgart.de/gitlab" target="_blank">login to gitlab</a> to activate your access, and then refresh this page.
+
// 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")