mirror/php-monstra
1
0
Fork 0
mirror of https://github.com/monstra-cms/monstra.git synced 2025-08-03 19:57:57 +02:00
Code Issues Releases Wiki Activity

UI Improvements - Admin - Login page updates #194

Browse Source
This commit is contained in:
Awilum
2014-01-31 20:18:20 +02:00
parent 8f0e576f99
commit 918820da3e
3 changed files with 39 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
admin/index.php
View File

@@ -82,6 +82,9 @@ if (Request::post('login_submit')) {
} }
} }
} }
Notification::set('error', $login_error);
} }
// Errors // Errors
@@ -117,13 +120,13 @@ if (Request::post('reset_password_submit')) {
$mail->AddReplyTo(Option::get('system_email')); $mail->AddReplyTo(Option::get('system_email'));
$mail->AddAddress($user['email'], $user['login']); $mail->AddAddress($user['email'], $user['login']);
$mail->Subject = __('Your login details for :site_name', 'users', array(':site_name' => $site_name)); $mail->Subject = __('Your login details for :site_name', 'users', array(':site_name' => $site_name));
$mail->MsgHTML(View::factory('box/users/views/emails/layout_email') $mail->MsgHTML(View::factory('box/emails/views/emails/email_layout')
->assign('site_url', $site_url) ->assign('site_url', $site_url)
->assign('site_name', $site_name) ->assign('site_name', $site_name)
->assign('user_id', $user['id']) ->assign('user_id', $user['id'])
->assign('user_login', $user['login']) ->assign('user_login', $user['login'])
->assign('new_hash', $new_hash) ->assign('new_hash', $new_hash)
->assign('view', 'reset_password_email') ->assign('email_template', 'reset-password')
->render()); ->render());
$mail->Send(); $mail->Send();

18
admin/themes/default/css/default.css
View File

@@ -92,6 +92,20 @@ footer span {
padding-left: 0; padding-left: 0;
} }
/* Admin Form */
.form-signin {
width: 400px;
}
.form-signin {
margin-top: 40px;
}
.form-signin .administration-area,
.form-signin .reset-password-area {
margin-top: 40px;
}
/* Dropdown Menu */ /* Dropdown Menu */
.dropdown-menu .divider { .dropdown-menu .divider {
background-color: #555454; background-color: #555454;
@@ -108,6 +122,10 @@ footer span {
} }
/* Navbar */ /* Navbar */
.navbar-inverse .navbar-nav > li > a {
color: #eee;
}
.navbar-inverse { .navbar-inverse {
background: #222; background: #222;
} }

31
admin/themes/default/login.template.php
View File

@@ -59,13 +59,18 @@
</head> </head>
<body class="login-body"> <body class="login-body">
<?php
// Monstra Notifications
Notification::get('success') AND Alert::success(Notification::get('success'));
Notification::get('warning') AND Alert::warning(Notification::get('warning'));
Notification::get('error') AND Alert::error(Notification::get('error'));
?>
<div class="container form-signin"> <div class="container form-signin">
<div style="text-align:center;"><a class="brand" href="<?php echo Option::get('siteurl'); ?>/admin"><img src="<?php echo Option::get('siteurl'); ?>/public/assets/img/monstra-logo.png" height="27" width="171" alt="monstra" /></a></div> <div class="text-center"><a class="brand" href="<?php echo Option::get('siteurl'); ?>/admin"><img src="<?php echo Option::get('siteurl'); ?>/public/assets/img/monstra-logo-256px.png" alt="monstra" /></a></div>
<div class="administration-area"> <div class="administration-area well">
<hr>
<div> <div>
<h2 class="text-center"><?php echo __('Administration', 'system'); ?></h2><br>
<form method="post"> <form method="post">
<div class="form-group"> <div class="form-group">
<label><?php echo __('Username', 'users'); ?></label> <label><?php echo __('Username', 'users'); ?></label>
@@ -75,19 +80,15 @@
<label><?php echo __('Password', 'users'); ?></label> <label><?php echo __('Password', 'users'); ?></label>
<input class="form-control" name="password" type="password" /> <input class="form-control" name="password" type="password" />
</div> </div>
<div class="form-group"> <div class="form-group">
<?php if (isset($login_error) && $login_error !== '') { ?><div class="alert alert-error"><?php echo $login_error; ?></div><?php } ?>
<input type="submit" name="login_submit" class="btn btn-primary" value="<?php echo __('Log In', 'users'); ?>" /> <input type="submit" name="login_submit" class="btn btn-primary" value="<?php echo __('Log In', 'users'); ?>" />
</div> </div>
</form> </form>
</div> </div>
</div> </div>
<div class="reset-password-area"> <div class="reset-password-area well">
<hr>
<div> <div>
<h2 style="text-align:center;"><?php echo __('Reset Password', 'users'); ?></h2><br>
<?php if (Notification::get('success')) Alert::success(Notification::get('success')); ?>
<form method="post"> <form method="post">
<div class="form-group"> <div class="form-group">
<label><?php echo __('Username', 'users'); ?></label> <label><?php echo __('Username', 'users'); ?></label>
@@ -110,17 +111,17 @@
} }
?> ?>
<div class="form-group"> <div class="form-group">
<input type="submit" name="reset_password_submit" class="btn btn-primary" value="<?php echo __('Send New Password', 'users')?>" /> <input type="submit" name="reset_password_submit" class="btn btn-primary" value="<?php echo __('Get New Password', 'users')?>" />
</div> </div>
</form> </form>
</div> </div>
</div> </div>
<hr>
<div> <div>
<div class="text-center"> <div class="text-center">
<a class="small-grey-text" href="<?php echo Option::get('siteurl'); ?>"><?php echo __('< Back to Website', 'system');?></a> - <a class="small-grey-text" href="<?php echo Option::get('siteurl'); ?>"><?php echo __('Back to Website', 'system');?></a> -
<a class="small-grey-text reset-password-btn" href="javascript:;"><?php echo __('Forgot your password? >', 'system');?></a> <a class="small-grey-text reset-password-btn" href="javascript:;"><?php echo __('Forgot your password ?', 'system');?></a>
<a class="small-grey-text administration-btn" href="javascript:;"><?php echo __('Administration >', 'system');?></a> <a class="small-grey-text administration-btn" href="javascript:;"><?php echo __('Log in', 'system');?></a>
</div> </div>
</div> </div>
</div> </div>