projects / photo-tags.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
moved css files into their own directory
[photo-tags.git] / index.php
diff --git a/index.php b/index.php
index 7237d283507d865fec76318b500ac7fa54125d29..55bc6c74e850f65e221559c81a75e86b1ea6cbf8 100644 (file)
--- a/index.php
+++ b/index.php
@@ -31,8 +31,8 @@ else
 <html>
 <title><?php echo htmlspecialchars($title) ?></title>
 <script src = "<?php echo $webbase?>/d3.min.js"></script>
 <html>
 <title><?php echo htmlspecialchars($title) ?></title>
 <script src = "<?php echo $webbase?>/d3.min.js"></script>
-<link rel="stylesheet" type="text/css" href="<?php echo $webbase?>/normalize.css" />
-<link rel="stylesheet" type="text/css" href="<?php echo $webbase?>/style.css" />
+<link rel="stylesheet" type="text/css" href="<?php echo $webbase?>/css/normalize.css" />
+<link rel="stylesheet" type="text/css" href="<?php echo $webbase?>/css/style.css" />
 
 <body>
 
 
 <body>
 
@@ -40,7 +40,7 @@ else
 <h1><?php echo htmlspecialchars($title) ?></h1>
 
 <nav>
 <h1><?php echo htmlspecialchars($title) ?></h1>
 
 <nav>
-<span class="index"></span>
+page <span class="index"></span>
 <button class="prev" type="button" disabled="disabled" onclick="prev_page()"> prev </button>
 <button class="next" type="button" onclick="next_page()">next </button>
 <button class="all"  type="submit" onclick="document.location.href='<?php echo $webbase?>'">all</button>
 <button class="prev" type="button" disabled="disabled" onclick="prev_page()"> prev </button>
 <button class="next" type="button" onclick="next_page()">next </button>
 <button class="all"  type="submit" onclick="document.location.href='<?php echo $webbase?>'">all</button>
@@ -50,7 +50,7 @@ else
 
 <div class="tagsearch">
 <form method="get" action="">
 
 <div class="tagsearch">
 <form method="get" action="">
- Add tag: <input list="MyTags" id="MyTagsInput" type="text" value="" />
+ Search for tag: <input list="MyTags" id="MyTagsInput" type="text" value="" />
   <datalist id="MyTags">
   </datalist>
 </form>
   <datalist id="MyTags">
   </datalist>
 </form>
@@ -70,8 +70,6 @@ else
 
 <script type="text/javascript" >
 
 
 <script type="text/javascript" >
 
-var pics = d3.select(".pics").select("ul");
-
 var page=<?php echo $page ?>;
 var N=<?php echo $N ?>;
 var T="<?php echo $tags ?>";
 var page=<?php echo $page ?>;
 var N=<?php echo $N ?>;
 var T="<?php echo $tags ?>";
@@ -79,6 +77,8 @@ var ID=<?php echo $pic ?>;
 var count=0;
 
 var webbase = "<?php echo $webbase?>";
 var count=0;
 
 var webbase = "<?php echo $webbase?>";
+var pics = d3.select(".pics").select("ul");
+
 
 /* populate data list with tags*/
 d3.json(webbase+"/getjson.php?S", function(json) {
 
 /* populate data list with tags*/
 d3.json(webbase+"/getjson.php?S", function(json) {
@@ -106,17 +106,15 @@ if (T!="")
     d3.select("#currenttags").append("span").text( ' none');
   };
 
     d3.select("#currenttags").append("span").text( ' none');
   };
 
-function load_content(a) {
-  //  d3.select(".debug").text("T,P,N = *"+T+"* *"+a+"* *"+N+"*");
-
-  update_page_index(a);
+function load_content() {
+  //  d3.select(".debug").text("T,P,N = *"+T+"* *"+page+"* *"+N+"*");
 
   if (ID>=0)
     url = webbase+"/getjson.php?ID="+ID;
   else if(T!="")
 
   if (ID>=0)
     url = webbase+"/getjson.php?ID="+ID;
   else if(T!="")
-    url = webbase+"/getjson.php?T="+T+"&P="+a;
+    url = webbase+"/getjson.php?T="+T+"&P="+page;
   else
   else
-    url = webbase+"/getjson.php?P="+a;
+    url = webbase+"/getjson.php?P="+page;
 
   /* update pics */
   d3.json(url, function(json) {
 
   /* update pics */
   d3.json(url, function(json) {
@@ -127,8 +125,8 @@ function load_content(a) {
       /* if ID is set, just show one pictures, else create an array of pictures */
       if (ID>=0)
        {
       /* if ID is set, just show one pictures, else create an array of pictures */
       if (ID>=0)
        {
-         var singlepicspace=pics.selectAll("li").data(picdata).enter().append("li").append("div").attr("class","singlepic");
-         singlepicspace.append("div").attr("class","left").append("img").attr("src",webbase+"/left.png");
+         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","large")
            .attr("src",function(d) {
          singlepicspace.append("img")
            .attr("class","large")
            .attr("src",function(d) {
@@ -136,63 +134,9 @@ function load_content(a) {
                s = s.replace('file:\/\/<?php echo "".str_replace("/","\/",$dbprefix); ?>',webbase+'/Photos-small/');
                return s;
              });
                s = s.replace('file:\/\/<?php echo "".str_replace("/","\/",$dbprefix); ?>',webbase+'/Photos-small/');
                return s;
              });
-         singlepicspace.append("div").attr("class","right").append("img").attr("src",webbase+"/right.png");
-
-         /* update thumbnails */
-         if(T!="")
-           url2 = webbase+"/getjson.php?NP=1&T="+T+"&ID="+ID;
-         else
-           url2 = webbase+"/getjson.php?NP=1&ID="+ID;
-
-         var IDprev=-1;
-         var IDnext=-1;
-         var IDcurr=-1;
-         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 = webbase;
-                   if(T!="")
-                     s = s + '/tag/' + T;
-                   s = s + '/pic/' + d.id;
-
-                   if( IDcurr != ID )
-                     {
-                       IDprev = IDcurr;
-                       IDcurr = IDnext;
-                       IDnext = 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); ?>',webbase+'/Photos-tiny/');
-                   return s;
-                 });
-
-             thumbs.exit().remove();
-
-             if (IDprev != -1 )
-               {
-                 s = webbase;
-                 if(T!="")
-                   s = s + '/tag/' + T;
-                 s = s + '/pic/' + IDprev;
-                 d3.select(".left").on("click", function(d) { document.location.href=s })
-               }
-             if (IDnext != -1 )
-               {
-                 s = webbase;
-                 if(T!="")
-                   s = s + '/tag/' + T;
-                 s = s + '/pic/' + IDnext;
-                 d3.select(".right").on("click", function(d) { document.location.href=s })
-               }
-
-           });
+         singlepicspace.append("div").attr("class","right").append("img").attr("src",webbase+"/icons/right.png");
+
+         update_thumbnails();
        }
       else
        {
        }
       else
        {
@@ -200,15 +144,7 @@ function load_content(a) {
          pics.selectAll("li").data(picdata)
            .enter().append("li")
            .append("a")
          pics.selectAll("li").data(picdata)
            .enter().append("li")
            .append("a")
-           .attr("href",function(d) {
-               s = webbase;
-               if(T!="")
-                 s = s + '/tag/' + T;
-               if(a!=1)
-                 s = s + '/page/' + a;
-               s = s + '/pic/' + d.id;
-               return s;
-             })
+           .on("click", function(d) { load_pic(d.id); })
            .append("img")
            .attr("src",function(d) {
                count++;
            .append("img")
            .attr("src",function(d) {
                count++;
@@ -221,10 +157,10 @@ function load_content(a) {
      checkbutton();
     });
 
      checkbutton();
     });
 
-   update_permalink(a)
+   update_permalink()
 }
 
 }
 
-function update_permalink(page) {
+function update_permalink() {
   /* update permalink */
 
   permalink = webbase;
   /* update permalink */
 
   permalink = webbase;
@@ -241,12 +177,25 @@ function update_permalink(page) {
 
 function prev_page() {
   if (page>=2) page=page-1;
 
 function prev_page() {
   if (page>=2) page=page-1;
-  load_content(page);
+  load_content();
 }
 
 function next_page() {
   page=page+1;
 }
 
 function next_page() {
   page=page+1;
-  load_content(page);
+  load_content();
+}
+
+function prev_pic() {
+}
+
+function next_pic() {
+}
+
+function load_pic(myid) {
+  ID=myid;
+  update_page_index();
+  update_thumbnails();
+  load_content();
 }
 
 function tagcloud() {
 }
 
 function tagcloud() {
@@ -269,6 +218,62 @@ function tagcloud() {
     });
 }
 
     });
 }
 
+function update_thumbnails(){
+  if(T!="")
+    url2 = webbase+"/getjson.php?NP=1&T="+T+"&ID="+ID;
+  else
+    url2 = webbase+"/getjson.php?NP=1&ID="+ID;
+
+  var IDprev=-1;
+  var IDnext=-1;
+  var IDcurr=-1;
+  d3.json(url2, function(json2) {
+      /* figure out where the arrows on the pic should link to */
+      all=""
+      for (var i in json2){
+       if( IDcurr != ID )
+         {
+           IDprev = IDcurr;
+           IDcurr = IDnext;
+           IDnext = json2[i].id;
+         };
+      }
+
+      var thumbs= d3.select(".nextprev").select("ul").selectAll("li").data(json2, function(d) {return d.id;});
+
+      thumbs.enter().append("li")
+       .append("a")
+       .on("click", function(d) {
+           load_pic(d.id); }
+         )
+       .append("img")
+       .attr("src",function(d) {
+           s= d.base_uri+'/'+d.filename;
+           s = s.replace('file:\/\/<?php echo "".str_replace("/","\/",$dbprefix); ?>',webbase+'/Photos-tiny/');
+           return s;
+         })
+       .style("height","0")
+       .transition().duration(1000)
+       .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);});
+
+
+      /* add links for left/right arrows */
+      if (IDprev != -1 )
+       d3.select(".left").on("click", function() { load_pic(IDprev); });
+      if (IDnext != -1 )
+       d3.select(".right").on("click", function() { load_pic(IDnext); });
+
+    });
+}
+
 function checkbutton()
 {
   if (page==1)
 function checkbutton()
 {
   if (page==1)
@@ -282,7 +287,7 @@ function checkbutton()
     { d3.select("button.next").attr("disabled",null);}
 }
 
     { d3.select("button.next").attr("disabled",null);}
 }
 
-function update_page_index(mypage)
+function update_page_index()
 {
   /* load number of pictures */
   myID = "";
 {
   /* load number of pictures */
   myID = "";
@@ -299,57 +304,50 @@ function update_page_index(mypage)
     n = Math.floor(json[0].total/N);
     nr = Math.floor( (json[0].row-1)/N); /* rowid starts at 1 not 0 */
 
     n = Math.floor(json[0].total/N);
     nr = Math.floor( (json[0].row-1)/N); /* rowid starts at 1 not 0 */
 
-    if(nr > 0) mypage = nr+1;
-    s = "";
+    if(nr > 0)
+      page = nr+1;
+
+    var mydata = new Array();  // add json data  {page: <nr>, name: <name>} ; at end reform array into real json and use d3 to parse it
 
     if(n>0)
       {
 
     if(n>0)
       {
-        s="page ";
-
-        if(mypage>7)
+        if(page>7)
          {
          {
-           s+=" <a href=\""+webbase;
-           if(T!="")
-             s+="/tag/"+T;
-           s+="/page/1\">1</a>...";
-           start = mypage-5;
+           mydata.push('{ page:1, name:"1"}');
+           mydata.push('{ page:1.5, name:"..."}');
+           start = page-5;
          }
         else
          start=1;
 
          }
         else
          start=1;
 
-        for(i=start;i<=Math.min(n+1,mypage+5);i++)
-         {
-           if(i==mypage)
-             s+= " "+i+" ";
-           else
-             {
-               s+=" <a href=\""+webbase;
-               if(T!="")
-                 s+="/tag/"+T;
-               s+="/page/"+i+"\">"+i+"</a>";
-             }
-         }
+        for(i=start;i<=Math.min(n+1,page+5);i++)
+         mydata.push('{ page:'+i+', name:"'+i+'"}');
 
 
-        if(mypage+5<n)
+        if(page+5<n)
          {
          {
-           s+="... <a href=\""+webbase;
-           if(T!="")
-             s+="/tag/"+T;
-           s+="/page/"+(n+1)+"\">"+(n+1)+"</a>";
+           mydata.push('{ page:'+(n+0.5)+', name:"..."}');
+           mydata.push('{ page:'+(n+1)+', name:"'+(n+1)+'"}');
          }
          }
-        else if(mypage+5==n)
-         {
-           s+=" <a href=\""+webbase;
-           if(T!="")
-             s+="/tag/"+T;
-           s+="/page/"+(n+1)+"\">"+(n+1)+"</a>";
-         };
+        else if(page+5==n)
+         mydata.push('{ page:'+(n+1)+', name:"'+(n+1)+'"}');
       };
       };
-    d3.select(".index").html(s);
+    mydata = "["+mydata.join(",")+"]";
+    mydata =  eval('(' + mydata + ')');
+
+    var pageindex = d3.select(".index").selectAll("button").data(mydata, function(d){ return d.page; });
+    pageindex.exit().remove();
+    pageindex.enter().append("button")
+      .on("click", function(d) { if(  (d.page - Math.floor(d.page)) ==0 )  {page=d.page; ID=-1;load_content(); update_page_index();} })
+      .text(function(d) {return " "+d.name+" "});
+    pageindex.sort( function(a,b) { return a.page- b.page;} );
     } );
     } );
+
+  d3.select(".index").selectAll("button").classed("currentpage",false);
+  d3.select(".index").selectAll("button").classed("currentpage",function(d){return (d.page==page);});
 }
 
 }
 
-load_content(page);
+load_content();
+update_page_index();
 
 </script>
 
 
 </script>
 
A small web gallery that uses the f-spot database to show pictures and tags online using php, d3.js, sqlite3 and some bash scripts.