Moving html assets back to flask template folder

ptzagk · Feb 27, 2016 · 4f4c67c · 4f4c67c
1 parent c929b2a
commit 4f4c67c
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/panoramix/assets/html/index.html b/panoramix/assets/html/index.html
diff --git a/panoramix/assets/html/basic.html → panoramix/templates/panoramix/basic.html b/panoramix/assets/html/basic.html → panoramix/templates/panoramix/basic.html
diff --git a/panoramix/assets/html/dashboard.html → panoramix/templates/panoramix/dashboard.html b/panoramix/assets/html/dashboard.html → panoramix/templates/panoramix/dashboard.html
@@ -1,4 +1,4 @@
-{% extends "refactor/basic.html" %}
+{% extends "panoramix/basic.html" %}
 
 {% block head_css %}
     {{ super() }}

diff --git a/panoramix/assets/html/explore.html → panoramix/templates/panoramix/explore.html b/panoramix/assets/html/explore.html → panoramix/templates/panoramix/explore.html
@@ -1,4 +1,4 @@
-{% extends "refactor/basic.html" %}
+{% extends "panoramix/basic.html" %}
 
 {% block body %}
   {% set datasource = viz.datasource %}

diff --git a/panoramix/assets/html/featured.html → panoramix/templates/panoramix/featured.html b/panoramix/assets/html/featured.html → panoramix/templates/panoramix/featured.html
@@ -1,4 +1,4 @@
-{% extends "refactor/basic.html" %}
+{% extends "panoramix/basic.html" %}
 {% block body %}
 <div class="container">
   <div class="header">

diff --git a/panoramix/templates/panoramix/index.html b/panoramix/templates/panoramix/index.html
@@ -0,0 +1,6 @@
+{% extends "panoramix/basic.html" %}
+
+{% block tail_js %}
+  {{ super() }}
+  <script src="/static/assets/javascripts/dist/index.entry.js"></script>
+{% endblock %}
diff --git a/panoramix/assets/html/sql.html → panoramix/templates/panoramix/sql.html b/panoramix/assets/html/sql.html → panoramix/templates/panoramix/sql.html
@@ -1,4 +1,4 @@
-{% extends "refactor/basic.html" %}
+{% extends "panoramix/basic.html" %}
 
 {% block head_css %}
   {{super()}}

diff --git a/panoramix/assets/html/viz.html → panoramix/templates/panoramix/viz.html b/panoramix/assets/html/viz.html → panoramix/templates/panoramix/viz.html
@@ -5,7 +5,7 @@
   {% if viz.request.args.get("standalone") == "true" %}
     {% extends 'panoramix/standalone.html' %}
   {% else %}
-    {% extends 'refactor/explore.html' %}
+    {% extends 'panoramix/explore.html' %}
   {% endif %}
 
 {% endif %}
diff --git a/panoramix/views.py b/panoramix/views.py
@@ -471,10 +471,10 @@ def explore(self, datasource_type, datasource_id):
         else:
             if config.get("DEBUG"):
                 resp = self.render_template(
-                    "refactor/viz.html", viz=obj, slice=slc)
+                    "panoramix/viz.html", viz=obj, slice=slc)
             try:
                 resp = self.render_template(
-                    "refactor/viz.html", viz=obj, slice=slc)
+                    "panoramix/viz.html", viz=obj, slice=slc)
             except Exception as e:
                 if config.get("DEBUG"):
                     raise(e)
@@ -560,7 +560,7 @@ def dashboard(**kwargs):
                 int(o['slice_id']):o
                 for o in json.loads(dash.position_json)}
         return self.render_template(
-            "refactor/dashboard.html", dashboard=dash,
+            "panoramix/dashboard.html", dashboard=dash,
             templates=templates,
             pos_dict=pos_dict)
 
@@ -575,7 +575,7 @@ def sql(self, database_id):
 
         table_name=request.args.get('table_name')
         return self.render_template(
-            "refactor/sql.html",
+            "panoramix/sql.html",
             tables=tables,
             table_name=table_name,
             db=mydb)
@@ -718,7 +718,7 @@ def featured(self):
         )
         featured_datasets = datasets_sqla + datasets_druid
         return self.render_template(
-            'refactor/featured.html',
+            'panoramix/featured.html',
             featured_datasets=featured_datasets,
             utils=utils)