Merge branch 'master' of github.com:TheOdinProject/theodinproject

README.md

@@ -1,5 +1,5 @@
-# [Welcome to The Odin Project a Open source Web development Curriculum](http://theodinproject.com)
-The Odin project is a open source community and curriculum for learning web development. Odin Project Students complete lessons which include links to the best free resources online and projects which they can use in their portfolio.
+# [Welcome to The Odin Project, an open source web development curriculum](http://theodinproject.com)
+The Odin Project is an open source community and curriculum for learning web development. Students of The Odin Project build portfolio projects and complete lessons that are constantly curated and updated with links to relevant resources.
 
 We teach:
 * Ruby programming
@@ -12,14 +12,14 @@ We teach:
 
 This repo contains the main app for the Odin Project which can be found online at [theodinproject.com](theodinproject.com). It pulls in lesson and project content from our [curriculum repo](https://github.com/TheOdinProject/curriculum).
 
-The Odin project community can be found on our [gitter chat rooms](https://gitter.im/TheOdinProject/theodinproject)
+The Odin project community can be found on our [Gitter chat rooms](https://gitter.im/TheOdinProject/theodinproject).
 
 
 ## Contributing
-The Odin Project depends on open source contributions to grow, improve and thrive.
+The Odin Project depends on open source contributions to grow, improve, and thrive.
 We welcome contributions from beginners and experienced developers alike.
 
-To find out more about how you can contribute please read our [contributing guide](https://github.com/TheOdinProject/theodinproject/wiki/Contributing-Guide)
+To find out more about how you can contribute, please read our [contributing guide](https://github.com/TheOdinProject/theodinproject/wiki/Contributing-Guide).
 
 ## Significant Contributors
 
@@ -35,5 +35,5 @@ To find out more about how you can contribute please read our [contributing guid
 * [Kevin Mulhern](https://github.com/KevinMulhern)
 * [Arun Kumar](https://github.com/arun1595)
 
-<hr>
+---
 Created by [Erik Trautman](http://www.github.com/eriktrautman)

app/assets/stylesheets/lessons.scss

@@ -577,7 +577,7 @@
   }
 }
 
-#lower-banner{
+#lower-adbox{
   height: 60px;
   width: 467px;
   border: 10px solid #eee;
@@ -586,6 +586,8 @@
   img{
     position: relative;
   }
+  background-image: url(http://s3.amazonaws.com/viking_education/mktg/viking_altad_wide.png);
+
   &:before{
     content: "From the creators of The Odin Project...";
     position: absolute;
@@ -631,11 +633,14 @@
     line-height:1.25em;
   }
   .lower-alt-txt{
-    margin-left: 80px!important;
+    margin-left: 0;
+    width: 468px;
+    height: 60px;
+    text-align: center;
   }
 }
 @media(max-width: 500px){
-  #lower-banner{
+  #lower-adbox{
     display: none;
   }
   #right-box{

app/views/lessons/_lower_banner_ad.html.erb

@@ -1,8 +1,8 @@
-<div id="lower-banner" class="adimage" data-ad-id="2">
+<div id="lower-adbox" class="adimage" data-ad-id="2">
   <%= link_to "http://www.vikingcodeschool.com/?utm_source=theodinproject&utm_medium=lowerbanner&utm_campaign=display&ref=The+Odin+Project" do %>
     <div class="alt-txt lower-alt-txt">
-      The Viking Code School
+
     </div>
     <%= image_tag "http://s3.amazonaws.com/viking_education/mktg/viking_ad_468x60.png" %>
   <% end %>
-</div>
+</div>

config/environments/production.rb

@@ -3,7 +3,7 @@
 
   # Code is not reloaded between requests.
   config.cache_classes = true
-  Rails.application.routes.default_url_options[:host] = 'theodinproject.com'
+  Rails.application.routes.default_url_options[:host] = 'www.theodinproject.com'
   config.middleware.use Rack::Attack
   # Eager load code on boot. This eager loads most of Rails and
   # your application in memory, allowing both threaded web servers
@@ -56,6 +56,7 @@
   # Use a real queuing backend for Active Job (and separate queues per environment)
   # config.active_job.queue_adapter     = :resque
   # config.active_job.queue_name_prefix = "theodinproject_#{Rails.env}"
+  config.action_mailer.default_url_options = { :host => 'www.theodinproject.com', :protocol => 'https' }
   config.action_mailer.perform_caching = false
 
   # Ignore bad email addresses and do not raise email delivery errors.

doc/linux_setup.md

@@ -1,7 +1,7 @@
 **This guide assumes that you have already installed Ruby and rails. To get instructions on how to do that go through the installations project [here](http://www.theodinproject.com/web-development-101/installations)**
 
 ## Set up Postgres
-Skip this is you have already installed and setup a user for postgresql.
+Skip this if you have already installed and setup a user for postgresql.
 First, we add the repository and then install postgresql and its dependencies:
 ```
 $ sudo sh -c "echo 'deb http://apt.postgresql.org/pub/repos/apt/ precise-pgdg main' > /etc/apt/sources.list.d/pgdg.list"
@@ -123,4 +123,4 @@ GITHUB_SECRET: <your client secret here>
 To test all this is working correctly, run the app locally and try to sign up with Github.
 
 ## Need Help?
-If you have any problems getting anything set up in this guide please let us know in our [contributing gitter channel](https://gitter.im/TheOdinProject/Contributing)
+If you have any problems getting anything set up in this guide please let us know in our [contributing gitter channel](https://gitter.im/TheOdinProject/Contributing).