windhamdavid 10 years ago
parent
commit
e747a85509
4 changed files with 62 additions and 26 deletions
  1. 0 3
      footer-home.php
  2. 27 20
      front-page.php
  3. 33 1
      functions.php
  4. 2 2
      page-card.php

+ 0 - 3
footer-home.php

@@ -65,8 +65,5 @@
 	</div>
 </div>
 <?php wp_footer(); ?>
-<!--[if lt IE 9]>
-	<script src="<?php echo get_template_directory_uri(); ?>/js/html5shiv.min.js"></script>
-<![endif]-->
 </body>
 </html>

+ 27 - 20
front-page.php

@@ -9,21 +9,14 @@
 	 ` ` '' '`-'-' '-`-`-' ' '`-'-`-`-` '`-'-
 -->
 <!DOCTYPE html>
-<html <?php language_attributes(); ?>>
+<html lang="en-US">
 <head>
-<meta charset="<?php bloginfo( 'charset' ); ?>" />
+<meta charset="UTF-8" />
 <meta http-equiv="X-UA-Compatible" content="IE=edge" /> 
 <title>David A. Windham</title>
 <meta name="description" content="David A. Windham - Zeken Woozer Enterprises, Un-Ltd. South Carolina USA" />
 <meta name="author" content="David Windham">
-<link rel="stylesheet" type="text/css" media="all" href="<?php echo get_template_directory_uri();?>/card.css"/>
-<link media="only screen and (max-device-width: 480px)" href="<?php echo get_template_directory_uri();?>/css/card-mob.css" type="text/css" rel="stylesheet" />
-<script type='text/javascript' src='https://code.jquery.com/jquery-1.11.0.min.js'></script><!--https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js-->
-<script type="text/javascript" src="<?php echo get_template_directory_uri();?>/js/card.js"></script>
-<!--[if lt IE 9]>
-<link rel="stylesheet" type="text/css" media="all" href="<?php echo get_template_directory_uri();?>/css/card-ie.css"/>
-<script src="<?php echo get_template_directory_uri();?>/js/html5shiv.js" type="text/javascript"></script>
-<![endif]-->
+<link rel="stylesheet" type="text/css" media="all" href="<?php echo get_template_directory_uri();?>/css/card.css"/>
 </head>
 <body>
 	<div id="wrapper" class="hfeed"> 
@@ -74,15 +67,29 @@
 
 		</div> 
 	</div>
-	<script>
-	  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-	  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-	  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-	  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
-
-	  ga('create', 'UA-1906067-6', 'davidawindham.com');
-	  ga('send', 'pageview');
-
-	</script>
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-1906067-6', 'davidawindham.com');
+  ga('send', 'pageview');
+</script>
+<script type="text/javascript">
+  var _paq = _paq || [];
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="//davidawindham.com/wik/";
+    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setSiteId', 1]);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>
+<noscript><p><img src="//davidawindham.com/wik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
+	  
+<script type='text/javascript' src='<?php echo get_template_directory_uri();?>/js/jquery-2.1.1.min.js'></script>
+<script type="text/javascript" src='<?php echo get_template_directory_uri();?>/js/card.js'></script>
 </body> 
 </html>

+ 33 - 1
functions.php

@@ -33,6 +33,7 @@ function dw_editor() {
 }
 add_action( 'init', 'dw_editor' );
 
+add_action( 'wp_enqueue_scripts', 'dw_scripts' );
 function dw_scripts() {
 	global $post;
 	wp_enqueue_style( 'style', get_stylesheet_uri() );
@@ -127,6 +128,37 @@ function dw_scripts() {
 	}
 			
 }
-add_action( 'wp_enqueue_scripts', 'dw_scripts' );
+
+add_action('wp_footer', 'dw_html5shim', 21);
+function dw_html5shim() { ?>
+	<!--[if lt IE 9]>
+		<script src="<?php echo get_template_directory_uri() . '/js/html5shiv.min.js'?>"></script>
+	<![endif]-->
+<?php }
+	
+
+add_action('wp_footer', 'dw_analytics', 22);
+function dw_analytics() { ?>
+<script>
+  (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+  (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+  m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+  })(window,document,'script','//www.google-analytics.com/analytics.js','ga');
+  ga('create', 'UA-1906067-6', 'davidawindham.com');
+  ga('send', 'pageview');
+
+  var _paq = _paq || [];
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u="//davidawindham.com/wik/";
+    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setSiteId', 1]);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
+    g.type='text/javascript'; g.async=true; g.defer=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+  })();
+</script>
+<noscript><p><img src="//davidawindham.com/wik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
+<?php }
 
 ?>

+ 2 - 2
page-card.php

@@ -18,8 +18,8 @@
 <meta name="description" content="David A. Windham - Zeken Woozer Enterprises, Un-Ltd. South Carolina USA" />
 <meta name="author" content="David Windham">
 <link rel="stylesheet" type="text/css" media="all" href="<?php echo get_template_directory_uri();?>/css/card.css"/>
-<script type='text/javascript' src='https://code.jquery.com/jquery-1.11.0.min.js'></script><!--https://ajax.googleapis.com/ajax/libs/jquery/1.4.4/jquery.min.js-->
-<script type="text/javascript" src="<?php echo get_template_directory_uri();?>/js/card.js"></script>
+<script type='text/javascript' src='<?php echo get_template_directory_uri();?>/js/jquery-2.1.1.min.js'></script>
+<script type="text/javascript" src='<?php echo get_template_directory_uri();?>/js/card.js'></script>
 </head>
 <body>
 <div id="container" class="card">