some css for text annotations

This commit is contained in:
rlx 2011-02-03 22:58:31 +00:00
parent 873951163c
commit 2c9d6c7e91
3 changed files with 39 additions and 1 deletions

View file

@ -1284,6 +1284,15 @@ Video
================================================================================ ================================================================================
*/ */
.OxAnnotation {
border-width: 0 0 1px 0;
border-style: solid;
padding: 4px;
}
.OxAnnotation:last-child {
border-width: 0;
}
.OxVideoEditor { .OxVideoEditor {
overflow-x: hidden; overflow-x: hidden;
overflow-y: auto; overflow-y: auto;

View file

@ -346,6 +346,10 @@ Video
================================================================================ ================================================================================
*/ */
.OxThemeModern .OxAnnotation {
border-color: rgb(48, 48, 48);
}
.OxThemeModern .OxVideoPlayer { .OxThemeModern .OxVideoPlayer {
background: rgb(0, 0, 0); background: rgb(0, 0, 0);
} }

View file

@ -10427,6 +10427,7 @@ requires
that = new Ox.Element('div', self) that = new Ox.Element('div', self)
.defaults({ .defaults({
id: '', id: '',
items: [],
title: '', title: '',
type: 'text' type: 'text'
}) })
@ -10434,12 +10435,31 @@ requires
that.$element = new Ox.CollapsePanel({ that.$element = new Ox.CollapsePanel({
collapsed: false, collapsed: false,
extras: [
new Ox.Button({
id: 'add',
style: 'symbol',
title: 'Add',
type: 'image'
})
],
size: 16, size: 16,
title: self.options.title title: self.options.title
}) })
.addClass('OxAnnotationPanel')
.bindEvent({ .bindEvent({
toggle: togglePanel toggle: togglePanel
}); });
that.$content = that.$element.$content;
self.$annotations = new Ox.Element('div')
.appendTo(that.$content);
self.options.items.forEach(function(item, i) {
new Ox.Element('div')
.addClass('OxAnnotation')
.html(item.value)
.appendTo(self.$annotations);
});
function togglePanel() { function togglePanel() {
@ -11434,6 +11454,9 @@ requires
.appendTo(self.$video); .appendTo(self.$video);
self.$annotations = new Ox.Element() self.$annotations = new Ox.Element()
.css({
overflowY: 'auto'
})
.bindEvent({ .bindEvent({
resize: resizeAnnotations, resize: resizeAnnotations,
toggle: toggleAnnotations toggle: toggleAnnotations
@ -11441,7 +11464,9 @@ requires
self.$annotationPanel = []; self.$annotationPanel = [];
self.options.layers.forEach(function(layer, i) { self.options.layers.forEach(function(layer, i) {
self.$annotationPanel[i] = new Ox.AnnotationPanel(layer) self.$annotationPanel[i] = new Ox.AnnotationPanel(
$.extend({}, layer, layer.id == 'subtitles' ? {items: self.options.subtitles} : {})
)
.appendTo(self.$annotations); .appendTo(self.$annotations);
}); });