Fiddled with header and footer and html_logo

ASCTech · Dec 27, 2012 · 6b5b30f · 6b5b30f
1 parent 84a1859
commit 6b5b30f
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 11 deletions.
diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css
@@ -14,8 +14,10 @@
 
 body {
   padding-top: 80px;
+  font-family: 'Open Sans', sans-serif;
 }
 
 #get-hint-button-container {
   text-align:  center;
 }
+
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
@@ -1,5 +1,5 @@
 module ApplicationHelper
   def html_logo
-    return '<span style="font-family: sans-serif;"><span style="font-weight: bold;">mooc</span><span style="font-weight: lighter">ulus</span></span>'
+    return '<span style="font-family: \'Open Sans\', sans-serif;"><span style="font-weight: 800;">mooc</span><span style="font-weight: 300;">ulus</span></span>'
   end
 end
diff --git a/app/views/home/people.html.erb b/app/views/home/people.html.erb
@@ -23,5 +23,7 @@
   <div class="span12">
     <h1>Acknowledgments</h1>
     <p><%=raw html_logo %> could not have been produced without the generous support of the <a href="http://www.math.osu.edu/">mathematics department</a> at <a href="http://www.osu.edu/">The Ohio State University</a>.</p>
+
+    <p>Uses <a href="http://twitter.github.com/bootstrap/" rel="external">Twitter&rsquo;s bootstrap</a> and <a href="https://github.com/Khan/khan-exercises/" rel="external">Khan Academy&rsquo;s exercise framework</a>.  Built on <a href="http://rubyonrails.org/">Rails</a>.</p>
   </div>
 </div>
diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb
@@ -6,10 +6,10 @@
     <%= javascript_include_tag "application" %>
     <%= favicon_link_tag '/favicon.ico' %>
     <%= csrf_meta_tags %>
+    <link href='http://fonts.googleapis.com/css?family=Open+Sans:300italic,400italic,600italic,700italic,800italic,400,600,300,800,700' rel='stylesheet' type='text/css'>
 </head>
 <body>
 
-  <% if user_signed_in? %>
   <div class="navbar navbar-inverse navbar-fixed-top">
     <div class="navbar-inner">
       <div class="container">
@@ -18,31 +18,30 @@
           <span class="icon-bar"></span>
           <span class="icon-bar"></span>
         </a>
-        <a class="brand" href="#"><span style="font-weight: bold">MOOC</span>ulus</a>
+        <a class="brand" href="#"><%=raw html_logo %></a>
         <div class="nav-collapse">
           <ul class="nav">
-            <li class="active"><a href="/">Lectures</a></li>
-            <li class="active"><%= link_to "Problems", :controller => "exercises", :action => "index" %></li>
+            <li class="active"><a href="/">lectures</a></li>
+            <li class="active"><%= link_to "problems", :controller => "exercises", :action => "index" %></li>
             <% if user_signed_in? %>
               <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                   <%= current_user.name %>
                   <b class="caret"></b>
                 </a>
                 <ul class="dropdown-menu">
-                  <li><%= link_to "Log out", destroy_user_session_path, :method => :delete %></li>
+                  <li><%= link_to "log out", destroy_user_session_path, :method => :delete %></li>
                 </ul>
               </li>
             <% else %>
-              <li class=""><%= link_to "Login", user_omniauth_authorize_path(:google_oauth2) %></a>
+              <li class=""><%= link_to "login", user_omniauth_authorize_path(:coursera) %></a>
 
             <% end %>
           </ul>
         </div><!--/.nav-collapse -->
       </div>
     </div>
   </div>
-  <% end %>
 
   <div class="container-fluid">
     <%= yield %>
@@ -51,7 +50,7 @@
 
     <footer>
     <div class="container">
-      <p>&copy; <%= Date.today.strftime( '%Y' ) %>, <a href="http://www.math.osu.edu/~fowler/" rel="external">Jim Fowler</a>, <a href="http://www.math.osu.edu/people/gubkin.1/view" rel="external">Steve Gubkin</a>, <a href="http://www.math.osu.edu/people/kowalick.1">Ryan Kowalick</a>, <a href="http://www.math.osu.edu/~snapp.14/">Bart Snapp</a>.  Uses <a href="http://twitter.github.com/bootstrap/" rel="external">Twitter&rsquo;s bootstrap</a> and <a href="https://github.com/Khan/khan-exercises/" rel="external">Khan Academy&rsquo;s exercise framework</a>.  Built on <a href="http://rubyonrails.org/">Rails</a>.</p>
+      <p>&copy; <%= Date.today.strftime( '%Y' ) %>, <a href="/people"><%=raw html_logo %> team</a>.
     </div>
     </footer>
   </div> <!-- /container -->

diff --git a/config/routes.rb b/config/routes.rb
@@ -1,6 +1,4 @@
 Assessor::Application.routes.draw do
-  devise_for :users, :controllers => { :omniauth_callbacks => "users/omniauth_callbacks" }
-
   # You can have the root of your site routed with "root"
   # just remember to delete public/index.html.
   root :to => 'home#index'