projects / photo-tags.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
better display of description and time for a single photo
[photo-tags.git] / index.php
diff --git a/index.php b/index.php
index 5e93f62d94cfb146d5e46f1ab23009913e44e584..05e34d1b7c37e7a6ad49d4c6eea7d49b67e14da5 100644 (file)
--- a/index.php
+++ b/index.php
@@ -1,4 +1,25 @@
 <?php
 <?php
+
+  /**
+    copyright 2012,2013 Arun Persaud <arun@nubati.net>
+
+    This file is part of photo-tags.
+
+    Photo-tags is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Photo-tags is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Photo-tags.  If not, see <http://www.gnu.org/licenses/>.
+
+  **/
+
 /* parse ini -file */
 $iniarray=parse_ini_file("config.ini");
 $webbase=$iniarray["webbase"];
 /* parse ini -file */
 $iniarray=parse_ini_file("config.ini");
 $webbase=$iniarray["webbase"];
@@ -19,169 +40,97 @@ if(isset($_REQUEST["tag"]))
 else
   $tags = "";
 
 else
   $tags = "";
 
+if(isset($_REQUEST["pic"]))
+  $pic = intval(htmlentities($_REQUEST["pic"]));
+else
+  $pic = -1;
+/* end parse flags */
+
+/* autoversioning of js and css files */
+function autoversion($file)
+{
+  /* changes the file name of e.g. css/style.css to css/style.<md5>.css/js
+   * this way the browser can cache the file and will reload it if the file changed
+   * needs to have .htaccess set up correctly to link back to css/style.css */
+
+  /* only use it for file that have an absolut path */
+  if(!file_exists(dirname($_SERVER['SCRIPT_FILENAME']). '/' . $file))
+    return $file;
+
+  $md5 = md5_file(dirname($_SERVER['SCRIPT_FILENAME']). '/' . $file);
+  return preg_replace('{\\.([^./]+)$}', ".$md5.\$1", $file);
+}
+
+/* The basic layout */
 ?>
 ?>
+<!DOCTYPE html>
 <html>
 <html>
+<head>
+<meta charset="utf-8">
 <title><?php echo htmlspecialchars($title) ?></title>
 <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" />
+<script src = "<?php echo $webbase.autoversion("/js/d3.min.js")?>"></script>
+<link rel="stylesheet" type="text/css" href="<?php echo $webbase.autoversion("/css/bootstrap.min.css")?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo $webbase.autoversion("/css/style.css")?>" />
+</head>
 
 <body>
 
 
 <body>
 
-<div class="debug">test</div>
+<div class="debug"></div>
 <h1><?php echo htmlspecialchars($title) ?></h1>
 
 <h1><?php echo htmlspecialchars($title) ?></h1>
 
-<button class="prev" disabled="disabled" onclick="left()"> prev </button>
-<button class="next"   onclick="right()">next </button>
+<nav>
+
+<div class="pagination">
+  <ul>
+  </ul>
+</div>
+
+</nav>
+
 
 <div class="permalink"></div>
 
 <div class="tagsearch">
 
 <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 class="form-search" method="get" action="">
+  <p>
+    <label>Search for tag:</label> <input class="input-medium search-query" list="MyTags" id="MyTagsInput" type="text" value="" />
+    <datalist id="MyTags">
+    </datalist>
+    Current tags:<span id="currenttags"></span>
+    <a class="next btn btn-small btn-info" onclick="tagcloud()">tag cloud</a>
+    <a class="btn btn-small btn-success" href='<?php echo $webbase?>'>all</a>
+    <span id="pictags"></span>
+  </p>
 </form>
 </div>
 
 </form>
 </div>
 
-<div class="index"></div>
-<div class="pics"> </div>
+<div class="nextprev"> <ul></ul></div>
+
+<div class="pics"><ul></ul> </div>
 
 <footer>
 
 <footer>
-  This gallery belongs to <?php echo htmlspecialchars($admin) ?>.
-  <div class="copyright"> code: copyright 2011 Arun Persaud arun@nubati.net, code available at nubati.net/git/f-spot-gallery</div>
+  <div class="pull-left">This gallery belongs to <?php echo htmlspecialchars($admin) ?>.</div>
+  <div class="copyright pull-right"> photo-tags: copyright 2011-2012 Arun Persaud arun@nubati.net,<br /> code available at <a href="http://source.nubati.net/projects/photo-tags">source.nubati.net/projects/photo-tags</a></div>
 </footer>
 
 
 </footer>
 
 
+<script src = "<?php echo $webbase.autoversion("/js/photo-tags.js")?>"></script>
+<script src="http://code.jquery.com/jquery-latest.js"></script>
+<script src="js/bootstrap.min.js"></script>
 <script type="text/javascript" >
 
 <script type="text/javascript" >
 
-var pics = d3.select(".pics").append("ul");
-
+/*hand parameters over to javascript*/
 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 ?>";
+var ID=<?php echo $pic ?>;
 var count=0;
 var count=0;
+var dbprefix="<?php echo $dbprefix ?>".replace(/\//g,"\/");
+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])
-      .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.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 */
-      n = Math.floor(json[0][0].total/N);
-      s = "";
-
-      if(n>1)
-       {
-         s="page ";
-
-         if(a>7)
-           {
-             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);
-
-      /* update pics */
-      count=0;
-      pics.selectAll("li").remove();
-      picdata=json[1];
-      pics.selectAll("li").data(picdata)
-       .enter().append("li")
-       .append("a")
-       .attr("href",function(d) {
-           s= d.base_uri+'/'+d.filename;
-           s = s.replace('file:\/\/<?php echo "".str_replace("/","\/",$dbprefix); ?>','<?php echo $webbase; ?>/Photos-small/');
-           return s;
-         })
-       .append("img")
-       .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/');
-           return s;
-         });
-      checkbutton();
-    });
-
-  permalink="<?php echo $webbase ?>/page/"+page;
-  d3.select(".permalink").html("Permalink: <a href=\""+permalink+"\">"+permalink+"</a>");
-}
-
-function left() {
-  if (page>=2) page=page-1;
-  myreload(page);
-}
-
-function right() {
-  page=page+1;
-  myreload(page);
-}
-
-function checkbutton() {
-
-  if (page==1)
-    { d3.select("button.prev").attr("disabled","disabled");}
-  else
-    { d3.select("button.prev").attr("disabled", null);};
-
-  if (count<N)
-    { d3.select("button.next").attr("disabled","disabled");}
-  else
-    { d3.select("button.next").attr("disabled",null);}
-}
-
-myreload(page);
+init();
+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.