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

init.js->pandora.js

Browse source
This commit is contained in:
j 2011-11-03 11:50:05 +01:00
parent c01ca5f0d8
commit a1d9a08e36
4 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.bzrignore
View file

@ -5,5 +5,5 @@ include
src src
bin bin
static/json/pandora.json static/json/pandora.json
static/js/pandora.js static/js/pandora.min.js
static/png/*.png static/png/*.png

2
pandora/app/config.py
View file

@ -64,7 +64,7 @@ def update_static():
data = '' data = ''
js = [] 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') 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 root, folders, files in os.walk(os.path.join(settings.STATIC_ROOT, 'js/pandora')):
for f in files: for f in files:

3
pandora/templates/index.html
View file

@ -7,6 +7,7 @@
<meta name="application-name" content="{{settings.SITENAME}}"/> <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="32x32"/>
<link rel="icon" href="/static/png/icon64.png" sizes="48x48"/> <link rel="icon" href="/static/png/icon64.png" sizes="48x48"/>
<meta name="application-name" content="{{settings.SITENAME}}"/>
<meta name="application-url" content="{{base_url}}"/> <meta name="application-url" content="{{base_url}}"/>
<script type='text/javascript'> <script type='text/javascript'>
if (typeof(console) == 'undefined') { if (typeof(console) == 'undefined') {
@ -16,7 +17,7 @@
} }
</script> </script>
<script type="text/javascript" src="/static/oxjs/build/Ox.js"></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> </head>
<body></body> <body></body>
</html> </html>

4
static/js/init.js → static/js/pandora.js
View file

@ -1,7 +1,5 @@
// vim: et:ts=4:sw=4:sts=4:ft=javascript // vim: et:ts=4:sw=4:sts=4:ft=javascript
// FIXME: this should be named pandora.js
/* /*
---- UI Tree ---- ---- UI Tree ----
appPanel appPanel
@ -179,7 +177,7 @@ appPanel
}); });
}); });
} else { } else {
Ox.loadFile(prefix + 'js/pandora.js', callback); Ox.loadFile(prefix + 'js/pandora.min.js', callback);
} }
} }