Merge branch 'master' into production

app/assets/main.html

@@ -36,6 +36,12 @@
   <script src="/javascripts/vendor.js"></script>
   <script src="/javascripts/aether.js"></script>
   <script src="/javascripts/app.js"></script> <!-- it's all Backbone! -->
+  <script>
+    $(function() {
+      FastClick.attach(document.body);
+    });
+  </script>
+  
   
   <!-- Can move to lib/services/linkedin.coffee instead somehow? Or just get rid of LinkedIn...
   </script>

app/styles/play/level/tome/spell_palette_entry.sass

@@ -110,3 +110,15 @@ html.fullscreen-editor
     bottom: inherit
     right: 50%
     margin-right: -300px
+
+// iPad property docs
+
+.tome-inventory-property-documentation
+  background-color: #e3d39a
+  padding: 10px
+  padding-bottom: 65px
+  width: 320px
+  min-height: 480px
+
+  h1:not(.not-code), h2:not(.not-code), h3:not(.not-code), h4:not(.not-code), h5:not(.not-code), h6:not(.not-code)
+    font-family: Menlo, Monaco, Consolas, "Courier New", monospace

app/templates/play/level/level_loading.jade

@@ -48,4 +48,4 @@
     .panel-heading.header-font(data-i18n="play_level.goals") Goals
     ul.list-group
   
-  button.start-level-button.btn.btn-lg.btn-success.header-font.secret(data-i18n="play_level.loading_start") Start Level
+  button.start-level-button.btn.btn-lg.btn-success.header-font.secret.needsclick(data-i18n="play_level.loading_start") Start Level

app/views/admin/UserCodeProblemsView.coffee

@@ -28,7 +28,7 @@ module.exports = class UserCodeProblemsView extends RootView
       lastMonth.setMonth lastMonth.getMonth() - 1
 
     conditions = [
-      ['limit', 1000]
+      ['limit', 300]
       ['sort', '-created']
       ['where', 'created']
       ['gte', lastMonth.toString()]

app/views/play/level/tome/SpellPaletteEntryView.coffee

@@ -27,6 +27,7 @@ module.exports = class SpellPaletteEntryView extends CocoView
     @thang = options.thang
     @docFormatter = new DocFormatter options
     @doc = @docFormatter.doc
+    @doc.initialHTML = @docFormatter.formatPopover()
 
   getRenderData: ->
     c = super()

bower.json

@@ -46,7 +46,8 @@
     "jquery.browser": "~0.0.6",
     "zatanna": "https://github.com/differentmatt/zatanna.git#master",
     "modernizr": "~2.8.3",
-    "backfire": "~0.3.0"
+    "backfire": "~0.3.0",
+    "fastclick": "~1.0.3"
   },
   "overrides": {
     "backbone": {

config.coffee

@@ -61,6 +61,7 @@ exports.config =
           'bower_components/tv4/tv4.js'
           # Aether before box2d for some strange Object.defineProperty thing
           'bower_components/aether/build/aether.js'
+          'bower_components/fastclick/lib/fastclick.js'
           'bower_components/d3/d3.min.js'
           'vendor/scripts/async.js'
         ]