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

4 files changed, 23 insertions, 34 deletions

diff --git a/includes/header.php b/includes/header.php
index 6a9caaf..b402025 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -8,7 +8,6 @@ function htmlHeader() {
     <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>

     <title>pathery.com</title>

 

-    <link href="http://fonts.googleapis.com/css?family=Cantarell:400,700" rel="stylesheet" type="text/css">

     <link href="css/mapstyle.css" rel="stylesheet" type="text/css" />

     <link href="css/pagestyle.css" rel="stylesheet" type="text/css" />

     <link href="css/statsstyle.css" rel="stylesheet" type="text/css" />

@@ -24,6 +23,12 @@ function htmlHeader() {
         var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;

         ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';

         var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);

+

+		var fo = document.createElement('link');

+		fo.rel = 'stylesheet';

+		fo.type = 'text/css';

+		fo.href = "http://fonts.googleapis.com/css?family=Cantarell:400,700";

+		var l = document.getElementsByTagName('link')[0]; l.parentNode.insertBefore(fo, l);

     })();

     </script>

 </head>

diff --git a/includes/maps.php b/includes/maps.php
index bef6c63..a1bbc95 100644
--- a/includes/maps.php
+++ b/includes/maps.php
@@ -100,13 +100,13 @@ function DisplayMap($mapMatrix, $idprefix = 1, $style = 'normal', $speed = NULL)
 	//This works in chrome, not sure about others.

 	$preloaddiv .= "

 	<div style='visibility:hidden;display:none'>

-		<img src='images/Path1.png' />

-		<img src='images/Path2.png' />

-		<img src='images/Path3.png' />

-		<img src='images/Path4.png' />

-		<img src='images/OverlayTileFaceted50.png' />

-		<img src='images/OverlayTileFaceted30.png' />

-		<img src='images/OverlayTileFaceted10.png' />

+		<img src='images/Path1.png' alt=''>

+		<img src='images/Path2.png' alt=''>

+		<img src='images/Path3.png' alt=''>

+		<img src='images/Path4.png' alt=''>

+		<img src='images/OverlayTileFaceted50.png' alt=''>

+		<img src='images/OverlayTileFaceted30.png' alt=''>

+		<img src='images/OverlayTileFaceted10.png' alt=''>

 	</div>";

 	

 	$mapdatadiv .= "<div id='$idprefix,mapdata' style='visibility:hidden;display:none'>";

diff --git a/index.php b/index.php
index 7ae7bd8..6005fe1 100644
--- a/index.php
+++ b/index.php
@@ -12,16 +12,11 @@ $Links['home'] = "Home";
 $Links['leaderboard'] = "Scoreboard";

 $Links['howtoplay'] = "How to Play";	

 //$Links['gallery'] = "Gallery";

-if ($_SESSION['accepted'] <> 1) {

-   $Links['login'] = "Log In";

-} else {

-	//$Links['logout'] = "Logout";

-}

 if ($_SESSION['isAdmin'] == true) {

 	$Links['admin'] = 'Admin';

 }

 $Links['faq'] = "FAQ";

-$Links['about'] = "About us";

+$Links['about'] = "About Us";

 

 switch (strtolower($_GET[page])) {

 

@@ -95,4 +90,4 @@ switch (strtolower($_GET[page])) {
    require("pages/home.php");

 }

 

-?>
\ No newline at end of file
+?>

diff --git a/pages/home.php b/pages/home.php
index 27605dd..8bd7d11 100644
--- a/pages/home.php
+++ b/pages/home.php
@@ -11,8 +11,6 @@ include('./includes/mapoftheday.php');
 

 include('./includes/datas.php');

 

-

-

 //Get the current day as int.

 $numday = date('w');

 $numday = intval($numday);

@@ -82,7 +80,6 @@ $motd = MapOfTheDay($maptype);
 

 topbar($Links);

 

-

 $mapID = $motd['id'];

 $map = $motd['map'];

 $userID = $_SESSION['userID'];

@@ -92,32 +89,26 @@ $topscores = topScores($motd['id'], 30);
 $topscorediv = "<div id='$mapID,dspScore'>\n$topscores\n</div>";

 $mergesolution = $map;

 

-//Like button

-	//<br /><b>I made a like button!</b> I'm not sure what happens if you press it.

-	//<iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fpathery.com/&amp;layout=button_count&amp;show_faces=false&amp;width=90&amp;action=like&amp;font&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:90px; height:21px;" allowTransparency="true"></iframe>

-

 ?>

 

-<br />

-<div width='94%' align='right'>

-<iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com/pages/Pathery/176985129018434&amp;layout=button_count&amp;show_faces=false&amp;width=90&amp;action=like&amp;font&amp;colorscheme=dark&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:95px; height:21px;" allowTransparency="true"></iframe>

-</div>

+<br>

+<iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com/pages/Pathery/176985129018434&amp;layout=button_count&amp;show_faces=false&amp;width=90&amp;action=like&amp;font&amp;colorscheme=dark&amp;height=21" style="border:none; overflow:hidden; width:95px; height:21px; float:right"></iframe>

 

 <div class="col1">

 	<p>

-	<center><strong>News:</strong></center>

+	<strong>News:</strong><br>

 	<strong>We've moved to pathery.com</strong> (look up, you're already there)! You'll need to re-login with Google.

 	<br />Don't worry &ndash; we've saved all your solutions and history (soon you'll even be able to see them! hehe).

 	</p>

 	<p>Maps for <?php echo "$date" ?>:

-	<br /><a href='?page=home&amp;maptype=easy'><? echo $easy; ?></a>

-	<br /><a href='?page=home&amp;maptype=normal'><? echo $normal; ?></a>

-	<br /><a href='?page=home&amp;maptype=hard'><? echo $hard; ?></a>

-	<br /><a href='?page=home&amp;maptype=day'><? echo $special; ?></a>

+	<br><a href='?page=home&amp;maptype=easy'><? echo $easy; ?></a>

+	<br><a href='?page=home&amp;maptype=normal'><? echo $normal; ?></a>

+	<br><a href='?page=home&amp;maptype=hard'><? echo $hard; ?></a>

+	<br><a href='?page=home&amp;maptype=day'><? echo $special; ?></a>

 	</p>

 	<p>

 	New maps are generated daily at 9:00 PM Pacific Time.

-	<br />

+	<br>

 	</p>

 

 	<? echo $topscorediv; ?>

@@ -173,8 +164,6 @@ echo $solutiondiv;
 //	<meta property="og:title" content="Pathery - The Game"/>

 //	<meta property="og:site_name" content="Pathery.com"/>

 // <meta property="og:image" content="http://www.pathery.com/  some sort of logo.... "/>

-//	<br /><iframe src="http://www.facebook.com/plugins/like.php?href=http%3A%2F%2Fwww.facebook.com/pages/Pathery/176985129018434&amp;layout=button_count&amp;show_faces=false&amp;width=90&amp;action=like&amp;font&amp;colorscheme=light&amp;height=21" scrolling="no" frameborder="0" style="border:none; overflow:hidden; width:90px; height:21px;" allowTransparency="true"></iframe>

-//

 

 ?>