more bootstrap integration, cleanup and some small bugfixes
[photo-tags.git] / index.php
index 44be53b253318db28df504c1a123749b642537f0..bb56f89cf31ae1b94a7e57d508c6fd66d04bc8f8 100644 (file)
--- a/index.php
+++ b/index.php
@@ -14,87 +14,100 @@ if(isset($_REQUEST["page"]))
 else
   $page = 1;
 
+if(isset($_REQUEST["tag"]))
+  $tags = htmlentities($_REQUEST["tag"]);
+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>
+<head>
+<meta charset="utf-8">
 <title><?php echo htmlspecialchars($title) ?></title>
-<script src="d3.min.js"></script>
-<link rel="stylesheet" type="text/css" href="normalize.css" />
-<link rel="stylesheet" type="text/css" href="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>
 
-<div class="debug">test</div>
+<div class="debug"></div>
 <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>
 
-<div class="pics"> </div>
+</nav>
+
+
+<div class="permalink"></div>
+
+<div class="tagsearch">
+<form class="form-search" method="get" action="">
+ <label>Search for tag:</label> <input class="input-medium search-query" list="MyTags" id="MyTagsInput" type="text" value="" />
+  <datalist id="MyTags">
+  </datalist>
+ <p> Current tags:<span id="currenttags"></span>
+  <button class="next btn btn-small btn-info" onclick="tagcloud()">tag cloud</button>
+  <a class="btn btn-small btn-success" href='<?php echo $webbase?>'>all</a>
+ </p>
+</form>
+</div>
+
+<div class="nextprev"> <ul></ul></div>
+
+<div class="pics"><ul></ul> </div>
 
 <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="copyright"> photo-tags: copyright 2011 Arun Persaud arun@nubati.net, code available at <a href="http://source.nubati.net/projects/photo-tags">source.nubati.net/projects/photo-tags</a></div>
 </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" >
 
-
-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 ID=<?php echo $pic ?>;
 var count=0;
+var dbprefix="<?php echo $dbprefix ?>".replace(/\//g,"\/");
+var webbase = "<?php echo $webbase?>";
 
-function myreload(a) {
-  d3.json("<?php echo $webbase?>/getjson.php?P="+a, function(json) {
-      count=0;
-      pics.selectAll("li").remove();
-      pics.selectAll("li").data(json)
-       .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();
-    });
-
-  d3.select(".debug").text("P, count= "+a+" "+count);
-}
-
-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>