Merge pull request code-dot-org#846 from code-dot-org/staging

DTT

Author: Josh Lory

aws/build.rake

@@ -158,8 +158,10 @@ $websites = build_task('websites', [deploy_dir('rebuild'), BLOCKLY_COMMIT_TASK])
     RakeUtils.system 'rake', 'build'
 
     if rack_env?(:production) && CDO.daemon
-      HipChat.log "Putting <b>dashboard</b> scripts in redis..."
-      RakeUtils.rake 'seed:script_cache_to_redis'
+      Dir.chdir(dashboard_dir) do
+        HipChat.log "Putting <b>dashboard</b> scripts in redis..."
+        RakeUtils.rake 'seed:script_cache_to_redis'
+      end
 
       thread_count = 1 + (CDO.app_servers.keys.count / 10)
       threaded_each CDO.app_servers.keys, thread_count do |name|

dashboard/config/locales/data.en.yml

@@ -499,6 +499,7 @@ en:
         'C4_math_artist' : 'Programming the Artist with Math'
         'C4_function_edit' : 'Editing Functions'
         'C4_function_create' : 'Creating Functions'
+        'C4_function_parameters' : 'Functions with Parameters'
         'C4_conditionals': 'Conditionals'
         'C4_unplugged_algorithms' : 'Algorithms with Tangrams'
         'C4_unplugged_madlibs' : 'Mad Libs'

dashboard/config/scripts/levels/NEW Course 4 Artist Params 9.level

@@ -22,7 +22,8 @@
     "use_contract_editor": "false",
     "embed": "false",
     "callout_json": "[{\r\n  \"localization_key\": \"edit_add_parameter\",\r\n  \"element_id\": \"#edit_add_parameter_qtip > .blocklyIconGroup:eq(-1)\",\r\n  \"qtip_config\": {\r\n    \"position\": {\"my\": \"top center\", \"at\": \"bottom center\"}\r\n  }\r\n}, {\r\n  \"on\": \"function_editor_opened\",\r\n  \"localization_key\": \"add_and_drag_parameter\",\r\n  \"element_id\": \"#paramAddText\",\r\n  \"qtip_config\": {\r\n    \"position\": {\"my\": \"right center\", \"at\": \"left center\"}\r\n  }\r\n}]",
-    "disable_sharing": "false"
+    "disable_sharing": "false",
+    "video_key": "C4_function_parameters"
   }
 }]]></config>
   <blocks>

dashboard/config/videos.csv

@@ -82,6 +82,7 @@ C4_for_loops			MAukAy9m9Sg	http://videos.code.org/2014/C4-for-loops.mp4
 C4_math_artist			3N6GnS_dzfg	http://videos.code.org/2014/C4-math-artist.mp4
 C4_function_edit			EoUnJB_BVLc	http://videos.code.org/2014/C4-function-edit.mp4
 C4_function_create			28Huilta-20	http://videos.code.org/2014/C4-function-create.mp4
+C4_function_parameters			e9qjXKaeDHg	http://videos.code.org/2014/C4-function-parameters.mp4
 C4_conditionals			8BaTjib4UEM	http://videos.code.org/2014/C4-conditionals.mp4
 C4_unplugged_algorithms			xZlKyTwQZv8	http://videos.code.org/2014/C4-unplugged-algorithms.mp4
 C4_unplugged_madlibs			TctGRrUdkcc	http://videos.code.org/2014/C4-unplugged-madlibs.mp4

pegasus/routes/v2_forms_routes.rb

@@ -2,6 +2,7 @@
 
 post '/v2/forms/:kind' do |kind|
   dont_cache
+  pass if kind == 'HocSignup2014'
   forbidden! if settings.read_only
   unsupported_media_type! unless payload = request.json_body