Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap
This commit is contained in:
@@ -7830,7 +7830,7 @@ a.link-social:hover {
|
||||
display: none; }
|
||||
/* line 24, admin-theme/_admin-nav.sass */
|
||||
#nav-sidebar ul.menu {
|
||||
margin: 0 0 50px 0;
|
||||
margin: 0;
|
||||
padding: 0;
|
||||
border-top: 1px black solid;
|
||||
list-style: none; }
|
||||
|
||||
@@ -0,0 +1,27 @@
|
||||
$green: #2aca76
|
||||
$blue: #53b5e6
|
||||
$red: #ea8557
|
||||
$purple: #9973C2
|
||||
$mint: #16a085
|
||||
|
||||
.ladda-button
|
||||
&[disabled],
|
||||
&[data-loading]
|
||||
border-color: rgba( 0, 0, 0, 0.07 )
|
||||
cursor: default
|
||||
background-color: #999
|
||||
&:hover
|
||||
cursor: default
|
||||
background-color: #999
|
||||
&[data-size=xs]
|
||||
padding: 4px 8px
|
||||
.ladda-label
|
||||
font-size: 0.7em
|
||||
&[data-size=s]
|
||||
padding: 6px 10px
|
||||
.ladda-label
|
||||
font-size: 0.9em
|
||||
&[data-size=l] .ladda-label
|
||||
font-size: 1.2em
|
||||
&[data-size=xl] .ladda-label
|
||||
font-size: 1.5em
|
||||
+471
@@ -0,0 +1,471 @@
|
||||
/*!
|
||||
* Ladda
|
||||
* http://lab.hakim.se/ladda
|
||||
* MIT licensed
|
||||
*
|
||||
* Copyright (C) 2013 Hakim El Hattab, http://hakim.se
|
||||
*/
|
||||
|
||||
|
||||
/*************************************
|
||||
* CONFIG
|
||||
*/
|
||||
|
||||
$spinnerSize: 32px;
|
||||
|
||||
|
||||
/*************************************
|
||||
* MIXINS
|
||||
*/
|
||||
|
||||
@mixin prefix ( $property, $value ) {
|
||||
-webkit-#{$property}: $value;
|
||||
-moz-#{$property}: $value;
|
||||
-ms-#{$property}: $value;
|
||||
-o-#{$property}: $value;
|
||||
#{$property}: $value;
|
||||
}
|
||||
|
||||
@mixin transition( $value ) {
|
||||
-webkit-transition: $value !important; // important to override bootstrap
|
||||
-moz-transition: $value !important;
|
||||
-ms-transition: $value !important;
|
||||
-o-transition: $value !important;
|
||||
transition: $value !important;
|
||||
}
|
||||
|
||||
@mixin vendor-transform( $value ) {
|
||||
@include prefix( transform, $value );
|
||||
}
|
||||
|
||||
@mixin transform-origin( $value ) {
|
||||
@include prefix( transform-origin, $value );
|
||||
}
|
||||
|
||||
@mixin buttonColor( $name, $color ) {
|
||||
&[data-color=#{$name}] {
|
||||
background: $color;
|
||||
|
||||
&:hover {
|
||||
background-color: lighten( $color, 5% );
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*************************************
|
||||
* BUTTON BASE
|
||||
*/
|
||||
|
||||
.ladda-button {
|
||||
position: relative;
|
||||
}
|
||||
|
||||
|
||||
/* Spinner animation */
|
||||
.ladda-button .ladda-spinner {
|
||||
position: absolute;
|
||||
z-index: 2;
|
||||
display: inline-block;
|
||||
width: $spinnerSize;
|
||||
height: $spinnerSize;
|
||||
top: 50%;
|
||||
margin-top: -$spinnerSize/2;
|
||||
opacity: 0;
|
||||
pointer-events: none;
|
||||
}
|
||||
|
||||
/* Button label */
|
||||
.ladda-button .ladda-label {
|
||||
position: relative;
|
||||
z-index: 3;
|
||||
}
|
||||
|
||||
/* Progress bar */
|
||||
.ladda-button .ladda-progress {
|
||||
position: absolute;
|
||||
width: 0;
|
||||
height: 100%;
|
||||
left: 0;
|
||||
top: 0;
|
||||
background: rgba( 0, 0, 0, 0.2 );
|
||||
|
||||
visibility: hidden;
|
||||
opacity: 0;
|
||||
|
||||
@include transition( 0.1s linear all );
|
||||
}
|
||||
.ladda-button[data-loading] .ladda-progress {
|
||||
opacity: 1;
|
||||
visibility: visible;
|
||||
}
|
||||
|
||||
|
||||
/*************************************
|
||||
* EASING
|
||||
*/
|
||||
|
||||
.ladda-button,
|
||||
.ladda-button .ladda-spinner,
|
||||
.ladda-button .ladda-label {
|
||||
@include transition( 0.3s cubic-bezier(0.175, 0.885, 0.320, 1.275) all );
|
||||
}
|
||||
|
||||
.ladda-button[data-style=zoom-in],
|
||||
.ladda-button[data-style=zoom-in] .ladda-spinner,
|
||||
.ladda-button[data-style=zoom-in] .ladda-label,
|
||||
.ladda-button[data-style=zoom-out],
|
||||
.ladda-button[data-style=zoom-out] .ladda-spinner,
|
||||
.ladda-button[data-style=zoom-out] .ladda-label {
|
||||
@include transition( 0.3s ease all );
|
||||
}
|
||||
|
||||
|
||||
/*************************************
|
||||
* EXPAND LEFT
|
||||
*/
|
||||
|
||||
.ladda-button[data-style=expand-right] {
|
||||
.ladda-spinner {
|
||||
right: 14px;
|
||||
}
|
||||
|
||||
&[data-size="s"] .ladda-spinner,
|
||||
&[data-size="xs"] .ladda-spinner {
|
||||
right: 4px;
|
||||
}
|
||||
|
||||
&[data-loading] {
|
||||
padding-right: 56px;
|
||||
|
||||
.ladda-spinner {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
&[data-size="s"],
|
||||
&[data-size="xs"] {
|
||||
padding-right: 40px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*************************************
|
||||
* EXPAND RIGHT
|
||||
*/
|
||||
|
||||
.ladda-button[data-style=expand-left] {
|
||||
.ladda-spinner {
|
||||
left: 14px;
|
||||
}
|
||||
|
||||
&[data-size="s"] .ladda-spinner,
|
||||
&[data-size="xs"] .ladda-spinner {
|
||||
left: 4px;
|
||||
}
|
||||
|
||||
&[data-loading] {
|
||||
padding-left: 56px;
|
||||
|
||||
.ladda-spinner {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
&[data-size="s"],
|
||||
&[data-size="xs"] {
|
||||
padding-left: 40px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*************************************
|
||||
* EXPAND UP
|
||||
*/
|
||||
|
||||
.ladda-button[data-style=expand-up] {
|
||||
overflow: hidden;
|
||||
|
||||
.ladda-spinner {
|
||||
top: -$spinnerSize;
|
||||
left: 50%;
|
||||
margin-left: -$spinnerSize/2;
|
||||
}
|
||||
|
||||
&[data-loading] {
|
||||
padding-top: 54px;
|
||||
|
||||
.ladda-spinner {
|
||||
opacity: 1;
|
||||
top: 14px;
|
||||
margin-top: 0;
|
||||
}
|
||||
|
||||
&[data-size="s"],
|
||||
&[data-size="xs"] {
|
||||
padding-top: 32px;
|
||||
|
||||
.ladda-spinner {
|
||||
top: 4px;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*************************************
|
||||
* EXPAND DOWN
|
||||
*/
|
||||
|
||||
.ladda-button[data-style=expand-down] {
|
||||
overflow: hidden;
|
||||
|
||||
.ladda-spinner {
|
||||
top: 62px;
|
||||
left: 50%;
|
||||
margin-left: -$spinnerSize/2;
|
||||
}
|
||||
|
||||
&[data-size="s"] .ladda-spinner,
|
||||
&[data-size="xs"] .ladda-spinner {
|
||||
top: 40px;
|
||||
}
|
||||
|
||||
&[data-loading] {
|
||||
padding-bottom: 54px;
|
||||
|
||||
.ladda-spinner {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
&[data-size="s"],
|
||||
&[data-size="xs"] {
|
||||
padding-bottom: 32px;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*************************************
|
||||
* SLIDE LEFT
|
||||
*/
|
||||
.ladda-button[data-style=slide-left] {
|
||||
overflow: hidden;
|
||||
|
||||
.ladda-label {
|
||||
position: relative;
|
||||
}
|
||||
.ladda-spinner {
|
||||
left: 100%;
|
||||
margin-left: -$spinnerSize/2;
|
||||
}
|
||||
|
||||
&[data-loading] {
|
||||
.ladda-label {
|
||||
opacity: 0;
|
||||
left: -100%;
|
||||
}
|
||||
.ladda-spinner {
|
||||
opacity: 1;
|
||||
left: 50%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*************************************
|
||||
* SLIDE RIGHT
|
||||
*/
|
||||
.ladda-button[data-style=slide-right] {
|
||||
overflow: hidden;
|
||||
|
||||
.ladda-label {
|
||||
position: relative;
|
||||
}
|
||||
.ladda-spinner {
|
||||
right: 100%;
|
||||
margin-left: -$spinnerSize/2;
|
||||
}
|
||||
|
||||
&[data-loading] {
|
||||
.ladda-label {
|
||||
opacity: 0;
|
||||
left: 100%;
|
||||
}
|
||||
.ladda-spinner {
|
||||
opacity: 1;
|
||||
left: 50%;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*************************************
|
||||
* SLIDE UP
|
||||
*/
|
||||
.ladda-button[data-style=slide-up] {
|
||||
overflow: hidden;
|
||||
|
||||
.ladda-label {
|
||||
position: relative;
|
||||
}
|
||||
.ladda-spinner {
|
||||
left: 50%;
|
||||
margin-left: -$spinnerSize/2;
|
||||
margin-top: 1em;
|
||||
}
|
||||
|
||||
&[data-loading] {
|
||||
.ladda-label {
|
||||
opacity: 0;
|
||||
top: -1em;
|
||||
}
|
||||
.ladda-spinner {
|
||||
opacity: 1;
|
||||
margin-top: -$spinnerSize/2;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*************************************
|
||||
* SLIDE DOWN
|
||||
*/
|
||||
.ladda-button[data-style=slide-down] {
|
||||
overflow: hidden;
|
||||
|
||||
.ladda-label {
|
||||
position: relative;
|
||||
}
|
||||
.ladda-spinner {
|
||||
left: 50%;
|
||||
margin-left: -$spinnerSize/2;
|
||||
margin-top: -2em;
|
||||
}
|
||||
|
||||
&[data-loading] {
|
||||
.ladda-label {
|
||||
opacity: 0;
|
||||
top: 1em;
|
||||
}
|
||||
.ladda-spinner {
|
||||
opacity: 1;
|
||||
margin-top: -$spinnerSize/2;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/*************************************
|
||||
* ZOOM-OUT
|
||||
*/
|
||||
|
||||
.ladda-button[data-style=zoom-out] {
|
||||
overflow: hidden;
|
||||
}
|
||||
.ladda-button[data-style=zoom-out] .ladda-spinner {
|
||||
left: 50%;
|
||||
margin-left: -$spinnerSize/2;
|
||||
|
||||
@include vendor-transform( scale( 2.5 ) );
|
||||
}
|
||||
.ladda-button[data-style=zoom-out] .ladda-label {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.ladda-button[data-style=zoom-out][data-loading] .ladda-label {
|
||||
opacity: 0;
|
||||
|
||||
@include vendor-transform( scale( 0.5 ) );
|
||||
}
|
||||
.ladda-button[data-style=zoom-out][data-loading] .ladda-spinner {
|
||||
opacity: 1;
|
||||
|
||||
@include vendor-transform( none );
|
||||
}
|
||||
|
||||
|
||||
/*************************************
|
||||
* ZOOM-IN
|
||||
*/
|
||||
|
||||
.ladda-button[data-style=zoom-in] {
|
||||
overflow: hidden;
|
||||
}
|
||||
.ladda-button[data-style=zoom-in] .ladda-spinner {
|
||||
left: 50%;
|
||||
margin-left: -$spinnerSize/2;
|
||||
|
||||
@include vendor-transform( scale( 0.2 ) );
|
||||
}
|
||||
.ladda-button[data-style=zoom-in] .ladda-label {
|
||||
position: relative;
|
||||
display: inline-block;
|
||||
}
|
||||
|
||||
.ladda-button[data-style=zoom-in][data-loading] .ladda-label {
|
||||
opacity: 0;
|
||||
|
||||
@include vendor-transform( scale( 2.2 ) );
|
||||
}
|
||||
.ladda-button[data-style=zoom-in][data-loading] .ladda-spinner {
|
||||
opacity: 1;
|
||||
|
||||
@include vendor-transform( none );
|
||||
}
|
||||
|
||||
|
||||
/*************************************
|
||||
* CONTRACT
|
||||
*/
|
||||
|
||||
.ladda-button[data-style=contract] {
|
||||
overflow: hidden;
|
||||
width: 100px;
|
||||
}
|
||||
.ladda-button[data-style=contract] .ladda-spinner {
|
||||
left: 50%;
|
||||
margin-left: -16px;
|
||||
}
|
||||
|
||||
.ladda-button[data-style=contract][data-loading] {
|
||||
border-radius: 50%;
|
||||
width: 52px;
|
||||
}
|
||||
.ladda-button[data-style=contract][data-loading] .ladda-label {
|
||||
opacity: 0;
|
||||
}
|
||||
.ladda-button[data-style=contract][data-loading] .ladda-spinner {
|
||||
opacity: 1;
|
||||
}
|
||||
|
||||
|
||||
|
||||
/*************************************
|
||||
* OVERLAY
|
||||
*/
|
||||
|
||||
.ladda-button[data-style=contract-overlay] {
|
||||
overflow: hidden;
|
||||
width: 100px;
|
||||
box-shadow: 0px 0px 0px 3000px rgba(0,0,0,0);
|
||||
}
|
||||
.ladda-button[data-style=contract-overlay] .ladda-spinner {
|
||||
left: 50%;
|
||||
margin-left: -16px;
|
||||
}
|
||||
|
||||
.ladda-button[data-style=contract-overlay][data-loading] {
|
||||
border-radius: 50%;
|
||||
width: 52px;
|
||||
|
||||
/*outline: 10000px solid rgba( 0, 0, 0, 0.5 );*/
|
||||
box-shadow: 0px 0px 0px 3000px rgba(0,0,0,0.8);
|
||||
}
|
||||
.ladda-button[data-style=contract-overlay][data-loading] .ladda-label {
|
||||
opacity: 0;
|
||||
}
|
||||
.ladda-button[data-style=contract-overlay][data-loading] .ladda-spinner {
|
||||
opacity: 1;
|
||||
}
|
||||
@@ -32,7 +32,11 @@
|
||||
<div id="container">
|
||||
<div class="row">
|
||||
<div id="login" class="col-md-4 col-md-offset-4 panel">
|
||||
<h1 class="text-center">{$shop_name}</h1>
|
||||
<h1 class="text-center">
|
||||
<img width="40px" src="data:image/svg+xml;base64,PD94bWwgdmVyc2lvbj0iMS4wIiBlbmNvZGluZz0idXRmLTgiPz4NCjwhLS0gR2VuZXJhdG9yOiBBZG9iZSBJbGx1c3RyYXRvciAxNi4wLjAsIFNWRyBFeHBvcnQgUGx1Zy1JbiAuIFNWRyBWZXJzaW9uOiA2LjAwIEJ1aWxkIDApICAtLT4NCjwhRE9DVFlQRSBzdmcgUFVCTElDICItLy9XM0MvL0RURCBTVkcgMS4xLy9FTiIgImh0dHA6Ly93d3cudzMub3JnL0dyYXBoaWNzL1NWRy8xLjEvRFREL3N2ZzExLmR0ZCI+DQo8c3ZnIHZlcnNpb249IjEuMSIgaWQ9IkxheWVyXzEiIHhtbG5zPSJodHRwOi8vd3d3LnczLm9yZy8yMDAwL3N2ZyIgeG1sbnM6eGxpbms9Imh0dHA6Ly93d3cudzMub3JnLzE5OTkveGxpbmsiIHg9IjBweCIgeT0iMHB4Ig0KCSB3aWR0aD0iNjEycHgiIGhlaWdodD0iNzkycHgiIHZpZXdCb3g9IjAgMCA2MTIgNzkyIiBzdHlsZT0iZW5hYmxlLWJhY2tncm91bmQ6bmV3IDAgMCA2MTIgNzkyOyIgeG1sOnNwYWNlPSJwcmVzZXJ2ZSI+DQo8cGF0aCBkPSJNMjA0LDg2Yy0zNiwyMy00Nyw2MS00MiwxMjBsLTI3LDNDMTMxLDE0NywxNjEsOTgsMjA0LDg2eiBNMjQ1LDc4YzY0LDgsMTAwLDM1LDExNSwxMDVsLTE2OSwyMEMxODUsMTQwLDE5OSwxMDUsMjQ1LDc4eg0KCSBNMjgwLDY0YzcyLDAsMTIwLDI1LDEzNSwxMTJsLTI3LDNDMzc1LDExMiwzNDEsNzYsMjgwLDY0eiBNNDQyLDE3NEM0MjksNTQsMzE0LDE5LDI0MCw1NmMtODMtMi0xNDAsNzMtMTMzLDE1N2wtOTYsMTBsNTgsNTUwDQoJbDI2MS0yNmMtNDctNTMtMTAwLTEzMy0xMjQtMTUyYy0yNy0yMy0zMC0zMS0yMy00NWMxMi0xNCwyNC0xMiw0NSw0bDQ4LDM3bDcsMzZsMTQtMWwtMzctMjMxYy00LTI0LDEtMzUsMTktNDBjMTgtMiwyNyw3LDMxLDM0DQoJbDIzLDE0MWwxOC0yYy03LTUwLTMtNTcsMTctNjJjMTktMywyOCwxMCwzNSw2NGwxNy0xYy01LTUwLTEtNTcsMTktNjBjMjItMSwyNSwxMiwzMiw2NWwxNiwyYy00LTQwLTQtNTEsMTgtNTNjMjEsMCwyNSwxNCwzMSw1OA0KCWMxNSwxMDAsMTMsMTU0LTYsMTgzbDcyLTdsLTU4LTU1NUw0NDIsMTc0eiIvPg0KPC9zdmc+DQo="/>
|
||||
PRESTASHOP
|
||||
</h1>
|
||||
<h4 class="text-center">{$shop_name}</h4>
|
||||
<hr/>
|
||||
<div id="error" class="hide alert alert-danger">
|
||||
{if isset($errors)}
|
||||
@@ -71,11 +75,11 @@
|
||||
</div>
|
||||
</div>
|
||||
<div class="form-group">
|
||||
<a href="#" class="show-forgot-password pull-right" >
|
||||
{l s='Lost password'}…
|
||||
</a>
|
||||
<label class="control-label" for="passwd">
|
||||
{l s='Password'}
|
||||
(<a href="#" class="show-forgot-password" >
|
||||
{l s='lost password'}…
|
||||
</a>)
|
||||
</label>
|
||||
<div class="input-group">
|
||||
<span class="input-group-addon"><i class="icon-key"></i></span>
|
||||
@@ -99,9 +103,11 @@
|
||||
</div>
|
||||
<hr/>
|
||||
<div class="form-group">
|
||||
<button class="btn btn-default btn-lg btn-block" name="submitLogin" type="submit" tabindex="4">
|
||||
<i class="icon-ok text-success"></i>
|
||||
{l s='Log in'}
|
||||
<button name="submitLogin" type="submit" tabindex="4" class="btn btn-default btn-lg btn-block ladda-button" data-style="slide-up" data-spinner-color="black" >
|
||||
<span class="ladda-label">
|
||||
<i class="icon-ok text-success"></i>
|
||||
{l s='Log in'}
|
||||
</span>
|
||||
</button>
|
||||
</div>
|
||||
<input type="hidden" name="redirect" id="redirect" value="{$redirect}"/>
|
||||
|
||||
@@ -33,7 +33,9 @@
|
||||
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1">
|
||||
<meta name="robots" content="NOFOLLOW, NOINDEX">
|
||||
<title>{$shop_name} {if $meta_title != ''}{if isset($navigationPipe)}{$navigationPipe|escape:'htmlall':'UTF-8'}{else}>{/if} {$meta_title}{/if} (PrestaShop™)</title>
|
||||
<title>
|
||||
{$shop_name} {if $meta_title != ''}{if isset($navigationPipe)}{$navigationPipe|escape:'htmlall':'UTF-8'}{else}>{/if} {$meta_title}{/if} (PrestaShop™)
|
||||
</title>
|
||||
{foreach from=$css_files key=css_uri item=media}
|
||||
<link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" />
|
||||
{/foreach}
|
||||
|
||||
@@ -46,6 +46,8 @@ class AdminLoginControllerCore extends AdminController
|
||||
$this->addJquery();
|
||||
$this->addCSS('/'.$admin_webpath.'/themes/'.$this->bo_theme.'/css/admin-theme.css');
|
||||
$this->addJS(_PS_JS_DIR_.'vendor/jquery.validate.js');
|
||||
$this->addJS(_PS_JS_DIR_.'vendor/spin.js');
|
||||
$this->addJS(_PS_JS_DIR_.'vendor/ladda.js');
|
||||
$this->addJS(_PS_JS_DIR_.'login.js');
|
||||
$this->addJqueryUI('ui.widget');
|
||||
$this->addJqueryUI('effects.shake');
|
||||
|
||||
+18
-7
@@ -1,11 +1,11 @@
|
||||
$(document).ready(function() {
|
||||
// Initialize events
|
||||
$("#login_form").validate({
|
||||
rules: {
|
||||
"email":{
|
||||
rules: {
|
||||
"email":{
|
||||
"email": true,
|
||||
"required": true },
|
||||
"passwd": {
|
||||
"passwd": {
|
||||
"required": true }
|
||||
},
|
||||
submitHandler: function(form) {
|
||||
@@ -64,9 +64,13 @@ $(document).ready(function() {
|
||||
}
|
||||
});
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
//todo: ladda init - move to top
|
||||
var l = new Object();
|
||||
function feedbackSubmit() {
|
||||
l = Ladda.create( document.querySelector( 'button[type=submit]' ) );
|
||||
}
|
||||
|
||||
function displayForgotPassword() {
|
||||
$('#error').hide();
|
||||
@@ -111,7 +115,12 @@ function doAjaxLogin(redirect) {
|
||||
redirect: redirect,
|
||||
stay_logged_in: $('#stay_logged_in:checked').val()
|
||||
},
|
||||
beforeSend: function(){
|
||||
feedbackSubmit();
|
||||
l.start();
|
||||
},
|
||||
success: function(jsonData) {
|
||||
l.stop();
|
||||
if (jsonData.hasErrors)
|
||||
displayErrors(jsonData.errors);
|
||||
else
|
||||
@@ -163,7 +172,9 @@ function displayErrors(errors) {
|
||||
for (var error in errors) //IE6 bug fix
|
||||
if (error != 'indexOf') str_errors += '<li>' + errors[error] + '</li>';
|
||||
$('#error').html(str_errors + '</ol>').removeClass('hide').fadeIn('slow');
|
||||
$("#login").effect("shake", {
|
||||
times: 4
|
||||
}, 100);
|
||||
|
||||
|
||||
// $("#login").effect("shake", {
|
||||
// times: 4
|
||||
// }, 100);
|
||||
}
|
||||
+314
@@ -0,0 +1,314 @@
|
||||
/*!
|
||||
* Ladda 0.8.0
|
||||
* http://lab.hakim.se/ladda
|
||||
* MIT licensed
|
||||
*
|
||||
* Copyright (C) 2013 Hakim El Hattab, http://hakim.se
|
||||
*/
|
||||
(function( root, factory ) {
|
||||
|
||||
// CommonJS
|
||||
if( typeof exports === 'object' ) {
|
||||
module.exports = factory();
|
||||
}
|
||||
// AMD module
|
||||
else if( typeof define === 'function' && define.amd ) {
|
||||
define( [ 'spin' ], factory );
|
||||
}
|
||||
// Browser global
|
||||
else {
|
||||
root.Ladda = factory( root.Spinner );
|
||||
}
|
||||
|
||||
}
|
||||
(this, function( Spinner ) {
|
||||
'use strict';
|
||||
|
||||
// All currently instantiated instances of Ladda
|
||||
var ALL_INSTANCES = [];
|
||||
|
||||
/**
|
||||
* Creates a new instance of Ladda which wraps the
|
||||
* target button element.
|
||||
*
|
||||
* @return An API object that can be used to control
|
||||
* the loading animation state.
|
||||
*/
|
||||
function create( button ) {
|
||||
|
||||
if( typeof button === 'undefined' ) {
|
||||
console.warn( "Ladda button target must be defined." );
|
||||
return;
|
||||
}
|
||||
|
||||
// The text contents must be wrapped in a ladda-label
|
||||
// element, create one if it doesn't already exist
|
||||
if( !button.querySelector( '.ladda-label' ) ) {
|
||||
button.innerHTML = '<span class="ladda-label">'+ button.innerHTML +'</span>';
|
||||
}
|
||||
|
||||
// Create the spinner
|
||||
var spinner = createSpinner( button );
|
||||
|
||||
// Wrapper element for the spinner
|
||||
var spinnerWrapper = document.createElement( 'span' );
|
||||
spinnerWrapper.className = 'ladda-spinner';
|
||||
button.appendChild( spinnerWrapper );
|
||||
|
||||
// Timer used to delay starting/stopping
|
||||
var timer;
|
||||
|
||||
var instance = {
|
||||
|
||||
/**
|
||||
* Enter the loading state.
|
||||
*/
|
||||
start: function() {
|
||||
|
||||
button.setAttribute( 'disabled', '' );
|
||||
button.setAttribute( 'data-loading', '' );
|
||||
|
||||
clearTimeout( timer );
|
||||
spinner.spin( spinnerWrapper );
|
||||
|
||||
this.setProgress( 0 );
|
||||
|
||||
return this; // chain
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* Enter the loading state, after a delay.
|
||||
*/
|
||||
startAfter: function( delay ) {
|
||||
|
||||
clearTimeout( timer );
|
||||
timer = setTimeout( function() { instance.start(); }, delay );
|
||||
|
||||
return this; // chain
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* Exit the loading state.
|
||||
*/
|
||||
stop: function() {
|
||||
|
||||
button.removeAttribute( 'disabled' );
|
||||
button.removeAttribute( 'data-loading' );
|
||||
|
||||
// Kill the animation after a delay to make sure it
|
||||
// runs for the duration of the button transition
|
||||
clearTimeout( timer );
|
||||
timer = setTimeout( function() { spinner.stop(); }, 1000 );
|
||||
|
||||
return this; // chain
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* Toggle the loading state on/off.
|
||||
*/
|
||||
toggle: function() {
|
||||
|
||||
if( this.isLoading() ) {
|
||||
this.stop();
|
||||
}
|
||||
else {
|
||||
this.start();
|
||||
}
|
||||
|
||||
return this; // chain
|
||||
|
||||
},
|
||||
|
||||
/**
|
||||
* Sets the width of the visual progress bar inside of
|
||||
* this Ladda button
|
||||
*
|
||||
* @param {Number} progress in the range of 0-1
|
||||
*/
|
||||
setProgress: function( progress ) {
|
||||
|
||||
// Cap it
|
||||
progress = Math.max( Math.min( progress, 1 ), 0 );
|
||||
|
||||
var progressElement = button.querySelector( '.ladda-progress' );
|
||||
|
||||
// Remove the progress bar if we're at 0 progress
|
||||
if( progress === 0 && progressElement && progressElement.parentNode ) {
|
||||
progressElement.parentNode.removeChild( progressElement );
|
||||
}
|
||||
else {
|
||||
if( !progressElement ) {
|
||||
progressElement = document.createElement( 'div' );
|
||||
progressElement.className = 'ladda-progress';
|
||||
button.appendChild( progressElement );
|
||||
}
|
||||
|
||||
progressElement.style.width = ( ( progress || 0 ) * button.offsetWidth ) + 'px';
|
||||
}
|
||||
|
||||
},
|
||||
|
||||
enable: function() {
|
||||
|
||||
this.stop();
|
||||
|
||||
return this; // chain
|
||||
|
||||
},
|
||||
|
||||
disable: function () {
|
||||
|
||||
this.stop();
|
||||
button.setAttribute( 'disabled', '' );
|
||||
|
||||
return this; // chain
|
||||
|
||||
},
|
||||
|
||||
isLoading: function() {
|
||||
|
||||
return button.hasAttribute( 'data-loading' );
|
||||
|
||||
}
|
||||
|
||||
};
|
||||
|
||||
ALL_INSTANCES.push( instance );
|
||||
|
||||
return instance;
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Binds the target buttons to automatically enter the
|
||||
* loading state when clicked.
|
||||
*
|
||||
* @param target Either an HTML element or a CSS selector.
|
||||
* @param options
|
||||
* - timeout Number of milliseconds to wait before
|
||||
* automatically cancelling the animation.
|
||||
*/
|
||||
function bind( target, options ) {
|
||||
|
||||
options = options || {};
|
||||
|
||||
var targets = [];
|
||||
|
||||
if( typeof target === 'string' ) {
|
||||
targets = toArray( document.querySelectorAll( target ) );
|
||||
}
|
||||
else if( typeof target === 'object' && typeof target.nodeName === 'string' ) {
|
||||
targets = [ target ];
|
||||
}
|
||||
|
||||
for( var i = 0, len = targets.length; i < len; i++ ) {
|
||||
|
||||
(function() {
|
||||
var element = targets[i];
|
||||
|
||||
// Make sure we're working with a DOM element
|
||||
if( typeof element.addEventListener === 'function' ) {
|
||||
var instance = create( element );
|
||||
var timeout = -1;
|
||||
|
||||
element.addEventListener( 'click', function() {
|
||||
|
||||
// This is asynchronous to avoid an issue where setting
|
||||
// the disabled attribute on the button prevents forms
|
||||
// from submitting
|
||||
instance.startAfter( 1 );
|
||||
|
||||
// Set a loading timeout if one is specified
|
||||
if( typeof options.timeout === 'number' ) {
|
||||
clearTimeout( timeout );
|
||||
timeout = setTimeout( instance.stop, options.timeout );
|
||||
}
|
||||
|
||||
// Invoke callbacks
|
||||
if( typeof options.callback === 'function' ) {
|
||||
options.callback.apply( null, [ instance ] );
|
||||
}
|
||||
|
||||
}, false );
|
||||
}
|
||||
})();
|
||||
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
/**
|
||||
* Stops ALL current loading animations.
|
||||
*/
|
||||
function stopAll() {
|
||||
|
||||
for( var i = 0, len = ALL_INSTANCES.length; i < len; i++ ) {
|
||||
ALL_INSTANCES[i].stop();
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
function createSpinner( button ) {
|
||||
|
||||
var height = button.offsetHeight,
|
||||
spinnerColor;
|
||||
|
||||
// If the button is tall we can afford some padding
|
||||
if( height > 32 ) {
|
||||
height *= 0.8;
|
||||
}
|
||||
|
||||
// Prefer an explicit height if one is defined
|
||||
if( button.hasAttribute( 'data-spinner-size' ) ) {
|
||||
height = parseInt( button.getAttribute( 'data-spinner-size' ), 10 );
|
||||
}
|
||||
|
||||
// Allow buttons to specify the color of the spinner element
|
||||
if (button.hasAttribute('data-spinner-color' ) ) {
|
||||
spinnerColor = button.getAttribute( 'data-spinner-color' );
|
||||
}
|
||||
|
||||
var lines = 12,
|
||||
radius = height * 0.2,
|
||||
length = radius * 0.6,
|
||||
width = radius < 7 ? 2 : 3;
|
||||
|
||||
return new Spinner( {
|
||||
color: spinnerColor || '#fff',
|
||||
lines: lines,
|
||||
radius: radius,
|
||||
length: length,
|
||||
width: width,
|
||||
zIndex: 'auto',
|
||||
top: 'auto',
|
||||
left: 'auto',
|
||||
className: ''
|
||||
} );
|
||||
|
||||
}
|
||||
|
||||
function toArray( nodes ) {
|
||||
|
||||
var a = [];
|
||||
|
||||
for ( var i = 0; i < nodes.length; i++ ) {
|
||||
a.push( nodes[ i ] );
|
||||
}
|
||||
|
||||
return a;
|
||||
|
||||
}
|
||||
|
||||
// Public API
|
||||
return {
|
||||
|
||||
bind: bind,
|
||||
create: create,
|
||||
stopAll: stopAll
|
||||
|
||||
};
|
||||
|
||||
}));
|
||||
+349
@@ -0,0 +1,349 @@
|
||||
//fgnass.github.com/spin.js#v1.3
|
||||
|
||||
/*!
|
||||
* Copyright (c) 2011-2013 Felix Gnass
|
||||
* Licensed under the MIT license
|
||||
*/
|
||||
(function(root, factory) {
|
||||
|
||||
/* CommonJS */
|
||||
if (typeof exports == 'object') module.exports = factory()
|
||||
|
||||
/* AMD module */
|
||||
else if (typeof define == 'function' && define.amd) define(factory)
|
||||
|
||||
/* Browser global */
|
||||
else root.Spinner = factory()
|
||||
}
|
||||
(this, function() {
|
||||
"use strict";
|
||||
|
||||
var prefixes = ['webkit', 'Moz', 'ms', 'O'] /* Vendor prefixes */
|
||||
, animations = {} /* Animation rules keyed by their name */
|
||||
, useCssAnimations /* Whether to use CSS animations or setTimeout */
|
||||
|
||||
/**
|
||||
* Utility function to create elements. If no tag name is given,
|
||||
* a DIV is created. Optionally properties can be passed.
|
||||
*/
|
||||
function createEl(tag, prop) {
|
||||
var el = document.createElement(tag || 'div')
|
||||
, n
|
||||
|
||||
for(n in prop) el[n] = prop[n]
|
||||
return el
|
||||
}
|
||||
|
||||
/**
|
||||
* Appends children and returns the parent.
|
||||
*/
|
||||
function ins(parent /* child1, child2, ...*/) {
|
||||
for (var i=1, n=arguments.length; i<n; i++)
|
||||
parent.appendChild(arguments[i])
|
||||
|
||||
return parent
|
||||
}
|
||||
|
||||
/**
|
||||
* Insert a new stylesheet to hold the @keyframe or VML rules.
|
||||
*/
|
||||
var sheet = (function() {
|
||||
var el = createEl('style', {type : 'text/css'})
|
||||
ins(document.getElementsByTagName('head')[0], el)
|
||||
return el.sheet || el.styleSheet
|
||||
}())
|
||||
|
||||
/**
|
||||
* Creates an opacity keyframe animation rule and returns its name.
|
||||
* Since most mobile Webkits have timing issues with animation-delay,
|
||||
* we create separate rules for each line/segment.
|
||||
*/
|
||||
function addAnimation(alpha, trail, i, lines) {
|
||||
var name = ['opacity', trail, ~~(alpha*100), i, lines].join('-')
|
||||
, start = 0.01 + i/lines * 100
|
||||
, z = Math.max(1 - (1-alpha) / trail * (100-start), alpha)
|
||||
, prefix = useCssAnimations.substring(0, useCssAnimations.indexOf('Animation')).toLowerCase()
|
||||
, pre = prefix && '-' + prefix + '-' || ''
|
||||
|
||||
if (!animations[name]) {
|
||||
sheet.insertRule(
|
||||
'@' + pre + 'keyframes ' + name + '{' +
|
||||
'0%{opacity:' + z + '}' +
|
||||
start + '%{opacity:' + alpha + '}' +
|
||||
(start+0.01) + '%{opacity:1}' +
|
||||
(start+trail) % 100 + '%{opacity:' + alpha + '}' +
|
||||
'100%{opacity:' + z + '}' +
|
||||
'}', sheet.cssRules.length)
|
||||
|
||||
animations[name] = 1
|
||||
}
|
||||
|
||||
return name
|
||||
}
|
||||
|
||||
/**
|
||||
* Tries various vendor prefixes and returns the first supported property.
|
||||
*/
|
||||
function vendor(el, prop) {
|
||||
var s = el.style
|
||||
, pp
|
||||
, i
|
||||
|
||||
if(s[prop] !== undefined) return prop
|
||||
prop = prop.charAt(0).toUpperCase() + prop.slice(1)
|
||||
for(i=0; i<prefixes.length; i++) {
|
||||
pp = prefixes[i]+prop
|
||||
if(s[pp] !== undefined) return pp
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Sets multiple style properties at once.
|
||||
*/
|
||||
function css(el, prop) {
|
||||
for (var n in prop)
|
||||
el.style[vendor(el, n)||n] = prop[n]
|
||||
|
||||
return el
|
||||
}
|
||||
|
||||
/**
|
||||
* Fills in default values.
|
||||
*/
|
||||
function merge(obj) {
|
||||
for (var i=1; i < arguments.length; i++) {
|
||||
var def = arguments[i]
|
||||
for (var n in def)
|
||||
if (obj[n] === undefined) obj[n] = def[n]
|
||||
}
|
||||
return obj
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns the absolute page-offset of the given element.
|
||||
*/
|
||||
function pos(el) {
|
||||
var o = { x:el.offsetLeft, y:el.offsetTop }
|
||||
while((el = el.offsetParent))
|
||||
o.x+=el.offsetLeft, o.y+=el.offsetTop
|
||||
|
||||
return o
|
||||
}
|
||||
|
||||
// Built-in defaults
|
||||
|
||||
var defaults = {
|
||||
lines: 12, // The number of lines to draw
|
||||
length: 7, // The length of each line
|
||||
width: 5, // The line thickness
|
||||
radius: 10, // The radius of the inner circle
|
||||
rotate: 0, // Rotation offset
|
||||
corners: 1, // Roundness (0..1)
|
||||
color: '#000', // #rgb or #rrggbb
|
||||
direction: 1, // 1: clockwise, -1: counterclockwise
|
||||
speed: 1, // Rounds per second
|
||||
trail: 100, // Afterglow percentage
|
||||
opacity: 1/4, // Opacity of the lines
|
||||
fps: 20, // Frames per second when using setTimeout()
|
||||
zIndex: 2e9, // Use a high z-index by default
|
||||
className: 'spinner', // CSS class to assign to the element
|
||||
top: 'auto', // center vertically
|
||||
left: 'auto', // center horizontally
|
||||
position: 'relative' // element position
|
||||
}
|
||||
|
||||
/** The constructor */
|
||||
function Spinner(o) {
|
||||
if (typeof this == 'undefined') return new Spinner(o)
|
||||
this.opts = merge(o || {}, Spinner.defaults, defaults)
|
||||
}
|
||||
|
||||
// Global defaults that override the built-ins:
|
||||
Spinner.defaults = {}
|
||||
|
||||
merge(Spinner.prototype, {
|
||||
|
||||
/**
|
||||
* Adds the spinner to the given target element. If this instance is already
|
||||
* spinning, it is automatically removed from its previous target b calling
|
||||
* stop() internally.
|
||||
*/
|
||||
spin: function(target) {
|
||||
this.stop()
|
||||
|
||||
var self = this
|
||||
, o = self.opts
|
||||
, el = self.el = css(createEl(0, {className: o.className}), {position: o.position, width: 0, zIndex: o.zIndex})
|
||||
, mid = o.radius+o.length+o.width
|
||||
, ep // element position
|
||||
, tp // target position
|
||||
|
||||
if (target) {
|
||||
target.insertBefore(el, target.firstChild||null)
|
||||
tp = pos(target)
|
||||
ep = pos(el)
|
||||
css(el, {
|
||||
left: (o.left == 'auto' ? tp.x-ep.x + (target.offsetWidth >> 1) : parseInt(o.left, 10) + mid) + 'px',
|
||||
top: (o.top == 'auto' ? tp.y-ep.y + (target.offsetHeight >> 1) : parseInt(o.top, 10) + mid) + 'px'
|
||||
})
|
||||
}
|
||||
|
||||
el.setAttribute('role', 'progressbar')
|
||||
self.lines(el, self.opts)
|
||||
|
||||
if (!useCssAnimations) {
|
||||
// No CSS animation support, use setTimeout() instead
|
||||
var i = 0
|
||||
, start = (o.lines - 1) * (1 - o.direction) / 2
|
||||
, alpha
|
||||
, fps = o.fps
|
||||
, f = fps/o.speed
|
||||
, ostep = (1-o.opacity) / (f*o.trail / 100)
|
||||
, astep = f/o.lines
|
||||
|
||||
;(function anim() {
|
||||
i++;
|
||||
for (var j = 0; j < o.lines; j++) {
|
||||
alpha = Math.max(1 - (i + (o.lines - j) * astep) % f * ostep, o.opacity)
|
||||
|
||||
self.opacity(el, j * o.direction + start, alpha, o)
|
||||
}
|
||||
self.timeout = self.el && setTimeout(anim, ~~(1000/fps))
|
||||
})()
|
||||
}
|
||||
return self
|
||||
},
|
||||
|
||||
/**
|
||||
* Stops and removes the Spinner.
|
||||
*/
|
||||
stop: function() {
|
||||
var el = this.el
|
||||
if (el) {
|
||||
clearTimeout(this.timeout)
|
||||
if (el.parentNode) el.parentNode.removeChild(el)
|
||||
this.el = undefined
|
||||
}
|
||||
return this
|
||||
},
|
||||
|
||||
/**
|
||||
* Internal method that draws the individual lines. Will be overwritten
|
||||
* in VML fallback mode below.
|
||||
*/
|
||||
lines: function(el, o) {
|
||||
var i = 0
|
||||
, start = (o.lines - 1) * (1 - o.direction) / 2
|
||||
, seg
|
||||
|
||||
function fill(color, shadow) {
|
||||
return css(createEl(), {
|
||||
position: 'absolute',
|
||||
width: (o.length+o.width) + 'px',
|
||||
height: o.width + 'px',
|
||||
background: color,
|
||||
boxShadow: shadow,
|
||||
transformOrigin: 'left',
|
||||
transform: 'rotate(' + ~~(360/o.lines*i+o.rotate) + 'deg) translate(' + o.radius+'px' +',0)',
|
||||
borderRadius: (o.corners * o.width>>1) + 'px'
|
||||
})
|
||||
}
|
||||
|
||||
for (; i < o.lines; i++) {
|
||||
seg = css(createEl(), {
|
||||
position: 'absolute',
|
||||
top: 1+~(o.width/2) + 'px',
|
||||
transform: o.hwaccel ? 'translate3d(0,0,0)' : '',
|
||||
opacity: o.opacity,
|
||||
animation: useCssAnimations && addAnimation(o.opacity, o.trail, start + i * o.direction, o.lines) + ' ' + 1/o.speed + 's linear infinite'
|
||||
})
|
||||
|
||||
if (o.shadow) ins(seg, css(fill('#000', '0 0 4px ' + '#000'), {top: 2+'px'}))
|
||||
|
||||
ins(el, ins(seg, fill(o.color, '0 0 1px rgba(0,0,0,.1)')))
|
||||
}
|
||||
return el
|
||||
},
|
||||
|
||||
/**
|
||||
* Internal method that adjusts the opacity of a single line.
|
||||
* Will be overwritten in VML fallback mode below.
|
||||
*/
|
||||
opacity: function(el, i, val) {
|
||||
if (i < el.childNodes.length) el.childNodes[i].style.opacity = val
|
||||
}
|
||||
|
||||
})
|
||||
|
||||
|
||||
function initVML() {
|
||||
|
||||
/* Utility function to create a VML tag */
|
||||
function vml(tag, attr) {
|
||||
return createEl('<' + tag + ' xmlns="urn:schemas-microsoft.com:vml" class="spin-vml">', attr)
|
||||
}
|
||||
|
||||
// No CSS transforms but VML support, add a CSS rule for VML elements:
|
||||
sheet.addRule('.spin-vml', 'behavior:url(#default#VML)')
|
||||
|
||||
Spinner.prototype.lines = function(el, o) {
|
||||
var r = o.length+o.width
|
||||
, s = 2*r
|
||||
|
||||
function grp() {
|
||||
return css(
|
||||
vml('group', {
|
||||
coordsize: s + ' ' + s,
|
||||
coordorigin: -r + ' ' + -r
|
||||
}),
|
||||
{ width: s, height: s }
|
||||
)
|
||||
}
|
||||
|
||||
var margin = -(o.width+o.length)*2 + 'px'
|
||||
, g = css(grp(), {position: 'absolute', top: margin, left: margin})
|
||||
, i
|
||||
|
||||
function seg(i, dx, filter) {
|
||||
ins(g,
|
||||
ins(css(grp(), {rotation: 360 / o.lines * i + 'deg', left: ~~dx}),
|
||||
ins(css(vml('roundrect', {arcsize: o.corners}), {
|
||||
width: r,
|
||||
height: o.width,
|
||||
left: o.radius,
|
||||
top: -o.width>>1,
|
||||
filter: filter
|
||||
}),
|
||||
vml('fill', {color: o.color, opacity: o.opacity}),
|
||||
vml('stroke', {opacity: 0}) // transparent stroke to fix color bleeding upon opacity change
|
||||
)
|
||||
)
|
||||
)
|
||||
}
|
||||
|
||||
if (o.shadow)
|
||||
for (i = 1; i <= o.lines; i++)
|
||||
seg(i, -2, 'progid:DXImageTransform.Microsoft.Blur(pixelradius=2,makeshadow=1,shadowopacity=.3)')
|
||||
|
||||
for (i = 1; i <= o.lines; i++) seg(i)
|
||||
return ins(el, g)
|
||||
}
|
||||
|
||||
Spinner.prototype.opacity = function(el, i, val, o) {
|
||||
var c = el.firstChild
|
||||
o = o.shadow && o.lines || 0
|
||||
if (c && i+o < c.childNodes.length) {
|
||||
c = c.childNodes[i+o]; c = c && c.firstChild; c = c && c.firstChild
|
||||
if (c) c.opacity = val
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
var probe = css(createEl('group'), {behavior: 'url(#default#VML)'})
|
||||
|
||||
if (!vendor(probe, 'transform') && probe.adj) initVML()
|
||||
else useCssAnimations = vendor(probe, 'animation')
|
||||
|
||||
return Spinner
|
||||
|
||||
}));
|
||||
Reference in New Issue
Block a user