From e269f64b23a0e4889ed0540cc27cf4c7e9a2d615 Mon Sep 17 00:00:00 2001
From: Nicolas Le Goff <legoff.n@gmail.com>
Date: Wed, 28 May 2014 15:48:34 +0200
Subject: [PATCH] Fix dashboard javascript & title issue

---
 .../web/report/ajax_dashboard_content_child.html.twig     | 8 ++++----
 www/skins/report/report.js                                | 5 ++---
 2 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/templates/web/report/ajax_dashboard_content_child.html.twig b/templates/web/report/ajax_dashboard_content_child.html.twig
index 91fcb68bc2..e877c317d5 100644
--- a/templates/web/report/ajax_dashboard_content_child.html.twig
+++ b/templates/web/report/ajax_dashboard_content_child.html.twig
@@ -31,25 +31,25 @@
         {% set title1 = "report:: Utilisateurs les plus actifs" | trans %}
         {% set title2 = "report:: utilisateurs" | trans %}
         {% set title3 = "report:: telechargements document" | trans %}
-        {{ dash.table(title1 , title2, title3, item.top_ten_user_doc, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }}
+        {{ dash.table(title1~"("~ title3~")", title2, title3, item.top_ten_user_doc, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }}
     {% endif %}
     {% if "top_ten_user_prev"|key_exists(item) %}
         {% set title1 = "report:: Utilisateurs les plus actifs" | trans %}
         {% set title2 = "report:: utilisateurs" | trans %}
         {% set title3 = "report:: telechargements preview" | trans %}
-        {{ dash.table(title1 , title2, title3, item.top_ten_user_prev, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }}
+        {{ dash.table(title1~"("~ title3~")", title2, title3, item.top_ten_user_prev, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "false", "false") }}
     {%endif %}
     {% if "top_ten_user_poiddoc"|key_exists(item) %}
         {% set title1 = "report:: Utilisateurs les plus actifs" | trans %}
         {% set title2 = "report:: utilisateurs" | trans %}
         {% set title3 = "report:: poids document" | trans %}
-        {{ dash.table(title1 , title2, title3, item.top_ten_user_poiddoc, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "true", "false") }}
+        {{ dash.table(title1~"("~ title3~")", title2, title3, item.top_ten_user_poiddoc, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "true", "false") }}
     {%endif %}
     {% if "top_ten_user_poidprev"|key_exists(item) %}
         {% set title1 = "report:: Utilisateurs les plus actifs" | trans %}
         {% set title2 = "report:: utilisateurs" | trans %}
         {% set title3 = "report:: poids preview" | trans %}
-        {{ dash.table(title1, title2, title3, item.top_ten_user_poidprev, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "true", "false") }}
+        {{ dash.table(title1~"("~ title3~")", title2, title3, item.top_ten_user_poidprev, dashboard.getTitleDate('dmin'), dashboard.getTitleDate('dmax'), "true", "false") }}
     {%endif %}
     {% if "top_dl_doc"|key_exists(item) %}
         {% set title1 = "report:: documents les plus telecharges" | trans %}
diff --git a/www/skins/report/report.js b/www/skins/report/report.js
index f65658dce9..c7e94df4e9 100644
--- a/www/skins/report/report.js
+++ b/www/skins/report/report.js
@@ -936,10 +936,9 @@ function loadDash() {
         error   : function( xhr, err ) {
         },
         timeout: function(){
-        },
-        done: function() {
-            $("#dashboard").removeClass("loading");
         }
+    }).done(function() {
+        $("#dashboard").removeClass("loading");
     });
     return false;
 }