small whitespace cleanup

[photo-tags.git] / js / photo-tags.js

diff --git a/js/photo-tags.js b/js/photo-tags.js
index 71dadd41c8150fdf4ca97f316651aebbac16180d..8db5df9e9f2feb06c06e5c5c2dac2ff6ac089440 100644 (file)
--- a/js/photo-tags.js
+++ b/js/photo-tags.js
@@ -15,22 +15,32 @@ function init()
       d3.select('form').attr("action",webbase+"/tag/"+document.getElementById('MyTagsInput').value.replace(" ","+"));
   });
 
+  d3.select("#currenttags").select("a").remove();
   if (T!="")
     {
       var mycurrenttags = T.split(",");
 
-      d3.select("#currenttags").select("button").remove();
-      d3.select("#currenttags").selectAll("button")
+      d3.select("#currenttags").selectAll("a")
         .data(mycurrenttags).enter()
-        .append("button").attr("type","button").text( function(d) {return d;} );
-    }
-   else
-    {
-      d3.select("#currenttags").select("button").remove();
-      d3.select("#currenttags").append("span").text( ' none');
+        .append("a").attr("class","btn btn-small").text( function(d) {return d;} )
+       .on("mouseover", function(d){ d3.select(this).classed("btn-danger",true)})
+       .on("mouseout", function(d){ d3.select(this).classed("btn-danger",false)})
+       .attr("href", function(d) { return removeTag(T.split(","),d) });
     };
 }
 
+function removeTag(alltags,removetag)
+{
+    /* return a link to a page with 'removetag' removed from the array of tags*/
+    var index = alltags.indexOf(removetag);
+    alltags.splice(index, 1);
+    if (alltags.length)
+       return webbase+'/tag/'+alltags.join(",");
+    else
+       return webbase;
+}
+
+
 function load_content() {
   // d3.select(".debug").text("T,P,N = *"+T+"* *"+page+"* *"+N+"*");
 
@@ -51,7 +61,7 @@ function load_content() {
       if (ID>=0)
        {
          var singlepicspace=pics.selectAll("li").data(picdata, function(d){return ID;}).enter().append("li").append("div").attr("class","singlepic");
-         singlepicspace.append("div").attr("class","left").append("img").attr("src",webbase+"/icons/left.png");
+         singlepicspace.append("img").attr("class","left").attr("src",webbase+"/icons/left.png");
          singlepicspace.append("img")
            .attr("class","large")
            .attr("src",function(d) {
@@ -59,7 +69,7 @@ function load_content() {
                s = s.replace('file:\/\/'+dbprefix,webbase+'/Photos-small/');
                return s;
              });
-         singlepicspace.append("div").attr("class","right").append("img").attr("src",webbase+"/icons/right.png");
+         singlepicspace.append("img").attr("class","right").attr("src",webbase+"/icons/right.png");
 
          update_thumbnails();
        }
@@ -135,11 +145,11 @@ function tagcloud() {
   /* update pics */
   d3.json(url, function(json) {
       svgelement.selectAll("text").data(json).enter().append("text")
-       .style("font-size", function(d){return (Math.log(d.count+1)/2.0)+"em"})
+       .style("font-size", function(d){return (Math.log(d.count+1)/3.0+0.5)+"em"})
        .text(function(d) { return d.name+" "; })
-       .on("mouseover", function(d){ d3.select(this).style("color","red")} )
-       .on("mouseout", function(d){ d3.select(this).style("color","white")} )
-       .on("click", function(d) { document.location.href=webbase+'/tag/'+d.name })
+       .on("mouseover", function(d){ d3.select(this).style("color","red")  })
+       .on("mouseout",  function(d){ d3.select(this).style("color","black")})
+       .on("click", function(d) { document.location.href=webbase+'/tag/'+d.name});
     });
 }
 
@@ -166,6 +176,8 @@ function update_thumbnails(){
 
       var thumbs= d3.select(".nextprev").select("ul").selectAll("li").data(json2, function(d) {return d.id;});
 
+      thumbs.exit().select("img").transition().duration(1000).style("height","0px").transition().duration(1050).remove();
+      thumbs.exit().transition().duration(1050).remove();
       thumbs.enter().append("li")
        .append("a")
        .on("click", function(d) {
@@ -177,16 +189,12 @@ function update_thumbnails(){
            s = s.replace('file:\/\/'+dbprefix,webbase+'/Photos-tiny/');
            return s;
          })
-       .style("height","0")
-       .transition().duration(1000)
+       .style("height","0px")
+       .transition().duration(500)
        .style("height","100px");
 
-      thumbs.exit().select("img").transition().duration(1000).style("height","0");
-      thumbs.exit().transition().duration(1050).remove();
-
       /* resort elements */
       d3.select(".nextprev").select("ul").selectAll("li").sort(function(a,b){return a.id-b.id;});
-      d3.select(".nextprev").select("ul").selectAll("li").select("a").select("img").classed("current",false);
       d3.select(".nextprev").select("ul").selectAll("li").select("a").select("img").classed("current",function(d){return (d.id==IDcurr);});
 
 
@@ -259,7 +267,13 @@ function update_page_index()
              mydata.push('{ page:'+(n+1)+', name:"'+(n+1)+'"}');
 
          mydata.push('{ page:'+(n+2.1)+', name:"Next"}');
-      };
+      }
+      else
+      {
+         mydata.push('{ page:0.1, name:"Prev"}');
+         mydata.push('{ page:1.1, name:"Next"}');
+      }
+
       mydata = "["+mydata.join(",")+"]";
       mydata =  eval('(' + mydata + ')');