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

href bug, remove some buttons

Browse Source
This commit is contained in:
Sanj 2011-02-21 13:28:19 +01:00
parent b709699df0
commit 66b97842f4
3 changed files with 23 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -137,6 +137,11 @@ p {
overflow-y: auto;
}
.padmaContributor {
font-style: italic;
font-size: 9px;
}
.padmaViewer {
position: relative;
width: 360px;

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

@ -178,8 +178,9 @@ function setupPadmaLink(videoObj, data) {
for (var i=0; i < thisTrackLayers.length; i++) {
var thisTrack = thisTrackLayers[i];
var thisHtml = '';
thisHtml += "<span class='padmaContributor'>" + thisTrack.creator + ":</span>";
thisHtml += " <span class='padmaAnnotation'>" + thisTrack.value_html + "</span>";
thisHtml += "<br />";
thisHtml += "<span class='padmaContributor'> -" + thisTrack.creator + ":</span>";
thisHtml += "<br /><br />";
annotHtml += thisHtml;
}

39
padmaTexts/templates/text_embed.html
View File

@ -20,21 +20,23 @@ $(function() {
}
$('a').each(function() {
var t = $(this);
var href = t.attr("href");
if (href.indexOf("http://maps.google.com") != -1) {
if (t.data("mapLoaded")) {
return false;
if (t.attr("href") != undefined) {
var href = t.attr("href");
if (href.indexOf("http://maps.google.com") != -1) {
if (t.data("mapLoaded")) {
return false;
}
var embedUrl = href + "&output=embed";
var iframe = $('<iframe />').attr("src", embedUrl).attr("width", "425").attr("height", "350");
var parentP = t.parents('p');
parentP.append("<br />").append(iframe);
t.data("mapLoaded", true);
t.toggle(function() {
iframe.slideUp();
}, function() {
iframe.slideDown();
});
}
var embedUrl = href + "&output=embed";
var iframe = $('<iframe />').attr("src", embedUrl).attr("width", "425").attr("height", "350");
var parentP = t.parents('p');
parentP.append("<br />").append(iframe);
t.data("mapLoaded", true);
t.toggle(function() {
iframe.slideUp();
}, function() {
iframe.slideDown();
});
}
});
});
@ -89,15 +91,6 @@ $(function() {
<span class="downloadVideo">
<a title="Right-click and Save Link As to download video" target="_blank" href="<%= linkData.url %>">&darr;</a>
</span>
<span class="aboutThis">
<a title="What is this?" target="_blank" href="about.html">?</a>
</span>
<span class="padmaHelp">
<a title="Help!" target="_blank" href="help.html">&iquest;</a>
</span>
<span class="padmaCopyright">
<a title="Copyright notice" target="_blank" href="copyright.html">&#x2184;</a>
</span>
</div>
<video src="<%= video.getLayerVideo(linkData.tcIn, linkData.tcOut) %>" width="320" poster="<%= video.getFrame(linkData.tcIn) %>" controls="controls" autoplay="autoplay"></video>