Merge pull request #423 from QuincyLarson/master

Bonfire display fix and new field-guide

seed_data/field-guides.json

@@ -317,6 +317,27 @@
       "</div>"
     ]
   },
+  {
+    "_id": "bd7158d9c445eddfaeb5bdff",
+    "name": "How can I deploy a website without writing any code at all?",
+    "description": [
+      "<h2 class='text-center'>It's possible to build dynamic, mobile responsive websites without writing any code at all, in just a few minutes.</h2><br/>",
+      "<div class=\"embed-responsive embed-responsive-16by9\">",
+      "  <iframe src=\"//player.vimeo.com/video/115194017\" class=\"embed-responsive-item\"></iframe>",
+      "</div>",
+      "<div class=\"col-xs-12 col-sm-10 col-sm-offset-1 text-left\">",
+      "  <h3>Here are the technologies we used here:",
+      "    <ul>",
+      "      <li><a href='http://www.atom.io/'>atom.io</a> - a free code editor</li>",
+      "      <li><a href='http://www.startbootstrap.com/'>startbootstrap.com</a> - a collection of free responsive (Bootstrap) templates</li>",
+      "      <li><a href='http://www.powr.io/'>powr.io</a> - a collection of free JavaScript plugins</li>",
+      "      <li><a href='http://www.bitballoon.com/'>bitballoon.com</a> - a tool for drag and drop website deployment</li>",
+      "    </ul>",
+      "  </h3>",
+      "<h3>You will quickly reach the limits of what you can do without actually coding, but it's nice to be able to rapidly build working prototype websites like this.</h3>",
+      "</div>"
+    ]
+  },
   {
     "_id": "bd7158d9c446eddfaeb5bdef",
     "name": "How do Free Code Camp's Nonprofit Projects work?",

views/account/show.jade

@@ -99,7 +99,6 @@ block content
                                 i.fa.icon-beaker
                                 | Try it out
 
-
             .spacer
                 .hidden-xs.hidden-sm.col-md-12
                     #cal-heatmap.d3-centered
@@ -135,6 +134,7 @@ block content
                                 h4.col-sm-6.text-right Longest Streak: #{longestStreak}
                                 h4.col-sm-6.text-left Current Streak: #{currentStreak}
 
+
                     - if (challenges.length > 0)
                         .col-sm-12
                             table.table.table-striped
@@ -145,8 +145,7 @@ block content
                                         th.col-xs-6 Link
                                 for challenge in challenges
                                     tr
-                                td.col-xs-4
-                                    a(href='/challenges/' + challenge.name)= challenge.name
+                                        td.col-xs-4= challenge.name
                                         td.col-xs-2= moment(challenge.completedDate, 'x').format("MMM DD, YYYY")
                                         td.col-xs-6
                                             a(href=challenge.solution) View my solution
@@ -162,9 +161,8 @@ block content
                                         th.col-xs-6 Solution
                                 for bonfire in bonfires
                                     tr
-                                td.col-xs-4
-                                     a(href='/bonfires/'+ bonfire.name)= bonfire.name
+                                        td.col-xs-4= bonfire.name
                                         td.col-xs-2= moment(bonfire.completedDate, 'x').format("MMM DD, YYYY")
                                         td.col-xs-6
-                                    pre= bonfire.solution
+                                            pre.wrappable= bonfire.solution
                                 br