From 51797ca9a5ae6b3e1433448f568dbbcdbaa517ca Mon Sep 17 00:00:00 2001 From: Maxime Beauchemin Date: Tue, 1 Mar 2016 18:22:41 -0800 Subject: [PATCH] Fixing the standalone mode --- panoramix/assets/webpack.config.js | 1 + panoramix/templates/panoramix/standalone.html | 26 +++++++------------ panoramix/viz.py | 2 ++ 3 files changed, 12 insertions(+), 17 deletions(-) diff --git a/panoramix/assets/webpack.config.js b/panoramix/assets/webpack.config.js index e6811635fcd90..d98211a409b23 100644 --- a/panoramix/assets/webpack.config.js +++ b/panoramix/assets/webpack.config.js @@ -11,6 +11,7 @@ var config = { explore: APP_DIR + '/javascripts/explore.js', featured: APP_DIR + '/javascripts/featured.js', sql: APP_DIR + '/javascripts/sql.js', + standalone: APP_DIR + '/javascripts/standalone.js', }, output: { path: BUILD_DIR, diff --git a/panoramix/templates/panoramix/standalone.html b/panoramix/templates/panoramix/standalone.html index bc2faa9dff4df..5a0818d221de8 100644 --- a/panoramix/templates/panoramix/standalone.html +++ b/panoramix/templates/panoramix/standalone.html @@ -1,29 +1,21 @@ - - - {% block head_css %} - - - {% endblock %} + + + {% set CSS_THEME = appbuilder.get_app.config.get("CSS_THEME") %} + {% set height = request.args.get("height", 700) %} + {% if CSS_THEME %} + + {% endif %}
+ style="height: {{ height }}px;"> loading
- - - {% block tail %}{% endblock %} diff --git a/panoramix/viz.py b/panoramix/viz.py index 7196270105ad3..3c7fa77096392 100644 --- a/panoramix/viz.py +++ b/panoramix/viz.py @@ -104,6 +104,8 @@ def reassignments(self): def get_url(self, **kwargs): d = self.orig_form_data.copy() + if 'json' in d: + del d['json'] if 'action' in d: del d['action'] d.update(kwargs)