From 7b854f85a40ea4ade63bb2af0e3f179f8aa6c328 Mon Sep 17 00:00:00 2001 From: Emma Dauterman Date: Wed, 17 Aug 2016 15:56:30 -0700 Subject: [PATCH] Blockly Factory: Update Workspace Factory Tab (#562) * Updated tab in blockly factory to reflect changes made to workspace factory, changes mainly in index.html and wfactory_init.js * Added tab for workspace editing mode * Changed font size in dropdown menu * Added class for options inputs to add event listeners more easily --- demos/blocklyfactory/app_controller.js | 2 +- demos/blocklyfactory/factory.css | 19 +- demos/blocklyfactory/index.html | 93 ++++++++-- .../blocklyfactory/workspacefactory/style.css | 10 +- .../workspacefactory/wfactory_controller.js | 9 +- .../workspacefactory/wfactory_init.js | 162 ++++++++++++++---- .../workspacefactory/wfactory_view.js | 20 +-- 7 files changed, 236 insertions(+), 79 deletions(-) diff --git a/demos/blocklyfactory/app_controller.js b/demos/blocklyfactory/app_controller.js index 87b0c8370..735834bf0 100644 --- a/demos/blocklyfactory/app_controller.js +++ b/demos/blocklyfactory/app_controller.js @@ -497,7 +497,7 @@ AppController.prototype.init = function() { this.addBlockFactoryEventListeners(); // Workspace Factory init. - FactoryInit.initWorkspaceFactory(this.workspaceFactoryController); + WorkspaceFactoryInit.initWorkspaceFactory(this.workspaceFactoryController); }; diff --git a/demos/blocklyfactory/factory.css b/demos/blocklyfactory/factory.css index e74383966..b49958ece 100644 --- a/demos/blocklyfactory/factory.css +++ b/demos/blocklyfactory/factory.css @@ -313,7 +313,7 @@ td { width: 30%; } -#category_section { +#toolbox_div, #preload_div { width: 20%; } @@ -388,16 +388,17 @@ td { } /* Links inside the dropdown */ -.dropdown-content a { - color: black; - display: block; - padding: 12px 16px; - text-decoration: none; +.dropdown-content a, .dropdown-content label { + color: black; + display: block; + font-size: small; + padding: 12px 16px; + text-decoration: none; } -/* Change color of dropdown links on hover */ -.dropdown-content a:hover { - background-color: #f1f1f1; +/* Change color of dropdown links on hover. */ +.dropdown-content a:hover, .dropdown-content label:hover { + background-color: #f1f1f1 } /* Show the dropdown menu */ diff --git a/demos/blocklyfactory/index.html b/demos/blocklyfactory/index.html index ec740f22e..2630e441d 100644 --- a/demos/blocklyfactory/index.html +++ b/demos/blocklyfactory/index.html @@ -125,21 +125,42 @@

- - - - - +

+ + + + +

Workspace Editor:

-

Drag blocks into your toolbox.

+

Drag blocks into your toolbox:

+ + + +
ToolboxWorkspace
-