diff --git a/MANIFEST.in b/MANIFEST.in
index 9941af47a18..9480b502767 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,4 +1,8 @@
recursive-include panoramix/templates *
recursive-include panoramix/static *
+recursive-exclude panoramix/static/assets/node_modules *
+recursive-include panoramix/static/assets/node_modules/font-awesome *
+recursive-exclude panoramix/static/docs *
+recursive-exclude tests *
recursive-include panoramix/data *
recursive-include panoramix/migrations *
diff --git a/panoramix/assets/javascripts/dashboard.js b/panoramix/assets/javascripts/dashboard.js
index 1b07df00a23..977296a4958 100644
--- a/panoramix/assets/javascripts/dashboard.js
+++ b/panoramix/assets/javascripts/dashboard.js
@@ -9,6 +9,7 @@ require('brace/mode/css');
require('brace/theme/crimson_editor');
require('./panoramix-select2.js');
+require('../node_modules/gridster/dist/jquery.gridster.min.css');
require('../node_modules/gridster/dist/jquery.gridster.min.js');
var Dashboard = function (dashboardData) {
diff --git a/panoramix/assets/javascripts/explore.js b/panoramix/assets/javascripts/explore.js
index b5dc19281be..74025c0802a 100644
--- a/panoramix/assets/javascripts/explore.js
+++ b/panoramix/assets/javascripts/explore.js
@@ -14,7 +14,6 @@ require('bootstrap');
require('./panoramix-select2.js');
require('../node_modules/bootstrap-toggle/js/bootstrap-toggle.min.js');
-require('../vendor/select2.sortable.js');
// css
require('../vendor/pygments.css');
diff --git a/panoramix/assets/javascripts/featured.js b/panoramix/assets/javascripts/featured.js
index 8f7b1414e4d..688702c8942 100644
--- a/panoramix/assets/javascripts/featured.js
+++ b/panoramix/assets/javascripts/featured.js
@@ -1,7 +1,9 @@
var $ = window.$ = require('jquery');
var jQuery = window.jQuery = $;
+var px = require('./modules/panoramix.js');
+
require('datatables');
-require('datatables-bootstrap3-plugin');
+require('../node_modules/datatables-bootstrap3-plugin/media/css/datatables-bootstrap3.css')
require('bootstrap');
$(document).ready(function () {
diff --git a/panoramix/assets/javascripts/modules/panoramix.js b/panoramix/assets/javascripts/modules/panoramix.js
index ad64a680d23..dff34242b4c 100644
--- a/panoramix/assets/javascripts/modules/panoramix.js
+++ b/panoramix/assets/javascripts/modules/panoramix.js
@@ -2,6 +2,8 @@ var $ = require('jquery');
var jQuery = $;
var d3 = require('d3');
+require('../../stylesheets/panoramix.css');
+
// vis sources
var sourceMap = {
area: 'nvd3_vis.js',
diff --git a/panoramix/assets/javascripts/panoramix-select2.js b/panoramix/assets/javascripts/panoramix-select2.js
index 6be060500f0..2118c9b55ad 100644
--- a/panoramix/assets/javascripts/panoramix-select2.js
+++ b/panoramix/assets/javascripts/panoramix-select2.js
@@ -1,2 +1,5 @@
+require('../node_modules/select2/select2.css');
require('../node_modules/select2-bootstrap-css/select2-bootstrap.min.css');
+require('../node_modules/jquery-ui/themes/base/jquery-ui.css')
require('select2');
+require('../vendor/select2.sortable.js');
diff --git a/panoramix/assets/webpack.config.js b/panoramix/assets/webpack.config.js
index abce0283df9..465a04e1c8a 100644
--- a/panoramix/assets/webpack.config.js
+++ b/panoramix/assets/webpack.config.js
@@ -30,9 +30,14 @@ var config = {
include: APP_DIR,
loader: "style-loader!css-loader"
},
- /* for require('*.less') */
+ /* for css linking images */
+ { test: /\.png$/, loader: "url-loader?limit=100000" },
+ { test: /\.jpg$/, loader: "file-loader" },
+ { test: /\.gif$/, loader: "file-loader" },
+ /* for font-awesome */
{ test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "url-loader?limit=10000&minetype=application/font-woff" },
{ test: /\.(ttf|eot|svg)(\?v=[0-9]\.[0-9]\.[0-9])?$/, loader: "file-loader" },
+ /* for require('*.less') */
{
test: /\.less$/,
include: APP_DIR,
diff --git a/panoramix/templates/panoramix/basic.html b/panoramix/templates/panoramix/basic.html
index db0363f0e8b..dcd4ca8329a 100644
--- a/panoramix/templates/panoramix/basic.html
+++ b/panoramix/templates/panoramix/basic.html
@@ -7,11 +7,7 @@
{% block head_meta %}{% endblock %}
{% block head_css %}
-
-
-
-
-
+
{% endblock %}
{% block head_js %}
diff --git a/panoramix/templates/panoramix/dashboard.html b/panoramix/templates/panoramix/dashboard.html
index 20250c582c1..c1b54151c92 100644
--- a/panoramix/templates/panoramix/dashboard.html
+++ b/panoramix/templates/panoramix/dashboard.html
@@ -2,7 +2,6 @@
{% block head_css %}
{{ super() }}
-
diff --git a/panoramix/templates/panoramix/featured.html b/panoramix/templates/panoramix/featured.html
index 29a646b704a..0b33f6ed9fb 100644
--- a/panoramix/templates/panoramix/featured.html
+++ b/panoramix/templates/panoramix/featured.html
@@ -34,11 +34,6 @@
{% endblock %}
-{% block head_css %}
-{{ super() }}
-
-{% endblock %}
-
{% block tail_js %}
{{ super() }}
diff --git a/setup.py b/setup.py
index 732a2247cb9..e1a071cbc4f 100644
--- a/setup.py
+++ b/setup.py
@@ -1,6 +1,6 @@
from setuptools import setup, find_packages
-version = '0.7.1'
+version = '0.8.0'
setup(
name='panoramix',
@@ -9,10 +9,6 @@ setup(
"and druid.io"),
version=version,
packages=find_packages(),
- package_data={'': [
- 'panoramix/migrations/alembic.ini',
- 'panoramix/data/birth_names.csv.gz',
- ]},
include_package_data=True,
zip_safe=False,
scripts=['panoramix/bin/panoramix'],