diff options
| -rw-r--r-- | index.php | 16 | ||||
| -rw-r--r-- | js/photo-tags.js | 12 |
2 files changed, 17 insertions, 11 deletions
@@ -71,13 +71,15 @@ function autoversion($file) <div class="tagsearch"> <form class="form-search" method="get" action=""> - <label>Search for tag:</label> <input class="input-medium search-query" list="MyTags" id="MyTagsInput" type="text" value="" /> - <datalist id="MyTags"> - </datalist> - <p> Current tags:<span id="currenttags"></span> - <a class="next btn btn-small btn-info" onclick="tagcloud()">tag cloud</a> - <a class="btn btn-small btn-success" href='<?php echo $webbase?>'>all</a> - </p> + <p> + <label>Search for tag:</label> <input class="input-medium search-query" list="MyTags" id="MyTagsInput" type="text" value="" /> + <datalist id="MyTags"> + </datalist> + Current tags:<span id="currenttags"></span> + <a class="next btn btn-small btn-info" onclick="tagcloud()">tag cloud</a> + <a class="btn btn-small btn-success" href='<?php echo $webbase?>'>all</a> + <span id="pictags"></span> + </p> </form> </div> diff --git a/js/photo-tags.js b/js/photo-tags.js index 238575d..b657fbe 100644 --- 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(); |