diff --git a/admin/index.php b/admin/index.php index 81add39..cdbda28 100644 --- a/admin/index.php +++ b/admin/index.php @@ -82,6 +82,9 @@ if (Request::post('login_submit')) { } } } + + Notification::set('error', $login_error); + } // Errors @@ -117,13 +120,13 @@ if (Request::post('reset_password_submit')) { $mail->AddReplyTo(Option::get('system_email')); $mail->AddAddress($user['email'], $user['login']); $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_name', $site_name) ->assign('user_id', $user['id']) ->assign('user_login', $user['login']) ->assign('new_hash', $new_hash) - ->assign('view', 'reset_password_email') + ->assign('email_template', 'reset-password') ->render()); $mail->Send(); diff --git a/admin/themes/default/css/default.css b/admin/themes/default/css/default.css index e280b51..9c903c6 100644 --- a/admin/themes/default/css/default.css +++ b/admin/themes/default/css/default.css @@ -92,6 +92,20 @@ footer span { 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 .divider { background-color: #555454; @@ -108,6 +122,10 @@ footer span { } /* Navbar */ +.navbar-inverse .navbar-nav > li > a { + color: #eee; +} + .navbar-inverse { background: #222; } diff --git a/admin/themes/default/login.template.php b/admin/themes/default/login.template.php index 9b64fab..a99536e 100644 --- a/admin/themes/default/login.template.php +++ b/admin/themes/default/login.template.php @@ -59,13 +59,18 @@ + +
-
monstra
-
-
+
monstra
+
-


@@ -75,19 +80,15 @@
-
-
+
-
-
+
-


-
@@ -110,17 +111,17 @@ } ?>
- +
-
+