diff --git a/static/js/pandora/editor.js b/static/js/pandora/editor.js index f70a355e..1e73656f 100644 --- a/static/js/pandora/editor.js +++ b/static/js/pandora/editor.js @@ -21,6 +21,7 @@ pandora.ui.editor = function(data) { duration: data.duration, enableDownload: pandora.site.capabilities.canDownloadVideo[pandora.user.level] >= data.rightslevel, enableImport: pandora.site.capabilities.canImportAnnotations[pandora.user.level], + enableSetPosterFrame: !pandora.site.media.importFrames && data.editable, enableSubtitles: pandora.user.ui.videoSubtitles, find: pandora.user.ui.itemFind, getFrameURL: function(position) { @@ -46,7 +47,6 @@ pandora.ui.editor = function(data) { out: pandora.user.ui.videoPoints[pandora.user.ui.item].out, position: pandora.user.ui.videoPoints[pandora.user.ui.item].position, posterFrame: data.posterFrame, - posterFrameControls: !pandora.site.media.importFrames, resolution: pandora.user.ui.videoResolution, selected: pandora.user.ui.videoPoints[pandora.user.ui.item].annotation ? pandora.user.ui.item + '/' + pandora.user.ui.videoPoints[pandora.user.ui.item].annotation diff --git a/static/js/pandora/item.js b/static/js/pandora/item.js index 08b4ff3f..febea82d 100644 --- a/static/js/pandora/item.js +++ b/static/js/pandora/item.js @@ -11,7 +11,7 @@ pandora.ui.item = function() { pandora.api.get({ id: pandora.user.ui.item, keys: isVideoView ? [ - 'cuts', 'director', 'duration', 'layers', + 'cuts', 'director', 'duration', 'editable', 'layers', 'parts', 'posterFrame', 'rendered', 'rightslevel', 'size', 'title', 'videoRatio', 'year' ] : [] @@ -64,7 +64,7 @@ pandora.ui.item = function() { } else if (pandora.user.ui.itemView == 'info') { - if (pandora.user.level == 'admin' && false) { + if (pandora.user.level == 'admin' && false) { // FIXME!! var $form, $edit = Ox.Element() .append($form = Ox.FormElementGroup({