From ed99c33df8645c26e72d2adbd9b44430f49d03aa Mon Sep 17 00:00:00 2001 From: Rosanny Date: Thu, 25 Mar 2021 11:24:28 +0100 Subject: [PATCH 1/3] DE translation --- routes/routes-account.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routes/routes-account.js b/routes/routes-account.js index 269ab1ff..0a62ba0f 100644 --- a/routes/routes-account.js +++ b/routes/routes-account.js @@ -594,7 +594,7 @@ module.exports = function (app, config, passport, i18n) { } else { updatedInformation.setLogo(pagesData.avatar_url) updatedInformation.setPath(pagesData.path) - res.flash("success", "Your website has been updated") + res.flash("success", "Ihre Website wurde aktualisiert") } res.redirect('/account/updateInformation?id='+updatedInformation.getId()) } -- GitLab From 932aed28aabce6b29b4650fc182997084cfe54d1 Mon Sep 17 00:00:00 2001 From: Rosanny Date: Thu, 25 Mar 2021 11:28:57 +0100 Subject: [PATCH 2/3] update README --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0de3d946..4c51fd33 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,3 @@ User Account Management -Re-implementation of https://transfer.hft-stuttgart.de/gitlab/sihombing/portal/tree/master/app-useracc using NodeJS and ExpressJS \ No newline at end of file +MLAB-481 branch should be created from this branch \ No newline at end of file -- GitLab From a9b7d1c848671a972e5d5e9a7871a17729dac46e Mon Sep 17 00:00:00 2001 From: Rosanny Date: Fri, 26 Mar 2021 10:48:03 +0100 Subject: [PATCH 3/3] test: gitlab user id --- views/DE/account/newInformation.pug | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/views/DE/account/newInformation.pug b/views/DE/account/newInformation.pug index 179770cd..b2b90516 100644 --- a/views/DE/account/newInformation.pug +++ b/views/DE/account/newInformation.pug @@ -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} - #{user.gitlabUserId} li(class="nav-item") a(class="nav-link pl-0" href="/account/profile") i(class="fa fa-user fa-fw") @@ -72,10 +72,14 @@ html(lang="de") label(for="description", class="col-sm-2") Beschreibung div(class="col-sm-8") textarea#description(name="description", type="text", class="form-control", placeholder="Beschreibung", maxlength="500" required) - div(class="form-group row") + div(class="form-group row") label(for="logo", class="col-sm-2") Projektlogo div(class="col-sm-8") - input#logo(name="logo", class="form-control-file", type="file" required) + div(class="form-group row px-4") + - let defaultLogo = "https://m4lab.hft-stuttgart.de/img/footer/M4_LAB_LOGO_Graustufen.png" + img(src=defaultLogo, width="100" height="100") + div(class="form-group row px-3") + input#logo(name="logo", class="form-control-file", type="file") input(type="submit", class="btn btn-primary", value="Senden") hr div(class="mx-4", style="color: gray;") -- GitLab