From 7e9c0025ca4511d269274662902d638318f64027 Mon Sep 17 00:00:00 2001 From: Patrick Davison Date: Tue, 28 May 2013 15:39:43 -0700 Subject: Sticky Footer! moved tag, renamed $Links $headerLinks. --- changelog/changelog.txt | 202 ---------------------------------------------- css/page.css | 56 +++++++------ includes/header.php | 81 ++++++++++--------- index.php | 22 +++-- pages/about.php | 3 +- pages/achievements.php | 4 +- pages/admin.php | 3 +- pages/challenge.php | 3 +- pages/challengeeditor.php | 3 +- pages/challengelist.php | 2 +- pages/chat.php | 4 +- pages/chooselogin.php | 2 +- pages/cp.php | 4 +- pages/faq.php | 3 +- pages/feedback.php | 3 +- pages/home.php | 4 +- pages/mapeditor.php | 3 +- pages/massemail.php | 3 +- pages/memberlist.php | 3 +- pages/oldleaderboard.php | 3 +- pages/process.php | 3 +- pages/scores.php | 2 +- pages/share.php | 3 +- pages/tutorial.php | 3 +- 24 files changed, 102 insertions(+), 320 deletions(-) delete mode 100644 changelog/changelog.txt diff --git a/changelog/changelog.txt b/changelog/changelog.txt deleted file mode 100644 index 4489604..0000000 --- a/changelog/changelog.txt +++ /dev/null @@ -1,202 +0,0 @@ -================= -== NamePending == -================= -04-04-11 - Setup the leaderboard to show every solution from yesterday. - Snap - Modified loadSol() JS function to support other calls. - Snap - Added col1 and col2 classes for the columns. They're now used on the homepage and leaderboard page. - raylu - The leaderboard specific CSS is in statsstyle.css. It's currently included on all pages, unfortunately. - raylu - Cleaned up the leaderboard.php code duplication. - raylu - Added some Javascript to only show one stats section at a time on the leaderboard page. - raylu - -04-03-11 - Fixed a database related issue, solution size was insuffecient. - Snap - Preferences for mute/speed is now saved - Snap - Facebook page semi-started (awaiting name?) - Snap - -03-28-11 - 03-31-11 - Added maps-per-day. - Snap - A few map-types designed and added. - Snap - Added deny all .htaccess to /pages. - Snap - -03-27-11 - Added yesterdays best solution to leaderboard. - Snap - -03-26-11 (Back from vacation) - do.php now confirms that it is a current map. - Snap - isCurrentMap() function added to do.php - Moved $Links array to index.php. - Snap - Fixed an issue with generating links before cookielogin. - The logic of having them next to where it checks for those links is better too. - -03-16-11 - Fixed an issue with the leaderboard. - Snap - -03-15-11 - Some spelling/grammar fixes in how to play. -raylu - Redid the layout. -raylu - There is no navigation bar anymore; everything is in the top bar. - There are now two float:left divs with widths 25%, 50% on the homepage. This gives the - illusion that the second one is "centered." - Fixed a lot of issues with the animated path. - Snap - -03-14-11 - Added cp.php, control-panel. - Snap - Allows users to change their displayname. - Link for now is located on their displayname, top right. - Fixed an issue where pathing didn't like to overlap. - Snap - -03-13-11 - Turned the Speed into a dropdown. -Snap (Thanks Rory) - Login Logout top-bar added. - Snap - Your personal best solution is loaded for the map. - Snap - Leaderboard added. - Snap - Logout link removed from nav, but login link kept. (makes sense, right?) - Snap - -03-12-11 - Tons if little changes to the UI. -Snap - -03-11-11 - Cookie login method added; session data is rebuilt. - Snap - !~ Auth is not dependent on a time frame, this will need to be fixed. - Cookies are deleted on logout. - MapCode is now requested from the database, rather than using the exploitable JS code. - Snap - Implemented "formSolution" function into do.php; - Snap - Now identical solutions will appear identical. - This could be useful in the future, but only if this is implemented now. - -03-10-11 - Updated our pipeline.txt - Snap - Added notification of when you beat or tie a record. - Snap - Fixed unusual bug where hitting a target could cause an issue with the counter-box. - Snap - Added datas.php for SQL statistical output. - Snap - Started topscores PHP function. - - -03-09-11 - Fixed a bug with reset button leaving shadows. - Snap (ty, everyone who mentioned that) - Added blink to teleport tiles when in use. - Snap - Test Path button is now disabled for the duration of the animation. - Snap - Started the 'How To Play' page: - Snap - Added optional arguement $example boolean = false to the PHP displayMap function. - When true, speed is set to slow, and the border-data is removed. - Fixed a height issue with smaller maps, which has been effecting other maps too. - Snap - Many improvements made to the "doAnimate" function. - Snap - -03-08-11 - Fixed a bug when removing blocks could currupt the solution. - Snap - The animated path now goes 'over' special squares, instead of hoping over them. - Snap - New function mapOfTheDay(TYPE). - Snap - Returns the map created for that TYPE or generates one that day. - TYPES; 1 2 3 4, easy normal hard random. Default: random. - new types are created very easily, I.E. $motd = mapOfTheDay(5); will generate the map, unless existing that day. - To set custom definitions for that map, just add a case in mapOfTheDay's switch $type. - -03-07-11 - Fixed a bug special where the path could be blocked by blocking a teleport OUT. - Snap (thanks Light) - (Special because other rare conditions had to be met too); - Tweaked game border-data. - Snap - Nice lookin IN and OUT tiles made. - Rex - -03-03-11 - 03-06-11 - Tweaked colors. - Snap - Changed how javascript handled teleports. and gray-ed out teleports. - Snap - Pathing now goes INTO the teleport in - rather than teleporting before reaching TPin. - Snap - A required change for the animation to properly locate the teleport-in square. - Note; this change will add +1 moves per used-teleport in some solutions. - Added sounds. Snap - Added slow-med-fast animation. Snap - Added gray-out checkpoints. Snap - mapcode format changed - see documentation.txt. - Snap - -03-02-11 - Started recording peoples best solution. - Snap - Login added. - Snap - Pages and links prepared. - Rex - Header navigation started. - Rex - mapoftheday.php and function mapOfTheDay() added; - Snap - Database tables added; maps, users, solutions - Snap - -03-01-11 - Added 'Reset Walls' button. - Snap - Once again fixed a counting issue with PHP... - Snap - Contained mazes to allow for unlimited mazes to be displayed, animated and solved. - Snap - - -02-28-11 - Fixed an issue where pathing could run into mapMatrix[0] (headers) - Snap - DisplayMap now sneaks in a hidden div containing JSON data for wall count & etc. - Snap - $numBlocks arguement changed to optional, default -1 for random. - Snap - Random odds currently set to: - $numBlocks = Rand(7, (int)($rows * $cols) * .12); - Many, many bug fixes related to having 0 checkpoints & alike. - Snap - Fixed snake-color issue adjustable checkpoints. -Snap - Routepath correctly handles different amount of checkpoints. - Snap - GenerateMap now has 2 optional arguements for checkpoints and teleports. - -1 - 5, -1 - 2, default -1 - which is random. - Snap - Fixed an issue where php's movecount was off. - Snap - Added checkpoints "d" and "e" - Snap - Set the "snake"'s color the same as it's next target. - Snap - -02-27-11 - Added 2nd teleport, and solved the many issues that arised with it. - Snap - Solved an issue where the javascript animation caused mapdistoration due to non-set width/height. - Snap - Fixed move-count when effected by teleports - Snap - -02-26-11 - Discovered that if you block the teleport-out square, it jumps to the next target... - Snap - bewildered by the fact that my code didn't fail, perhaps we should leave it as is? - Semi-implemented arrow-snake. - Snap - More attractive images added. - Rex - -02-25-11 (Updates from previous days) - Added ValidateMap($mapMatrix) function. - Snap - Started a database, no tables. - Snap - contact Snap for DB access. - A sweet teleport 't' and 'u' added! w00 h00! - Snap (w/ help). - Updated Pathing to support multiple start locations. (['start'] = 'y,x' of start location) - Snap - Finished update on javascript to support multiple start locations. - Snap - Completed pathing. - Snap - Updated visuals. - Edited CSS for .grid_table. - Rex - Added Website Diagram to /Changelog. - Rex - - -02-22-11 - Modified MergeMapSolution function - Snap - Added optional $idprefix to DisplayMap, to allow for multiple maps on the same page. - Snap - Added required mapid to AnimatePath(path, mapid) - Snap - Added solution array, and blocks array, for multiple maps - Snap - Added alternate prefixes to CSS Transitions, sadly firefox doesn't support this property - but, it still looks good without it. (Opera & Netscape some others do). - Started work on gallery. - Snap - -02-21-11 - Started work on AJAX (do.php & home.php). -Snap - Added function MergeMapSolution(Map, Solution) -Snap - Added JS function AnimatePath(PATHCODE) Fairly pretty :) -Snap - Had a lot of fun with css transitions. - Worked on FindPath function -Rex - -02/20/11 - $mapMatrix[0] now holds header data - Edited GenerateMapCode - added more headers and adjusted loop - Created GenerateMapByCode function. - Created GetTile function. (Not working) - Fixed Checkpoint spawn - Fixed an issue regarding an extra column being generated in GenerateMap - -Snap 02/19/11 - - Added headers to GenerateMapCode - Temporarly moved Functions GenerateMapCode & GenerateMap to map.php - Created DisplayMap function - Lots of little things. - - -02/18/11 -In Concept. - - - - diff --git a/css/page.css b/css/page.css index 8d964e6..99a1cda 100644 --- a/css/page.css +++ b/css/page.css @@ -1,19 +1,15 @@ html { - font-family: Trebuchet MS1, Trebuchet MS, sans-serif; + font-family: Trebuchet MS1, Trebuchet MS, sans-serif; + height:100%; } html.wf-active { - /* font-family: "Comic Sans MS", sans-serif; */ /* Not websafe */ /* font-family: Cantarell, Helvetica, Arial, sans-serif; */ /* font-family: Helvetica, Arial, sans-serif; */ - /* font-family: Lucida Sans Unicode, Lucida Grande, sans-serif; - /* font-family: Book Antiqua3; */ - - - } body { + height: 100%; font-size: 16px; text-shadow: rgba(0,0,0,.01) 0 0 1px; /* this is definitely not a webkit-specific hack to fix font aliasing */ background-color: #121212; @@ -21,16 +17,15 @@ body { margin: 0; opacity: 1; } - -p { - margin-top: 0; -} - -form { - display: inline; +.mainContent { + min-height: 100%; + height: auto !important; + height: 100%; + margin: 0 auto -165px; /* the bottom margin is the negative value of the footer's height */ } -.footerArea { +.footerArea, .footerPush { + height: 165px; width:100%; text-align:center; } @@ -106,8 +101,13 @@ form { #six li { width:16.666%; } /* 6 col */ +p { + margin-top: 0; +} - +form { + display: inline; +} a:link, a:visited, a:active { text-decoration: underline; color: #FFFFCC; @@ -304,26 +304,24 @@ position:absolute;color:#333;left:25px;bottom:20px; position: relative; min-width: 960px; width:100%; + /* filter: alpha(opacity=90); -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)"; -moz-opacity: 0.9; -khtml-opacity: 0.9; opacity: 0.9; - - background: -moz-linear-gradient(top, rgba(85,85,85,0.9) 0%, rgba(85,85,85,0.9) 1%, rgba(34,34,34,0.9) 100%); - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(85,85,85,0.9)), color-stop(1%,rgba(85,85,85,0.9)), color-stop(100%,rgba(34,34,34,0.9))); - background: -webkit-linear-gradient(top, rgba(85,85,85,0.9) 0%,rgba(85,85,85,0.9) 1%,rgba(34,34,34,0.9) 100%); - background: -o-linear-gradient(top, rgba(85,85,85,0.9) 0%,rgba(85,85,85,0.9) 1%,rgba(34,34,34,0.9) 100%); - background: -ms-linear-gradient(top, rgba(85,85,85,0.9) 0%,rgba(85,85,85,0.9) 1%,rgba(34,34,34,0.9) 100%); - background: linear-gradient(to bottom, rgba(85,85,85,0.9) 0%,rgba(85,85,85,0.9) 1%,rgba(34,34,34,0.9) 100%); - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e6555555', endColorstr='#e6222222',GradientType=0 ); + */ + + background: #555555; /* Old browsers */ + background: -moz-linear-gradient(top, #555555 0%, #222222 100%); /* FF3.6+ */ + background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,#555555), color-stop(100%,#222222)); /* Chrome,Safari4+ */ + background: -webkit-linear-gradient(top, #555555 0%,#222222 100%); /* Chrome10+,Safari5.1+ */ + background: -o-linear-gradient(top, #555555 0%,#222222 100%); /* Opera 11.10+ */ + background: -ms-linear-gradient(top, #555555 0%,#222222 100%); /* IE10+ */ + background: linear-gradient(to bottom, #555555 0%,#222222 100%); /* W3C */ + filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#555555', endColorstr='#222222',GradientType=0 ); /* IE6-9 */ z-index:9999; - -ms-filter: "progid:DXImageTransform.Microsoft.Alpha(Opacity=90)"; - filter: alpha(opacity=90); - -moz-opacity: 0.9; - -khtml-opacity: 0.9; - opacity: 0.9; } #topbarContent { margin: 0 auto; diff --git a/includes/header.php b/includes/header.php index 368e1c8..c79ee8e 100644 --- a/includes/header.php +++ b/includes/header.php @@ -73,51 +73,57 @@ function htmlFooter() { //Preload the path-images and add the google-analytics script global $footerLinks; - + + echo "

"; + echo "

"; + echo " "; + + + echo "

"; echo "

"; - echo "

$value

-

- Copyright © 2011-2013 pathery.com -

-

+

+

+ Copyright © 2011-2013 pathery.com +

+

Reddit

Google Plus

+

+

+ + + -

-
- - +

"; //Empty first-div contains sound manager stuff echo '

'; @@ -187,7 +194,7 @@ function topbar($links) { echo '

'; - foreach ($links as $key => $value) { + foreach ($headerLinks as $key => $value) { if ($request == $key) { $selected = " selected"; } else { diff --git a/index.php b/index.php index de4421b..08091c3 100644 --- a/index.php +++ b/index.php @@ -1,6 +1,5 @@ BETA!"; -//$Links['tutorial'] = "Tutorial"; +$headerLinks['home'] = "Home"; +$headerLinks['scores'] = "Scores"; +//$headerLinks['challengelist'] = "Challenges BETA!"; if ($accepted) { $linkname = 'achievements?id='.$_SESSION['userID']; - $Links[$linkname] = "Achievements"; - $Links['chat'] = "Chat"; + $headerLinks[$linkname] = "Achievements"; + $headerLinks['chat'] = "Chat"; } else { - $Links['tutorial'] = "Tutorial"; + $headerLinks['tutorial'] = "Tutorial"; } -// $Links['members'] = "Member List"; +// $headerLinks['members'] = "Member List"; -//$Links['faq'] = "FAQ"; -//$Links['about'] = "About Us"; +//$headerLinks['faq'] = "FAQ"; +//$headerLinks['about'] = "About Us"; $request = isset($_GET['page']) ? strtolower($_GET['page']) : ''; if ($request == '' && !$accepted) diff --git a/pages/about.php b/pages/about.php index be526b8..82f396f 100644 --- a/pages/about.php +++ b/pages/about.php @@ -4,9 +4,8 @@ htmlHeader(array(), 'About', 'About Pathery.com'); -

diff --git a/pages/achievements.php b/pages/achievements.php index e18a890..5780f53 100644 --- a/pages/achievements.php +++ b/pages/achievements.php @@ -7,10 +7,8 @@ htmlHeader( ?> - - - -

diff --git a/pages/challengeeditor.php b/pages/challengeeditor.php index 9b1371f..b2add4a 100644 --- a/pages/challengeeditor.php +++ b/pages/challengeeditor.php @@ -116,10 +116,9 @@ htmlHeader(array('stats'), 'Challenge Editor', ?> -

This is a fake page underlying

\ No newline at end of file +

This is a fake page underlying

\ No newline at end of file diff --git a/pages/cp.php b/pages/cp.php index 8ce922e..f6efd30 100644 --- a/pages/cp.php +++ b/pages/cp.php @@ -2,8 +2,6 @@ htmlHeader(); ?> - - - - - + @@ -88,7 +88,7 @@ function adToggle() { -