Merge branch 'bootstrap' of https://github.com/PrestaShop/PrestaShop into bootstrap

admin-dev/themes/default/css/admin-theme.css

@@ -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; }

admin-dev/themes/default/css/admin-theme/_ladda-theme.sass

@@ -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

admin-dev/themes/default/css/admin-theme/_ladda.scss

@@ -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;
+	}

admin-dev/themes/default/template/controllers/login/content.tpl

@@ -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'}&hellip;
+						</a>
 					<label class="control-label" for="passwd">
 						{l s='Password'}
-						(<a href="#" class="show-forgot-password" >
-							{l s='lost password'}&hellip;
-						</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}"/>

admin-dev/themes/default/template/controllers/login/header.tpl

@@ -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}&gt;{/if} {$meta_title}{/if} (PrestaShop&trade;)</title>
+	<title>
+		{$shop_name} {if $meta_title != ''}{if isset($navigationPipe)}{$navigationPipe|escape:'htmlall':'UTF-8'}{else}&gt;{/if} {$meta_title}{/if} (PrestaShop&trade;)
+	</title>
 	{foreach from=$css_files key=css_uri item=media}
 		<link href="{$css_uri}" rel="stylesheet" type="text/css" media="{$media}" />
 	{/foreach}