diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index db155bcd5..40d2776b1 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/admin-dev/themes/default/css/admin-theme.css @@ -9566,41 +9566,51 @@ textarea { font-size: 1.5em; } /* line 1, admin-theme/_admin-login.sass */ -.flip-container { - perspective: 1000; } - -/* line 4, admin-theme/_admin-login.sass */ -.flip-container:hover .flipper, .flip-container.hover .flipper { - transform: rotateY(180deg); } - +#login-panel { + margin: 0 auto; + width: 420px; } +/* line 5, admin-theme/_admin-login.sass */ +#login-panel .flip-container { + height: 500px; + -webkit-perspective: 1000px; + -moz-perspective: 1000px; + -ms-perspective: 1000px; + -o-perspective: 1000px; + perspective: 1000px; } /* line 8, admin-theme/_admin-login.sass */ -.flip-container, .front, .back { - width: 420px; - height: 420px; } - -/* line 14, admin-theme/_admin-login.sass */ -.flipper { - transition: 0.6s; +#login-panel .flip-container.flip .flipper { + -webkit-transform: rotateY(180deg); + -moz-transform: rotateY(180deg); + -ms-transform: rotateY(180deg); + -o-transform: rotateY(180deg); + transform: rotateY(180deg); } +/* line 13, admin-theme/_admin-login.sass */ +#login-panel .flipper { + -webkit-transition-duration: 0.6s; + transition-duration: 0.6s; + -webkit-transform-style: preserve-3d; + -moz-transform-style: preserve-3d; + -ms-transform-style: preserve-3d; + -o-transform-style: preserve-3d; transform-style: preserve-3d; position: relative; } - -/* line 19, admin-theme/_admin-login.sass */ -.front, .back { +/* line 18, admin-theme/_admin-login.sass */ +#login-panel .front, #login-panel .back { + -webkit-backface-visibility: hidden; + -moz-backface-visibility: hidden; backface-visibility: hidden; position: absolute; top: 0; left: 0; } - -/* line 26, admin-theme/_admin-login.sass */ -.front { +/* line 24, admin-theme/_admin-login.sass */ +#login-panel .front { z-index: 2; } - -/* line 29, admin-theme/_admin-login.sass */ -.back { - transform: rotateY(180deg); } - -/* line 32, admin-theme/_admin-login.sass */ -.flip-container:hover .flipper, .flip-container.hover .flipper, .flip-container.flip .flipper { +/* line 27, admin-theme/_admin-login.sass */ +#login-panel .back { + -webkit-transform: rotateY(180deg); + -moz-transform: rotateY(180deg); + -ms-transform: rotateY(180deg); + -o-transform: rotateY(180deg); transform: rotateY(180deg); } /* line 1, admin-theme/_admin-carrier-wizard.sass */ diff --git a/admin-dev/themes/default/css/admin-theme/_admin-login.sass b/admin-dev/themes/default/css/admin-theme/_admin-login.sass index f8e4e10de..785a56088 100644 --- a/admin-dev/themes/default/css/admin-theme/_admin-login.sass +++ b/admin-dev/themes/default/css/admin-theme/_admin-login.sass @@ -1,35 +1,28 @@ -.flip-container - perspective: 1000 - -.flip-container:hover .flipper, -.flip-container.hover .flipper - transform: rotateY(180deg) - -.flip-container, -.front, -.back +#login-panel + margin: 0 auto width: 420px - height: 420px -.flipper - transition: 0.6s - transform-style: preserve-3d - position: relative + .flip-container + height: 500px + @include perspective(1000px) + &.flip .flipper + @include rotateY(180deg) -.front, -.back - backface-visibility: hidden - position: absolute - top: 0 - left: 0 + .flip-container, .front, .back -.front - z-index: 2 + .flipper + @include transition-duration(0.6s) + @include transform-style(preserve-3d) + position: relative -.back - transform: rotateY(180deg) + .front, .back + @include backface-visibility(hidden) + position: absolute + top: 0 + left: 0 -.flip-container:hover .flipper, -.flip-container.hover .flipper, -.flip-container.flip .flipper - transform: rotateY(180deg) \ No newline at end of file + .front + z-index: 2 + + .back + @include rotateY(180deg) \ No newline at end of file diff --git a/admin-dev/themes/default/template/controllers/login/content.tpl b/admin-dev/themes/default/template/controllers/login/content.tpl index d0d6bb817..ffdf272c0 100755 --- a/admin-dev/themes/default/template/controllers/login/content.tpl +++ b/admin-dev/themes/default/template/controllers/login/content.tpl @@ -28,38 +28,37 @@ var label_errors = '{l s='errors'}'; var label_error = '{l s='error'}'; - -
-
-
-
-
-

- - PRESTASHOP -

-

{$shop_name}

-
-
- {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)} -
{$warningSslMessage}
+
+
+

+ + PRESTASHOP +

+
+

{$shop_name}

+
+ {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)} +
{$warningSslMessage}
+ {/if} +
+
+
+
{if !isset($wrong_folder_name) && !isset($wrong_install_name)}
@@ -105,7 +104,7 @@
-
+
-
+

@@ -143,9 +142,9 @@

-
+
- {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} @@ -175,29 +173,26 @@

{/if} - -
- -
-

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

-

- - - - - - - - - - - - -

-
\ No newline at end of file + \ No newline at end of file diff --git a/js/login.js b/js/login.js index 21736541b..5627043e0 100644 --- a/js/login.js +++ b/js/login.js @@ -1,6 +1,6 @@ $(document).ready(function() { // Initialize events - $("#login_form").validate({ + $("#login_form, #forgot_password_form").validate({ rules: { "email":{ "email": true, @@ -72,25 +72,21 @@ function feedbackSubmit() { l = Ladda.create( document.querySelector( 'button[type=submit]' ) ); } + function displayForgotPassword() { + $('#error').hide(); - - document.querySelector("#login").toggle("flip"); - - $('#login_form').fadeOut('fast', function () { - $("#forgot_password_form").removeClass('hide').fadeIn('fast'); - // Focus on email address forgot field - $('#email_forgot').select(); - }); + $("#login").find('.flip-container').toggleClass("flip"); + $("#forgot_password_form").removeClass('hide'); + $('#email_forgot').select(); } function displayLogin() { + $('#error').hide(); - $('#forgot_password_form').fadeOut('fast', function () { - $('#login_form').fadeIn('fast'); - // Focus on email address field - $('#email').select(); - }); + $("#login").find('.flip-container').toggleClass("flip"); + //$('#login_form').fadeIn('fast'); + $('#email').select(); return false; }