Changeset 112233 in spip-zone

Timestamp:

Oct 31, 2018, 11:48:55 AM (2 years ago)

Author:

booz@…

Message:

Affichage des stats plus lisible quand on passe > 100 000 et formatage avec espace des milliers

Location:

_core_/plugins/statistiques/prive

Files:

• squelettes/inclure/stats-visites-jours.html (modified) (2 diffs)
• stats/visites.html (modified) (1 diff)
• style_prive_plugin_stats.html (modified) (1 diff)

_core_/plugins/statistiques/prive/squelettes/inclure/stats-visites-jours.html

@@ -25 +25 @@
                         <tr class="odd on">
                                 <th><:info_maximum|trim{':'}|trim|ucfirst:></th>
-                                <td class='num'>#GET{max}</td>
+                                <td class='num'>[(#GET{max}|number_format{0,"","&nbsp;"})]</td>
                         </tr>
                         <tr class="odd on">
                                 <th><:info_moyenne|trim{':'}|trim|ucfirst:></th>
-                                <td class='num'>[(#GET{moy}|round)]</td>
+                                <td class='num'>[(#GET{moy}|round|number_format{0,"","&nbsp;"})]</td>
                         </tr>
                         <tr class="even">
                                 <th><a href="#URL_ECRIRE{stats_referers,jour=jour}"
                                                                 title="<:statistiques:titre_liens_entrants|trim{':'}|trim|attribut_html:>: <:info_aujourdhui|trim{':'}|trim|attribut_html:>"><:info_aujourdhui|trim{':'}|trim|ucfirst:></a></th>
-                                <td class='num'>#GET{last}</td>
+                                <td class='num'>[(#GET{last}|number_format{0,"","&nbsp;"})]</td>
                         </tr>
                         <tr class="even">
                                 <th><a href="#URL_ECRIRE{stats_referers,jour=veille}"
                                                                 title="<:statistiques:titre_liens_entrants|trim{':'}|trim|attribut_html:>: <:info_hier|trim{':'}|trim|attribut_html:>"><:info_hier|trim{':'}|trim|ucfirst:></a></th>
-                                <td class='num'>#GET{lastlast}</td>
+                                <td class='num'>[(#GET{lastlast}|number_format{0,"","&nbsp;"})]</td>
                         </tr>
                         <BOUCLE_art(ARTICLES){id_article}{statut?}>
                                 <tr class="odd">
                                         <th><:statistiques:info_popularite_5|trim{':'}|trim|ucfirst:></th>
-                                        <td class='num'>[(#CHAMP_SQL{popularite}|round)]</td>
+                                        <td class='num'>[(#CHAMP_SQL{popularite}|round|number_format{0,"","&nbsp;"})]</td>
                                 </tr>
                                 <tr class="odd">
                                         <th><:info_total|trim{':'}|trim|ucfirst:></th>
-                                        <td class='num'>[(#VISITES|round)]</td>
+                                        <td class='num'>[(#VISITES|round|number_format{0,"","&nbsp;"})]</td>
                                 </tr>
                                 <tr class="odd">
@@ -57 +57 @@
                                 <tr class="odd">
                                         <th><:info_total|trim{':'}|trim|ucfirst:></th>
-                                        <td class='num'>[(#REM|stats_total)]</td>
+                                        <td class='num'>[(#REM|stats_total|number_format{0,"","&nbsp;"})]</td>
                                 </tr>
                                 <tr class="odd">
                                         <th><:statistiques:info_popularite_2|trim{':'}|trim|ucfirst:></th>
-                                        <td class='num'>[(#CONFIG{popularite_total}|round)]</td>
+                                        <td class='num'>[(#CONFIG{popularite_total}|round|number_format{0,"","&nbsp;"})]</td>
                                 </tr>
                         <//B_art>

_core_/plugins/statistiques/prive/stats/visites.html

@@ -71 +71 @@
                         },
                         yaxis:{
-                                position: "right"
+                                position: "right",
+                                tickDecimals: 1,
+                                tickFormatter: function nbFormatter(val, axis) {
+                                        if (val >= 1000000){
+                                                var fval = (val / 1000000).toFixed(axis.tickDecimals) ;
+                                                return fval.replace(/\.0$/,"") + " M";
+                                        }
+                                        else{
+                                                if (val >= 100000)
+                                                        return (val / 1000).toFixed(axis.tickDecimals).replace(/\.0$/,"") + " k";
+                                                else{
+                                                        var fval = val.toFixed(axis.tickDecimals).replace(/\.0$/,"") ;
+                                                        return fval.replace(/(\d{3})$/," $1") ;
+                                                }
+                                        }
+                                }
                         }
                 },

_core_/plugins/statistiques/prive/style_prive_plugin_stats.html

@@ -50 +50 @@
 /* graphique flot */
 .graphique{clear:both; overflow:hidden; margin-bottom:2em;}
-.graphResult-wrap {padding: 10px 25px;float:#GET{left};}
+.graphResult-wrap {padding: 10px;float:#GET{left};}
 .graphResult{}
 .graphInfo{float:#GET{left}; clear:#GET{left};margin-#GET{left}:20px;}