From ddb6165a76e7eb25838cdff9ad6b6f81eb85a85c Mon Sep 17 00:00:00 2001 From: rolux Date: Fri, 7 Feb 2014 06:19:48 +0000 Subject: [PATCH] update video edit panel columns, remove reference to pandora --- source/Ox.UI/js/Video/ClipPanel.js | 27 ++++++++++++++++--------- source/Ox.UI/js/Video/VideoEditPanel.js | 1 + 2 files changed, 19 insertions(+), 9 deletions(-) diff --git a/source/Ox.UI/js/Video/ClipPanel.js b/source/Ox.UI/js/Video/ClipPanel.js index 8cea8dd6..119ae77a 100644 --- a/source/Ox.UI/js/Video/ClipPanel.js +++ b/source/Ox.UI/js/Video/ClipPanel.js @@ -17,6 +17,7 @@ Ox.ClipPanel = function(options, self) { editable: false, getClipImageURL: null, 'in': 0, + itemName: '', layers: [], out: 0, position: 0, @@ -77,19 +78,27 @@ Ox.ClipPanel = function(options, self) { width: 60 }, { + addable: false, id: 'id', operator: '+', - title: Ox._('ID'), unique: true, - visible: false, - width: 60 }, { + addable: false, id: 'item', operator: '+', - title: Ox._(pandora.site.itemName.singular), + }, + { + id: 'title', + format: function(value, data) { + return value + ( + data.director ? ' (' + data.director.join(', ') + ')' : '' + ); + }, + operator: '+', + title: self.options.itemName, visible: true, - width: 60 + width: 120 }, { align: 'right', @@ -137,12 +146,11 @@ Ox.ClipPanel = function(options, self) { width: 90 }, { - align: 'right', + addable: false, id: 'sort', operator: '+', - title: Ox._('Sort'), - visible: false, - width: 60 + // title: Ox._('Sort'), + visible: false } ]; @@ -342,6 +350,7 @@ Ox.ClipPanel = function(options, self) { columnsResizable: true, columnsVisible: true, items: self.options.clips, + keys: ['director'], scrollbarVisible: true, selected: self.options.selected, sort: getListSort(), diff --git a/source/Ox.UI/js/Video/VideoEditPanel.js b/source/Ox.UI/js/Video/VideoEditPanel.js index 265dc3df..cd4fbe6d 100644 --- a/source/Ox.UI/js/Video/VideoEditPanel.js +++ b/source/Ox.UI/js/Video/VideoEditPanel.js @@ -313,6 +313,7 @@ Ox.VideoEditPanel = function(options, self) { editable: self.options.editable, getClipImageURL: self.options.getClipImageURL, 'in': self.options['in'], + itemName: self.options.itemName, layers: Ox.clone(self.options.layers), out: self.options.out, position: self.options.position,