dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

// login

Browse Source
This commit is contained in:
Kevin Granger
2013-10-15 20:04:19 +02:00
parent dcbe3cb8e8
commit be2ea4ca77
5 changed files with 210 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
admin-dev/themes/default/css/admin-theme.css
+110 -5
View File
@@ -1,5 +1,5 @@
@import url(http://fonts.googleapis.com/css?family=Josefin+Sans:200,400,700);
/*
/*!
* Bootstrap v3.0.0
*
* Copyright 2013 Twitter, Inc
@@ -8,7 +8,7 @@
*
* Designed and built with all the love in the world by @mdo and @fat.
*/
/* normalize.css v2.1.0 | MIT License | git.io/normalize */
/*! normalize.css v2.1.0 | MIT License | git.io/normalize */
/* line 22, ../bower_components/sass-bootstrap/lib/_normalize.scss */
article, aside, details, figcaption, figure, footer, header, hgroup, main, nav, section, summary {
display: block; }
@@ -5718,7 +5718,7 @@ th.visible-print, td.visible-print {
/* line 523, ../bower_components/sass-bootstrap/lib/_mixins.scss */
th.hidden-print, td.hidden-print {
display: none !important; } }
/*
/*!
* Font Awesome 3.2.1
* the iconic font designed for Bootstrap
* ------------------------------------------------------------------------------
@@ -9132,7 +9132,7 @@ textarea {
-webkit-box-shadow: #1ba6e5 0 0 0 inset;
box-shadow: #1ba6e5 0 0 0 inset; } }
/*
/*!
* Ladda
* http://lab.hakim.se/ladda
* MIT licensed
@@ -9564,7 +9564,7 @@ textarea {
/* line 5, admin-theme/_admin-login.sass */
#login-header {
margin: 0;
margin: 0 0 60px 0;
color: white; }
/* line 9, admin-theme/_admin-login.sass */
@@ -9627,6 +9627,111 @@ textarea {
#login-footer a {
color: #a0aab5; }
/* line 45, admin-theme/_admin-login.sass */
.animated {
-webkit-animation-duration: 1s;
-moz-animation-duration: 1s;
-o-animation-duration: 1s;
animation-duration: 1s;
-webkit-animation-fill-mode: both;
-moz-animation-fill-mode: both;
-o-animation-fill-mode: both;
animation-fill-mode: both; }
@-webkit-keyframes fadeInDown {
/* line 56, admin-theme/_admin-login.sass */
0% {
opacity: 0;
-webkit-transform: translateY(-20px); }
/* line 59, admin-theme/_admin-login.sass */
100% {
opacity: 1;
-webkit-transform: translateY(0); } }
@-moz-keyframes fadeInDown {
/* line 64, admin-theme/_admin-login.sass */
0% {
opacity: 0;
-moz-transform: translateY(-20px); }
/* line 67, admin-theme/_admin-login.sass */
100% {
opacity: 1;
-moz-transform: translateY(0); } }
@-o-keyframes fadeInDown {
/* line 72, admin-theme/_admin-login.sass */
0% {
opacity: 0;
-o-transform: translateY(-20px); }
/* line 75, admin-theme/_admin-login.sass */
100% {
opacity: 1;
-o-transform: translateY(0); } }
@keyframes fadeInDown {
/* line 80, admin-theme/_admin-login.sass */
0% {
opacity: 0;
transform: translateY(-20px); }
/* line 83, admin-theme/_admin-login.sass */
100% {
opacity: 1;
transform: translateY(0); } }
/* line 87, admin-theme/_admin-login.sass */
.animated.fadeInDown {
-webkit-animation-name: fadeInDown;
-moz-animation-name: fadeInDown;
-o-animation-name: fadeInDown;
animation-name: fadeInDown; }
@-webkit-keyframes fadeIn {
/* line 95, admin-theme/_admin-login.sass */
0% {
opacity: 0; }
/* line 97, admin-theme/_admin-login.sass */
100% {
opacity: 1; } }
@-moz-keyframes fadeIn {
/* line 101, admin-theme/_admin-login.sass */
0% {
opacity: 0; }
/* line 103, admin-theme/_admin-login.sass */
100% {
opacity: 1; } }
@-o-keyframes fadeIn {
/* line 107, admin-theme/_admin-login.sass */
0% {
opacity: 0; }
/* line 109, admin-theme/_admin-login.sass */
100% {
opacity: 1; } }
@keyframes fadeIn {
/* line 113, admin-theme/_admin-login.sass */
0% {
opacity: 0; }
/* line 115, admin-theme/_admin-login.sass */
100% {
opacity: 1; } }
/* line 118, admin-theme/_admin-login.sass */
.animated.fadeIn {
-webkit-animation-name: fadeIn;
-moz-animation-name: fadeIn;
-o-animation-name: fadeIn;
animation-name: fadeIn; }
/* line 1, admin-theme/_admin-carrier-wizard.sass */
#carrier_wizard {
position: relative;
admin-dev/themes/default/css/admin-theme/_admin-login.sass
+81 -2
View File
@@ -3,7 +3,7 @@
@include background(radial-gradient(color-stops(rgba(104,128,138,.4) 10%,rgba(138,114,76,0) 40%), top left),linear-gradient(top,rgba(57,173,219,.25),rgba(42,60,87,.4)),linear-gradient(left top,#670D10,#092756))
#login-header
margin: 0
margin: 0 0 60px 0
color: white
#login-panel
@@ -40,4 +40,83 @@
#login-footer
a
color: #A0AAB5
color: #A0AAB5
.animated
-webkit-animation-duration: 1s
-moz-animation-duration: 1s
-o-animation-duration: 1s
animation-duration: 1s
-webkit-animation-fill-mode: both
-moz-animation-fill-mode: both
-o-animation-fill-mode: both
animation-fill-mode: both
@-webkit-keyframes fadeInDown
0%
opacity: 0
-webkit-transform: translateY(-20px)
100%
opacity: 1
-webkit-transform: translateY(0)
@-moz-keyframes fadeInDown
0%
opacity: 0
-moz-transform: translateY(-20px)
100%
opacity: 1
-moz-transform: translateY(0)
@-o-keyframes fadeInDown
0%
opacity: 0
-o-transform: translateY(-20px)
100%
opacity: 1
-o-transform: translateY(0)
@keyframes fadeInDown
0%
opacity: 0
transform: translateY(-20px)
100%
opacity: 1
transform: translateY(0)
.animated.fadeInDown
-webkit-animation-name: fadeInDown
-moz-animation-name: fadeInDown
-o-animation-name: fadeInDown
animation-name: fadeInDown
@-webkit-keyframes fadeIn
0%
opacity: 0
100%
opacity: 1
@-moz-keyframes fadeIn
0%
opacity: 0
100%
opacity: 1
@-o-keyframes fadeIn
0%
opacity: 0
100%
opacity: 1
@keyframes fadeIn
0%
opacity: 0
100%
opacity: 1
.animated.fadeIn
-webkit-animation-name: fadeIn
-moz-animation-name: fadeIn
-o-animation-name: fadeIn
animation-name: fadeIn
admin-dev/themes/default/template/controllers/login/content.tpl
+10 -11
View File
@@ -29,10 +29,10 @@
var label_error = '{l s='error'}';
</script>
<div id="login-panel">
<div id="login-header">
<div id="login-header" class="animated fadeIn">
<h1 class="text-center">
<img width="40px" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNi4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iNjEycHgiIGhlaWdodD0iNzkycHgiIHZpZXdCb3g9IjAgMCA2MTIgNzkyIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCA2MTIgNzkyOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8cGF0aCBkPSJNMjA0LDg2Yy0zNiwyMy00Nyw2MS00MiwxMjBsLTI3LDNDMTMxLDE0NywxNjEsOTgsMjA0LDg2eiBNMjQ1LDc4YzY0LDgsMTAwLDM1LDExNSwxMDVsLTE2OSwyMEMxODUsMTQwLDE5OSwxMDUsMjQ1LDc4eg0KCSBNMjgwLDY0YzcyLDAsMTIwLDI1LDEzNSwxMTJsLTI3LDNDMzc1LDExMiwzNDEsNzYsMjgwLDY0eiBNNDQyLDE3NEM0MjksNTQsMzE0LDE5LDI0MCw1NmMtODMtMi0xNDAsNzMtMTMzLDE1N2wtOTYsMTBsNTgsNTUwDQoJbDI2MS0yNmMtNDctNTMtMTAwLTEzMy0xMjQtMTUyYy0yNy0yMy0zMC0zMS0yMy00NWMxMi0xNCwyNC0xMiw0NSw0bDQ4LDM3bDcsMzZsMTQtMWwtMzctMjMxYy00LTI0LDEtMzUsMTktNDBjMTgtMiwyNyw3LDMxLDM0DQoJbDIzLDE0MWwxOC0yYy03LTUwLTMtNTcsMTctNjJjMTktMywyOCwxMCwzNSw2NGwxNy0xYy01LTUwLTEtNTcsMTktNjBjMjItMSwyNSwxMiwzMiw2NWwxNiwyYy00LTQwLTQtNTEsMTgtNTNjMjEsMCwyNSwxNCwzMSw1OA0KCWMxNSwxMDAsMTMsMTU0LTYsMTgzbDcyLTdsLTU4LTU1NUw0NDIsMTc0eiIvPg0KPC9zdmc+DQo="/>
PRESTASHOP
<img id="logo" width="40px" src="{$img_dir}/icon-prestashop.svg"/>
PRESTASHOP
</h1>
<hr/>
<h4 class="text-center">{$shop_name}</h4>
@@ -57,7 +57,7 @@
<div class="alert alert-warning">{$warningSslMessage}</div>
{/if}
</div>
<div class="flip-container">
<div class="flip-container animated fadeInDown">
<div class="flipper">
<div class="front panel">
{if !isset($wrong_folder_name) && !isset($wrong_install_name)}
@@ -142,7 +142,6 @@
placeholder="test@example.com" />
</div>
</div>
<hr/>
<div class="panel-footer">
<button href="#" class="btn btn-default show-login-form" tabindex="3">
<i class="icon-caret-left"></i>
@@ -176,23 +175,23 @@
{/if}
</div>
</div>
<div id="login-footer">
<div id="login-footer" class="animated fadeIn">
<p class="text-center text-muted">
<a href="http://www.prestashop.com">
<a href="http://www.prestashop.com/">
&copy; PrestaShop 2005-{$smarty.now|date_format:"%Y"} - All rights reserved.
</a>
</p>
<p class="text-center">
<a class="link-social link-twitter" href="#" title="Twitter">
<a class="link-social link-twitter" href="https://twitter.com/PrestaShop" target="_blank" title="Twitter">
<i class="icon-twitter"></i>
</a>
<a class="link-social link-facebook" href="#" title="Facebook">
<a class="link-social link-facebook" href="https://www.facebook.com/prestashop" target="_blank" title="Facebook">
<i class="icon-facebook"></i>
</a>
<a class="link-social link-github" href="#" title="Github">
<a class="link-social link-github" href="https://github.com/PrestaShop/PrestaShop/" target="_blank" title="Github">
<i class="icon-github"></i>
</a>
<a class="link-social link-google" href="#" title="Google">
<a class="link-social link-google" href="https://plus.google.com/+prestashop/" target="_blank" title="Google">
<i class="icon-google-plus"></i>
</a>
</p>
controllers/admin/AdminLoginController.php
+2 -2
View File
@@ -68,8 +68,8 @@ class AdminLoginControllerCore extends AdminController
$this->errors[] = Tools::displayError('SSL is activated. However, your IP is allowed to enter unsecure mode for maintenance or local IP issues.');
else
{
$warningSslMessage = Tools::displayError('SSL is activated. Please connect using the following URL to log into secure mode (https://).');
$warningSslMessage .= '<a href="https://'.Tools::safeOutput(Tools::getServerName()).Tools::safeOutput($_SERVER['REQUEST_URI']).'">https://'.Tools::safeOutput(Tools::getServerName()).Tools::safeOutput($_SERVER['REQUEST_URI']).'</a>';
$warningSslMessage = Tools::displayError('SSL is activated. Please connect using the following link to ');
$warningSslMessage .= '<a href="https://'.Tools::safeOutput(Tools::getServerName()).Tools::safeOutput($_SERVER['REQUEST_URI']).'">log into secure mode (https://)</a>';
$this->context->smarty->assign(array('warningSslMessage' => $warningSslMessage));
}
}
img/icon-prestashop.svg
+7
View File
@@ -0,0 +1,7 @@
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" x="0px" y="0px" width="612px" height="792px" viewBox="0 0 612 792" xml:space="preserve" class="style0">
<style>
.style0{enable-background: new 0 0 612 792;}
.logo-prestashop{fill: white;}
</style>
<path class="logo-prestashop" d="M204 86c-36 23-47 61-42 120l-27 3C131 147 161 98 204 86z M245 78c64 8 100 35 115 105l-169 20C185 140 199 105 245 78z M280 64c72 0 120 25 135 112l-27 3C375 112 341 76 280 64z M442 174C429 54 314 19 240 56c-83-2-140 73-133 157l-96 10l58 550 l261-26c-47-53-100-133-124-152c-27-23-30-31-23-45c12-14 24-12 45 4l48 37l7 36l14-1l-37-231c-4-24 1-35 19-40c18-2 27 7 31 34 l23 141l18-2c-7-50-3-57 17-62c19-3 28 10 35 64l17-1c-5-50-1-57 19-60c22-1 25 12 32 65l16 2c-4-40-4-51 18-53c21 0 25 14 31 58 c15 100 13 154-6 183l72-7l-58-555L442 174z"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 869 B