From f0104dc7265f69995c81c0db2aecae15656c89cc Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Mon, 21 Oct 2013 17:22:42 +0200 Subject: [PATCH 1/3] // Wait 1s for ajax element close --- js/admin.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/js/admin.js b/js/admin.js index 0d3bb1009..d71935cbe 100644 --- a/js/admin.js +++ b/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); }); From e7b901ce341509c9ddbef08d8161ea01d0d98d16 Mon Sep 17 00:00:00 2001 From: Damien Metzger Date: Mon, 21 Oct 2013 17:24:20 +0200 Subject: [PATCH 2/3] // Smaller update notification --- admin-dev/themes/default/css/admin-theme.css | 11 +++++------ .../default/css/admin-theme/_admin-dashboard.sass | 2 +- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/admin-dev/themes/default/css/admin-theme.css b/admin-dev/themes/default/css/admin-theme.css index 762e201f5..2d3ac61d3 100644 --- a/admin-dev/themes/default/css/admin-theme.css +++ b/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 * ------------------------------------------------------------------------------ @@ -9264,8 +9264,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 * @@ -10402,5 +10401,5 @@ li.sortable-placeholder { overflow: hidden; } /* line 232, admin-theme/_admin-dashboard.sass */ #dash_version iframe { - height: 140px; + height: 80px; width: 100%; } diff --git a/admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass b/admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass index 4923a563e..59d48f828 100644 --- a/admin-dev/themes/default/css/admin-theme/_admin-dashboard.sass +++ b/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% \ No newline at end of file From d6ad300625269396c84a3ac5a03967d131f08c8e Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Mon, 21 Oct 2013 17:59:48 +0200 Subject: [PATCH 3/3] // List pagination improvements --- .../themes/default/template/helpers/list/list_footer.tpl | 8 +++++--- .../themes/default/template/helpers/list/list_header.tpl | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/admin-dev/themes/default/template/helpers/list/list_footer.tpl b/admin-dev/themes/default/template/helpers/list/list_footer.tpl index e6cb8841f..8638b7f6d 100644 --- a/admin-dev/themes/default/template/helpers/list/list_footer.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_footer.tpl @@ -110,12 +110,12 @@ {/if} {/while} -
  • $total_pages}class="disabled"{/if}> +
  • = $total_pages}class="disabled"{/if}>
  • -
  • $total_pages}class="disabled"{/if}> +
  • = $total_pages}class="disabled"{/if}> @@ -124,7 +124,9 @@ diff --git a/admin-dev/themes/default/template/helpers/list/list_header.tpl b/admin-dev/themes/default/template/helpers/list/list_header.tpl index 4323bc617..5042f3bdc 100644 --- a/admin-dev/themes/default/template/helpers/list/list_header.tpl +++ b/admin-dev/themes/default/template/helpers/list/list_header.tpl @@ -76,6 +76,7 @@ {if !$simple_header}
    + {block name="override_form_extra"}{/block}
    @@ -300,7 +301,6 @@ {if $has_actions} {if $show_filters} - {*Search must be before reset for default form submit*}