X-Git-Url: https://git.nubati.net/cgi-bin/gitweb.cgi?p=photo-tags.git;a=blobdiff_plain;f=index.php;h=4a7bdf48720a6b629bb03ca0b29d027bf0112ea3;hp=018beddc3578929e0915c7f3b23aa5fce66a7f29;hb=26ae9884808f0613d35268818a3b0cd7ed247872;hpb=4849d7271c75cace9faffc1353c22101b84c49bb

diff --git a/index.php b/index.php
index 018bedd..4a7bdf4 100644
--- a/index.php
+++ b/index.php
@@ -14,6 +14,11 @@ if(isset($_REQUEST["page"]))
 else
   $page = 1;
 
+if(isset($_REQUEST["tag"]))
+  $tags = htmlentities($_REQUEST["tag"]);
+else
+  $tags = "";
+
 ?>
 <html>
 <title><?php echo htmlspecialchars($title) ?></title>
@@ -30,6 +35,15 @@ else
 <button class="next"   onclick="right()">next </button>
 
 <div class="permalink"></div>
+
+<div class="tagsearch">
+<form method="get" action="">
+ Tags: <input list="MyTags" id="MyTagsInput" type="text" value="" />
+  <datalist id="MyTags">
+  </datalist>
+</form>
+</div>
+
 <div class="index"></div>
 <div class="pics"> </div>
 
@@ -41,27 +55,85 @@ else
 
 <script type="text/javascript" >
 
-
 var pics = d3.select(".pics").append("ul");
 
 var page=<?php echo $page ?>;
 var N=<?php echo $N ?>;
+var T="<?php echo $tags ?>";
 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])
+      .enter().append("option").attr("value",function(d) {return d.name});
+  });
+
+/* update form to point to new link */
+d3.select("input").on("keyup", function(d) {
+    d3.select('form').attr("action","<?php echo $webbase?>/tag/"+document.getElementById('MyTagsInput').value.replace(" ","+"));
+});
+
 function myreload(a) {
-  d3.json("<?php echo $webbase?>/getjson.php?T=1", function(json) {
+  d3.select(".debug").text("T,P,N ="+T+" "+a+" "+N);
+
+  if(T!="")
+    url = "<?php echo $webbase?>/getjson.php?T="+T+"&P="+a;
+  else
+    url = "<?php echo $webbase?>/getjson.php?P="+a;
+
+  d3.json(url, function(json) {
+
+      /* update index, show only page +-5 pages max */
       s="page ";
-      n = json[0].total/N;
-      for(i=1;i<=n+1;i++)
+      n = Math.floor(json[0][0].total/N);
+
+      if(a>7)
 	{
-	  s+=" <a href=\"<?php echo $webbase?>/page/"+i+"\">"+i+"</a>";
+	  s+=" <a href=\"<?php echo $webbase?>";
+	  if(T!="")
+	    s+="/tag/"+T;
+	  s+="/page/1\">1</a>...";
+	  start = a-5;
 	}
+      else
+	start=1;
+
+      for(i=start;i<=Math.min(n+1,a+5);i++)
+	{
+	  if(i==a)
+	    s+= " "+i+" ";
+	  else
+	    {
+	      s+=" <a href=\"<?php echo $webbase?>";
+	      if(T!="")
+		s+="/tag/"+T;
+	      s+="/page/"+i+"\">"+i+"</a>";
+	    }
+	}
+
+      if(a+5<n)
+	{
+	  s+="... <a href=\"<?php echo $webbase?>";
+	  if(T!="")
+	    s+="/tag/"+T;
+	  s+="/page/"+(n+1)+"\">"+(n+1)+"</a>";
+	}
+      else if(a+5==n)
+	{
+	  s+=" <a href=\"<?php echo $webbase?>";
+	  if(T!="")
+	    s+="/tag/"+T;
+	  s+="/page/"+(n+1)+"\">"+(n+1)+"</a>";
+	};
+
+
       d3.select(".index").html(s);
-    });
-  d3.json("<?php echo $webbase?>/getjson.php?P="+a, function(json) {
+
+      /* update pics */
       count=0;
       pics.selectAll("li").remove();
-      pics.selectAll("li").data(json)
+      picdata=json[1];
+      pics.selectAll("li").data(picdata)
 	.enter().append("li")
 	.append("a")
 	.attr("href",function(d) {
@@ -81,7 +153,6 @@ function myreload(a) {
 
   permalink="<?php echo $webbase ?>/page/"+page;
   d3.select(".permalink").html("Permalink: <a href=\""+permalink+"\">"+permalink+"</a>");
-  d3.select(".debug").text("P,N ="+a+" "+N);
 }
 
 function left() {
