From 4d7c63887f79395590d5685350aab7ca440710c2 Mon Sep 17 00:00:00 2001 From: Matthew Matz <19737272+MatzElectronics@users.noreply.github.com> Date: Mon, 8 Jul 2019 12:24:09 -0700 Subject: [PATCH 1/2] Update and cleanup HTML to make it valid This includes: - remove inline SVGs and set them to be replaced by JS on page load, similar to how the text internationalization is set up - classes that replace some inline styles - simplified navigation and UI elements - removes inline javascript, especially "onclick" triggers, moving them to editor.js and blocklyc.js instead. --- src/main/webapp/editor/blocklyc.jsp | 341 +++++++++++++++------------- 1 file changed, 186 insertions(+), 155 deletions(-) diff --git a/src/main/webapp/editor/blocklyc.jsp b/src/main/webapp/editor/blocklyc.jsp index a92fa98f..003c2a75 100644 --- a/src/main/webapp/editor/blocklyc.jsp +++ b/src/main/webapp/editor/blocklyc.jsp @@ -1,16 +1,33 @@ -<%-- - Document : login - Created on : 24-mei-2015, 18:41:02 - Author : Michel ---%> + + <%@page contentType="text/html" pageEncoding="UTF-8"%> <%@ include file="/WEB-INF/includes/include.jsp"%> <%-- Support for experimental blocks in Demo builds --%> <%-- See developer notes to use this feature --%> -<%-- --%> - + + "> @@ -103,78 +120,77 @@ - @@ -209,21 +223,29 @@ @@ -234,15 +256,18 @@ @@ -252,12 +277,12 @@ @@ -268,14 +293,14 @@ @@ -286,15 +311,15 @@ @@ -304,7 +329,7 @@ -
-
-
Time (seconds)
+
+
@@ -336,25 +361,28 @@ @@ -366,7 +394,7 @@ @@ -477,21 +505,21 @@ @@ -555,6 +586,6 @@ - + From 2ecebb65df1d0e6f58d6a4766ea9b54f6bfa274d Mon Sep 17 00:00:00 2001 From: Matthew Matz <19737272+MatzElectronics@users.noreply.github.com> Date: Sat, 20 Jul 2019 02:53:50 -0700 Subject: [PATCH 2/2] Refactor HTML layout to remove tables --- src/main/webapp/editor/blocklyc.jsp | 534 +++++++++++++++++++--------- 1 file changed, 359 insertions(+), 175 deletions(-) diff --git a/src/main/webapp/editor/blocklyc.jsp b/src/main/webapp/editor/blocklyc.jsp index 54b9d795..2e696bb5 100644 --- a/src/main/webapp/editor/blocklyc.jsp +++ b/src/main/webapp/editor/blocklyc.jsp @@ -116,115 +116,170 @@ -
- - - - - - - - - - -
- -
-
-
-
-
-
-
-
-
+
+ + + +
+
+ + + + ! + + + + + + + + + + + +
+ +
+ +
+
+ +
+
+ + > + >> + # + ~ + + + + +     +
+ +
+ + + + + + +
+
+
+ + + + +
+
+
+
+
+
+
+
+ @@ -256,7 +314,8 @@
@@ -278,11 +340,13 @@ @@ -293,14 +357,16 @@ @@ -311,15 +377,17 @@ @@ -329,7 +397,8 @@ @@ -361,17 +436,21 @@ + + + + +
@@ -487,9 +654,12 @@ @@ -497,8 +667,8 @@ - - + + @@ -570,22 +749,27 @@ - - - + + + - +