Merge branch 'HEAD' of ssh://git@git.raylu.net/pathery

8 files changed, 67 insertions, 31 deletions

diff --git a/css/page.css b/css/page.css
index 46563d2..ec0f1c9 100644
--- a/css/page.css
+++ b/css/page.css
@@ -507,5 +507,14 @@ table.score th {
 	background-color:#356;

 	cursor:default;

 }

+.unselectable

+{

+	-webkit-touch-callout: none;

+	-webkit-user-select: none;

+	-khtml-user-select: none;

+	-moz-user-select: none;

+	-ms-user-select: none;

+	user-select: none;

+}

 

 

diff --git a/css/stats.css b/css/stats.css
index 3028d91..282f58a 100644
--- a/css/stats.css
+++ b/css/stats.css
@@ -1,3 +1,9 @@
+#displayDate
+{
+	font-size: 105%;
+	text-align: center;
+	padding: 7px 0px;
+}
 .col1 {
 	float: left;
 	margin-right: 8px;
@@ -57,7 +63,7 @@
 	cursor: auto;
 }
 .mapNavActive {
-	cursor: auto;
+	cursor: pointer;
 }
 .mapNavActive:hover {
 	background-color: #343c57;
@@ -115,10 +121,25 @@
 }
 
 .mapThumbnail.current {
-	background-color:#557;
+	background-color: #373737;
+    color: #CCCCCC;
 }
 .mapThumbnail.current:hover {
-	background-color:#668;
+	background-color:#474747;
+}
+#currentMapMessage
+{
+    color: #FF2818;
+    display: none;
+    text-align: center;
+	padding-bottom: 12px;
+}
+
+#currentMapMessage span
+{
+    background-color: #1A1A1A;
+    border-radius: 8px 8px 8px 8px;
+    padding: 3px 10px;
 }
 
 
diff --git a/includes/.gitignore b/includes/.gitignore
new file mode 100644
index 0000000..4f36fe0
--- /dev/null
+++ b/includes/.gitignore
@@ -0,0 +1 @@
+/db.inc.php
diff --git a/includes/db.inc.php b/includes/db.inc.php
deleted file mode 100644
index e1db0ee..0000000
--- a/includes/db.inc.php
+++ /dev/null
@@ -1,6 +0,0 @@
-<?php

-$db_host = "db2894.perfora.net";

-$db_user = "dbo362854667";

-$db_name = "db362854667";

-$db_pass = "mazes4me";

-?>
\ No newline at end of file
diff --git a/includes/header.php b/includes/header.php
index 44d028e..cf427e4 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -20,11 +20,10 @@ function htmlHeader($css = array(), $title = 'Pathery', $desc = '', $scripts = a
 	foreach ($scripts as $s) echo "<script src='js/$s.js?v=122612'></script>";

 ?>

 	<script src="js/ajax.js" async="async"></script>

+	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>

 	<script src="js/mapspecs.js?v=122612"></script>

 	<script src="js/globe.js?v=122612"></script>

 

-	<script src="//ajax.googleapis.com/ajax/libs/jquery/1.8.3/jquery.min.js"></script>

-

 	<script>

 	(function(c,a){window.mixpanel=a;var b,d,h,e;b=c.createElement("script");b.type="text/javascript";b.async=!0;b.src=("https:"===c.location.protocol?"https:":"http:")+'//cdn.mxpnl.com/libs/mixpanel-2.1.min.js';d=c.getElementsByTagName("script")[0];d.parentNode.insertBefore(b,d);a._i=[];a.init=function(b,c,f){function d(a,b){var c=b.split(".");2==c.length&&(a=a[c[0]],b=c[1]);a[b]=function(){a.push([b].concat(Array.prototype.slice.call(arguments,0)))}}var g=a;"undefined"!==typeof f?

 	g=a[f]=[]:f="mixpanel";g.people=g.people||[];h="disable track track_pageview track_links track_forms register register_once unregister identify name_tag set_config people.identify people.set people.increment".split(" ");for(e=0;e<h.length;e++)d(g,h[e]);a._i.push([b,c,f])};a.__SV=1.1})(document,window.mixpanel||[]);

diff --git a/js/globe.js b/js/globe.js
index 9538d9b..152ad71 100644
--- a/js/globe.js
+++ b/js/globe.js
@@ -1,4 +1,3 @@
-

 function showSignin() {

 	if (document.getElementById('oid_hidden') !== undefined) {

 		document.getElementById('oid_hidden').id = 'oid_wrapper';

@@ -26,6 +25,11 @@ function createSignin() {
 	document.body.appendChild(div.firstChild);

 }

 

-

-

-

+//Make unselectable elements unselectable (hack for IE 9.0 and below, which doesn't support our CSS)

+$(document).ready(function()

+{

+	if ($.browser.msie && $.browser.version < 10) 

+	{

+		$('.unselectable').find(':not(input)').attr('unselectable', 'on');

+	}

+});
\ No newline at end of file
diff --git a/js/scores.js b/js/scores.js
index 2b137cb..dc164f2 100644
--- a/js/scores.js
+++ b/js/scores.js
@@ -114,7 +114,7 @@ function scoresFormatPage(JO) {
 	//console.log("jo object", JO);

 	var navi = '';

 	if (JO.pageCount > 1) {

-		navi = "<tr><th colspan='3' style='text-align:center;'>"+formatPageNavi(JO, "scoresShowPage", JO.mapid)+"</th></tr>"; 

+		navi = "<tr><th class='unselectable' colspan='3' style='text-align:center;'>"+formatPageNavi(JO, "scoresShowPage", JO.mapid)+"</th></tr>"; 

 		p = p+navi;

 	}

 	

@@ -345,11 +345,12 @@ function formatPageNavi(JO, callback) {
 			if (!showedPrevPage) 

 				r = r + ' ... ';

 			if (JO.page == i) {

-				r = r + " <b style='color:#aaaabb; font-size:150%;'>" + i + "</b>";

+				r = r + " <b class='unselectable' style='color:#aaaabb; font-size:150%;'>" + i + "</b>";

 			} else if (i == JO.userPage) {

-				r = r + " <a href='javascript:"+callback+"("+i+", "+arguments[2]+", "+arguments[3]+")' style='color:#99cc99;' title='You are on this page'><i>" + i + '</i></a>';

+				r = r + " <a class='unselectable' href='javascript:"+callback+"("+i+", "+arguments[2]+", "+arguments[3]

+					+ ")' style='color:#99cc99;' title='You are on this page'><i>" + i + '</i></a>';

 			} else {

-				r = r + " <a href='javascript:"+callback+"("+i+", "+arguments[2]+", "+arguments[3]+")'>" + i + '</a>';

+				r = r + " <a class='unselectable' href='javascript:"+callback+"("+i+", "+arguments[2]+", "+arguments[3]+")'>" + i + '</a>';

 			}

 			showedPrevPage = true;

 		} else {

@@ -360,18 +361,18 @@ function formatPageNavi(JO, callback) {
 	var prevPage = JO.page - 1;

 	if (JO.pageCount > 1) {

 		if (JO.page < JO.pageCount) {

-			r = r+" <a class='scoreRight' title='Last' href='javascript:"+callback+"("+JO.pageCount+", "+arguments[2]+", "+arguments[3]+")'>&gt;&gt;&gt;</a>";

-			r = r+" <a class='scoreRight' title='Next' href='javascript:"+callback+"("+nextPage+", "+arguments[2]+", "+arguments[3]+")'>&gt;</a>";

+			r = r+" <a class='scoreRight unselectable' title='Last' href='javascript:"+callback+"("+JO.pageCount+", "+arguments[2]+", "+arguments[3]+")'>&gt;&gt;&gt;</a>";

+			r = r+" <a class='scoreRight unselectable' title='Next' href='javascript:"+callback+"("+nextPage+", "+arguments[2]+", "+arguments[3]+")'>&gt;</a>";

 		} else {

-			r = r+" <span class='scoreRight'>&gt;&gt;&gt;</span>";

-			r = r+" <span class='scoreRight'>&gt;</span>";

+			r = r+" <span class='scoreRight unselectable'>&gt;&gt;&gt;</span>";

+			r = r+" <span class='scoreRight unselectable'>&gt;</span>";

 		}

 		if (JO.page > 1) {

-			r = " <a class='scoreLeft' title='Previous' href='javascript:"+callback+"("+prevPage+", "+arguments[2]+", "+arguments[3]+")'>&lt;</a>"+r;

-			r = " <a class='scoreLeft' title='First' href='javascript:"+callback+"(1, "+arguments[2]+", "+arguments[3]+")'>&lt;&lt;&lt;</a>"+r;

+			r = " <a class='scoreLeft unselectable' title='Previous' href='javascript:"+callback+"("+prevPage+", "+arguments[2]+", "+arguments[3]+")'>&lt;</a>"+r;

+			r = " <a class='scoreLeft unselectable' title='First' href='javascript:"+callback+"(1, "+arguments[2]+", "+arguments[3]+")'>&lt;&lt;&lt;</a>"+r;

 		} else {

-			r = r+" <span class='scoreLeft'>&lt;&lt;&lt;</span>";

-			r = r+" <span class='scoreLeft'>&lt;</span>";

+			r = r+" <span class='scoreLeft unselectable'>&lt;&lt;&lt;</span>";

+			r = r+" <span class='scoreLeft unselectable'>&lt;</span>";

 		}

 	}

 

diff --git a/pages/scores.php b/pages/scores.php
index 37ef45c..9b645c2 100644
--- a/pages/scores.php
+++ b/pages/scores.php
@@ -90,6 +90,13 @@ function displayMapScores(mapID) {
 		$('#scoreDisplay').empty();

 		newDiv.prependTo('#scoreDisplay');

 	}

+	

+	//Hack: display the "current map" div for currently running maps

+	//Relies on the fact that the #thumb_<mapId> div has a single child with the 'current' class..

+	var showCurrentMapMessage = $('#thumb_'+mapID).children().hasClass('current');

+	$('#currentMapMessage').toggle(showCurrentMapMessage);

+		

+	

 	$("#mapDisplay").fadeOut('fast');

 	displayMap(mapID, "mapDisplay", 682);

 	scoresShowPage(pointerPage, mapID);

@@ -271,18 +278,18 @@ topbar($Links);
 

 <div class="wrapper">

 

-	<div style='font-size: 105%;text-align:center;padding-bottom:7px;' id='displayDate'>

+	<div id='displayDate'>

 	Loading...

 	</div>

 

 	<div class='mapNavCon'>

-		<a id='mapNavLeft' class='mapNavLeft mapNavActive' href='javascript:getMapIDs("prev");'>&lt;</a>

-		<a id='mapNavRight' class='mapNavRight mapNavActive' href='javascript:getMapIDs("next");'>&gt;</a>

+		<a id='mapNavLeft' class='mapNavLeft mapNavActive unselectable' href='javascript:getMapIDs("prev");'>&lt;</a>

+		<a id='mapNavRight' class='mapNavRight mapNavActive unselectable' href='javascript:getMapIDs("next");'>&gt;</a>

 		<div class='mapNavCenter'>

 			<div id='mapNavigation'></div>

 		</div>

 	</div>

-	

+	<div id="currentMapMessage"><span>This map is currently running, so points/solutions are not available</span></div>

 	<div style='clear:both'></div>

 	<div>

 		<div class='scoreCol' id='scoreDisplay'></div>