From 66b97842f46286d750befbd788595a8bb97ca861 Mon Sep 17 00:00:00 2001
From: Sanj <b@pad.ma>
Date: Mon, 21 Feb 2011 13:28:19 +0100
Subject: [PATCH] href bug, remove some buttons

---
 padmaTexts/static/css/text.css        |  5 ++++
 padmaTexts/static/js/views/sidebar.js |  3 ++-
 padmaTexts/templates/text_embed.html  | 39 +++++++++++----------------
 3 files changed, 23 insertions(+), 24 deletions(-)

diff --git a/padmaTexts/static/css/text.css b/padmaTexts/static/css/text.css
index b930998..907cdae 100644
--- a/padmaTexts/static/css/text.css
+++ b/padmaTexts/static/css/text.css
@@ -137,6 +137,11 @@ p {
   overflow-y: auto;
 }
 
+.padmaContributor {
+  font-style: italic;
+  font-size: 9px;
+}
+
 .padmaViewer {
   position: relative;
   width: 360px;
diff --git a/padmaTexts/static/js/views/sidebar.js b/padmaTexts/static/js/views/sidebar.js
index c134eee..326a7c3 100644
--- a/padmaTexts/static/js/views/sidebar.js
+++ b/padmaTexts/static/js/views/sidebar.js
@@ -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;  
         }
diff --git a/padmaTexts/templates/text_embed.html b/padmaTexts/templates/text_embed.html
index 01bcaa3..c3a2f1f 100644
--- a/padmaTexts/templates/text_embed.html
+++ b/padmaTexts/templates/text_embed.html
@@ -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>