Merge branch 'devel_varun' into 'testing'

Devel varun

See merge request !74

public/js/headfootLogout.js

@@ -70,8 +70,8 @@ function head(){
     alertbutton.innerHTML = "×";
     alertdiv.innerHTML="<strong>Disclaimer</strong> This website is under construction and in prototype-phase. It is not for public use."
     prependChild(alertdiv, alertbutton);
-    alertdiv.classList.add('alert','alert-danger', 'alert-dismissible', 'fade','show');
-    alertdiv.style = "text-align:center;";
+    alertdiv.classList.add('alert','alert-danger', 'alert-dismissible', 'fade','show', 'text-center');
+    //alertdiv.style = "text-align:center;";
     navheader.appendChild(alertdiv);
     let navbar = document.createElement('nav');
     navbar.classList.add("navbar", "navbar-default");

views/DE/account/contact.pug

@@ -14,7 +14,7 @@ html(lang="de")
   body
     div(class="container")
         div(class="row")
-            div(class="col-md-12" style="margin-bottom: 40px;")
+            div(class="col-md-12 margin_bottom_40")
                 img(class="mx-auto" src="/img/Kontakt.jpg" width="100%")
     div(class="contact-clean" style="background-color: rgb(234,234,234);")
         if flash.success
@@ -32,18 +32,18 @@ html(lang="de")
             div(class="form-group")
                 textarea#message(class="form-control" name="message" placeholder="Nachricht" rows="14")
             div(class="form-group")
-                input#submitBtn(class="btn btn-primary" type="submit" style="background-color: #8a348b;" value="SENDEN")
-    div(class="contact-clean" style="background-color: rgb(234,234,234);padding: 80px;padding-top: 0px;")
+                input#submitBtn(class="btn contact_send_btn" type="submit" value="SENDEN")
+    div(class="contact-clean contact_footer")
         form(method="POST")
-            p(style="margin-top: 25px;") <strong>Hochschule für Technik Stuttgart</strong><br/>Institut für Angewandte Forschung<br/>Innovative Hochschule - Projekt M4_LAB<br/>Schellingstr. 24<br/>70174 Stuttgart<br/>Deutschland<br/><br/><a href="mailto:support-transfer@hft-stuttgart.de">support-transfer@hft-stuttgart.de</a><br/><br/><a href="https://www.hft-stuttgart.de/">www.hft-stuttgart.de</a> / <a href="https://www.hft-stuttgart.de/M4LAB">www.hft-stuttgart.de/M4LAB</a><br/>
-    div(style="background-color: rgba(138,52,139,0.45);")
+            p(class="m_top_25") <strong>Hochschule für Technik Stuttgart</strong><br/>Institut für Angewandte Forschung<br/>Innovative Hochschule - Projekt M4_LAB<br/>Schellingstr. 24<br/>70174 Stuttgart<br/>Deutschland<br/><br/><a href="mailto:support-transfer@hft-stuttgart.de">support-transfer@hft-stuttgart.de</a><br/><br/><a href="https://www.hft-stuttgart.de/">www.hft-stuttgart.de</a> / <a href="https://www.hft-stuttgart.de/M4LAB">www.hft-stuttgart.de/M4LAB</a><br/>
+    div(class="background_8a348b")
         div(class="container")
             div(class="row")
                 div(class="col-md-4 col-lg-2")
                 div(class="col-md-4 col-lg-8")
-                    div(style="background-color: #feffff;margin: 0px;padding: 60px;padding-top: 20px;padding-bottom: 20px;")
-                        img(class="d-flex d-lg-flex justify-content-center justify-content-lg-center align-items-lg-start mx-auto" src="/img/Logo_TV1.png" width="100px" style="padding-bottom: 35px;")
-                        h2(class="text-center" style="color: #8a348b;") <strong>Transferportal</strong>
+                    div(class="contact_foot_message")
+                        img(class="d-flex d-lg-flex justify-content-center justify-content-lg-center align-items-lg-start mx-auto p_bottom_35" src="/img/Logo_TV1.png" width="100px")
+                        h2(class="text-center color_8a348b") <strong>Transferportal</strong>
                         p(class="text-center") Das Transferportal entsteht in einem Teilprojekt der Innovativen <a href="https://www.hft-stuttgart.de">Hochschule für Technik Stuttgart</a>. Im <a href="https://www.hft-stuttgart.de/forschung/innovative-hochschule-m4-lab">Innovationslabor M4_LAB</a> wird das Transferportal als eine Webpräsenz entwickelt, welches Wissen, Lösungen und Dienste für HFT-Mitglieder, externe Partner und die allgemeine Öffentlichkeit bereitstellt.<br/><br/>Es ergänzt die Informationen der allgemeinen HFT-Webseite durch konkrete Ergebnisse aus Forschung und Entwicklung, verfügbar in verschiedenster Form wie beispielsweise Daten, Dokumentationen und Software-Code.<br/><br/>Zudem stellt es Kollaborationsmittel für Projektpartner und später auch Partizipationsmöglichkeiten für die breite Öffentlichkeit bereit.
                 div(class="col-md-4 col-lg-2")
 

views/DE/account/home.pug

@@ -16,7 +16,7 @@ html(lang="de")
                 | Wir haben Ihnen eine E-Mail an Ihre verwendete Adresse gesendet. Diese enthält einen Link zur Bestätigung Ihres Accounts.
                 | Wenn Sie die Mail nicht in ihrem Postfach vorfinden, prüfen Sie bitte auch Ihren Spam-Ordner.
                 | <br >Falls Sie keine E-Mail von uns erhalten haben, können Sie <a href="javascript:void(0);" onclick="verify();">diese hier</a> erneut anfordern.
-                div(class="spinner-border text-secondary", role="status", style="display: none")
+                div(class="spinner-border text-secondary display_none", role="status")
         else
             div(class="row min-vh-100 flex-column flex-md-row")
                 aside(class="col-12 col-md-3 p-0 flex-shrink-1")
@@ -25,7 +25,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="#")
-                                        span(class="font-weight-bold" style="color:black;") #{user.firstName} #{user.lastName}
+                                        span(class="font-weight-bold 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")
@@ -40,7 +40,7 @@ html(lang="de")
                                         i(class="fa fa-tasks fa-fw")
                                         span(class="d-none d-md-inline") Projekte und Dienste
                                 li(class="nav-item")
-                                    a(class="nav-link pl-0" href="/logout" style="color:red;")
+                                    a(class="nav-link pl-0 color_red" href="/logout")
                                         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")

views/DE/account/profile.pug

@@ -31,7 +31,7 @@ html(lang="de")
                                     i(class="fa fa-tasks fa-fw")
                                     span(class="d-none d-md-inline") Projekte und Dienste
                             li(class="nav-item")
-                                a(class="nav-link pl-0" href="/logout" style="color:red;")
+                                a(class="nav-link pl-0 color_red" href="/logout")
                                     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")

views/DE/account/security.pug

@@ -20,21 +20,21 @@ 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 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
                             li(class="nav-item")
                                 a(class="nav-link pl-0" href="/account/security")
-                                    i(class="fa fa-lock fa-fw" style="color:black;")
-                                    span(class="d-none d-md-inline" style="color:black;") Sicherheitseinstellungen
+                                    i(class="fa fa-lock fa-fw color_black")
+                                    span(class="d-none d-md-inline color_black") Sicherheitseinstellungen
                             li(class="nav-item")
                                 a(class="nav-link pl-0" href="/account/services")
                                     i(class="fa fa-tasks fa-fw")
                                     span(class="d-none d-md-inline") Projekte und Dienste
                             li(class="nav-item")
-                                a(class="nav-link pl-0" href="/logout" style="color:red;")
+                                a(class="nav-link pl-0 color_red" href="/logout")
                                     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")

views/DE/account/services.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="/")
-                                    span(class="font-weight-bold" style="color:black;") #{user.firstName} #{user.lastName}
+                                    span(class="font-weight-bold 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")
@@ -28,10 +28,10 @@ html(lang="de")
                                         span(class="d-none d-md-inline") Sicherheitseinstellungen
                             li(class="nav-item")
                                 a(class="nav-link pl-0" href="/account/services")
-                                    i(class="fa fa-tasks fa-fw" style="color:black;")
-                                    span(class="d-none d-md-inline" style="color:black;") Projekte und Dienste
+                                    i(class="fa fa-tasks fa-fw color_black")
+                                    span(class="d-none d-md-inline color_black") Projekte und Dienste
                             li(class="nav-item")
-                                a(class="nav-link pl-0" href="/logout" style="color:red;")
+                                a(class="nav-link pl-0 color_red" href="/logout")
                                     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")