projects / photo-tags.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
clean up and use a variable for the web base address everywhere
[photo-tags.git] / index.php
diff --git a/index.php b/index.php
index aa799b98d868fb0f220e9484205499e709aa40d5..9e4bc15546a3a6bc1908984faae31c1b06720afa 100644 (file)
--- a/index.php
+++ b/index.php
@@ -30,13 +30,13 @@ else
 
 <html>
 <title><?php echo htmlspecialchars($title) ?></title>
-<script src="<?php echo $webbase?>/d3.min.js"></script>
+<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" />
 
 <body>
 
-<div class="debug">test</div>
+<div class="debug"></div>
 <h1><?php echo htmlspecialchars($title) ?></h1>
 
 <nav>
@@ -58,7 +58,9 @@ else
   <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) ?>.
@@ -68,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 ?>;
@@ -76,15 +78,17 @@ var T="<?php echo $tags ?>";
 var ID=<?php echo $pic ?>;
 var count=0;
 
+var webbase = "<?php echo $webbase?>";
+
 /* populate data list with tags*/
-d3.json("<?php echo $webbase?>/getjson.php?S", function(json) {
-    d3.select("#MyTags").selectAll("option").data(json[1])
+d3.json(webbase+"/getjson.php?S", function(json) {
+    d3.select("#MyTags").selectAll("option").data(json)
       .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(" ","+"));
+    d3.select('form').attr("action",webbase+"/tag/"+document.getElementById('MyTagsInput').value.replace(" ","+"));
 });
 
 if (T!="")
@@ -108,11 +112,11 @@ function load_content(a) {
   update_page_index(a);
 
   if (ID>=0)
-    url = "<?php echo $webbase?>/getjson.php?ID="+ID;
+    url = webbase+"/getjson.php?ID="+ID;
   else if(T!="")
-    url = "<?php echo $webbase?>/getjson.php?T="+T+"&P="+a;
+    url = webbase+"/getjson.php?T="+T+"&P="+a;
   else
-    url = "<?php echo $webbase?>/getjson.php?P="+a;
+    url = webbase+"/getjson.php?P="+a;
 
   /* update pics */
   d3.json(url, function(json) {
@@ -123,23 +127,81 @@ function load_content(a) {
       /* if ID is set, just show one pictures, else create an array of pictures */
       if (ID>=0)
        {
-         pics.selectAll("li").data(picdata)
-           .enter().append("li")
-           .append("img")
+         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");
+         singlepicspace.append("img")
            .attr("class","large")
            .attr("src",function(d) {
                s= d.base_uri+'/'+d.filename;
-               s = s.replace('file:\/\/<?php echo "".str_replace("/","\/",$dbprefix); ?>','<?php echo $webbase?>/Photos-small/');
+               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 })
+               }
+
+           });
        }
       else
        {
+         d3.select(".nextprev").select("ul").selectAll("li").remove();
          pics.selectAll("li").data(picdata)
            .enter().append("li")
            .append("a")
            .attr("href",function(d) {
-               s = '<?php echo $webbase; ?>';
+               s = webbase;
                if(T!="")
                  s = s + '/tag/' + T;
                if(a!=1)
@@ -151,7 +213,7 @@ function load_content(a) {
            .attr("src",function(d) {
                count++;
                s= d.base_uri+'/'+d.filename;
-               s = s.replace('file:\/\/<?php echo "".str_replace("/","\/",$dbprefix); ?>','<?php echo $webbase?>/Photos-tiny/');
+               s = s.replace('file:\/\/<?php echo "".str_replace("/","\/",$dbprefix); ?>',webbase+'/Photos-tiny/');
                return s;
              });
        };
@@ -159,15 +221,19 @@ function load_content(a) {
      checkbutton();
     });
 
+   update_permalink()
+}
+
+function update_permalink() {
   /* update permalink */
 
-  permalink="<?php echo $webbase ?>";
+  permalink = webbase;
+
   if(T!="")
     permalink += '/tag/' + T;
   if(a!=1)
     permalink += '/page/' + a;
 
-
   d3.select(".permalink").html("Permalink: <a href=\""+permalink+"\">"+permalink+"</a>");
 }
 
@@ -183,7 +249,7 @@ function right() {
 
 function cloud() {
 
-  url = "<?php echo $webbase?>/getjson.php?CLOUD=1";
+  url = webbase+"/getjson.php?CLOUD=1";
 
   pics.selectAll("li").remove();
 
@@ -193,11 +259,11 @@ function cloud() {
   /* 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)+"em"})
-       .text(function(d) { return d.name; })
+       .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 })
+       .on("click", function(d) { document.location.href=webbase+'/tag/'+d.name })
     });
 }
 
@@ -218,11 +284,15 @@ function checkbutton()
 function update_page_index(mypage)
 {
   /* load number of pictures */
+  
+  myID = "";
+  if(ID > 0)
+    myID = "&ID="+ID;
 
   if(T!="")
-    url = "<?php echo $webbase?>/getjson.php?C=1&T="+T;
+    url = webbase+"/getjson.php?C=1&T="+T+myID;
   else
-    url = "<?php echo $webbase?>/getjson.php?C=1";
+    url = webbase+"/getjson.php?C=1"+myID;
 
   d3.json(url, function(json) {
     /* update index, show only page +-5 pages max */
@@ -235,7 +305,7 @@ function update_page_index(mypage)
 
         if(mypage>7)
          {
-           s+=" <a href=\"<?php echo $webbase?>";
+           s+=" <a href=\""+webbase;
            if(T!="")
              s+="/tag/"+T;
            s+="/page/1\">1</a>...";
@@ -250,7 +320,7 @@ function update_page_index(mypage)
              s+= " "+i+" ";
            else
              {
-               s+=" <a href=\"<?php echo $webbase?>";
+               s+=" <a href=\""+webbase;
                if(T!="")
                  s+="/tag/"+T;
                s+="/page/"+i+"\">"+i+"</a>";
@@ -259,14 +329,14 @@ function update_page_index(mypage)
 
         if(mypage+5<n)
          {
-           s+="... <a href=\"<?php echo $webbase?>";
+           s+="... <a href=\""+webbase;
            if(T!="")
              s+="/tag/"+T;
            s+="/page/"+(n+1)+"\">"+(n+1)+"</a>";
          }
         else if(mypage+5==n)
          {
-           s+=" <a href=\"<?php echo $webbase?>";
+           s+=" <a href=\""+webbase;
            if(T!="")
              s+="/tag/"+T;
            s+="/page/"+(n+1)+"\">"+(n+1)+"</a>";
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.