Let the GraphsViewer display a fullscreen button

pydio · Sep 9, 2014 · 9443486 · 9443486
1 parent 91f0236
commit 9443486
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 5 deletions.
diff --git a/core/src/plugins/editor.ajxp_graphs/class.GraphsViewer.js b/core/src/plugins/editor.ajxp_graphs/class.GraphsViewer.js
@@ -30,7 +30,7 @@ Class.create("GraphsViewer", AbstractEditor, {
     initialize: function($super, oFormObject, editorOptions)
     {
         editorOptions = Object.extend({
-            fullscreen:false
+            fullscreen:true
         }, editorOptions);
         $super(oFormObject, editorOptions);
         this.charts = $H();
@@ -70,20 +70,23 @@ Class.create("GraphsViewer", AbstractEditor, {
     },
 
     parseAndLoadQueries: function(queriesData){
-        this.element.update('');
+        if(this.element.down("#graph_viewer_loader")){
+            this.element.down("#graph_viewer_loader").remove();
+        }
+        this.element.down("#graph_viewer_container").update('');
         this.queriesData = $A(queriesData);
         this.queriesData.each(function(qData){
             var div;
             if(qData['SEPARATOR']){
                 div = new Element('div', {class:'tabrow', style:'clear:left;'}).update('<li class="selected">' + qData['LABEL'] + '</li>');
-                this.element.insert(div);
+                this.element.down("#graph_viewer_container").insert(div);
                 if(qData['UPDATER']){
                     this.buildUpdaterButtons(div, qData['UPDATER']);
                 }
                 return;
             }
             div = new Element('div', {id:qData['NAME']+'_container'});
-            this.element.insert(div);
+            this.element.down("#graph_viewer_container").insert(div);
             if(qData["FIGURE"]){
                 div.addClassName("cumulated_figure");
                 div.update('<div class="innerTitle">'+qData['LABEL']+'</div>' + '<div class="figure">&nbsp;</div>');

diff --git a/core/src/plugins/editor.ajxp_graphs/manifest.xml b/core/src/plugins/editor.ajxp_graphs/manifest.xml
@@ -18,7 +18,8 @@
 	</client_settings>
 	<clientForm id="graph_viewer_box"><![CDATA[
 		<div id="graph_viewer_box" class="tabbed_editor" style="background-color:#f8f8f8; overflow-y: scroll; border-radius:0 4px 0 0;" box_resize="true" box_padding="0">
-		<div style="text-align:center; padding-top: 40px;"> Loading analytics data ... </div>
+		    <div id="graph_viewer_loader" style="text-align:center; padding-top: 40px;"> Loading analytics data ... </div>
+		    <div id="graph_viewer_container"></div>
 		</div>
 	]]></clientForm>
 	<dependencies>