update the view menu's show entries (breaks info panel)

This commit is contained in:
rolux 2011-10-13 10:12:00 +00:00
commit 883e9d58e6
13 changed files with 110 additions and 111 deletions

View file

@ -1,11 +1,21 @@
/*
Pan.do/ra Settings
You can edit this file.
*/
{
/*
Capabilities are per user level.
They can either be general (true/false)
or related to items (max. item rights level)
*/
"capabilities": {
"canDeleteItems": {"admin": true},
"canEditItemIcons": {"staff": true, "admin": true},
"canPlayClips": {"guest": 1, "member": 2, "friend": 3, "staff": 4, "admin": 4},
"canPlayVideo": {"guest": 0, "member": 1, "friend": 3, "staff": 4, "admin": 4},
"canReloadMetadata": {"staff": true, "admin": true},
"canSeeFiles": {"guest": -1, "member": -1, "friend": -1, "staff": 4, "admin": 4},
"canSeeFiles": {"staff": true, "admin": true},
"canSeeItem": {"guest": 2, "member": 2, "friend": 3, "staff": 4, "admin": 4},
"canSeeExtraItemViews": {"friend": true, "staff": true, "admin": true}
},
@ -493,6 +503,15 @@
"importMoviePosters": true,
"importPosterFrames": true
},
"personalLists": [
{"id": "favorites", "title": "Favorites"},
{"id": "most_popular", "title": "Most Popular", "query": {}},
{"id": "recently_viewed", "title": "Recently Viewed", "query": {}},
{"id": "1960s", "title": "1960s", "query": {"conditions": [{"key": "year", "value": "196", "operator": "^"}], "operator": "&"}},
{"id": "movies_with_full_video", "title": "Movies with Full Video", "query": {"conditions": [{"key": "canPlayVideo", "value": true, "operator": "="}], "operator": "&"}},
{"id": "movies_with_clips", "title": "Movies with Clips", "query": {"conditions": [{"key": "canPlayClips", "value": true, "operator": "="}], "operator": "&"}},
{"id": "no_tv_series", "title": "No TV Series", "query": {"conditions": [{"key": "isSeries", "value": false, "operator": "="}], "operator": "&"}}
],
"rightsLevel": {"member": 5, "staff": 4, "admin": 3},
"rightsLevels": [
{"name": "Public", "color": [0, 255, 0], "description": "Everyone can see and play."},
@ -503,6 +522,12 @@
],
"sendReferrer": false,
"site": {
"email": {
// E-mail address in contact form (to)
"contact": "0xdb@0xdb.org",
// E-mail address uses by the system (from)
"system": "0xdb@0xdb.org"
},
"id": "{{settings.SITEID}}",
"name": "{{settings.SITENAME}}",
"url": "{{settings.URL}}"
@ -524,28 +549,6 @@
],
"user": {
"level": "guest",
"lists": {
"common": [
{"id": "all", "title": "All Movies", "query": {}}
],
"personal": [
{"user": "foo", "name": "Favorites", "featured": false, "public": true},
{"id": "favorites", "title": "Favorites", "public": true, "items": []},
{"id": "most_popular", "title": "Most Popular", "query": {}},
{"id": "recently_viewed", "title": "Recently Viewed", "query": {}},
{"id": "1960s", "title": "1960s", "query": {"conditions": [{"key": "year", "value": "196", "operator": "^"}], "operator": "&"}},
{"id": "movies_with_full_video", "title": "Movies with Full Video", "query": {"conditions": [{"key": "canPlayVideo", "value": true, "operator": ""}], "operator": "&"}},
{"id": "movies_with_full_video", "title": "Movies with Clips", "query": {"conditions": [{"key": "canPlayClips", "value": true, "operator": ""}], "operator": "&"}}
],
"favorite": [
{"id": "rlx:watchme", "title": "rlx: watchme", "public": true, "items": [0, 1, 2, 3, 4]}
],
"featured": [
{"id": "situationist_film", "title": "Situationist Film", "query": {}},
{"id": "timelines", "title": "Timelines", "items": [0, 1, 2, 3, 4, 5, 6, 7, 8]}
]
},
"notes": "",
"preferences": {},
"ui": {
"annotationsSize": 256,
@ -580,6 +583,7 @@
"mapSelection": "",
"section": "items",
"showAnnotations": true,
"showBrowser": true,
"showControls": true,
"showFlags": true,
"showGroups": true,
@ -588,7 +592,6 @@
"showInfo": true,
"showMapControls": false,
"showMapLabels": false,
"showMovies": true,
"showFolder": {
"items": {
"personal": true,
@ -609,9 +612,7 @@
"videoVolume": 1
},
"username": "",
"volumes": [
{"name": "Movies A-Z", "path": "", "items": 1234}
]
"volumes": []
},
"userLevels": ["guest", "member", "friend", "staff", "admin"],
"video": {

View file

@ -1,6 +1,7 @@
# -*- coding: utf-8 -*-
# vi:si:et:sw=4:sts=4:ts=4
from __future__ import division, with_statement
import os
import sys
import time
@ -8,7 +9,7 @@ import thread
from django.db import models
from django.conf import settings
from ox.utils import json
import ox.jsonc
_win = (sys.platform == "win32")
@ -25,7 +26,7 @@ RUN_RELOADER = True
def load_config():
with open(settings.SITE_CONFIG) as f:
config = json.load(f)
config = ox.jsonc.load(f)
config['site']['id'] = settings.SITEID
config['site']['name'] = settings.SITENAME

View file

@ -25,7 +25,7 @@ ADMINS = (
#('admin', 'admin@example.com'),
)
DEFAULT_FROM_EMAIL='admin@' + URL.split('/')[0]
DEFAULT_FROM_EMAIL='system@' + URL.split('/')[0]
#DEFAULT_FROM_EMAIL='admin@example.com'
SERVER_EMAIL=DEFAULT_FROM_EMAIL
@ -165,21 +165,12 @@ LOGGING = {
AUTH_PROFILE_MODULE = 'user.UserProfile'
#Video encoding settings
#available profiles: 96p, 240p, 360p, 480p, 720p, 1080p
SITE_CONFIG = join(PROJECT_ROOT, '0xdb.json')
DEFAULT_SORT = [{"key": "director", "operator": ""}]
DEFAULT_THEME = "classic"
SITE_CONFIG = join(PROJECT_ROOT, '0xdb.jsonc')
TRACKER_URL="http://url2torrent.net:6970/announce"
TRANSMISSON_HOST = 'localhost'
TRANSMISSON_PORT = 9091
TRANSMISSON_USER = 'transmission'
TRANSMISSON_PASSWORD = 'transmission'
#Movie related settings
REVIEW_WHITELIST = {
@ -248,16 +239,3 @@ except NameError:
except IOError:
Exception('Please create a %s file with random characters to generate your secret key!' % SECRET_FILE)
from ox.utils import json
with open(SITE_CONFIG) as f:
CONFIG = json.load(f)
CONFIG['site']['id'] = SITEID
CONFIG['site']['name'] = SITENAME
CONFIG['site']['sectionName'] = SITENAME
CONFIG['site']['url'] = URL
CONFIG['keys'] = {}
for key in CONFIG['itemKeys']:
CONFIG['keys'][key['id']] = key