From 5838e7ee7f5b0c64617bcbc68122babc74d78dbb Mon Sep 17 00:00:00 2001
From: Kai Hermann <kai.uwe.hermann@gmail.com>
Date: Tue, 30 Aug 2011 16:47:16 +0200
Subject: [PATCH] fixed merge conflicts

---
 static/timeslider.html | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/static/timeslider.html b/static/timeslider.html
index 4dbf8d939..c1ea176d8 100644
--- a/static/timeslider.html
+++ b/static/timeslider.html
@@ -271,7 +271,11 @@
               <!-- termporary place holder--> 
               <a id = "returnbutton">Return to pad</a>
               <script>
-                $("#returnbutton").attr("href", document.referrer);
+              	if(document.referrer.length > 0 && document.referrer.substring(document.referrer.lastIndexOf("/")-1,document.referrer.lastIndexOf("/")) === "p") {
+                  $("#returnbutton").attr("href", document.referrer);
+              	} else {
+                  $("#returnbutton").attr("href", document.location.href.substring(0,document.location.href.lastIndexOf("/")));
+              	}
               </script>
             </div>