pt
/
superset
mirror of https://github.com/apache/superset.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Getting rid of the template heavy approach

This commit is contained in:
Maxime Beauchemin 2015-12-21 00:05:50 -08:00
parent 458703d9c8
commit fffb0a7a80
14 changed files with 2 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
panoramix/templates/panoramix/dashboard.html
View File

@ -9,11 +9,6 @@
<style id="user_style" type="text/css">
{{ dashboard.css }}
</style>
{% for slice in dashboard.slices %}
{% set viz = slice.viz %}
{% import viz.template as viz_macros %}
{{ viz_macros.viz_css(viz) }}
{% endfor %}
{% endblock %}
{% block content_fluid %}
@ -77,7 +72,6 @@ body {
{% for slice in dashboard.slices %}
{% set pos = pos_dict.get(slice.id, {}) %}
{% set viz = slice.viz %}
{% import viz.template as viz_macros %}
<li
id="slice_{{ slice.id }}"
slice_id="{{ slice.id }}"
@ -111,7 +105,7 @@ body {
</table>
<div id="{{ viz.token }}" class="token" style="height: 100%;">
<img src="{{ url_for("static", filename="img/loading.gif") }}" class="loading" alt="loading">
<div class="slice_container" id="{{ viz.token }}_con" style="height: 100%; width: 100%;">{{ viz_macros.viz_html(viz) }}</div>
<div class="slice_container" id="{{ viz.token }}_con" style="height: 100%; width: 100%;"></div>
</div>
</li>
{% endfor %}
@ -132,9 +126,4 @@ body {
var dashboard = px.Dashboard();
});
</script>
{% for slice in dashboard.slices %}
{% set viz = slice.viz %}
{% import viz.template as viz_macros %}
{{ viz_macros.viz_js(viz) }}
{% endfor %}
{% endblock %}

2
panoramix/templates/panoramix/explore.html
View File

@ -150,7 +150,7 @@
<div class="alert alert-warning">{{ viz.warning_msg }}</div>
{% endif %}
{% endblock %}
<div id="{{ viz.token }}_con" class="slice_container" style="height: 100%; width: 100%">{{ viz_macros.viz_html(viz) }}</div>
<div id="{{ viz.token }}_con" class="slice_container" style="height: 100%; width: 100%"></div>
</div>
</div>
</div>

8
panoramix/templates/panoramix/viz.html
View File

@ -1,5 +1,3 @@
{% import viz.template as viz_macros %}
{% if viz.form_data.get("json") == "true" %}
{{ viz.get_json() }}
{% else %}
@ -10,10 +8,6 @@
{% endif %}
{% block viz_html %}
{{ viz_macros.viz_html(viz) }}
{% endblock %}
{% block head_css %}
{{super()}}
{% if viz.request.args.get("skip_libs") != "true" %}
@ -21,7 +15,6 @@
<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename=css) }}">
{% endfor %}
{% endif %}
{{ viz_macros.viz_css(viz) }}
{% endblock %}
@ -31,7 +24,6 @@
{% for js in viz.js_files %}
<script src="{{ url_for('static', filename=js) }}"></script>
{% endfor %}
{{ viz_macros.viz_js(viz) }}
{% endif %}
{% endblock %}
{% endif %}

8
panoramix/templates/panoramix/viz_bignumber.html
View File

@ -1,8 +0,0 @@
{% macro viz_html(viz) %}
{% endmacro %}
{% macro viz_js(viz) %}
{% endmacro %}
{% macro viz_css(viz) %}
{% endmacro %}

8
panoramix/templates/panoramix/viz_directed_force.html
View File

@ -1,8 +0,0 @@
{% macro viz_html(viz) %}
{% endmacro %}
{% macro viz_js(viz) %}
{% endmacro %}
{% macro viz_css(viz) %}
{% endmacro %}

8
panoramix/templates/panoramix/viz_markup.html
View File

@ -1,8 +0,0 @@
{% macro viz_html(viz) %}
{% endmacro %}
{% macro viz_js(viz) %}
{% endmacro %}
{% macro viz_css(viz) %}
{% endmacro %}

8
panoramix/templates/panoramix/viz_nvd3.html
View File

@ -1,8 +0,0 @@
{% macro viz_html(viz) %}
{% endmacro %}
{% macro viz_js(viz) %}
{% endmacro %}
{% macro viz_css(viz) %}
{% endmacro %}

8
panoramix/templates/panoramix/viz_pivot_table.html
View File

@ -1,8 +0,0 @@
{% macro viz_html(viz) %}
{% endmacro %}
{% macro viz_js(viz) %}
{% endmacro %}
{% macro viz_css(viz) %}
{% endmacro %}

9
panoramix/templates/panoramix/viz_sankey.html
View File

@ -1,9 +0,0 @@
{% macro viz_html(viz) %}
{% endmacro %}
{% macro viz_js(viz) %}
{% endmacro %}
{% macro viz_css(viz) %}
{% endmacro %}

8
panoramix/templates/panoramix/viz_sunburst.html
View File

@ -1,8 +0,0 @@
{% macro viz_html(viz) %}
{% endmacro %}
{% macro viz_js(viz) %}
{% endmacro %}
{% macro viz_css(viz) %}
{% endmacro %}

8
panoramix/templates/panoramix/viz_table.html
View File

@ -1,8 +0,0 @@
{% macro viz_html(viz) %}
{% endmacro %}
{% macro viz_js(viz) %}
{% endmacro %}
{% macro viz_css(viz) %}
{% endmacro %}

8
panoramix/templates/panoramix/viz_word_cloud.html
View File

@ -1,8 +0,0 @@
{% macro viz_html(viz) %}
{% endmacro %}
{% macro viz_js(viz) %}
{% endmacro %}
{% macro viz_css(viz) %}
{% endmacro %}

8
panoramix/templates/panoramix/viz_world_map.html
View File

@ -1,8 +0,0 @@
{% macro viz_html(viz) %}
{% endmacro %}
{% macro viz_js(viz) %}
{% endmacro %}
{% macro viz_css(viz) %}
{% endmacro %}

11
panoramix/viz.py
View File

@ -22,7 +22,6 @@ config = app.config
class BaseViz(object):
viz_type = None
verbose_name = "Base Viz"
template = None
is_timeseries = False
fieldsets = (
{
@ -240,7 +239,6 @@ class BaseViz(object):
class TableViz(BaseViz):
viz_type = "table"
verbose_name = "Table View"
template = 'panoramix/viz_table.html'
fieldsets = (
{
'label': None,
@ -307,7 +305,6 @@ class TableViz(BaseViz):
class PivotTableViz(BaseViz):
viz_type = "pivot_table"
verbose_name = "Pivot Table"
template = 'panoramix/viz_pivot_table.html'
css_files = [
'lib/dataTables/dataTables.bootstrap.css',
'widgets/viz_pivot_table.css']
@ -378,7 +375,6 @@ class PivotTableViz(BaseViz):
class MarkupViz(BaseViz):
viz_type = "markup"
verbose_name = "Markup Widget"
template = 'panoramix/viz_markup.html'
js_files = ['widgets/viz_markup.js']
fieldsets = (
{
@ -406,7 +402,6 @@ class WordCloudViz(BaseViz):
"""
viz_type = "word_cloud"
verbose_name = "Word Cloud"
template = 'panoramix/viz_word_cloud.html'
is_timeseries = False
fieldsets = (
{
@ -443,7 +438,6 @@ class WordCloudViz(BaseViz):
class NVD3Viz(BaseViz):
viz_type = None
verbose_name = "Base NVD3 Viz"
template = 'panoramix/viz_nvd3.html'
is_timeseries = False
js_files = [
'lib/d3.min.js',
@ -525,7 +519,6 @@ class BubbleViz(NVD3Viz):
class BigNumberViz(BaseViz):
viz_type = "big_number"
verbose_name = "Big Number"
template = 'panoramix/viz_bignumber.html'
is_timeseries = True
js_files = [
'lib/d3.min.js',
@ -858,7 +851,6 @@ class SunburstViz(BaseViz):
viz_type = "sunburst"
verbose_name = "Sunburst"
is_timeseries = False
template = 'panoramix/viz_sunburst.html'
js_files = [
'lib/d3.min.js',
'widgets/viz_sunburst.js']
@ -925,7 +917,6 @@ class SankeyViz(BaseViz):
viz_type = "sankey"
verbose_name = "Sankey"
is_timeseries = False
template = 'panoramix/viz_sankey.html'
js_files = [
'lib/d3.min.js',
'lib/d3-sankey.js',
@ -968,7 +959,6 @@ class DirectedForceViz(BaseViz):
viz_type = "directed_force"
verbose_name = "Directed Force Layout"
is_timeseries = False
template = 'panoramix/viz_directed_force.html'
js_files = [
'lib/d3.min.js',
'widgets/viz_directed_force.js']
@ -1015,7 +1005,6 @@ class WorldMapViz(BaseViz):
viz_type = "world_map"
verbose_name = "World Map"
is_timeseries = False
template = 'panoramix/viz_world_map.html'
js_files = [
'lib/d3.min.js',
'lib/topojson.min.js',