Add titles

pydio · Apr 8, 2014 · cfa6784 · cfa6784
1 parent 3089052
commit cfa6784
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 2 deletions.
diff --git a/core/src/plugins/editor.ajxp_graphs/class.GraphsViewer.js b/core/src/plugins/editor.ajxp_graphs/class.GraphsViewer.js
@@ -59,7 +59,13 @@ Class.create("GraphsViewer", AbstractEditor, {
         $('graph_viewer_box').update('');
         this.queriesData = $A(queriesData);
         this.queriesData.each(function(qData){
-            var div = new Element('div', {id:qData['NAME']+'_container'});
+            var div;
+            if(qData['SEPARATOR']){
+                div = new Element('div', {class:'tabrow'}).update('<li class="selected">' + qData['LABEL'] + '</li>');
+                this.element.insert(div);
+                return;
+            }
+            div = new Element('div', {id:qData['NAME']+'_container'});
             this.element.insert(div);
             div.insert({top:('<div class="innerTitle">'+qData['LABEL']+'</div>')});
             div.insert(('<div style="text-align: center; padding:100px;">Loading...</div>'));

diff --git a/core/src/plugins/log.sql/class.sqlLogDriver.php b/core/src/plugins/log.sql/class.sqlLogDriver.php
@@ -131,7 +131,7 @@ public function exposeQueries($actionName, &$httpVars, &$fileVars){
 
     private function getQuery($queryName){
         foreach($this->queries as $q){
-            if($q["NAME"] == $queryName) return $q;
+            if(isset($q["NAME"]) && $q["NAME"] == $queryName) return $q;
         }
         return false;
     }

diff --git a/core/src/plugins/log.sql/queries.json b/core/src/plugins/log.sql/queries.json
@@ -5,6 +5,10 @@
     "FIGURE":"total_number_of_logins",
     "SQL":"SELECT COUNT( DISTINCT id ) AS total_number_of_logins FROM ajxp_log2 WHERE user IN ( SELECT DISTINCT login FROM ajxp_user_rights WHERE severity =  \"INFO\" AND login NOT IN ( SELECT DISTINCT login FROM ajxp_user_rights WHERE repo_uuid = \"ajxp.parent_user\" ) ) AND params LIKE  \"Log In%\""
   },
+    {
+        "SEPARATOR":true,
+        "LABEL":"Users activity"
+    },
   {
     "NAME":"unique_users_per_day",
     "LABEL":"Unique users per day",
@@ -23,6 +27,10 @@
     },
     "SQL":"SELECT SQL_CALC_FOUND_ROWS DATE( logdate )AS Date, COUNT( DISTINCT id ) AS \"Users Connections\" FROM ajxp_log2 WHERE user IN ( SELECT DISTINCT login FROM ajxp_user_rights WHERE severity =  \"INFO\" AND login NOT IN (SELECT DISTINCT login FROM ajxp_user_rights WHERE repo_uuid = \"ajxp.parent_user\" ) ) AND params LIKE  \"Log In%\" GROUP BY DATE( logdate )  ORDER BY logdate DESC"
   },
+    {
+        "SEPARATOR":true,
+        "LABEL":"Documents Activity"
+    },
   {
     "NAME":"downloads_per_day",
     "LABEL":"Downloads per day",