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

Levelbuilder -> Staging

Author: Trevor Berg

Gemfile

@@ -7,7 +7,7 @@ gem 'rails', '~> 4.2.4'
 # (see: http://guides.rubyonrails.org/4_2_release_notes.html#respond-with-class-level-respond-to)
 gem 'responders', '~> 2.0'
 
-gem 'sinatra', '1.4.4', require: 'sinatra/base'
+gem 'sinatra', require: 'sinatra/base'
 gem 'rack-contrib', '~> 1.1'
 
 gem 'mysql2', '~> 0.3.13'

Gemfile.lock

@@ -433,10 +433,10 @@ GEM
       json (~> 1.8)
       simplecov-html (~> 0.10.0)
     simplecov-html (0.10.0)
-    sinatra (1.4.4)
+    sinatra (1.4.6)
       rack (~> 1.4)
       rack-protection (~> 1.4)
-      tilt (~> 1.3, >= 1.3.4)
+      tilt (>= 1.3, < 3)
     spring (1.3.6)
     spring-commands-testunit (1.0.1)
       spring (>= 0.9.1)
@@ -590,7 +590,7 @@ DEPENDENCIES
   sequel (~> 4.10.0)
   shotgun
   simplecov
-  sinatra (= 1.4.4)
+  sinatra
   spring
   spring-commands-testunit
   sqlite3

apps/src/StudioApp.js

@@ -232,7 +232,8 @@ StudioApp.prototype.init = function(config) {
       level_source_id: config.level_source_id,
       phone_share_url: config.send_to_phone_url,
       sendToPhone: config.sendToPhone,
-      twitter: config.twitter
+      twitter: config.twitter,
+      app: config.app
     });
   }
 
@@ -1427,14 +1428,23 @@ StudioApp.prototype.handleHideSource_ = function (options) {
   var container = document.getElementById(options.containerId);
   this.hideSource = true;
   var workspaceDiv = document.getElementById('codeWorkspace');
-  if(!options.embed || options.level.skipInstructionsPopup) {
+  if (!options.embed || options.level.skipInstructionsPopup) {
     container.className = 'hide-source';
   }
   workspaceDiv.style.display = 'none';
   document.getElementById('visualizationResizeBar').style.display = 'none';
 
+  // Chrome-less share page.
+  if (this.share && options.app === 'applab') {
+    if (dom.isMobile()) {
+      document.getElementById('visualizationColumn').className = 'chromelessShare';
+    } else {
+      document.getElementsByClassName('header-wrapper')[0].style.display = 'none';
+      document.getElementById('visualizationColumn').className = 'wireframeShare';
+    }
+    document.body.style.backgroundColor = '#202B34';
   // For share page on mobile, do not show this part.
-  if ((!options.embed) && (!this.share || !dom.isMobile())) {
+  } else if (!options.embed && !(this.share && dom.isMobile())) {
     var runButton = document.getElementById('runButton');
     var buttonRow = runButton.parentElement;
     var openWorkspace = document.createElement('button');

apps/static/applab/phone_wireframe.png

@@ -209,6 +209,30 @@ div#visualizationResizeBar {
 
 // ** END OF RULES THAT ARE MODIFIED AT RUNTIME IN adjustAppSizeStyles() **
 
+#visualizationColumn.wireframeShare {
+  background: url("#{$root}phone_wireframe.png") center center no-repeat;
+  max-width: none !important;
+  width: 363px;
+  height: 714px;
+  margin: 20px auto;
+
+  #designToggleRow, #gameButtons {
+    display: none;
+  }
+
+  #visualization {
+    top: 116px;
+    left: 21px;
+    border: 0;
+  }
+}
+
+#visualizationColumn.chromelessShare {
+  #designToggleRow, #gameButtons {
+    display: none;
+  }
+}
+
 #divApplab {
   overflow: hidden;
   outline: none;

apps/style/applab/style.scss

@@ -43,8 +43,7 @@ def main()
     status = 1
     Dir.chdir(aws_dir) do
       RakeUtils.bundle_install
-      status, output = RakeUtils.system__(RakeUtils.command_('rake', '--rakefile', 'build.rake', *ARGV))
-      puts output if status != 0
+      status = RakeUtils.system_ 'rake', '--rakefile', 'build.rake', *ARGV
     end
 
     FileUtils.rm 'build-started' if File.file?('build-started')

aws/build

@@ -32,7 +32,7 @@ def build_task(name, dependencies=[], params={})
     rescue => e
       HipChat.log "<b>#{name}</b> FAILED!", color: 'red', notify: 1
       HipChat.log "/quote #{e}\n#{CDO.backtrace e}", message_format: 'text'
-      raise $!, $!.message, []
+      raise
     end
   end
 

aws/build.rake

@@ -6562,7 +6562,10 @@ Blockly.BlockSpace.prototype.drawTrashZone = function(x, startDragX) {
     background = flyout.svgBackground_;
     blockGroup = flyout.blockSpace_.svgGroup_;
     trashcan = flyout.trashcan;
-    trashcanElement = trashcan.svgGroup_
+    trashcanElement = trashcan.svgGroup_;
+    if(this.blockSpaceEditor.hideTrashRect_) {
+      blockGroupForeground = this.blockSpaceEditor.flyout_.svgGroup_
+    }
   }
   var toolbarWidth = background.getBoundingClientRect().width;
   var dragBuffer = 10;

blockly-core/build-output/blockly_compressed.js

@@ -741,6 +741,10 @@ Blockly.BlockSpace.prototype.drawTrashZone = function(x, startDragX) {
     blockGroup = flyout.blockSpace_.svgGroup_;
     trashcan = flyout.trashcan;
     trashcanElement = trashcan.svgGroup_;
+
+    if (this.blockSpaceEditor.hideTrashRect_) {
+      blockGroupForeground = this.blockSpaceEditor.flyout_.svgGroup_;
+    }
   }
 
   var toolbarWidth = background.getBoundingClientRect().width;