From 12318b8d358d89d7ed0c71fc20e6c00b384e4cac Mon Sep 17 00:00:00 2001
From: Rosanny <rosanny.sihombing@hft-stuttgart.de>
Date: Fri, 12 Feb 2021 22:34:12 +0100
Subject: [PATCH] update UI
---
views/DE/account/home.pug | 2 +-
views/DE/account/newInformation.pug | 8 ++++----
views/DE/account/profile.pug | 2 +-
views/DE/account/security.pug | 2 +-
views/DE/account/services.pug | 12 ++++++------
views/DE/account/updateInformation.pug | 8 ++++----
6 files changed, 17 insertions(+), 17 deletions(-)
diff --git a/views/DE/account/home.pug b/views/DE/account/home.pug
index 6a4f3863..104778eb 100644
--- a/views/DE/account/home.pug
+++ b/views/DE/account/home.pug
@@ -30,7 +30,7 @@ html(lang="de")
a(class="nav-link pl-0" href="/account/profile")
i(class="fa fa-user fa-fw")
span(class="d-none d-md-inline") Benutzerprofil
- if user.m4lab_idp == 1
+ if user.is_m4lab_idp
li(class="nav-item")
a(class="nav-link pl-0" href="/account/security")
i(class="fa fa-lock fa-fw")
diff --git a/views/DE/account/newInformation.pug b/views/DE/account/newInformation.pug
index 838423dd..8a862dfb 100644
--- a/views/DE/account/newInformation.pug
+++ b/views/DE/account/newInformation.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,12 +16,12 @@ 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.fullName}
+ 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")
span(class="d-none d-md-inline") Benutzerprofil
- if user.m4lab_idp == 1
+ if user.is_m4lab_idp
li(class="nav-item")
a(class="nav-link pl-0" href="/account/security")
i(class="fa fa-lock fa-fw")
diff --git a/views/DE/account/profile.pug b/views/DE/account/profile.pug
index be76107d..a7c6f99f 100644
--- a/views/DE/account/profile.pug
+++ b/views/DE/account/profile.pug
@@ -21,7 +21,7 @@ html(lang="de")
a(class="nav-link pl-0" href="/account/profile")
i(class="fa fa-user fa-fw" style="color:black;")
span(class="d-none d-md-inline" style="color:black;") Benutzerprofil
- if user.m4lab_idp == 1
+ if user.is_m4lab_idp
li(class="nav-item")
a(class="nav-link pl-0" href="/account/security")
i(class="fa fa-lock fa-fw")
diff --git a/views/DE/account/security.pug b/views/DE/account/security.pug
index 60dbd2be..55e0494f 100644
--- a/views/DE/account/security.pug
+++ b/views/DE/account/security.pug
@@ -20,7 +20,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")
diff --git a/views/DE/account/services.pug b/views/DE/account/services.pug
index 86f526dc..4d678f8b 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="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,12 +16,12 @@ 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="/")
- span(class="font-weight-bold" style="color:black;") #{user.fullName}
+ 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")
span(class="d-none d-md-inline") Benutzerprofil
- if user.m4lab_idp == 1
+ if user.is_m4lab_idp
li(class="nav-item")
a(class="nav-link pl-0" href="/account/security")
i(class="fa fa-lock fa-fw")
@@ -49,7 +49,7 @@ html(lang="de")
div(class="row pb-1")
div(class="col font-weight-bold") Projektinformationen
div(class="col text-right")
- a(href="/newInformation" class="btn btn-sm btn-success" role="button") New Information
+ a(href="/account/newInformation" class="btn btn-sm btn-success" role="button") New Information
table(class="table")
for item in gitlabPages
- let img = item.logo
@@ -69,7 +69,7 @@ html(lang="de")
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
+ button(type="button", class="btn btn-sm btn-success" disabled) New Code and Data
table(class="table")
for item in gitlabRepos
- let img = item.logo
diff --git a/views/DE/account/updateInformation.pug b/views/DE/account/updateInformation.pug
index 4f42ca21..45602d05 100644
--- a/views/DE/account/updateInformation.pug
+++ b/views/DE/account/updateInformation.pug
@@ -4,8 +4,8 @@ html(lang="de")
title= "Update a 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,12 +16,12 @@ 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.fullName}
+ 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")
span(class="d-none d-md-inline") Benutzerprofil
- if user.m4lab_idp == 1
+ if user.is_m4lab_idp
li(class="nav-item")
a(class="nav-link pl-0" href="/account/security")
i(class="fa fa-lock fa-fw")
--
GitLab