0x2620/pandora
2
1
Fork 1
Code Issues 1.3k 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
parent 747f5bc8a0
commit 714f495a3d
7 changed files with 9 additions and 9 deletions
Show stats 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') oxjs_build = os.path.join(settings.STATIC_ROOT, 'oxjs/tools/build/build.py')
if os.path.exists(oxjs_build): if os.path.exists(oxjs_build):
print 'update oxjs' 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' geo = '-nogeo'
else: else:
geo = '' geo = ''
@ -244,7 +244,7 @@ def update_static():
for f in (pandora_js, pandora_json): for f in (pandora_js, pandora_json):
os.system('gzip -9 -c "%s" > "%s.gz"' % (f, f)) 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: for f in files:
if os.path.splitext(f)[-1] in ('.js', '.json'): if os.path.splitext(f)[-1] in ('.js', '.json'):
f = os.path.join(root, f) f = os.path.join(root, f)

2
pandora/templates/embed.html
View file

@ -3,7 +3,7 @@
<head> <head>
<meta charset="utf-8" /> <meta charset="utf-8" />
<title>{{settings.SITENAME}}</title> <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> <script type="text/javascript" src="/static/js/embed/pandora.js?{{settings.CONFIG.site.version}}"></script>
<meta name="google" value="notranslate"/> <meta name="google" value="notranslate"/>
</head> </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"/> <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> <script type="text/javascript" src="/static/pdf.js/compatibility.js"></script>

2
static/html/404.html
View file

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<title>We couldn't find what you're looking for.</title> <title>We couldn't find what you're looking for.</title>
<link rel="stylesheet" type="text/css" href="/static/oxjs/build/Ox.UI/css/Ox.UI.css"/> <link rel="stylesheet" type="text/css" href="/static/oxjs/min/UI/css/UI.css"/>
<style> <style>
body { body {
text-align: center; text-align: center;

2
static/html/50x.html
View file

@ -2,7 +2,7 @@
<html> <html>
<head> <head>
<title>We will be back in a moment.</title> <title>We will be back in a moment.</title>
<link rel="stylesheet" type="text/css" href="/static/oxjs/build/Ox.UI/css/Ox.UI.css"/> <link rel="stylesheet" type="text/css" href="/static/oxjs/min/UI/css/UI.css"/>
<style> <style>
body { body {
text-align: center; text-align: center;

4
static/js/pandora.js
View file

@ -133,7 +133,7 @@ appPanel
images.loadingIcon.style.OUserSelect = 'none'; images.loadingIcon.style.OUserSelect = 'none';
images.loadingIcon.style.WebkitUserSelect = 'none'; images.loadingIcon.style.WebkitUserSelect = 'none';
images.loadingIcon.src = '/static/oxjs/' + (enableDebugMode ? 'dev' : 'build') images.loadingIcon.src = '/static/oxjs/' + (enableDebugMode ? 'dev' : 'build')
+ '/Ox.UI/themes/' + theme + '/svg/symbolLoading.svg'; + '/UI/themes/' + theme + '/svg/symbolLoading.svg';
callback(images); callback(images);
}; };
images.logo.src = '/static/png/logo.png'; images.logo.src = '/static/png/logo.png';
@ -196,7 +196,7 @@ appPanel
} else { } else {
script.onload = callback; script.onload = callback;
} }
script.src = '/static/oxjs/' + (enableDebugMode ? 'dev' : 'build') + '/Ox.js?' + getPandoraVersion(); script.src = '/static/oxjs/' + (enableDebugMode ? 'dev' : 'min') + '/Ox.js?' + getPandoraVersion();
script.type = 'text/javascript'; script.type = 'text/javascript';
head.appendChild(script); head.appendChild(script);
} }

2
static/pdf.js/index.html
View file

@ -24,7 +24,7 @@ limitations under the License.
<link rel="stylesheet" href="/static/pdf.js/viewer.css"/> <link rel="stylesheet" href="/static/pdf.js/viewer.css"/>
<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="compatibility.js"></script> <script type="text/javascript" src="compatibility.js"></script>