0x2620/pandora
2
1
Fork 1
Code Issues 1.2k Pull requests Releases Wiki Activity

build/ -> min/, Ox.UI/ -> UI/

Browse source
This commit is contained in:
rolux 2014-09-26 16:54:20 +02:00
commit 714f495a3d
7 changed files with 9 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

4
pandora/app/config.py
View file

@ -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)

2
pandora/templates/embed.html
View file

@ -3,7 +3,7 @@
<head>
<meta charset="utf-8" />
<title>{{settings.SITENAME}}</title>
<script type="text/javascript" src="/static/oxjs/build/Ox.js"></script>
<script type="text/javascript" src="/static/oxjs/min/Ox.js"></script>
<script type="text/javascript" src="/static/js/embed/pandora.js?{{settings.CONFIG.site.version}}"></script>
<meta name="google" value="notranslate"/>
</head>

2
pandora/text/templates/pdf/viewer.html
View file

@ -24,7 +24,7 @@ limitations under the License.
<link rel="stylesheet" href="/static/pdf.js/viewer.css"/>
<script type="text/javascript" src="/static/oxjs/build/Ox.js?{{settings.CONFIG.site.version}}"></script>
<script type="text/javascript" src="/static/oxjs/min/Ox.js?{{settings.CONFIG.site.version}}"></script>
<script type="text/javascript" src="/static/pdf.js/compatibility.js"></script>