forked from 0x2620/pandora
merge changes
This commit is contained in:
commit
1e05da5689
4 changed files with 7780 additions and 396 deletions
|
@ -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>
|
||||
|
|
|
@ -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
7316
static/js/jquery/jquery.js
vendored
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
Loading…
Reference in a new issue