$page = 1;
if(isset($_REQUEST["tag"]))
- $tags = $_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 */
?>
+
<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" />
+<script src = "<?php echo $webbase.autoversion("/js/d3.min.js")?>"></script>
+<link rel="stylesheet" type="text/css" href="<?php echo $webbase.autoversion("/css/normalize.css")?>" />
+<link rel="stylesheet" type="text/css" href="<?php echo $webbase.autoversion("/css/style.css")?>" />
<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>
+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>
+</nav>
<div class="permalink"></div>
<div class="tagsearch">
<form method="get" action="">
- Tags: <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="tagcloud()">tag cloud</button>
</div>
-<div class="index"></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) ?>.
- <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 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?>";
-/* populate data list with tags*/
-d3.json("<?php echo $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);
-});
-
-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 */
- s="page ";
- n = json[0][0].total/N;
- for(i=1;i<=n+1;i++)
- {
- s+=" <a href=\"<?php echo $webbase?>";
- if(T!="")
- s+="/tag/"+T;
- s+="/page/"+i+"\">"+i+"</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);
+load_content();
+update_page_index();
</script>
projects / photo-tags.git / blobdiff