Merge branch 'new_layout' into 'testing'

changed ids for login form

See merge request !4

mymodule/themes/fancytheme/core/loginuserpass.php

@@ -51,8 +51,8 @@ if ($this->data['errorcode'] !== null) {
             <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"><input id="username" class="form-control" type="email" name="username" placeholder="E-Mail-Adresse"></div>
+                <div class="form-group"><input id="password" 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