diff --git a/mymodule/themes/fancytheme/core/loginuserpass.php b/mymodule/themes/fancytheme/core/loginuserpass.php index e271ca75393e72f1eb4504402bdb738397274ae0..0e4b87fb061d4952cfdb04bbba207b7334652679 100644 --- a/mymodule/themes/fancytheme/core/loginuserpass.php +++ b/mymodule/themes/fancytheme/core/loginuserpass.php @@ -7,7 +7,15 @@ if (strlen($this->data['username']) > 0) { $this->data['autofocus'] = 'username'; } $this->includeAtTemplateBase('includes/header.php'); +?> + <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> +<?php if ($this->data['errorcode'] !== null) { ?> <div style="border-left: 1px solid #e8e8e8; border-bottom: 1px solid #e8e8e8; background: #f5f5f5"> @@ -40,28 +48,27 @@ 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 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> + <?php if (strpos($_GET['AuthState'], 'admin') !== false) : ?> + <div class="form-group"><input id="username" class="form-control" type="text" name="username" placeholder="Administrator"></div> + <?php else : ?> + <div class="form-group"><input id="username" class="form-control" type="email" name="username" placeholder="E-Mail-Adresse"></div> + <?php endif; ?> + <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 + 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">'; diff --git a/mymodule/themes/fancytheme/includes/footer.php b/mymodule/themes/fancytheme/default/includes/footer.php similarity index 88% rename from mymodule/themes/fancytheme/includes/footer.php rename to mymodule/themes/fancytheme/default/includes/footer.php index 82827ad47968908f4fef48a7e76f548bd9b383c8..36b75fca21f25b2cf1787ea4be97c76a0790cfb5 100644 --- a/mymodule/themes/fancytheme/includes/footer.php +++ b/mymodule/themes/fancytheme/default/includes/footer.php @@ -14,7 +14,7 @@ if (!empty($this->data['htmlinject']['htmlContentPost'])) { <div id="footer"> <hr /> <img src="/<?php echo $this->data['baseurlpath']; ?>resources/icons/ssplogo-fish-small.png" alt="Small fish logo" style="float: right" /> - Copyright © 2007-2019 <a href="http://uninett.no/">UNINETT AS</a> + simplesamlphp Copyright © 2007-2019 <a href="http://uninett.no/">UNINETT AS</a> <br style="clear: right" /> diff --git a/mymodule/themes/fancytheme/includes/header.php b/mymodule/themes/fancytheme/default/includes/header.php similarity index 98% rename from mymodule/themes/fancytheme/includes/header.php rename to mymodule/themes/fancytheme/default/includes/header.php index 7a6d8390e83ef907acb3d9639d28262f0edf5a38..257a7a1b5ed5a19cb12a79543391c1d9906f8569 100644 --- a/mymodule/themes/fancytheme/includes/header.php +++ b/mymodule/themes/fancytheme/default/includes/header.php @@ -48,7 +48,7 @@ header('X-Frame-Options: SAMEORIGIN'); <title>M4_LAB: User Login</title> <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" /> <link rel="stylesheet" type="text/css" href="/css/bootstrap/bootstrap.css"/> -<link rel="stylesheet" type="text/css" href="/css/custom/login.css"/> +<link rel="stylesheet" type="text/css" href="/css/Login-Form-Clean.css"/> <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.8.2/css/all.css" integrity="sha384-oS3vJWv+0UjzBfQzYUhtDYW+Pj2yciDJxpsK1OYPAYjqT085Qq/1cq5FLXAZQ7Ay" crossorigin="anonymous"> <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.1.1/jquery.min.js"></script> <script src="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.7/js/bootstrap.min.js"></script>