From 48f5f0dca7c18a65b0f27d04a4fa6429c2968c58 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Sun, 19 Feb 2012 12:54:04 +0100 Subject: [PATCH] Uniformize login and password forgotten page --- htdocs/core/tpl/login.tpl.php | 181 ++++++++++++---------- htdocs/core/tpl/passwordforgotten.tpl.php | 86 +++++----- 2 files changed, 143 insertions(+), 124 deletions(-) diff --git a/htdocs/core/tpl/login.tpl.php b/htdocs/core/tpl/login.tpl.php index be0aa97aa6b..dfd8c2506d0 100644 --- a/htdocs/core/tpl/login.tpl.php +++ b/htdocs/core/tpl/login.tpl.php @@ -1,6 +1,6 @@ - * Copyright (C) 2011 Laurent Destailleur + * Copyright (C) 2011-2012 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -45,7 +45,7 @@ print ' margin-top: 70px; margin-bottom: 30px; } -#login table { +.login_table { width: 512px; border: 1px solid #C0C0C0; background: #F0F0F0 url('.$login_background.') repeat-x; @@ -210,127 +210,136 @@ jQuery(document).ready(function () { - +
- + - + + + + + +'; + echo ''; } + + if ($helpcenterlink) { + echo ''; + if ($forgetpasslink) { + echo ' - '; + } else { + echo '('; + } + echo $langs->trans('NeedHelpCenter').')'; + } + echo ''; +} ?> - -
- -
- - -
-
- -

- - global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT)) - { - ?> -
- - -
- + + +
+ +
+ + + +
+
+ +

+ + +global->MAIN_GOOGLE_AD_CLIENT) && ! empty($conf->global->MAIN_GOOGLE_AD_SLOT)) +{ +?> +
+ + +
+ diff --git a/htdocs/core/tpl/passwordforgotten.tpl.php b/htdocs/core/tpl/passwordforgotten.tpl.php index 2a65b472f74..22a012032f8 100644 --- a/htdocs/core/tpl/passwordforgotten.tpl.php +++ b/htdocs/core/tpl/passwordforgotten.tpl.php @@ -1,5 +1,6 @@ + * Copyright (C) 2011-2012 Laurent Destailleur * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by @@ -15,70 +16,69 @@ * along with this program. If not, see . * */ + header('Cache-Control: Public, must-revalidate'); header("Content-type: text/html; charset=".$conf->file->character_set_client); + ?> - - - + - - - -Dolibarr Authentification - - + + + + +'.$langs->trans('Login').' '.$title.''."\n"; +print ''."\n"; +if (constant('JS_JQUERY_UI')) print ''."\n"; // JQuery +else print ''."\n"; // JQuery +// JQuery. Must be before other includes +print ''."\n"; +if (constant('JS_JQUERY')) print ''."\n"; +else print ''."\n"; +print ' +'."\n"; +if (! empty($conf->global->MAIN_HTML_HEADER)) print $conf->global->MAIN_HTML_HEADER; +print ' +'; - +?> - + -
- +
- + - +
-
- - trans('BackToLoginPage'); ?> -