From 574746b2aa24ca65be59cc1d98a71945de44ffbd Mon Sep 17 00:00:00 2001
From: Seth Vargo <sethvargo@gmail.com>
Date: Tue, 21 Oct 2014 23:20:52 -0400
Subject: [PATCH] Push javascript to the bottom, read description

---
 website/source/layouts/_footer.erb | 10 ++++++++
 website/source/layouts/_meta.erb   | 40 ++++++++++--------------------
 2 files changed, 23 insertions(+), 27 deletions(-)
diff --git a/website/source/layouts/_footer.erb b/website/source/layouts/_footer.erb
index 3f8dee3b79..911db64175 100644
--- a/website/source/layouts/_footer.erb
+++ b/website/source/layouts/_footer.erb
@@ -22,6 +22,16 @@
 </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-53231375-1', 'auto');
+  ga('send', 'pageview');
+</script>
+
 <%= javascript_include_tag "application" %>
 
 </body>
diff --git a/website/source/layouts/_meta.erb b/website/source/layouts/_meta.erb
index c05381bb6b..1f21b8daea 100644
--- a/website/source/layouts/_meta.erb
+++ b/website/source/layouts/_meta.erb
@@ -1,35 +1,21 @@
 <!DOCTYPE html>
 <html lang="en">
-<head>
-<meta charset="utf-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<meta name="description" content="">
+  <head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <meta name="description" content="<%= current_page.data.description %>">
 
-<link rel="shortcut icon" href="<%= image_path('favicon.png') %>">
+    <link rel="shortcut icon" href="<%= image_path('favicon.png') %>">
 
-<title><%= current_page.data.page_title ? "#{current_page.data.page_title} - " : "" %>Terraform</title>
+    <title><%= [current_page.data.page_title, "Terraform by HashiCorp"].compact.join(" - ") %></title>
 
-<!-- Bootstrap core CSS -->
-<%= stylesheet_link_tag "application" %>
+    <%= stylesheet_link_tag "application" %>
 
-<!-- google fonts -->
-<link href='http://fonts.googleapis.com/css?family=Lato:300,400,700' rel='stylesheet' type='text/css'>
+    <!--[if lt IE 9]>
+      <%= javascript_include_tag "html5shiv", "respond.min" %>
+    <![endif]-->
 
-<!-- HTML5 shim and Respond.js IE8 support of HTML5 elements and media queries -->
-<!--[if lt IE 9]>
-  <%= javascript_include_tag "html5shiv", "respond.min" %>
-<![endif]-->
+    <%= yield_content :head %>
+  </head>
 
-<%= yield_content :head %>
-
-<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-53231375-1', 'auto');
-  ga('send', 'pageview');
-</script>
-</head>
-<body id="page-<%= current_page.data.page_title ? "#{current_page.data.page_title}" : "home" %>" class="page-<%= current_page.data.page_title ? "#{current_page.data.page_title} layout-#{current_page.data.layout} page-sub" : "home layout-#{current_page.data.layout}" %>">
+  <body id="page-<%= current_page.data.page_title ? "#{current_page.data.page_title}" : "home" %>" class="page-<%= current_page.data.page_title ? "#{current_page.data.page_title} layout-#{current_page.data.layout} page-sub" : "home layout-#{current_page.data.layout}" %>">
