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

3 files changed, 14 insertions, 11 deletions

diff --git a/changelog/datascheme.sql b/changelog/datascheme.sql
index bb00b23..7e88d91 100644
--- a/changelog/datascheme.sql
+++ b/changelog/datascheme.sql
@@ -31,7 +31,7 @@ CREATE TABLE `mapOfTheDay` (
   `mapType` tinyint(4) NOT NULL,
   `mapDate` date NOT NULL,
   PRIMARY KEY  (`ID`)
-) ENGINE=MyISAM  DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
 
@@ -44,7 +44,7 @@ CREATE TABLE `maps` (
   `code` varchar(512) collate latin1_general_ci NOT NULL,
   `dateCreated` timestamp NOT NULL default CURRENT_TIMESTAMP,
   PRIMARY KEY  (`ID`)
-) ENGINE=MyISAM  DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
 
@@ -61,7 +61,7 @@ CREATE TABLE `solutions` (
   `dateModified` timestamp NOT NULL default CURRENT_TIMESTAMP,
   PRIMARY KEY  (`ID`),
   KEY `userID` (`userID`,`mapID`)
-) ENGINE=MyISAM  DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
 
 -- --------------------------------------------------------
 
@@ -79,4 +79,4 @@ CREATE TABLE `users` (
   `isAdmin` tinyint(1) NOT NULL default '0',
   PRIMARY KEY  (`ID`),
   UNIQUE KEY `openID` (`openID`)
-) ENGINE=MyISAM  DEFAULT CHARSET=latin1 COLLATE=latin1_general_ci;
+) ENGINE=InnoDB  DEFAULT CHARSET=utf8;
diff --git a/pages/about.php b/pages/about.php
index f5ddb8e..eb1ada8 100644
--- a/pages/about.php
+++ b/pages/about.php
@@ -14,11 +14,11 @@ echo "<br />";
 <center>

 <br />Email us: <a href='mailto:snapems@gmail.com'>snapems@gmail.com</a>

 <br />

-<h3>Created by:</h3> <span title='AKA Snap'>Patrick Davison</span> and <span title='Goes by "Rex"'>Rex Ounekeo</span>.

+<h3>Created by:</h3> <span title='AKA Snap'>Patrick Davison</span> and <span title='Goes by "Rex"'>Rex Ounekeo</span>

 <br />

 <h3>Special thanks:</h3>

 <h4>Programmers:</h4>

-<br />raylu

+raylu

 <h4>Testers:</h4>

 Steven Gosling

 <br />Patrick's Family

diff --git a/pages/home.php b/pages/home.php
index 928a99e..53c8fe4 100644
--- a/pages/home.php
+++ b/pages/home.php
@@ -104,15 +104,18 @@ $mergesolution = $map;
 <div class="col1">

 	<p>

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

-	<strong>We've moved to www.Pathery.com </strong> (look up, you're already there) <strong>You'll need to re-allow your email-address with google.

-	<br />Don't worry- we've saved all your solutions and history - (soon you'll be able to access it too! hehe)</strong> - 09-09-11

-	<br />New maps are generated daily at 9:00 PM Pacific Time.

-	<br /><i>Maps for <?php echo "$date" ?>:</i>

+	<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>

 	</p>

+	<p>

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

+	</p>

 

 	<? echo $topscorediv; ?>

 </div>

@@ -170,7 +173,7 @@ echo $solutiondiv;
 	<br />Send feedback to <a href='mailto:snapems@gmail.com'>snapems@gmail.com</a> (or IM me if you know me).

 	<br />We've been aptly implementing changes from feedback.

 	<br />This game is being adjusted, some 'rules' may change.

-	<br />Copyright &copy; 2011 www.pathery.com

+	<br />Copyright &copy; 2011 pathery.com

 	

 </div>