merging
This commit is contained in:
@@ -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
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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">
|
||||
|
||||
Reference in New Issue
Block a user