From 145f81046bc5881d7da86b05c8b92862b63f8080 Mon Sep 17 00:00:00 2001
From: B Mathis <brandon@imathis.com>
Date: Thu, 5 Nov 2009 21:30:03 -0600
Subject: updated rake file, reorganized stylesheets, added google site search,
 added google analytics

---
 source/_layouts/default.haml | 24 ++++++++++++++++++------
 1 file changed, 18 insertions(+), 6 deletions(-)

(limited to 'source/_layouts/default.haml')

diff --git a/source/_layouts/default.haml b/source/_layouts/default.haml
index 481791cb..30f4da19 100644
--- a/source/_layouts/default.haml
+++ b/source/_layouts/default.haml
@@ -1,6 +1,6 @@
 ---
 blog_title: My Octopress Blog
-root_url: 
+google_site_search_id: 
 ---
 
 !!! 1.1 Transitional
@@ -13,24 +13,29 @@ root_url:
       %meta(name="keywords" content="#{page.keywords}")/
     %link(href="/stylesheets/screen.css" rel="stylesheet" media="screen projection" type="text/css")
     %link(href="/atom.xml" rel="alternate" title="#{page.blog_title}" type="application/atom+xml")
-    /%script(src="http://ajax.googleapis.com/ajax/libs/mootools/1.2.3/mootools-yui-compressed.js" type="text/javascript")/
     %script(src="/javascripts/mootools-yui-compressed.js" type="text/javascript")
     %script(src="/javascripts/jsonp.js" type="text/javascript")
     %script(src="/javascripts/twitter_gitter.js" type="text/javascript")
     %script(src="/javascripts/twitter.js" type="text/javascript")
+    %script(src="http://www.google-analytics.com/ga.js" type="text/javascript")
   %body
     #header
       .page_width
         %a.title(href="/")=page.blog_title
+        #search
+          %form(action="http://www.google.com/cse" id="cse-search-box")
+            %input(type="hidden" name="cx" value="#{page.google_site_search_id}")
+            %input(type="hidden" name="ie" value="UTF-8")
+            %input#q(type="text" name="q")
     #nav
       .page_width
         %ul
           %li.alpha
-            %a(href="#{page.root_url}/") Blog
+            %a(href="/") Blog
           %li.omega
-            %a(href="#{page.root_url}/about") About
+            %a(href="/about") About
           %li.subscribe
-            %a(href="#{page.root_url}/atom.xml") Subscribe
+            %a(href="/atom.xml") Subscribe
     #page
       .page_width
         #main
@@ -49,4 +54,11 @@ root_url:
     #footer
       .page_width
         = "Copyright &copy; #{Time.now.strftime('%Y')} - #{page.blog_title} | "
-        %span.credit Powered by <a href="http://github.com/imathis/octopress/">Octopress</a>
\ No newline at end of file
+        %span.credit Powered by <a href="http://github.com/imathis/octopress/">Octopress</a>
+  
+    //Google Analytics code
+    :javascript
+      try {
+      var pageTracker = _gat._getTracker("UA-10876422-1");
+      pageTracker._trackPageview();
+      } catch(err) {}
\ No newline at end of file
-- 
cgit v1.2.1