From fffb0a7a804df8fce09e2d464e20ccee7e225670 Mon Sep 17 00:00:00 2001
From: Maxime Beauchemin <maximebeauchemin@gmail.com>
Date: Mon, 21 Dec 2015 00:05:50 -0800
Subject: [PATCH] Getting rid of the template heavy approach

---
 panoramix/templates/panoramix/dashboard.html        | 13 +------------
 panoramix/templates/panoramix/explore.html          |  2 +-
 panoramix/templates/panoramix/viz.html              |  8 --------
 panoramix/templates/panoramix/viz_bignumber.html    |  8 --------
 .../templates/panoramix/viz_directed_force.html     |  8 --------
 panoramix/templates/panoramix/viz_markup.html       |  8 --------
 panoramix/templates/panoramix/viz_nvd3.html         |  8 --------
 panoramix/templates/panoramix/viz_pivot_table.html  |  8 --------
 panoramix/templates/panoramix/viz_sankey.html       |  9 ---------
 panoramix/templates/panoramix/viz_sunburst.html     |  8 --------
 panoramix/templates/panoramix/viz_table.html        |  8 --------
 panoramix/templates/panoramix/viz_word_cloud.html   |  8 --------
 panoramix/templates/panoramix/viz_world_map.html    |  8 --------
 panoramix/viz.py                                    | 11 -----------
 14 files changed, 2 insertions(+), 113 deletions(-)
 delete mode 100644 panoramix/templates/panoramix/viz_bignumber.html
 delete mode 100644 panoramix/templates/panoramix/viz_directed_force.html
 delete mode 100644 panoramix/templates/panoramix/viz_markup.html
 delete mode 100644 panoramix/templates/panoramix/viz_nvd3.html
 delete mode 100644 panoramix/templates/panoramix/viz_pivot_table.html
 delete mode 100644 panoramix/templates/panoramix/viz_sankey.html
 delete mode 100644 panoramix/templates/panoramix/viz_sunburst.html
 delete mode 100644 panoramix/templates/panoramix/viz_table.html
 delete mode 100644 panoramix/templates/panoramix/viz_word_cloud.html
 delete mode 100644 panoramix/templates/panoramix/viz_world_map.html

diff --git a/panoramix/templates/panoramix/dashboard.html b/panoramix/templates/panoramix/dashboard.html
index 393687a7a34..a69b5ce5580 100644
--- a/panoramix/templates/panoramix/dashboard.html
+++ b/panoramix/templates/panoramix/dashboard.html
@@ -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 %}
diff --git a/panoramix/templates/panoramix/explore.html b/panoramix/templates/panoramix/explore.html
index 35ea3612b41..301060f8bd9 100644
--- a/panoramix/templates/panoramix/explore.html
+++ b/panoramix/templates/panoramix/explore.html
@@ -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>
diff --git a/panoramix/templates/panoramix/viz.html b/panoramix/templates/panoramix/viz.html
index 61f7bce7e55..d8eabb78b43 100644
--- a/panoramix/templates/panoramix/viz.html
+++ b/panoramix/templates/panoramix/viz.html
@@ -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 %}
diff --git a/panoramix/templates/panoramix/viz_bignumber.html b/panoramix/templates/panoramix/viz_bignumber.html
deleted file mode 100644
index 062c23bfd55..00000000000
--- a/panoramix/templates/panoramix/viz_bignumber.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% macro viz_html(viz) %}
-{% endmacro %}
-
-{% macro viz_js(viz) %}
-{% endmacro %}
-
-{% macro viz_css(viz) %}
-{% endmacro %}
diff --git a/panoramix/templates/panoramix/viz_directed_force.html b/panoramix/templates/panoramix/viz_directed_force.html
deleted file mode 100644
index 062c23bfd55..00000000000
--- a/panoramix/templates/panoramix/viz_directed_force.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% macro viz_html(viz) %}
-{% endmacro %}
-
-{% macro viz_js(viz) %}
-{% endmacro %}
-
-{% macro viz_css(viz) %}
-{% endmacro %}
diff --git a/panoramix/templates/panoramix/viz_markup.html b/panoramix/templates/panoramix/viz_markup.html
deleted file mode 100644
index 062c23bfd55..00000000000
--- a/panoramix/templates/panoramix/viz_markup.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% macro viz_html(viz) %}
-{% endmacro %}
-
-{% macro viz_js(viz) %}
-{% endmacro %}
-
-{% macro viz_css(viz) %}
-{% endmacro %}
diff --git a/panoramix/templates/panoramix/viz_nvd3.html b/panoramix/templates/panoramix/viz_nvd3.html
deleted file mode 100644
index 062c23bfd55..00000000000
--- a/panoramix/templates/panoramix/viz_nvd3.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% macro viz_html(viz) %}
-{% endmacro %}
-
-{% macro viz_js(viz) %}
-{% endmacro %}
-
-{% macro viz_css(viz) %}
-{% endmacro %}
diff --git a/panoramix/templates/panoramix/viz_pivot_table.html b/panoramix/templates/panoramix/viz_pivot_table.html
deleted file mode 100644
index 062c23bfd55..00000000000
--- a/panoramix/templates/panoramix/viz_pivot_table.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% macro viz_html(viz) %}
-{% endmacro %}
-
-{% macro viz_js(viz) %}
-{% endmacro %}
-
-{% macro viz_css(viz) %}
-{% endmacro %}
diff --git a/panoramix/templates/panoramix/viz_sankey.html b/panoramix/templates/panoramix/viz_sankey.html
deleted file mode 100644
index b27e0a5c787..00000000000
--- a/panoramix/templates/panoramix/viz_sankey.html
+++ /dev/null
@@ -1,9 +0,0 @@
-{% macro viz_html(viz) %}
-{% endmacro %}
-
-{% macro viz_js(viz) %}
-{% endmacro %}
-
-{% macro viz_css(viz) %}
-{% endmacro %}
-
diff --git a/panoramix/templates/panoramix/viz_sunburst.html b/panoramix/templates/panoramix/viz_sunburst.html
deleted file mode 100644
index 062c23bfd55..00000000000
--- a/panoramix/templates/panoramix/viz_sunburst.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% macro viz_html(viz) %}
-{% endmacro %}
-
-{% macro viz_js(viz) %}
-{% endmacro %}
-
-{% macro viz_css(viz) %}
-{% endmacro %}
diff --git a/panoramix/templates/panoramix/viz_table.html b/panoramix/templates/panoramix/viz_table.html
deleted file mode 100644
index 062c23bfd55..00000000000
--- a/panoramix/templates/panoramix/viz_table.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% macro viz_html(viz) %}
-{% endmacro %}
-
-{% macro viz_js(viz) %}
-{% endmacro %}
-
-{% macro viz_css(viz) %}
-{% endmacro %}
diff --git a/panoramix/templates/panoramix/viz_word_cloud.html b/panoramix/templates/panoramix/viz_word_cloud.html
deleted file mode 100644
index 062c23bfd55..00000000000
--- a/panoramix/templates/panoramix/viz_word_cloud.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% macro viz_html(viz) %}
-{% endmacro %}
-
-{% macro viz_js(viz) %}
-{% endmacro %}
-
-{% macro viz_css(viz) %}
-{% endmacro %}
diff --git a/panoramix/templates/panoramix/viz_world_map.html b/panoramix/templates/panoramix/viz_world_map.html
deleted file mode 100644
index 062c23bfd55..00000000000
--- a/panoramix/templates/panoramix/viz_world_map.html
+++ /dev/null
@@ -1,8 +0,0 @@
-{% macro viz_html(viz) %}
-{% endmacro %}
-
-{% macro viz_js(viz) %}
-{% endmacro %}
-
-{% macro viz_css(viz) %}
-{% endmacro %}
diff --git a/panoramix/viz.py b/panoramix/viz.py
index 7ae8f25a15c..09f43adab7e 100644
--- a/panoramix/viz.py
+++ b/panoramix/viz.py
@@ -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',