CAMP/padmatexts
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fixed annot height

Browse Source
This commit is contained in:
Sanj 2011-03-12 17:02:24 +05:30
parent 02439a5ad7
commit 4be1607f06
2 changed files with 13 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
padmaTexts/static/css/text.css
View File

@ -127,14 +127,13 @@ p {
margin-top: 8px; margin-top: 8px;
margin-bottom: 8px; margin-bottom: 8px;
font-size: 13px; font-size: 13px;
height: 250px; height: 300px;
overflow-y: auto; overflow-y: auto;
width: 90%; width: 90%;
margin-left: auto; margin-left: auto;
margin-right: auto; margin-right: auto;
/* padding: 8px; /* padding: 8px;
margin-right: 2px; */ margin-right: 2px; */
overflow-y: auto;
} }
.padmaContributor { .padmaContributor {
@ -182,10 +181,14 @@ p {
cursor: pointer; cursor: pointer;
} }
.padmaTrack {
color: #fff;
font-style: italic;
}
.padmaButtons { .padmaButtons {
width: 216px; width: 216px;
margin-left: auto; margin-left: 4px;
margin-right: auto;
} }
.padmaButtons a { .padmaButtons a {

8
padmaTexts/static/js/views/sidebar.js
View File

@ -95,14 +95,18 @@ function setupPadmaLink(videoObj, data) {
//FIXME: should be a better way to deal with displaying default layer. //FIXME: should be a better way to deal with displaying default layer.
var currentLayers = videoObj.getLayersAtTimecode(npt2ms(linkData.tcIn)); var currentLayers = videoObj.getLayersAtTimecode(npt2ms(linkData.tcIn));
// var annotHtml = getLayersHtml(npt2ms(linkData.tcIn), ['transcript']);
var transcripts = filterLayersByTracks(currentLayers, ['transcript']); var transcripts = filterLayersByTracks(currentLayers, ['transcript']);
if (transcripts.length > 0) { if (transcripts.length > 0) {
var annotHtml = transcripts[0].value_html; var annotHtml = transcripts[0].value_html;
} else { } else {
var annotHtml = ''; var annotHtml = '';
} }
$('.annotationText').html(annotHtml); $('.annotationText').html(annotHtml);
var annotHeight = $(window).height() - 320;
$('.annotationText').css({'height': annotHeight + "px"});
var videoElem = $('video'); var videoElem = $('video');
videoElem.bind("play", function() { videoElem.bind("play", function() {
var that = this var that = this
@ -173,7 +177,7 @@ function setupPadmaLink(videoObj, data) {
annotHtml += thisTrack + "s<br />"; annotHtml += thisTrack + "s<br />";
} }
for (var i=0; i < thisTrackLayers.length; i++) { for (var i=0; i < thisTrackLayers.length; i++) {
var thisTrack = thisTrackLayers[i]; var thisTrack = '<span class="padmaTrack">' + thisTrackLayers[i] + ':</span>';
var thisHtml = ''; var thisHtml = '';
thisHtml += " <span class='padmaAnnotation'>" + thisTrack.value_html + "</span>"; thisHtml += " <span class='padmaAnnotation'>" + thisTrack.value_html + "</span>";
thisHtml += "<br />"; thisHtml += "<br />";