diff --git a/admin-dev/themes/default/template/controllers/login/content.tpl b/admin-dev/themes/default/template/controllers/login/content.tpl index 12c706598..70068f7d5 100755 --- a/admin-dev/themes/default/template/controllers/login/content.tpl +++ b/admin-dev/themes/default/template/controllers/login/content.tpl @@ -22,79 +22,115 @@ * @license http://opensource.org/licenses/afl-3.0.php Academic Free License (AFL 3.0) * International Registered Trademark & Property of PrestaShop SA *} - -
-
-{if isset($errors)} -

{if $nbErrors > 1}{l s='There are %d errors.' sprintf=$nbErrors}{else}{l s='There is %d error.' sprintf=$nbErrors}{/if}

-
    - {foreach from=$errors item="error"} -
  1. {$error}
    2. - {/foreach} + +
    +
    +
    +
    + {if isset($errors)} +

    {if $nbErrors > 1}{l s='There are %d errors.' sprintf=$nbErrors}{else}{l s='There is %d error.' sprintf=$nbErrors}{/if}

    +
      + {foreach from=$errors item="error"} +
    1. {$error}
      2. + {/foreach}
    -{/if} -
    -
    -{if isset($warningSslMessage)} + {/if} +
    + {if isset($warningSslMessage)}
    {$warningSslMessage}
    -{/if} -
    -

    {$shop_name}

    -{if !isset($wrong_folder_name) && !isset($wrong_install_name)} -
    -
    - - -
    -
    - - -
    -
    - -

    - -

    -

    - {l s='Lost password?'} -

    -
    + {/if} +
    +

    {$shop_name}

    + {if !isset($wrong_folder_name) && !isset($wrong_install_name)} + +
    +
    + +
    + + +
    +
    +
    + +
    + + +
    +
    +
    +
    + +

    + + + {l s='Lost password?'} + +

    +
    - -
    -

    {l s='Forgot your password?'}

    -

    {l s='In order to receive your access code by email, please enter the address you provided during the registration process.'}

    -
    - - -
    -
    - -

    - -

    -

    - -

    -
    +
    + +
    +
    +

    {l s='Forgot your password?'}

    +

    + {l s='In order to receive your access code by email, please enter the address you provided during the registration process.'} +

    +
    + +
    + + +
    - -{else} -
    -

    {l s='For security reasons, you cannot connect to the Back Office until after you have:'}

    -
      - {if isset($wrong_install_name) && $wrong_install_name == true}
    • {l s='deleted the /install folder'}
      • {/if} - {if isset($wrong_folder_name) && $wrong_folder_name == true}
    • {l s='renamed the /admin folder (e.g. %s)' sprintf=$randomNb}
      • {/if} -
    -

    {l s='Please then access this page by the new URL (e.g. %s)' sprintf=$adminUrl}

    -
    -{/if} -
    -

    © 2005 - {$smarty.now|date_format:"%Y"} Copyright by PrestaShop. all rights reserved.

    -
    \ No newline at end of file +
    +
    + +

    + +

    +
    +
    +
    + + {else} +
    +

    {l s='For security reasons, you cannot connect to the Back Office until after you have:'}

    +
      + {if isset($wrong_install_name) && $wrong_install_name == true}
    • {l s='deleted the /install folder'}
      • {/if} + {if isset($wrong_folder_name) && $wrong_folder_name == true}
    • {l s='renamed the /admin folder (e.g. %s)' sprintf=$randomNb}
      • {/if} +
    +

    + {l s='Please then access this page by the new URL (e.g. %s)' sprintf=$adminUrl} +

    +
    + {/if} +
    +

    + + © 2005 - {$smarty.now|date_format:"%Y"} Copyright by PrestaShop. all rights reserved. + +

    +
+ +
\ No newline at end of file diff --git a/js/login.js b/js/login.js index bfbb53e01..4a7c87feb 100644 --- a/js/login.js +++ b/js/login.js @@ -58,7 +58,7 @@ function displayLogin() { */ function doAjaxLogin(redirect) { $('#error').hide(); - $('#login_form .ajax-loader').fadeIn('slow', function() { + $('#login_form').fadeIn('slow', function() { $.ajax({ type: "POST", headers: { "cache-control": "no-cache" }, @@ -82,14 +82,14 @@ function doAjaxLogin(redirect) { }, error: function(XMLHttpRequest, textStatus, errorThrown) { $('#error').html('

TECHNICAL ERROR:

Details: Error thrown: ' + XMLHttpRequest + '

Text status: ' + textStatus + '

').removeClass('hide'); - $('#login_form .ajax-loader').fadeOut('slow'); + $('#login_form').fadeOut('slow'); } }); }); } function doAjaxForgot() { $('#error').hide(); - $('#forgot_password_form .ajax-loader').fadeIn('slow', function() { + $('#forgot_password_form').fadeIn('slow', function() { $.ajax({ type: "POST", headers: { "cache-control": "no-cache" }, @@ -109,23 +109,23 @@ function doAjaxForgot() { else { alert(jsonData.confirm); - $('#forgot_password_form .ajax-loader').hide(); + $('#forgot_password_form').hide(); displayLogin(); } }, error: function(XMLHttpRequest, textStatus, errorThrown) { $('#error').html('

TECHNICAL ERROR:

Details: Error thrown: ' + XMLHttpRequest + '

Text status: ' + textStatus + '

').show(); - $('#forgot_password_form .ajax-loader').fadeOut('slow'); + $('#forgot_password_form').fadeOut('slow'); } }); }); } function displayErrors(errors) { - str_errors = '

' + (errors.length > 1 ? there_are : there_is) + ' ' + errors.length + ' ' + (errors.length > 1 ? label_errors : label_error) + '

    '; + str_errors = '

    ' + (errors.length > 1 ? there_are : there_is) + ' ' + errors.length + ' ' + (errors.length > 1 ? label_errors : label_error) + '

      '; for (var error in errors) //IE6 bug fix if (error != 'indexOf') str_errors += '
    1. ' + errors[error] + '
      2. '; $('.ajax-loader').hide(); - $('#error').html(str_errors + '
    ').fadeIn('slow'); + $('#error').html(str_errors + '
').removeClass('hide').fadeIn('slow'); $("#login").effect("shake", { times: 4 }, 100);