From e760fc00875c733781a787099a3cba525d8a1bff Mon Sep 17 00:00:00 2001
From: John Poulin <john.m.poulin@gmail.com>
Date: Tue, 8 Apr 2014 12:49:31 -0400
Subject: [PATCH] merging

---
 app/controllers/dashboard_controller.rb   |  5 +++++
 app/views/layouts/application.html.erb    | 14 +++++++-------
 app/views/layouts/shared/_header.html.erb |  8 +++++---
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/app/controllers/dashboard_controller.rb b/app/controllers/dashboard_controller.rb
index 593abe4..41d4236 100755
--- a/app/controllers/dashboard_controller.rb
+++ b/app/controllers/dashboard_controller.rb
@@ -4,6 +4,11 @@ class DashboardController < ApplicationController
   
   def home
     @user = current_user
+
+    # See if the user has a font preference
+    if params[:font]
+    	cookies[:font] = params[:font]
+    end
   end
 
 end
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
index 4720e04..01d0022 100755
--- a/app/views/layouts/application.html.erb
+++ b/app/views/layouts/application.html.erb
@@ -6,13 +6,13 @@
   <%= javascript_include_tag "application" %>
   <%= csrf_meta_tags %> <!-- <~ What is this for? I hear it helps w/ JS and Sea-surfing.....whatevz -->
   <!-- bootstrap css -->
- <script type="text/javascript" src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script>
- <!--[if lte IE 7]>
- <script src="assets/fonts/lte-ie7.js">
- </script>
- <![endif]--> 
-
- <!-- Google Visualization JS -->
+<%
+if cookies[:font]
+%>
+<style>body { font-size:<%= cookies[:font] %>pt !important;}</style>
+<%
+end
+%>
  <script type="text/javascript" src="https://www.google.com/jsapi"></script>
 
 </head>
diff --git a/app/views/layouts/shared/_header.html.erb b/app/views/layouts/shared/_header.html.erb
index 7c4d310..95f1b31 100755
--- a/app/views/layouts/shared/_header.html.erb
+++ b/app/views/layouts/shared/_header.html.erb
@@ -1,8 +1,10 @@
 <header>
-     <a href="#l" class="logo">
-      
-     </a>
 
+    <span style="color:#eee;margin-left:10px;">
+     Font Size:
+     <a href="<%= home_dashboard_index_path %>?font=10" style="font-size:10pt;color:#eee;">A</a>
+     <a href="<%= home_dashboard_index_path %>?font=18" style="font-size:18pt;color:#eee;">A</a>
+   </span>
      <div class="user-profile">
        <a data-toggle="dropdown" class="dropdown-toggle">
          <img src=" <%= image_path('profile_color.jpg')%>"  alt="profile">