From 714f495a3d85de32a49c76430b79d9d088524b91 Mon Sep 17 00:00:00 2001 From: rolux Date: Fri, 26 Sep 2014 16:54:20 +0200 Subject: [PATCH] build/ -> min/, Ox.UI/ -> UI/ --- pandora/app/config.py | 4 ++-- pandora/templates/embed.html | 2 +- pandora/text/templates/pdf/viewer.html | 2 +- static/html/404.html | 2 +- static/html/50x.html | 2 +- static/js/pandora.js | 4 ++-- static/pdf.js/index.html | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pandora/app/config.py b/pandora/app/config.py index c26ede1f..0e13dbba 100644 --- a/pandora/app/config.py +++ b/pandora/app/config.py @@ -204,7 +204,7 @@ def update_static(): oxjs_build = os.path.join(settings.STATIC_ROOT, 'oxjs/tools/build/build.py') if os.path.exists(oxjs_build): print 'update oxjs' - if os.path.exists(os.path.join(settings.STATIC_ROOT, 'oxjs/build/Ox.Geo/json/Ox.Geo.json')): + if os.path.exists(os.path.join(settings.STATIC_ROOT, 'oxjs/min/Geo/json/Geo.json')): geo = '-nogeo' else: geo = '' @@ -244,7 +244,7 @@ def update_static(): for f in (pandora_js, pandora_json): os.system('gzip -9 -c "%s" > "%s.gz"' % (f, f)) - for root, folders, files in os.walk(os.path.join(settings.STATIC_ROOT, 'oxjs/build')): + for root, folders, files in os.walk(os.path.join(settings.STATIC_ROOT, 'oxjs/min')): for f in files: if os.path.splitext(f)[-1] in ('.js', '.json'): f = os.path.join(root, f) diff --git a/pandora/templates/embed.html b/pandora/templates/embed.html index 70d60573..ee00bc65 100644 --- a/pandora/templates/embed.html +++ b/pandora/templates/embed.html @@ -3,7 +3,7 @@ {{settings.SITENAME}} - + diff --git a/pandora/text/templates/pdf/viewer.html b/pandora/text/templates/pdf/viewer.html index 9150cb35..69149c9b 100644 --- a/pandora/text/templates/pdf/viewer.html +++ b/pandora/text/templates/pdf/viewer.html @@ -24,7 +24,7 @@ limitations under the License. - + diff --git a/static/html/404.html b/static/html/404.html index f2947a9e..8eb8a911 100644 --- a/static/html/404.html +++ b/static/html/404.html @@ -2,7 +2,7 @@ We couldn't find what you're looking for. - +