hazza/Phraseanet
1
0
Fork 0
mirror of https://github.com/alchemy-fr/Phraseanet.git synced 2025-10-24 02:13:15 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix dashboard javascript & title issue

Browse Source
This commit is contained in:
Nicolas Le Goff
2014-05-28 15:48:34 +02:00
parent 53c2f7b5e0
commit e269f64b23
2 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
templates/web/report/ajax_dashboard_content_child.html.twig
View File

@@ -31,25 +31,25 @@
{% set title1 = "report:: Utilisateurs les plus actifs" | trans %} {% set title1 = "report:: Utilisateurs les plus actifs" | trans %}
{% set title2 = "report:: utilisateurs" | trans %} {% set title2 = "report:: utilisateurs" | trans %}
{% set title3 = "report:: telechargements document" | 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 %} {% endif %}
{% if "top_ten_user_prev"|key_exists(item) %} {% if "top_ten_user_prev"|key_exists(item) %}
{% set title1 = "report:: Utilisateurs les plus actifs" | trans %} {% set title1 = "report:: Utilisateurs les plus actifs" | trans %}
{% set title2 = "report:: utilisateurs" | trans %} {% set title2 = "report:: utilisateurs" | trans %}
{% set title3 = "report:: telechargements preview" | 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 %} {%endif %}
{% if "top_ten_user_poiddoc"|key_exists(item) %} {% if "top_ten_user_poiddoc"|key_exists(item) %}
{% set title1 = "report:: Utilisateurs les plus actifs" | trans %} {% set title1 = "report:: Utilisateurs les plus actifs" | trans %}
{% set title2 = "report:: utilisateurs" | trans %} {% set title2 = "report:: utilisateurs" | trans %}
{% set title3 = "report:: poids document" | 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 %} {%endif %}
{% if "top_ten_user_poidprev"|key_exists(item) %} {% if "top_ten_user_poidprev"|key_exists(item) %}
{% set title1 = "report:: Utilisateurs les plus actifs" | trans %} {% set title1 = "report:: Utilisateurs les plus actifs" | trans %}
{% set title2 = "report:: utilisateurs" | trans %} {% set title2 = "report:: utilisateurs" | trans %}
{% set title3 = "report:: poids preview" | 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 %} {%endif %}
{% if "top_dl_doc"|key_exists(item) %} {% if "top_dl_doc"|key_exists(item) %}
{% set title1 = "report:: documents les plus telecharges" | trans %} {% set title1 = "report:: documents les plus telecharges" | trans %}

5
www/skins/report/report.js
View File

@@ -936,10 +936,9 @@ function loadDash() {
error : function( xhr, err ) { error : function( xhr, err ) {
}, },
timeout: function(){ timeout: function(){
},
done: function() {
$("#dashboard").removeClass("loading");
} }
}).done(function() {
$("#dashboard").removeClass("loading");
}); });
return false; return false;
} }