0x2620/cablegates
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

merge changes

Browse source
This commit is contained in:
j 2010-12-25 09:50:42 +05:30
commit 1e05da5689
4 changed files with 7780 additions and 396 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pandora/templates/index.html
View file

@ -18,7 +18,8 @@ if(typeof(console)=='undefined') {
<script type="text/javascript" src="/static/oxjs/build/js/ox.js"></script>
<script type="text/javascript" src="/static/oxjs/build/js/ox.ui.js"></script>
<script type="text/javascript" src="/static/js/pandora.js"></script>
<script type="text/javascript" src="/static/js/pandora.local.js"></script>
<!--
<script type="text/javascript" src="/static/js/pandora.local.js"></script> -->
</head>
<body></body>
</html>

7
pandora/templates/site.json
View file

@ -58,8 +58,7 @@
{"id": "history", "title": "History"},
{"id": "lists", "title": "My Lists"},
{"id": "public", "title": "Public Lists"},
{"id": "featured", "title": "Featured Lists"},
{"id": "admin", "title": "Admin"}
{"id": "featured", "title": "Featured Lists"}
],
"sortKeys": [
{"id": "title", "title": "Title", "operator": "", "align": "left", "width": 180, "removable": false},
@ -121,17 +120,19 @@
"findQuery": {"conditions": [], "operator": ""},
"groupsQuery": {"conditions": [], "operator": "|"},
"groupsSize": 176,
"item": "",
"itemView": "timeline",
"listQuery": {"conditions": [], "operator": ""},
"listsSize": 256,
"listView": "icons",
"section": "items",
"sections": ["history", "lists", "public", "featured", "admin"],
"sections": ["history", "lists", "public", "featured"],
"showAnnotations": true,
"showGroups": true,
"showInfo": true,
"showLists": true,
"showMovies": true,
"sitePage": "home",
"sort": [
{"key": "director", "operator": ""}
],

7316
static/js/jquery/jquery.js vendored
View file

File diff suppressed because it is too large Load diff

848
static/js/pandora.js
View file

File diff suppressed because it is too large Load diff