Merge branch 'release/hoc-2016-1' into release/2.2.15

* release/hoc-2016-1:
  Merge pull request #1027 from TheGrits/patch-7
  Additional content changes
  Fix TTT content
  Redirect hoc page to `/go`
  Merge pull request #1037 from chrisgarrity/patch-column-count
  update ttt content
  Update ttt content
  Merge pull request #1006 from chrisgarrity/feature/gh979-tttpage
  Merge pull request #1018 from mewtaylor/issue/gh-995
  Merge pull request #1008 from mewtaylor/issue/gh-980
  Update pattern so rewrite accepts querystring too

# Conflicts:
#	src/components/modal/ttt/modal.jsx
#	src/views/jobs/jobs.jsx
#	src/views/thingstotry/l10n.json

src/components/modal/ttt/modal.jsx

@@ -88,7 +88,7 @@ var TTTModal = React.createClass({
                             href={this.props.activityLoc}
                             className="button white mod-ttt-item"
                         >
-                            <FormattedMessage id="ttt.download" />
+                            <FormattedMessage id="ttt.open" />
                         </a>
                     </FlexRow>
                     <FlexRow as="li" className="mod-ttt-item">
@@ -109,7 +109,7 @@ var TTTModal = React.createClass({
                             href={this.props.guideLoc}
                             className="button white mod-ttt-item"
                         >
-                            <FormattedMessage id="ttt.download" />
+                            <FormattedMessage id="ttt.open" />
                         </a>
                     </FlexRow>
                 </ul>

src/components/title-banner/title-banner.scss

@@ -10,15 +10,20 @@
     padding: 20px 0;
     width: 100%;
 
-    h1, 
+    h1,
     p {
         margin: 0 auto;
         padding: 5px 0;
         text-align: center;
-        color: $type-white;        
+        color: $type-white;
     }
 
     p {
         max-width: 500px;
     }
+
+    // On windows strong gets reset to font-weight 500, so make sure to override for banners
+    strong {
+        font-weight: 700;
+    }
 }

src/routes.json

@@ -121,10 +121,9 @@
     },
     {
         "name": "hoc",
-        "pattern": "^/hoc/?$",
+        "pattern": "^/hoc/?(\\?.*)?$",
         "routeAlias": "/hoc/?\\??",
-        "view": "hoc/hoc",
-        "title": "Hour of Code"
+        "redirect": "/go"
     },
     {
         "name": "cards",

src/views/jobs/jobs.jsx

@@ -31,7 +31,7 @@ var Jobs = React.createClass({
                         <h3><FormattedMessage id='jobs.openings' /></h3>
                         <ul>
                             <li>
-                                <a href="http://bit.ly/24B9aEz">
+                                <a href="http://bit.ly/2f5hABE">
                                     Trust &amp; Safety Manager
                                 </a>
                                 <span>

src/views/thingstotry/l10n.json

@@ -1,7 +1,7 @@
 {
     "ttt.placeholder": "Placeholder text",
     "ttt.title": "Things to Try",
-    "ttt.subTitle": "You can get started with Scratch in a variety of ways. Click a picture to try a <b>Tutorial</b>. You can also download a set of <b>Activity Cards</b> and <b>Educator Guide</b> for each theme.",
+    "ttt.subTitle": "You can get started with Scratch in a variety of ways. Click a picture to try the <strong>Tutorial</strong>. You can also download a set of <strong>Activity Cards</strong> and <strong>Educator Guide</strong> for each theme.",
     "tile.tutorial": "Tutorial",
     "tile.guides": "See Cards and Guides",
     "ttt.tutorialTitle": "Tutorial",
@@ -11,7 +11,7 @@
     "ttt.educatorTitle": "Educator Guide",
     "ttt.educatorSubtitle": "Use this educator guide to plan and lead a one-hour Scratch workshop.",
     "ttt.tryIt": "Try It",
-    "ttt.download": "Download",
+    "ttt.open": "Open",
     "ttt.MakeItFlyTitle": "Make It Fly",
     "ttt.MakeItFlyDescription": "Animate the Scratch Cat, The Powerpuff Girls, or even a taco!",
     "ttt.AnimateYourNameTitle": "Animate Your Name",
@@ -20,7 +20,7 @@
     "ttt.RaceDescription": "Make a game where two characters race each other.",
     "ttt.MakeMusicTitle": "Make Music",
     "ttt.MakeMusicDescription": "Choose instruments, add sounds, and press keys to play music.",
-    "ttt.HideAndSeekTitle": "Hide-and-Seek Game",
+    "ttt.HideAndSeekTitle": "Hide and Seek",
     "ttt.HideAndSeekDescription": "Make a hide-and-seek game with characters that appear and disappear.",
     "ttt.StoryTitle": "Create a Story",
     "ttt.StoryDescription": "Choose characters, add conversation, and bring your story to life.",