deblan/phpci
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fixing login pages

Browse source
This commit is contained in:
Dan Cryer 2015-10-15 10:41:35 +01:00
parent f904cab599
commit 8fed994921
4 changed files with 12 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
PHPCI/Model/Build.php
View file

@ -231,7 +231,7 @@ class Build extends BuildBase
$lineEnd = null $lineEnd = null
) { ) {
unset($builder); unset($builder);
$error = new BuildError(); $error = new BuildError();
$error->setBuild($this); $error->setBuild($this);
$error->setCreatedDate(new \DateTime()); $error->setCreatedDate(new \DateTime());

14
PHPCI/View/Session.phtml
View file

@ -7,9 +7,9 @@
<meta charset="UTF-8"> <meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0"> <meta name="viewport" content="width=device-width, initial-scale=1.0">
<link rel="stylesheet" type="text/css" href="<?php echo PHPCI_URL ?>assets/css/bootstrap.min.css"> <link href="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.1/css/bootstrap.min.css" rel="stylesheet" type="text/css" />
<script src="//code.jquery.com/jquery-1.8.1.min.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/jquery/2.1.1/jquery.js"></script>
<script src="<?php echo PHPCI_URL ?>assets/js/bootstrap.min.js"></script> <script src="//cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/3.3.1/js/bootstrap.min.js" type="text/javascript"></script>
<style type="text/css"> <style type="text/css">
@ -56,7 +56,7 @@
} }
#logo { #logo {
background: transparent url('https://www.block8.co.uk/assets/images/b8-phpci-logo-muted.png') no-repeat top left; background: transparent url('https://block8.digital/assets/images/b8-phpci-logo-muted.png') no-repeat top left;
background-size: 130px 46px; background-size: 130px 46px;
display: inline-block; display: inline-block;
height: 46px; height: 46px;
@ -77,7 +77,7 @@
} }
#logo:hover { #logo:hover {
background-image: url('https://www.block8.co.uk/assets/images/b8-phpci-logo.png'); background-image: url('https://block8.digital/assets/images/b8-phpci-logo.png');
} }
#phpci-logo img { #phpci-logo img {
@ -89,14 +89,14 @@
<body> <body>
<div class="container"> <div class="container">
<div class="row" style="margin-top: 10%; text-align: center"> <div class="row" style="margin-top: 10%; text-align: center">
<a id="phpci-logo" href="http://www.phptesting.org"> <a id="phpci-logo" href="https://www.phptesting.org">
<img src="<?php print PHPCI_URL; ?>/assets/img/logo-large.png"> <img src="<?php print PHPCI_URL; ?>/assets/img/logo-large.png">
</a> </a>
<div class="" id="login-box"> <div class="" id="login-box">
<?php print $content; ?> <?php print $content; ?>
</div> </div>
<a id="logo" href="https://www.block8.co.uk">Block 8 - Manchester Web Development Specialists</a> <a target="_blank" id="logo" href="https://block8.digital">Block 8 - Digital Development Experts</a>
</div> </div>
</div> </div>
</body> </body>

9
PHPCI/View/Session/forgotPassword.phtml
View file

@ -5,18 +5,16 @@
</p> </p>
<?php else: ?> <?php else: ?>
<?php if (empty($error)): ?> <?php if (empty($error)): ?>
<div class="panel panel-success" style="margin-bottom: 0"> <div class="" style="margin-bottom: 15px;">
<div class="box-header">
<?php Lang::out('reset_header'); ?> <?php Lang::out('reset_header'); ?>
</div> </div>
<?php else: ?> <?php else: ?>
<div class="panel panel-danger" style="margin-bottom: 0"> <div class="alert alert-danger">
<div class="box-header">
<?php print $error; ?> <?php print $error; ?>
</div> </div>
<?php endif; ?> <?php endif; ?>
<div class="box-body"> <div class="">
<form class="form" action="<?php print PHPCI_URL; ?>session/forgot-password" method="POST"> <form class="form" action="<?php print PHPCI_URL; ?>session/forgot-password" method="POST">
<div class="form-group"> <div class="form-group">
<label for="email"><?php Lang::out('reset_email_address'); ?></label> <label for="email"><?php Lang::out('reset_email_address'); ?></label>
@ -28,7 +26,6 @@
</div> </div>
</form> </form>
</div> </div>
</div>
<?php endif; ?> <?php endif; ?>

3
PHPCI/View/Session/resetPassword.phtml
View file

@ -1,6 +1,6 @@
<?php use PHPCI\Helper\Lang; ?> <?php use PHPCI\Helper\Lang; ?>
<?php if (empty($error)): ?> <?php if (empty($error)): ?>
<div class="panel panel-success" style="margin-bottom: 0">
<div class="box-header"> <div class="box-header">
<?php Lang::out('reset_enter_password'); ?> <?php Lang::out('reset_enter_password'); ?>
</div> </div>
@ -17,7 +17,6 @@
</div> </div>
</form> </form>
</div> </div>
</div>
<?php else: ?> <?php else: ?>
<div class="alert alert-danger" style="margin-bottom: 0"> <div class="alert alert-danger" style="margin-bottom: 0">
<?php print $error; ?> <?php print $error; ?>