init.js->pandora.js
This commit is contained in:
parent
c01ca5f0d8
commit
a1d9a08e36
4 changed files with 5 additions and 6 deletions
|
@ -5,5 +5,5 @@ include
|
|||
src
|
||||
bin
|
||||
static/json/pandora.json
|
||||
static/js/pandora.js
|
||||
static/js/pandora.min.js
|
||||
static/png/*.png
|
||||
|
|
|
@ -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:
|
||||
|
|
|
@ -7,6 +7,7 @@
|
|||
<meta name="application-name" content="{{settings.SITENAME}}"/>
|
||||
<link rel="icon" href="/static/png/icon64.png" sizes="32x32"/>
|
||||
<link rel="icon" href="/static/png/icon64.png" sizes="48x48"/>
|
||||
<meta name="application-name" content="{{settings.SITENAME}}"/>
|
||||
<meta name="application-url" content="{{base_url}}"/>
|
||||
<script type='text/javascript'>
|
||||
if (typeof(console) == 'undefined') {
|
||||
|
@ -16,7 +17,7 @@
|
|||
}
|
||||
</script>
|
||||
<script type="text/javascript" src="/static/oxjs/build/Ox.js"></script>
|
||||
<script type="text/javascript" src="/static/js/init.js"></script>
|
||||
<script type="text/javascript" src="/static/js/pandora.js"></script>
|
||||
</head>
|
||||
<body></body>
|
||||
</html>
|
||||
|
|
|
@ -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);
|
||||
}
|
||||
}
|
||||
|
Loading…
Reference in a new issue