summaryrefslogtreecommitdiffstats
path: root/includes
diff options
context:
space:
mode:
authorPatrick Davison <snapwilliam@gmail.com>2011-09-11 20:05:20 -0700
committerPatrick Davison <snapwilliam@gmail.com>2011-09-11 20:05:20 -0700
commita9d16fbd58b2dfab4dc243e5d163dfbfebc92f3a (patch)
tree03a4f354a280e940396a844d29d2e50e924c680c /includes
parent094eb070b40cd707625738ab254a1a06cc11b4e0 (diff)
parenteb3e11068965f2bd9428e0d15147b8086e5ab026 (diff)
downloadpathery-a9d16fbd58b2dfab4dc243e5d163dfbfebc92f3a.tar.xz
Merge branch 'HEAD' of ssh://git@git.raylu.net/pathery
Diffstat (limited to 'includes')
-rw-r--r--includes/header.php41
-rw-r--r--includes/maps.php4
2 files changed, 23 insertions, 22 deletions
diff --git a/includes/header.php b/includes/header.php
index b386cfa..adfc211 100644
--- a/includes/header.php
+++ b/includes/header.php
@@ -3,28 +3,29 @@
function htmlHeader() {
?>
<!DOCTYPE html>
-<html xml:lang="en" lang="en">
-<head>
- <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
- <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" />
- <title>pathery.com</title>
+<html xml:lang="en" lang="en">
+<head>
+ <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+ <title>pathery.com</title>
- <script src="js/ajax.js" type="text/javascript"></script>
- <script src="js/mapspecs.js" type="text/javascript"></script>
-
-<script type="text/javascript">
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-371072-3']);
- _gaq.push(['_trackPageview']);
+ <link href="http://fonts.googleapis.com/css?family=Cantarell:400,400italic,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" />
+ <script src="js/ajax.js" type="text/javascript"></script>
+ <script src="js/mapspecs.js" type="text/javascript"></script>
- (function() {
- 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);
- })();
-</script>
+ <script type="text/javascript">
+ var _gaq = _gaq || [];
+ _gaq.push(['_setAccount', 'UA-371072-3']);
+ _gaq.push(['_trackPageview']);
+
+ (function() {
+ 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);
+ })();
+ </script>
</head>
<?
}
diff --git a/includes/maps.php b/includes/maps.php
index 7be04eb..c01af22 100644
--- a/includes/maps.php
+++ b/includes/maps.php
@@ -152,9 +152,9 @@ function DisplayMap($mapMatrix, $idprefix = 1, $example = false, $speed = NULL)
//$date = date("m-d-y");
$output = "
- <div id='$idprefix,outer' class='grid_outer' style='width:".($width+2)."px;height:".($height+50)."px;'>
+ <div id='$idprefix,outer' class='grid_outer' style='width:".($width+2)."px;height:".($height+60)."px;'>
- <div class='grid_dsp_left dsp_49'>
+ <div class='grid_dsp_left dsp_60'>
<div id='$idprefix,dspID' title='MapID: $idprefix'>
MapID: $idprefix
</div>