diff --git a/.bzrignore b/.bzrignore index 38a8341f..b87a85b5 100644 --- a/.bzrignore +++ b/.bzrignore @@ -5,5 +5,5 @@ include src bin static/json/pandora.json -static/js/pandora.js +static/js/pandora.min.js static/png/*.png diff --git a/pandora/app/config.py b/pandora/app/config.py index 04d27eac..a4612a8c 100644 --- a/pandora/app/config.py +++ b/pandora/app/config.py @@ -64,7 +64,7 @@ def update_static(): data = '' js = [] - pandora_js = os.path.join(settings.STATIC_ROOT, 'js/pandora.js') + pandora_js = os.path.join(settings.STATIC_ROOT, 'js/pandora.min.js') pandora_json = os.path.join(settings.STATIC_ROOT, 'json/pandora.json') for root, folders, files in os.walk(os.path.join(settings.STATIC_ROOT, 'js/pandora')): for f in files: diff --git a/pandora/templates/index.html b/pandora/templates/index.html index 4c441bf7..39a5640b 100644 --- a/pandora/templates/index.html +++ b/pandora/templates/index.html @@ -7,6 +7,7 @@ + - + diff --git a/static/js/init.js b/static/js/pandora.js similarity index 99% rename from static/js/init.js rename to static/js/pandora.js index 2677771f..de98147a 100644 --- a/static/js/init.js +++ b/static/js/pandora.js @@ -1,7 +1,5 @@ // vim: et:ts=4:sw=4:sts=4:ft=javascript -// FIXME: this should be named pandora.js - /* ---- UI Tree ---- appPanel @@ -179,7 +177,7 @@ appPanel }); }); } else { - Ox.loadFile(prefix + 'js/pandora.js', callback); + Ox.loadFile(prefix + 'js/pandora.min.js', callback); } }