Adds new reporting graphs (disk usage) to the GoogleApps admin page.

Signed-off-by: Vincent Zanotti <vincent.zanotti@polytechnique.org>

diff --git a/htdocs/images/googleapps/.gitignore b/htdocs/images/googleapps/.gitignore
index d455c33..e793c7e 100644 (file)
--- a/htdocs/images/googleapps/.gitignore
+++ b/htdocs/images/googleapps/.gitignore
@@ -1,2 +1,2 @@
-/activity-monthly.png
-/activity-yearly.png
+/activity-*.png
+/usage-*.png

diff --git a/templates/googleapps/admin.tpl b/templates/googleapps/admin.tpl
index 67e9ccb..8b6331b 100644 (file)
--- a/templates/googleapps/admin.tpl
+++ b/templates/googleapps/admin.tpl
@@ -94,7 +94,17 @@
 
 <div style="text-align: center">
   <img src="images/googleapps/activity-yearly.png" alt="Activité Google Apps - 1 an" width="500 height="250" />
-  <br /><em>Utilisation des comptes Google Apps sur les 12 derniers mois</em>.
+  <br /><em>Utilisation disque des comptes sur les 12 derniers mois</em>.
+</div>
+
+<div style="text-align: center">
+  <img src="images/googleapps/usage-monthly.png" alt="Utilisation disque - 1 mois" width="500 height="250" />
+  <br /><em>Utilisation des comptes Google Apps sur les 31 derniers jours</em>.
+</div>
+
+<div style="text-align: center">
+  <img src="images/googleapps/usage-yearly.png" alt="Utilisation disque - 1 an" width="500 height="250" />
+  <br /><em>Utilisation disque des comptes sur les 12 derniers mois</em>.
 </div>
 
 {* vim:set et sw=2 sts=2 sws=2 enc=utf-8: *}