merge changes from pandora

This commit is contained in:
j 2010-09-05 14:59:24 +02:00
commit 0a63490697
3 changed files with 863 additions and 1696 deletions

File diff suppressed because it is too large Load diff

View file

@ -0,0 +1,124 @@
{
"findKeys": [
{"id": "all", "title": "All"},
{"id": "title", "title": "Title", "autocomplete": true},
{"id": "director", "title": "Director", "autocomplete": true},
{"id": "country", "title": "Country", "autocomplete": true},
{"id": "year", "title": "Year", "autocomplete": true},
{"id": "language", "title": "Language", "autocomplete": true},
{"id": "writer", "title": "Writer", "autocomplete": true},
{"id": "producer", "title": "Producer", "autocomplete": true},
{"id": "cinematographer", "title": "Cinematographer", "autocomplete": true},
{"id": "editor", "title": "Editor", "autocomplete": true},
{"id": "actor", "title": "Actor", "autocomplete": true},
{"id": "character", "title": "Character", "autocomplete": true},
{"id": "name", "title": "Name", "autocomplete": true},
{"id": "genre", "title": "Genre", "autocomplete": true},
{"id": "keyword", "title": "Keyword", "autocomplete": true},
{"id": "summary", "title": "Summary"},
{"id": "dialog", "title": "Dialog"}
],
"groups": ["director", "country", "year", "language", "genre"],
"itemViews": [
{"id": "info", "title": "Info"},
{"id": "statistics", "title": "Statistics"},
{"id": "clips", "title": "Clips"},
{"id": "timeline", "title": "Timeline"},
{"id": "map", "title": "Map"},
{"id": "calendar", "title": "Calendar"},
{"id": "files", "title": "Files", "admin": true}
],
"listViews": [
{"id": "list", "title": "as List"},
{"id": "icons", "title": "as Icons"},
{"id": "info", "title": "with Info"},
{"id": "clips", "title": "with Clips"},
{"id": "timelines", "title": "with Timelines"},
{"id": "maps", "title": "with Maps"},
{"id": "calendars", "title": "with Calendars"},
{"id": "clip", "title": "as Clips"},
{"id": "map", "title": "on Map"},
{"id": "calendar", "title": "on Calendar"}
],
"sections": [
{"id": "history", "title": "History"},
{"id": "lists", "title": "My Lists"},
{"id": "public", "title": "Public Lists"},
{"id": "featured", "title": "Featured Lists"}
],
"sortKeys": [
{"id": "title", "title": "Title", "operator": "", "align": "left", "width": 180, "removable": false},
{"id": "director", "title": "Director", "operator": "", "align": "left", "width": 180, "removable": false},
{"id": "country", "title": "Country", "operator": "", "align": "left", "width": 120},
{"id": "year", "title": "Year", "operator": "-", "align": "right", "width": 60},
{"id": "language", "title": "Language", "operator": "", "align": "left", "width": 120},
{"id": "runtime", "title": "Runtime", "operator": "-", "align": "right", "width": 60},
{"id": "writer", "title": "Writer", "operator": "", "align": "left", "width": 180},
{"id": "producer", "title": "Producer", "operator": "", "align": "left", "width": 180},
{"id": "cinematographer", "title": "Cinematographer", "operator": "", "align": "left", "width": 180},
{"id": "editor", "title": "Editor", "operator": "", "align": "left", "width": 180},
{"id": "actors", "title": "Number of Actors", "operator": "-", "align": "right", "width": 60},
{"id": "genre", "title": "Genre", "operator": "", "align": "left", "width": 120},
{"id": "keywords", "title": "Number of Keywords", "operator": "-", "align": "right", "width": 60},
{"id": "summary", "title": "Words in Summary", "operator": "-", "align": "right", "width": 60},
{"id": "trivia", "title": "Words in Trivia", "operator": "-", "align": "right", "width": 60},
{"id": "releasedate", "title": "Release Date", "operator": "-", "align": "left", "width": 90},
{"id": "budget", "title": "Budget", "operator": "-", "align": "right", "width": 90},
{"id": "gross", "title": "Gross", "operator": "-", "align": "right", "width": 90},
{"id": "profit", "title": "Profit", "operator": "-", "align": "right", "width": 90},
{"id": "rating", "title": "Rating", "operator": "-", "align": "right", "width": 60},
{"id": "votes", "title": "Votes", "operator": "-", "align": "right", "width": 90},
{"id": "id", "title": "ID", "operator": "", "align": "left", "width": 90},
{"id": "aspectratio", "title": "Aspect Ratio", "operator": "-", "align": "left", "width": 90},
{"id": "duration", "title": "Duration", "operator": "-", "align": "right", "width": 90},
{"id": "color", "title": "Color", "operator": "", "align": "left", "width": 90},
{"id": "saturation", "title": "Saturation", "operator": "-", "align": "right", "width": 60},
{"id": "brightness", "title": "Brightness", "operator": "-", "align": "right", "width": 60},
{"id": "volume", "title": "Volume", "operator": "-", "align": "right", "width": 60},
{"id": "clips", "title": "Clips", "operator": "-", "align": "right", "width": 60},
{"id": "cuts", "title": "Cuts", "operator": "-", "align": "right", "width": 60},
{"id": "cutsperminute", "title": "Cuts per Minute", "operator": "-", "align": "right", "width": 60},
{"id": "words", "title": "Words", "operator": "-", "align": "right", "width": 60},
{"id": "wordsperminute", "title": "Words per Minute", "operator": "-", "align": "right", "width": 60},
{"id": "resolution", "title": "Resolution", "operator": "-", "align": "left", "width": 90},
{"id": "pixels", "title": "Pixels", "operator": "-", "align": "right", "width": 90},
{"id": "size", "title": "Size", "operator": "-", "align": "right", "width": 90},
{"id": "bitrate", "title": "Bitrate", "operator": "-", "align": "right", "width": 90},
{"id": "files", "title": "Files", "operator": "-", "align": "right", "width": 60},
{"id": "filename", "title": "Filename", "operator": "", "align": "left", "width": 180},
{"id": "published", "title": "Date Published", "operator": "-", "align": "left", "width": 90},
{"id": "modified", "title": "Date Modified", "operator": "-", "align": "left", "width": 90}
],
"totals": [
{"id": "items"},
{"id": "runtime"},
{"id": "files", "admin": true},
{"id": "duration", "admin": true},
{"id": "size", "admin": true},
{"id": "pixels"}
],
"user": {
"group": "guest",
"preferences": {},
"ui": {
"columns": ["id", "title", "director", "country", "year", "language", "genre"],
"findQuery": {"conditions": [{"key": "", "value": "", "operator": ""}], "operator": ""},
"groupsQuery": {"conditions": [], "operator": "|"},
"groupsSize": 128,
"itemView": "info",
"listQuery": {"conditions": [], "operator": ""},
"listsSize": 192,
"listView": "list",
"sections": ["history", "lists", "public", "featured"],
"showGroups": true,
"showInfo": true,
"showLists": true,
"showMovies": true,
"sort": [
{"key": "director", "operator": ""}
],
"theme": "classic"
},
"name": ""
}
}

View file

@ -4,7 +4,7 @@
<title>{{settings.SITENAME}}</title> <title>{{settings.SITENAME}}</title>
<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/> <meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
<link rel="stylesheet" type="text/css" href="/static/oxjs/build/css/ox.ui.css"/> <link rel="stylesheet" type="text/css" href="/static/oxjs/build/css/ox.ui.css"/>
<script type="text/javascript" src="/static/oxjs/build/js/ox.load.js"></script>
<script type="text/javascript" src="/static/oxjs/build/js/jquery-1.4.2.js"></script> <script type="text/javascript" src="/static/oxjs/build/js/jquery-1.4.2.js"></script>
<script type="text/javascript" src="/static/js/jquery/jquery.videosupport.js"></script> <script type="text/javascript" src="/static/js/jquery/jquery.videosupport.js"></script>
<script type="text/javascript" src="/static/oxjs/build/js/ox.js"></script> <script type="text/javascript" src="/static/oxjs/build/js/ox.js"></script>
@ -12,6 +12,5 @@
<script type="text/javascript" src="/site.js"></script> <script type="text/javascript" src="/site.js"></script>
<script type="text/javascript" src="/static/js/pandora.js"></script> <script type="text/javascript" src="/static/js/pandora.js"></script>
</head> </head>
<body> <body></body>
</body> </html>
</html>