build static, move js files

This commit is contained in:
j 2011-10-23 04:29:20 +02:00
commit 7586f2746a
65 changed files with 146 additions and 116 deletions

View file

View file

@ -0,0 +1,15 @@
# -*- coding: utf-8 -*-
# vi:si:et:sw=4:sts=4:ts=4
from django.core.management.base import BaseCommand
from ... import models
class Command(BaseCommand):
"""
"""
help = 'update static files'
args = ''
def handle(self, **options):
models.update_static()

View file

@ -10,6 +10,7 @@ import thread
from django.db import models
from django.conf import settings
import ox.jsonc
from ox.utils import json
_win = (sys.platform == "win32")
@ -52,3 +53,28 @@ def reloader_thread():
time.sleep(1)
thread.start_new_thread(reloader_thread, ())
def update_static():
oxjs_build = os.path.join(settings.STATIC_ROOT, 'oxjs/tools/build/build.py')
if os.path.exists(oxjs_build):
os.system(oxjs_build)
data = ''
js = []
pandora_js = os.path.join(settings.STATIC_ROOT, 'js/pandora.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:
js.append(os.path.join(root, f)[len(settings.STATIC_ROOT)+1:])
with open(os.path.join(root, f)) as j:
data += j.read() + '\n'
print 'write', pandora_js
with open(pandora_js, 'w') as f:
#data = ox.js.minify(data)
f.write(data)
print 'write', pandora_json
with open(pandora_json, 'w') as f:
json.dump(sorted(js), f, indent=2)

View file

@ -7,8 +7,8 @@
<link rel="shortcut icon" type="image/png" href="/static/png/icon16.png"/>
<link rel="stylesheet" type="text/css" href="/static/css/highlight.css"/>
<script type="text/javascript" src="/static/oxjs/build/Ox.js"></script>
<script type="text/javascript" src="/static/js/highlight.pack.js"></script>
<script type="text/javascript" src="/static/js/pandora.api.js"></script>
<script type="text/javascript" src="/static/js/api/highlight.pack.js"></script>
<script type="text/javascript" src="/static/js/api/pandora.js"></script>
</head>
<body></body>

View file

@ -4,7 +4,7 @@
<title>{{settings.SITENAME}}</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<script type="text/javascript" src="/static/oxjs/build/Ox.js"></script>
<script type="text/javascript" src="/static/js/pandoraEmbed.js"></script>
<script type="text/javascript" src="/static/js/embed/pandora.js"></script>
</head>
<body>
</body>

View file

@ -11,8 +11,8 @@
};
}
</script>
<script type="text/javascript" src="/static/oxjs/dev/Ox.js"></script>
<script type="text/javascript" src="/static/js/pandora.js"></script>
<script type="text/javascript" src="/static/oxjs/build/Ox.js"></script>
<script type="text/javascript" src="/static/js/init.js"></script>
</head>
<body></body>
</html>