Typo fixes and add content to placeholders

rachelmyers · rachelmyers · commit 4451f52a5452 · 2014-06-04T12:36:51.000-05:00
diff --git a/sites/en/job-board/add_a_navbar.step b/sites/en/job-board/add_a_navbar.step
@@ -13,7 +13,7 @@ MARKDOWN
 discussion_box "What's an application layout?", <<-MARKDOWN
   None of the view pages that we've been working with so far have had the necessary structure for a valid HTML page. No `<head>` or `<body>` or JavaScript or CSS tags. This application layout file is where all of that stuff exists!
 
-  * How does is this page related to the individual page content? Try comparing the source in the browser to this file, and see where the individual page's code starts showing up.
+  * How is this page related to the individual page content? Try comparing the source in the browser to this file, and see where the individual page's code starts showing up.
   * If you add something (say, an h1) to this file, where will it show up?
 MARKDOWN
 
@@ -44,7 +44,7 @@ ERB
 message <<-MARKDOWN
   Things to note:
 
-  * We use Rails link helpers instead of typing in `<a href="/jobs/new">Add Job</a>` [SAY WHY]
+  * We use Rails link helpers instead of typing in `<a href="/jobs/new">Add Job</a>`. The reason is that if the url of a page changes in the future, without the link helpers, we’d have to update every single place we link to that page. The link helpers abstract the actual url for us, so if we change a specific url, we update the address in only one place, in the routes file; and all the places we link to it stay the same.
   * The `<header>` tag is HTML5. Aren't we cool!?
 
   So let's take a look at it. Refresh, and ... isn't that horrifying looking? Let's make it look like a nav, albeit a very ugly one.
diff --git a/sites/en/job-board/add_a_new_job_form.step b/sites/en/job-board/add_a_new_job_form.step
@@ -3,7 +3,7 @@ message <<-MARKDOWN
 
   * Use Rails form helpers to create the HTML for the form
   * Learn to use the Rails server output for great good
-  * Update the controller so that the form save submissions to the database
+  * Update the controller so that the form saves submissions to the database
   * Learn about the beauty of the params hash
 
   # Side Note: Web forms are not perfectly straightfoward
@@ -30,7 +30,7 @@ RUBY
 message <<-MARKDOWN
   Refresh <http://localhost:3000/jobs/new>, and we see that familiar "Template is missing" error. So, let's add that template.
 
-  Under app/views/jobs, add a file called new.html.erb. This will be our form. Add some html to the topic to keep things moving along:
+  Under app/views/jobs, add a file called new.html.erb. This will be our form. Add some html to the template to keep things moving along:
 MARKDOWN
 
 source_code :html,
diff --git a/sites/en/job-board/create_a_rails_app.step b/sites/en/job-board/create_a_rails_app.step
@@ -10,14 +10,13 @@ message <<-MARKDOWN
 
   First, let's get into a directory for RailsBridge projects (either by finding your existing one & moving there or making a new folder).
 
-  If you don't already have a RailsBridge folder, use the command `mkdir` to create one:
+  If you don't already have a RailsBridge folder, use the commands `mkdir` and `cd` to create one and move into it:
 MARKDOWN
 
 console_without_message "mkdir railsbridge"
+console_without_message "cd railsbridge"
 
 message <<-MARKDOWN
-  and then use `cd railsbridge` to move into it.
-
   # Rails New!!!
 MARKDOWN
 
diff --git a/sites/en/job-board/crud_and_resourceful_routing.step b/sites/en/job-board/crud_and_resourceful_routing.step
@@ -13,7 +13,7 @@ message <<-MARKDOWN
   !["Screenshot of Rails routes page"](img/rails-routes.png)
 MARKDOWN
 
-discussion_box "CRUD", "Really, compare those two things! Out loud! As a group!"
+discussion_box "CRUD", "Talk through the different uses for the HTTP verbs. What is their general purpose, and what are we specifically using them for??"
 
 message <<-MARKDOWN
   To have a useful app, we need to be able to create job postings, see them all and their details, change them, and delete them. The way that Rails wants us to do this is by following RESTful routing conventions, which are perfectly encapsulated by the output of `resource :jobs` in our routes.rb file.
@@ -28,7 +28,7 @@ message <<-MARKDOWN
 
   You could make your URLs look like anything you wanted, like: `/all_the_jobs` or `/add_a_job` or `show_job`. This would totally work if you set up your controller methods and the route file correctly.
 
-  But we don't do this, generally, because Rails prefers resourceful routing, in which the paths are structured around a specific resource &mdash; in our case, jobs.
+ But we generally avoid this because the RESTful routing is a best practice that Rails makes easy to follow. In RESTful routes, the paths are structured around a specific resource &mdash; in our case, jobs. Check out more about [RESTful](http://en.wikipedia.org/wiki/Representational_state_transfer) urls.
 
   Another example: if we were making a puppy app, I would expect that going to `/puppies` would show me an index of all the puppies, and `/puppies/1` would find the puppy with the ID of one and show me their individual page, and `/puppies/1/edit` would show me the form to update a given puppy.
 
diff --git a/sites/en/job-board/delete_job_listings.step b/sites/en/job-board/delete_job_listings.step
@@ -2,7 +2,6 @@ message <<-MARKDOWN
   # What we're going to do
 
   * Remove postings
-  * That's about it
 
   Once a job is filled, we don't want a listing for it hanging out forever. Let's add a way to delete postings.
 
diff --git a/sites/en/job-board/listing_the_jobs.step b/sites/en/job-board/listing_the_jobs.step
@@ -4,7 +4,7 @@ message <<-MARKDOWN
   * Show the jobs!
   * Learn about ERB
 
-  Going back to the jobs index (<http://localhost:3000/jobs>) and not seeing our new jobs kinda sucks. Let's actually build the job board part of this job board now!
+  Going back to the jobs index (<http://localhost:3000/jobs>), we expect to see the new jobs. Let's actually build the job board part of this job board now!
 
   # Get all the jobs out of the database
 
@@ -26,7 +26,8 @@ discussion_box "Rails Console", <<-MARKDOWN
   The Rails console is super fun! It's giving us direct access to our local database.
 
   * Try running `Job.all.to_sql`. What does that do?
-  * Something else here!
+  * Try selecting an individual Job record.
+  * Try updating an that individual record from the console!
 MARKDOWN
 
 message "# Show those jobs!"
diff --git a/sites/en/job-board/make_a_jobs_home_page.step b/sites/en/job-board/make_a_jobs_home_page.step
@@ -28,7 +28,7 @@ message <<-MARKDOWN
    * typing in `route`
    * hitting enter
 
-  Magic!
+  Magic! (Sublime is using fuzzy search, so you can use the entire file path, or just part of the filename to go to files.)
 MARKDOWN
 
 source_code_with_message "We're going to need a resource route, which will create EIGHT different routes for us. Add this to line two:", :ruby, "resources :jobs"
@@ -81,7 +81,7 @@ error_box "The action 'index' could not be found for JobsController", <<-MARKDOW
 MARKDOWN
 
 message <<-MARKDOWN
-  It's looking for a method called index on the jobs controller! But there isn't one, boooo. So let's add it.
+  It's looking for a method called index on the jobs controller! Since there isn't a controller method for this route, we'll need to add it.
 
   Open up your jobs controller (again, try to use keyboard shortcuts: cmd+p on Mac or ctl+p on PC to find the file at app/controllers/jobs_controller.rb).
 MARKDOWN
diff --git a/sites/en/job-board/make_the_form_work.step b/sites/en/job-board/make_the_form_work.step
@@ -5,7 +5,7 @@ message <<-MARKDOWN
   * Learn how to read server output
   * Review happy debugging techniques
 
-  # Form Partytime
+  # Partytime: Use the form to Create Objects
 MARKDOWN
 
 message "Now, try to submit your form."
diff --git a/sites/en/job-board/store_jobs_in_the_database.step b/sites/en/job-board/store_jobs_in_the_database.step
@@ -31,7 +31,7 @@ message <<-MARKDOWN
 
   # Make that migration file useful
 
-  Open up the migration file that you just made (cmd+p / ctl+p and type createjobs and hit enter) and you'll see the following:
+  Open up the migration file that you just made (cmd+p / ctl+p, type 'create jobs', and hit enter) and you'll see the following:
 MARKDOWN
 
 source_code :ruby, <<-RUBY
@@ -77,7 +77,7 @@ MARKDOWN
 message <<-MARKDOWN
   # Check out the model
 
-  The migration we just ran updated the database, but that doesn't mean that we can talk to the database using Ruby yet. Look at the file `app/models/job.rb`. The `jobs` class inherits from ActiveRecord::Base, so that we can talk to the database with Ruby instead of SQL!
+  The migration we just ran updated the database, but that doesn't mean that we can talk to the database using Ruby yet. Look at the file `app/models/job.rb`. The `Job` class inherits from ActiveRecord::Base, so that we can talk to the database with Ruby instead of SQL!
 
   Okay, so we've got some place to store our jobs. But how can we make any? THROUGH THE MAGIC OF FORMS!!!
 MARKDOWN
diff --git a/sites/en/job-board/update_job_listings.step b/sites/en/job-board/update_job_listings.step
@@ -26,13 +26,13 @@ ERB
 message <<-MARKDOWN
   Okay, so that's awesome. Now we just have to add a form for editing. I wonder if it is any different from the create form? I guess we could copy and paste the other form?
 
-  *Noooooooooo!!!!!!!!!!*
+  We could copy and paste from the other form, but we try to avoid that because duplicated code is hard to maintain. For example, if I want to add placeholder text for the inputs in the form, when the code is duplicated, I’ll need to update the code in each place the form was copied. (In large apps it’s easy to miss a place that would need to be updated.) The solution is to reuse rather than duplicate the code, and the way to reuse code in views is by using partials.
 MARKDOWN
 
-discussion_box "Partials",
+discussion_box "Don't Repeat Yourself",
 <<-MARKDOWN
-  * What's a partial?
-  * Why should we use them?
+  * What are some reasons to DRY up our code?
+  * What are some strategies for DRYing up code throughout a Rails app?
 MARKDOWN
 
 message <<-MARKDOWN
