From 6b5b30f41c2f4636084e4896aea40abefa1418d1 Mon Sep 17 00:00:00 2001 From: Jim Fowler Date: Wed, 26 Dec 2012 19:42:24 -0500 Subject: [PATCH] Fiddled with header and footer and html_logo --- app/assets/stylesheets/application.css | 2 ++ app/helpers/application_helper.rb | 2 +- app/views/home/people.html.erb | 2 ++ app/views/layouts/application.html.erb | 15 +++++++-------- config/routes.rb | 2 -- 5 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/assets/stylesheets/application.css b/app/assets/stylesheets/application.css index 5c79d3c..c045638 100644 --- 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 index 1dca333..3e15eb2 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -1,5 +1,5 @@ module ApplicationHelper def html_logo - return 'mooculus' + return 'mooculus' end end diff --git a/app/views/home/people.html.erb b/app/views/home/people.html.erb index 3070457..eae48e0 100644 --- a/app/views/home/people.html.erb +++ b/app/views/home/people.html.erb @@ -23,5 +23,7 @@

Acknowledgments

<%=raw html_logo %> could not have been produced without the generous support of the mathematics department at The Ohio State University.

+ +

Uses Twitter’s bootstrap and Khan Academy’s exercise framework. Built on Rails.

diff --git a/app/views/layouts/application.html.erb b/app/views/layouts/application.html.erb index 10243b1..1a7e5a2 100644 --- 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 %> + - <% if user_signed_in? %>
@@ -18,11 +18,11 @@ - MOOCulus + <%=raw html_logo %>
    -
  • Lectures
    • -
  • <%= link_to "Problems", :controller => "exercises", :action => "index" %>
    • +
  • lectures
    • +
  • <%= link_to "problems", :controller => "exercises", :action => "index" %>
    • <% if user_signed_in? %>
  • @@ -30,11 +30,11 @@
      -
    • <%= link_to "Log out", destroy_user_session_path, :method => :delete %>
      • +
    • <%= link_to "log out", destroy_user_session_path, :method => :delete %>
    • <% else %> -
  • <%= link_to "Login", user_omniauth_authorize_path(:google_oauth2) %> +
  • <%= link_to "login", user_omniauth_authorize_path(:coursera) %> <% end %>
@@ -42,7 +42,6 @@
- <% end %>
<%= yield %> @@ -51,7 +50,7 @@
diff --git a/config/routes.rb b/config/routes.rb index 810611e..9ec26f2 100644 --- 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'