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

update video editor

Browse source
This commit is contained in:
rolux 2012-01-12 16:09:19 +05:30
parent a31d4737f8
commit 7d8a4aa948
4 changed files with 28 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
pandora/0xdb.jsonc
View file

@ -4,6 +4,9 @@
You can edit this file.
*/
{
"annotations": {
"showUsers": true
},
/*
Capabilities are per user level.
They can either be general:
@ -501,6 +504,7 @@
"item": "Note",
"overlap": true,
"private": true,
"showInfo": true,
"type": "text"
},
{
@ -509,6 +513,7 @@
"canAddAnnotations": {"member": true, "friend": true, "staff": true, "admin": true},
"item": "Note",
"overlap": true,
"showInfo": true,
"type": "text"
},
{

17
pandora/app/config.py
View file

@ -48,13 +48,16 @@ def load_config():
def reloader_thread():
_config_mtime = 0
while RUN_RELOADER:
stat = os.stat(settings.SITE_CONFIG)
mtime = stat.st_mtime
if _win:
mtime -= stat.st_ctime
if mtime > _config_mtime:
load_config()
_config_mtime = mtime
try:
stat = os.stat(settings.SITE_CONFIG)
mtime = stat.st_mtime
if _win:
mtime -= stat.st_ctime
if mtime > _config_mtime:
load_config()
_config_mtime = mtime
except:
print "reloading config failed"
time.sleep(1)
def update_static():

6
pandora/padma.jsonc
View file

@ -4,6 +4,9 @@
You can edit this file.
*/
{
"annotations": {
"showUsers": true
},
/*
Capabilities are per user level.
They can either be general:
@ -431,6 +434,7 @@
"canAddAnnotations": {"member": true, "staff": true, "admin": true},
"item": "Description",
"overlay": true,
"showInfo": true,
"type": "text"
},
{
@ -448,7 +452,7 @@
//{"id": "info", "title": "with Info"},
{"id": "clips", "title": "with Clips"},
{"id": "timelines", "title": "with Timelines"},
{"id": "maps", "title": "with Maps"},
//{"id": "maps", "title": "with Maps"},
//{"id": "calendars", "title": "with Calendars"},
{"id": "clip", "title": "as Clips"},
//{"id": "video", "title": "as Video"},

14
static/js/pandora/item.js
View file

@ -120,7 +120,7 @@ pandora.ui.item = function() {
);
} else if (pandora.user.ui.itemView == 'video') {
pandora.$ui.contentPanel.replaceElement(1, pandora.$ui.player = Ox.VideoPanelPlayer({
pandora.$ui.contentPanel.replaceElement(1, pandora.$ui.player = Ox.VideoPanel({
annotationsSize: pandora.user.ui.annotationsSize,
censored: videoOptions.censored,
cuts: result.data.cuts || [],
@ -140,6 +140,7 @@ pandora.ui.item = function() {
scaleToFill: pandora.user.ui.videoScale == 'fill',
showAnnotations: pandora.user.ui.showAnnotations,
showTimeline: pandora.user.ui.showTimeline,
showUsers: pandora.site.annotations.showUsers,
subtitles: videoOptions.subtitles,
tooltips: true,
timeline: '/' + pandora.user.ui.item + '/timeline16p.png',
@ -232,6 +233,7 @@ pandora.ui.item = function() {
showAnnotations: pandora.user.ui.showAnnotations,
showLargeTimeline: true,
showLayers: pandora.user.ui.showLayers,
showUsers: pandora.site.annotations.showUsers,
subtitles: videoOptions.subtitles,
tooltips: true,
video: videoOptions.video,
@ -240,16 +242,16 @@ pandora.ui.item = function() {
volume: pandora.user.ui.videoVolume,
width: pandora.$ui.document.width() - pandora.$ui.mainPanel.size(0) - 1
}).bindEvent({
annotationsFont: function(data) {
annotationsfont: function(data) {
pandora.UI.set({annotationsFont: data.font});
},
annotationsRange: function(data) {
annotationsrange: function(data) {
pandora.UI.set({annotationsRange: data.range});
},
annotationsSize: function(data) {
annotationssize: function(data) {
pandora.UI.set({annotationsSize: data.size});
},
annotationsSort: function(data) {
annotationssort: function(data) {
pandora.UI.set({annotationsSort: data.sort});
},
find: function(data) {
@ -323,7 +325,7 @@ pandora.ui.item = function() {
id: data.id
}, function(result) {
//fixme: check for errors
pandora.$ui.editor.removeAnnotation(data.layer, data.id);
//pandora.$ui.editor.removeAnnotation(data.layer, data.id);
});
},
toggleannotations: function(data) {