removed debug output

[photo-tags.git] / index.php
diff --git a/index.php b/index.php

index 82378b43636aa64efb5fd4ae3f8f3ea23f7049ce..34efdc480c66992d3f578ea421617b727b16f308 100644 (file)
--- a/index.php
+++ b/index.php
@@ -36,7 +36,7 @@ else
  
  <body>
  
-<div class="debug">test</div>
+<div class="debug"></div>
  <h1><?php echo htmlspecialchars($title) ?></h1>
  
  <nav>
@@ -55,9 +55,12 @@ else
    </datalist>
  </form>
    Current tags:<span id="currenttags"></span>
+  <button class="next" type="button" onclick="cloud()">tag cloud</button>
  </div>
  
-<div class="pics"> </div>
+<div class="nextprev"> <ul></ul></div>
+
+<div class="pics"><ul></ul> </div>
  
  <footer>
    This gallery belongs to <?php echo htmlspecialchars($admin) ?>.
@@ -67,7 +70,7 @@ else
  
  <script type="text/javascript" >
  
-var pics = d3.select(".pics").append("ul");
+var pics = d3.select(".pics").select("ul");
  
  var page=<?php echo $page ?>;
  var N=<?php echo $N ?>;
@@ -77,7 +80,7 @@ var count=0;
  
  /* populate data list with tags*/
  d3.json("<?php echo $webbase?>/getjson.php?S", function(json) {
-    d3.select("#MyTags").selectAll("option").data(json[1])
+    d3.select("#MyTags").selectAll("option").data(json)
        .enter().append("option").attr("value",function(d) {return d.name});
    });
  
@@ -131,9 +134,39 @@ function load_content(a) {
                 s = s.replace('file:\/\/<?php echo "".str_replace("/","\/",$dbprefix); ?>','<?php echo $webbase?>/Photos-small/');
                 return s;
               });
+
+         /* update thumbnails */
+         if(T!="")
+           url2 = "<?php echo $webbase?>/getjson.php?NP=1&T="+T+"&ID="+ID;
+         else
+           url2 = "<?php echo $webbase?>/getjson.php?NP=1&ID="+ID;
+
+         d3.json(url2, function(json2) {
+             var thumbs= d3.select(".nextprev").select("ul").selectAll("li").data(json2);
+             thumbs.enter().append("li")
+               .append("a")
+               .attr("href",function(d) {
+                   s = '<?php echo $webbase; ?>';
+                   if(T!="")
+                     s = s + '/tag/' + T;
+                   s = s + '/pic/' + d.id;
+                   return s;
+                 })
+               .append("img")
+               .attr("src",function(d) {
+                   s= d.base_uri+'/'+d.filename;
+                   s = s.replace('file:\/\/<?php echo "".str_replace("/","\/",$dbprefix); ?>','<?php echo $webbase?>/Photos-tiny/');
+                   return s;
+                 });
+
+             thumbs.exit().remove();
+
+
+           });
         }
        else
         {
+         d3.select(".nextprev").select("ul").selectAll("li").remove();
           pics.selectAll("li").data(picdata)
             .enter().append("li")
             .append("a")
@@ -180,6 +213,26 @@ function right() {
    load_content(page);
  }
  
+function cloud() {
+
+  url = "<?php echo $webbase?>/getjson.php?CLOUD=1";
+
+  pics.selectAll("li").remove();
+
+  var svgelement=pics.append("li")
+    .append("svg").attr("width",400).attr("height",400);
+
+  /* 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"})
+       .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='<?php echo $webbase?>/tag/'+d.name })
+    });
+}
+
  function checkbutton()
  {