show search tags, current tags, and tags of the current pic in one line

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

diff --git a/js/photo-tags.js b/js/photo-tags.js
index e577a15ddfe87ea318c493689ba1c248e44d416b..b657fbef1630dce5969e1490eb8407d45c64bd7d 100644 (file)
--- a/js/photo-tags.js
+++ b/js/photo-tags.js
@@ -81,17 +81,21 @@ function load_content() {
                        return "Description: "+d.description + "Time: "+date.toUTCString();
                });
            /* show tags */
-           tags="";
            d3.json(webbase+"/getjson.php?IDT="+ID, function(jsontag) {
-               singlepicspace.append("p").selectAll("span").data(jsontag)
+               tags=0;
+               d3.select("#pictags").selectAll("span").remove();
+               d3.select("#pictags").selectAll("span").data(jsontag)
                    .enter().append("span")
                    .attr("class","btn btn-small")
                    .text( function(t) {
+                       tags=1;
                        return t.name;
                    })
                    .on("mouseover", function(d){ d3.select(this).classed("btn-success",true)})
-                   .on("mouseout", function(d){ d3.select(this).classed("btn-success",false)})
-                   .on("click", function(d) { document.location.href=webbase+'/tag/'+d.name});
+                   .on("mouseout",  function(d){ d3.select(this).classed("btn-success",false)})
+                   .on("click",     function(d){ document.location.href=webbase+'/tag/'+d.name});
+               if(tags)
+               d3.select("#pictags").insert("span",":first-child").text("tags in current picture:");
            });
 
            update_thumbnails();
@@ -143,16 +147,9 @@ function next_page() {
     update_page_index();
 }
 
-function prev_pic() {
-}
-
-function next_pic() {
-}
-
 function load_pic(myid) {
   ID=myid;
   update_page_index();
-  update_thumbnails();
   load_content();
 }
 
@@ -218,16 +215,23 @@ function update_thumbnails(){
 
       /* 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",function(d){return (d.id==IDcurr);});
+      d3.select(".nextprev").select("ul").selectAll("li").select("a").select("img")
+         .classed("current",function(d){return (d.id==IDcurr);});
 
 
       /* add links for left/right arrows */
       if (IDprev != -1 )
-       d3.select(".left").on("click", function() { load_pic(IDprev); });
+         d3.select(".left" ).on("click", function() { load_pic(IDprev); });
       if (IDnext != -1 )
-       d3.select(".right").on("click", function() { load_pic(IDnext); });
-
-    });
+         d3.select(".right").on("click", function() { load_pic(IDnext); });
+
+      /* keyboard shortcuts */
+      $(document)
+         .keydown(  function (e) {
+             if(e.which == 37 && IDprev != -1) { $(document).unbind('keydown'); load_pic(IDprev);  }
+             if(e.which == 39 && IDnext != -1) { $(document).unbind('keydown'); load_pic(IDnext);  }
+         });
+  });
 }
 
 function checkbutton()