update video edit panel columns, remove reference to pandora

This commit is contained in:
rolux 2014-02-07 06:19:48 +00:00
parent d2718c2ec1
commit ddb6165a76
2 changed files with 19 additions and 9 deletions

View file

@ -17,6 +17,7 @@ Ox.ClipPanel = function(options, self) {
editable: false, editable: false,
getClipImageURL: null, getClipImageURL: null,
'in': 0, 'in': 0,
itemName: '',
layers: [], layers: [],
out: 0, out: 0,
position: 0, position: 0,
@ -77,19 +78,27 @@ Ox.ClipPanel = function(options, self) {
width: 60 width: 60
}, },
{ {
addable: false,
id: 'id', id: 'id',
operator: '+', operator: '+',
title: Ox._('ID'),
unique: true, unique: true,
visible: false,
width: 60
}, },
{ {
addable: false,
id: 'item', id: 'item',
operator: '+', 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, visible: true,
width: 60 width: 120
}, },
{ {
align: 'right', align: 'right',
@ -137,12 +146,11 @@ Ox.ClipPanel = function(options, self) {
width: 90 width: 90
}, },
{ {
align: 'right', addable: false,
id: 'sort', id: 'sort',
operator: '+', operator: '+',
title: Ox._('Sort'), // title: Ox._('Sort'),
visible: false, visible: false
width: 60
} }
]; ];
@ -342,6 +350,7 @@ Ox.ClipPanel = function(options, self) {
columnsResizable: true, columnsResizable: true,
columnsVisible: true, columnsVisible: true,
items: self.options.clips, items: self.options.clips,
keys: ['director'],
scrollbarVisible: true, scrollbarVisible: true,
selected: self.options.selected, selected: self.options.selected,
sort: getListSort(), sort: getListSort(),

View file

@ -313,6 +313,7 @@ Ox.VideoEditPanel = function(options, self) {
editable: self.options.editable, editable: self.options.editable,
getClipImageURL: self.options.getClipImageURL, getClipImageURL: self.options.getClipImageURL,
'in': self.options['in'], 'in': self.options['in'],
itemName: self.options.itemName,
layers: Ox.clone(self.options.layers), layers: Ox.clone(self.options.layers),
out: self.options.out, out: self.options.out,
position: self.options.position, position: self.options.position,