From 0f6d6e94b76efb5cc8d115acb9d20dc23c06e7ff Mon Sep 17 00:00:00 2001
From: Dylan Lloyd <dylan@dylansserver.com>
Date: Thu, 2 Jan 2014 22:26:19 +0000
Subject: [PATCH] update doctype, pgp key url, add piwik analytics

---
 view/analytics.php | 15 +++++++++++++++
 view/archive.php   | 11 +++++------
 view/index.php     |  4 +++-
 view/note.php      | 14 ++++++--------
 view/page.php      | 13 ++++++-------
 5 files changed, 35 insertions(+), 22 deletions(-)
 create mode 100644 view/analytics.php
diff --git a/view/analytics.php b/view/analytics.php
new file mode 100644
index 0000000..b235fd1
--- /dev/null
+++ b/view/analytics.php
@@ -0,0 +1,15 @@
+<!-- Piwik -->
+<script type="text/javascript">
+  var _paq = _paq || [];
+  _paq.push(['trackPageView']);
+  _paq.push(['enableLinkTracking']);
+  (function() {
+    var u=(("https:" == document.location.protocol) ? "https" : "http") + "://dylansserver.com/piwik/";
+    _paq.push(['setTrackerUrl', u+'piwik.php']);
+    _paq.push(['setSiteId', 1]);
+    var d=document, g=d.createElement('script'), s=d.getElementsByTagName('body')[0]; g.type='text/javascript';
+    g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.appendChild(g);
+  })();
+</script>
+<noscript><p><img src="http://dylansserver.com/piwik/piwik.php?idsite=1" style="border:0;" alt="" /></p></noscript>
+<!-- End Piwik Code -->
diff --git a/view/archive.php b/view/archive.php
index 4231b17..5aa3e1a 100644
--- a/view/archive.php
+++ b/view/archive.php
@@ -1,5 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE html>
 
 <html>
 <head>
@@ -31,8 +30,7 @@
   <div id="structure">
     <div id="banner">
       <a href="<?php echo $this->home_link ?>">
-      <img src="/images/dylansserver.png" alt="dylansserver"
-      border="0"></a>
+      <img src="/images/dylansserver.png" alt="dylansserver"></a>
     </div>
 
     <div id="content">
@@ -58,12 +56,13 @@
         ?>
       </div>
       <div id="contact_me"><h1><a href=
-      "mailto:dylan@psu.edu">dylan</a></h1><a href=
-      "mailto:dylan@psu.edu">@psu.edu</a>
+      "mailto:dylan@dylansserver.com">dylan</a></h1><a href=
+      "mailto:dylan@dylansserver.com">@dylansserver.com</a>
       </div>
     </div>
     <br>
     <br>
   </div>
+<? include 'analytics.php' ?>
 </body>
 </html>
diff --git a/view/index.php b/view/index.php
index 1b41473..f9ec5ba 100644
--- a/view/index.php
+++ b/view/index.php
@@ -87,7 +87,8 @@
             <h1><a href= "mailto:dylan@dylansserver.com">dylan</a></h1>
             <a href= "mailto:dylan@dylansserver.com">@dylansserver.com</a>
            <br>
-           [<a href="http://pgp.mit.edu:11371/pks/lookup?op=vindex&amp;search=0xBE93C5C18CD4C40F">pgp key</a>]
+           <!-- [<a href="http://pgp.mit.edu:11371/pks/lookup?op=vindex&amp;search=0xBE93C5C18CD4C40F">pgp key</a>] -->
+           [<a href="/pubkey.pgp.asc">pgp key</a>]
           </div>
         </li>
       </ul>
@@ -99,5 +100,6 @@
     <br>
     &nbsp;
   </div>
+<? include 'analytics.php' ?>
 </body>
 </html>
diff --git a/view/note.php b/view/note.php
index 36a3dd2..31f3f22 100644
--- a/view/note.php
+++ b/view/note.php
@@ -1,5 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE html>
 
 <html>
 <head>
@@ -31,16 +30,14 @@
   <div id="structure">
     <div id="banner">
       <a href="<?php echo $this->home_link ?>">
-      <img src="/images/dylansserver.png" alt="dylansserver"
-      border="0"></a>
+      <img src="/images/dylansserver.png" alt="dylansserver"></a>
     </div>
 
     <div id="content">
       <div id='notes'>
         <div class='note'>
             <h1><span class='date'>
-              <?php echo "$this->year_posted/$this->month_posted/$this->day_posted/" ?>
-            </span><?php echo $this->title ?></h1>
+              <?php echo "$this->year_posted/$this->month_posted/$this->day_posted/" ?></span><?php echo $this->title ?></h1>
             <?php echo $this->text ?>
         </div>
         <br><br><br><br>
@@ -55,12 +52,13 @@
           </h1>
         </div>
         <div id="contact_me"><h1><a href=
-        "mailto:dylan@psu.edu">dylan</a></h1><a href=
-        "mailto:dylan@psu.edu">@psu.edu</a>
+        "mailto:dylan@dylansserver.com">dylan</a></h1><a href=
+        "mailto:dylan@dylansserver.com">@dylansserver.com</a>
         </div>
       </div>
     <br>
     <br>
   </div>
+<? include 'analytics.php' ?>
 </body>
 </html>
diff --git a/view/page.php b/view/page.php
index 10de5f4..6be24b8 100644
--- a/view/page.php
+++ b/view/page.php
@@ -1,5 +1,4 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
-"http://www.w3.org/TR/html4/loose.dtd">
+<!DOCTYPE html>
 
 <html>
 <head>
@@ -31,13 +30,11 @@
   <div id="structure">
     <div id="banner">
       <a href="<?php echo $this->home_link ?>">
-      <img src="/images/dylansserver.png" alt="dylansserver"
-      border="0"></a>
+      <img src="/images/dylansserver.png" alt="dylansserver"></a>
     </div>
 
     <div id="content">
       <div id="notes">
-        <div id="notes">
         <?php
           foreach ($this->notes as $note) {
             echo "<div class='note'>";
@@ -52,6 +49,7 @@
             echo "</a>";
             echo "</h1>";
             echo $note['text'];
+            echo "</div>";
           }
         ?>
       </div>
@@ -69,12 +67,13 @@
     </h1>
     </div>
       <div id="contact_me"><h1><a href=
-      "mailto:dylan@psu.edu">dylan</a></h1><a href=
-      "mailto:dylan@psu.edu">@psu.edu</a>
+      "mailto:dylan@dylansserver.com">dylan</a></h1><a href=
+      "mailto:dylan@dylansserver.com">@dylansserver.com</a>
       </div>
     </div>
     <br>
     <br>
   </div>
+<? include 'analytics.php' ?>
 </body>
 </html>
-- 
2.30.2

