projects / photo-tags.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
some small cleanup
[photo-tags.git] / index.php
diff --git a/index.php b/index.php
index 62839eb1543b879427d06a81227a196c9a983102..f4ad8fbc7d06514df72659dac43bbf50edd6fdf7 100644 (file)
--- a/index.php
+++ b/index.php
@@ -30,7 +30,7 @@ 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" />
 
@@ -41,8 +41,8 @@ else
 
 <nav>
 <span class="index"></span>
-<button class="prev" type="button" disabled="disabled" onclick="left()"> prev </button>
-<button class="next" type="button" onclick="right()">next </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>
 </nav>
 
@@ -50,12 +50,12 @@ else
 
 <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>
   Current tags:<span id="currenttags"></span>
-  <button class="next" type="button" onclick="cloud()">tag cloud</button>
+  <button class="next" type="button" onclick="tagcloud()">tag cloud</button>
 </div>
 
 <div class="nextprev"> <ul></ul></div>
@@ -70,23 +70,25 @@ else
 
 <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 ID=<?php echo $pic ?>;
 var count=0;
 
+var webbase = "<?php echo $webbase?>";
+var pics = d3.select(".pics").select("ul");
+
+
 /* populate data list with tags*/
-d3.json("<?php echo $webbase?>/getjson.php?S", function(json) {
+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!="")
@@ -104,17 +106,17 @@ if (T!="")
     d3.select("#currenttags").append("span").text( ' none');
   };
 
-function load_content(a) {
-  //  d3.select(".debug").text("T,P,N = *"+T+"* *"+a+"* *"+N+"*");
+function load_content() {
+  d3.select(".debug").text("T,P,N = *"+T+"* *"+page+"* *"+N+"*");
 
-  update_page_index(a);
+  update_page_index();
 
   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="+page;
   else
-    url = "<?php echo $webbase?>/getjson.php?P="+a;
+    url = webbase+"/getjson.php?P="+page;
 
   /* update pics */
   d3.json(url, function(json) {
@@ -126,21 +128,21 @@ function load_content(a) {
       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","<?php echo $webbase?>/left.png");
+         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","<?php echo $webbase?>/right.png");
+         singlepicspace.append("div").attr("class","right").append("img").attr("src",webbase+"/right.png");
 
          /* update thumbnails */
          if(T!="")
-           url2 = "<?php echo $webbase?>/getjson.php?NP=1&T="+T+"&ID="+ID;
+           url2 = webbase+"/getjson.php?NP=1&T="+T+"&ID="+ID;
          else
-           url2 = "<?php echo $webbase?>/getjson.php?NP=1&ID="+ID;
+           url2 = webbase+"/getjson.php?NP=1&ID="+ID;
 
          var IDprev=-1;
          var IDnext=-1;
@@ -150,7 +152,7 @@ function load_content(a) {
              thumbs.enter().append("li")
                .append("a")
                .attr("href",function(d) {
-                   s = '<?php echo $webbase; ?>';
+                   s = webbase;
                    if(T!="")
                      s = s + '/tag/' + T;
                    s = s + '/pic/' + d.id;
@@ -167,7 +169,7 @@ function load_content(a) {
                .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/');
+                   s = s.replace('file:\/\/<?php echo "".str_replace("/","\/",$dbprefix); ?>',webbase+'/Photos-tiny/');
                    return s;
                  });
 
@@ -175,7 +177,7 @@ function load_content(a) {
 
              if (IDprev != -1 )
                {
-                 s = '<?php echo $webbase; ?>';
+                 s = webbase;
                  if(T!="")
                    s = s + '/tag/' + T;
                  s = s + '/pic/' + IDprev;
@@ -183,7 +185,7 @@ function load_content(a) {
                }
              if (IDnext != -1 )
                {
-                 s = '<?php echo $webbase; ?>';
+                 s = webbase;
                  if(T!="")
                    s = s + '/tag/' + T;
                  s = s + '/pic/' + IDnext;
@@ -199,11 +201,11 @@ function load_content(a) {
            .enter().append("li")
            .append("a")
            .attr("href",function(d) {
-               s = '<?php echo $webbase; ?>';
+               s = webbase;
                if(T!="")
                  s = s + '/tag/' + T;
-               if(a!=1)
-                 s = s + '/page/' + a;
+               if(page!=1)
+                 s = s + '/page/' + page;
                s = s + '/pic/' + d.id;
                return s;
              })
@@ -211,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;
              });
        };
@@ -225,29 +227,31 @@ function load_content(a) {
 function update_permalink() {
   /* update permalink */
 
-  permalink="<?php echo $webbase ?>";
+  permalink = webbase;
 
   if(T!="")
     permalink += '/tag/' + T;
-  if(a!=1)
-    permalink += '/page/' + a;
+  if(page!=1)
+    permalink += '/page/' + page;
+  if(ID>0)
+    permalink += '/pic/' + ID;
 
   d3.select(".permalink").html("Permalink: <a href=\""+permalink+"\">"+permalink+"</a>");
 }
 
-function left() {
+function prev_page() {
   if (page>=2) page=page-1;
-  load_content(page);
+  load_content();
 }
 
-function right() {
+function next_page() {
   page=page+1;
-  load_content(page);
+  load_content();
 }
 
-function cloud() {
+function tagcloud() {
 
-  url = "<?php echo $webbase?>/getjson.php?CLOUD=1";
+  url = webbase+"/getjson.php?CLOUD=1";
 
   pics.selectAll("li").remove();
 
@@ -261,13 +265,12 @@ function cloud() {
        .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 })
     });
 }
 
 function checkbutton()
 {
-
   if (page==1)
     { d3.select("button.prev").attr("disabled","disabled");}
   else
@@ -279,62 +282,66 @@ function checkbutton()
     { d3.select("button.next").attr("disabled",null);}
 }
 
-function update_page_index(mypage)
+function update_page_index()
 {
   /* load number of pictures */
-  
   myID = "";
   if(ID > 0)
     myID = "&ID="+ID;
 
   if(T!="")
-    url = "<?php echo $webbase?>/getjson.php?C=1&T="+T+myID;
+    url = webbase+"/getjson.php?C=1&T="+T+myID;
   else
-    url = "<?php echo $webbase?>/getjson.php?C=1"+myID;
+    url = webbase+"/getjson.php?C=1"+myID;
 
   d3.json(url, function(json) {
     /* update index, show only page +-5 pages max */
     n = Math.floor(json[0].total/N);
+    nr = Math.floor( (json[0].row-1)/N); /* rowid starts at 1 not 0 */
+
+    if(nr > 0)
+      page = nr+1;
+
     s = "";
 
     if(n>0)
       {
         s="page ";
 
-        if(mypage>7)
+        if(page>7)
          {
-           s+=" <a href=\"<?php echo $webbase?>";
+           s+=" <a href=\""+webbase;
            if(T!="")
              s+="/tag/"+T;
            s+="/page/1\">1</a>...";
-           start = mypage-5;
+           start = page-5;
          }
         else
          start=1;
 
-        for(i=start;i<=Math.min(n+1,mypage+5);i++)
+        for(i=start;i<=Math.min(n+1,page+5);i++)
          {
-           if(i==mypage)
+           if(i==page)
              s+= " "+i+" ";
            else
              {
-               s+=" <a href=\"<?php echo $webbase?>";
+               s+=" <a href=\""+webbase;
                if(T!="")
                  s+="/tag/"+T;
                s+="/page/"+i+"\">"+i+"</a>";
              }
          }
 
-        if(mypage+5<n)
+        if(page+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)
+        else if(page+5==n)
          {
-           s+=" <a href=\"<?php echo $webbase?>";
+           s+=" <a href=\""+webbase;
            if(T!="")
              s+="/tag/"+T;
            s+="/page/"+(n+1)+"\">"+(n+1)+"</a>";
@@ -344,7 +351,7 @@ function update_page_index(mypage)
     } );
 }
 
-load_content(page);
+load_content();
 
 </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.