Merge branch 'new_layout' into 'testing'

new loginpage

See merge request !1

mymodule/themes/fancytheme/core/loginuserpass.php

@@ -40,28 +40,29 @@ if ($this->data['errorcode'] !== null) {
 <?php
 }
 ?>
-    <div class="container">
-<br/>
-    <form action="?" method="post" name="f" class="form-signin">
-			<img src="/images/demo/m4lab_logo.jpg" class="img-responsive center-block" width="185" height="192"/>
-		    	<br/>
-		        <input type="text" id="username" name="username" placeholder="Email" class="form-control"/>
-		        <br/>
-		        <input type="password" placeholder="Password" id="password" name="password" class="form-control"/> <br/>
-		        <button id="submit_button" class="btn btn-outline-dark btn-block" name="Submit" value="Login" type="Submit"
-		                >Login</button>
-        <input type="hidden" id="processing_trans" value="<?php echo $this->t('{login:processing}'); ?>" />
-        <?php
-        foreach ($this->data['stateparams'] as $name => $value) {
-            echo '<input type="hidden" name="'.htmlspecialchars($name).'" value="'.htmlspecialchars($value).'" />';
-        }
-        ?>
-    </form>
-
-    <p align="middle">Need an account?!! <a href="https://m4lab.hft-stuttgart.de/account/registration">Signup</a>. Or go <a href="https://transfer.hft-stuttgart.de/">Home</a>.</p>
-    <p align="middle"><a href="https://m4lab.hft-stuttgart.de/account/forgotPwd">Reset Password</a></p>
-</div>
-
+    <div>
+        <div class="container">
+            <div class="row">
+                <div class="col-md-12" style="margin-bottom: 40px;"><img class="mx-auto" src="/img/Anmelden.png" width="100%"></div>
+            </div>
+        </div>
+    
+        <div class="login-clean" style="background-color: rgb(234,234,234);">
+            <form method="post">
+                <h2 class="sr-only">Login Form</h2>
+                <div class="illustration"><img src="/img/M4_LAB_LOGO.png" width="130"></div>
+                <div class="form-group"><input class="form-control" type="email" name="email" placeholder="E-Mail-Adresse"></div>
+                <div class="form-group"><input class="form-control" type="password" name="password" placeholder="Passwort"></div><a class="text-right forgot" href="/account/forgotPwd">Passwort vergessen?</a>
+                <div class="form-group"><button class="btn btn-primary btn-block" type="submit" style="background-color: #8a348b;"><strong>Anmelden</strong></button><a class="btn btn-primary btn-block" type="" style="background-color: rgb(234,234,234);color: rgb(0,0,0);" href="/account/registration"><strong>Neues Benutzerkonto anlegen</strong></a></div>
+                <input type="hidden" id="processing_trans" value="<?php echo $this->t('{login:processing}'); ?>" />
+                <?php
+                foreach ($this->data['stateparams'] as $name => $value) {
+                echo '<input type="hidden" name="'.htmlspecialchars($name).'" value="'.htmlspecialchars($value).'" />';
+                }
+                ?>
+            </form>
+        </div>
+    </div>
 <?php
 if (!empty($this->data['links'])) {
     echo '<ul class="links" style="margin-top: 2em">';