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

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

@@ -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
  *  ------------------------------------------------------------------------------
@@ -9276,8 +9276,7 @@ textarea {
     -webkit-box-shadow: #00a4e7 0 0 0 inset;
     box-shadow: #00a4e7 0 0 0 inset; } }
 
-/*!
+/* Ladda
- * Ladda
  * http://lab.hakim.se/ladda
  * MIT licensed
  *
@@ -10414,5 +10413,5 @@ li.sortable-placeholder {
   overflow: hidden; }
 /* line 232, admin-theme/_admin-dashboard.sass */
 #dash_version iframe {
-  height: 140px;
+  height: 80px;
   width: 100%; }

admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass

@@ -230,5 +230,5 @@
 	padding: 0!important
 	overflow: hidden
 	iframe
-		height: 140px
+		height: 80px
 		width: 100%

admin-dev/themes/default/template/helpers/list/list_footer.tpl

@@ -110,12 +110,12 @@
 					</li>
 				{/if}
 			{/while}
-			<li {if $page > $total_pages}class="disabled"{/if}>
+			<li {if $page >= $total_pages}class="disabled"{/if}>
 				<a href="javascript:void(0);" class="pagination-link" data-page="{$page + 1}" data-list-id="{$list_id}">
 					<i class="icon-angle-right"></i>
 				</a>
 			</li>
-			<li {if $page > $total_pages}class="disabled"{/if}>
+			<li {if $page >= $total_pages}class="disabled"{/if}>
 				<a href="javascript:void(0);" class="pagination-link" data-page="{$total_pages}" data-list-id="{$list_id}">
 					<i class="icon-double-angle-right"></i>
 				</a>
@@ -124,7 +124,9 @@
 		<script type="text/javascript">
 			$('.pagination-link').on('click',function(e){
 				e.preventDefault();
-				$('#submitFilter'+$(this).data("list-id")).val($(this).data("page")).closest("form").submit();
+
+				if (!$(this).parent().hasClass('disabled'))
+					$('#submitFilter'+$(this).data("list-id")).val($(this).data("page")).closest("form").submit();
 			});
 		</script>
 	</div>

admin-dev/themes/default/template/helpers/list/list_header.tpl

@@ -76,6 +76,7 @@
 
 {if !$simple_header}
 <form method="post" action="{$action}" class="form-horizontal">
+	<input type="hidden" id="submitFilter{$list_id}" name="submitFilter{$list_id}" value="0"/>
 	{block name="override_form_extra"}{/block}
 	<div class="panel col-lg-12">
 		<div class="panel-heading">
@@ -300,7 +301,6 @@
 					{if $has_actions}
 					<td class="actions">
 						{if $show_filters}
-						<input type="hidden" id="submitFilter{$list_id}" name="submitFilter{$list_id}" value="0"/>
 						<span class="pull-right">
 							{*Search must be before reset for default form submit*}
 							<button type="submit" id="submitFilterButton{$list_id}" name="submitFilter" class="btn btn-default" data-list-id="{$list_id}">

js/admin.js

@@ -861,12 +861,14 @@ $(document).ready(function()
 	});
 
 	$('#ajax_running').ajaxStop(function() {
-		$(this).slideUp('fast');
+		var element = $(this)
+		setTimeout(function(){element.slideUp('fast')}, 1000);
 		clearTimeout(ajax_running_timeout);
 	});
 
 	$('#ajax_running').ajaxError(function() {
-		$(this).slideUp('fast');
+		var element = $(this)
+		setTimeout(function(){element.slideUp('fast')}, 1000);
 		clearTimeout(ajax_running_timeout);
 	});