diff --git a/OpenRobertaServer/db/openroberta-db.script b/OpenRobertaServer/db/openroberta-db.script index ad09c293c..e3f139451 100644 --- a/OpenRobertaServer/db/openroberta-db.script +++ b/OpenRobertaServer/db/openroberta-db.script @@ -60,7 +60,7 @@ GRANT DBA TO "orA" SET SCHEMA SYSTEM_LOBS INSERT INTO BLOCKS VALUES(0,2147483647,0) SET SCHEMA PUBLIC -INSERT INTO USER VALUES(0,'Roberta','d4ab787ab667fef4:a5bf6037bd904f05b76ee431ae285f443229e3a3','','TEACHER','2015-08-30 21:34:50.811000','2015-08-30 21:34:50.937000',NULL) +INSERT INTO USER VALUES(1,'Roberta','d4ab787ab667fef4:a5bf6037bd904f05b76ee431ae285f443229e3a3','','TEACHER','2015-08-30 21:34:50.811000','2015-08-30 21:34:50.937000',NULL) INSERT INTO USER VALUES(42,'r','fa22c66d2ea99ebb:0176c1177428c0a4ce866f93b764a490e097c7ee','','TEACHER','2014-12-05 22:15:02.944000','2015-08-12 15:02:28.812000',NULL) INSERT INTO USER VALUES(43,'account-0','a2df3b9898d4c661:cadc82761df276b02c2a51f5544a90f07d0c833c','stuff','STUDENT','2014-12-11 15:58:02.527000','2014-12-11 15:58:02.527000','rwth') INSERT INTO USER VALUES(44,'account-1','7b4b5a06002e9b4b:595fb7a60b9a0559cfcd8dd0c9fc4b0bde856de0','stuff','STUDENT','2014-12-11 15:58:15.648000','2014-12-11 15:58:15.648000','rwth') @@ -79,7 +79,7 @@ INSERT INTO USER VALUES(56,'rrr','e1097ec65bbd01cd:505b15c5fb2b2a691604854663214 INSERT INTO USER VALUES(57,'b','cc97d0b92d16b075:d755cc59c29a1be574d9eb88c88da94174d07805','b','TEACHER','2015-07-01 23:25:13.181000','2015-08-31 11:57:02.967000',NULL) INSERT INTO ROBOT VALUES(42,'ev3','2015-07-06 11:48:05.954000','',0) INSERT INTO ROBOT VALUES(43,'oraSim','2015-07-06 11:48:05.954000','',0) -INSERT INTO PROGRAM VALUES(0,'NEPOprog',0,43,'FOREWARD30EQCOLOUR_COLOUR3#000000','2015-08-31 11:58:48.167000','2015-08-31 11:58:48.167000',NULL,NULL,0,NULL,0) +INSERT INTO PROGRAM VALUES(1,'NEPOprog',1,43,'FOREWARD30EQCOLOUR_COLOUR3#000000','2015-08-31 11:58:48.167000','2015-08-31 11:58:48.167000',NULL,NULL,0,NULL,0) INSERT INTO PROGRAM VALUES(42,'hallo',42,42,'Hallo00','2014-12-05 22:15:14.958000','2014-12-05 22:20:36.595000',NULL,NULL,0,NULL,0) INSERT INTO PROGRAM VALUES(43,'green',42,42,'GREENON','2014-12-05 22:15:35.316000','2014-12-05 22:15:35.316000',NULL,NULL,0,NULL,0) INSERT INTO PROGRAM VALUES(44,'red',42,42,'1GREENONREDON','2014-12-05 22:15:44.512000','2015-06-18 16:58:59.150000',NULL,NULL,0,NULL,0) diff --git a/OpenRobertaServer/staticResources/blockly/core/bubble.js b/OpenRobertaServer/staticResources/blockly/core/bubble.js index 65480f854..7d56a27fd 100644 --- a/OpenRobertaServer/staticResources/blockly/core/bubble.js +++ b/OpenRobertaServer/staticResources/blockly/core/bubble.js @@ -228,6 +228,7 @@ Blockly.Bubble.prototype.createDom_ = function(content, hasResize) { 'rx' : Blockly.BlockSvg.CORNER_RADIUS, 'ry' : Blockly.BlockSvg.CORNER_RADIUS }, this.bubbleGroup_); + this.bubbleGroup_.appendChild(content); if (hasResize) { this.resizeGroup_ = Blockly.createSvgElement('g', { 'class' : Blockly.RTL ? 'blocklyResizeSW' : 'blocklyResizeSE' @@ -261,11 +262,10 @@ Blockly.Bubble.prototype.createDom_ = function(content, hasResize) { + 'h2.061l.229-.023c-.186.307-.29.656-.29 1.023 0 .534.208 1.036.586 1.414s.88.586 1.414.586c.367 0 .716-.105 1.023-.289' + 'l-.023.228v2.061h-1.939c-.122 0-.24.015-.356.036.189-.31.295-.664.295-1.036 0-.534-.208-1.036-.586-1.414z' }, this.resizeGroup_); + this.bubbleGroup_.appendChild(this.resizeGroup_); } else { this.resizeGroup_ = null; } - this.bubbleGroup_.appendChild(content); - // this.bubbleGroup_.appendChild(this.resizeGroup_); return this.bubbleGroup_; }; diff --git a/OpenRobertaServer/staticResources/css/roberta.css b/OpenRobertaServer/staticResources/css/roberta.css index 90299b277..701d4cf07 100644 --- a/OpenRobertaServer/staticResources/css/roberta.css +++ b/OpenRobertaServer/staticResources/css/roberta.css @@ -22,11 +22,15 @@ body > :not(.pace),body:before,body:after { -moz-transition:opacity .4s ease-in-out; -o-transition:opacity .4s ease-in-out; -ms-transition:opacity .4s ease-in-out; - transition:opacity .4s ease-in-out + transition:opacity .4s ease-in-out; } body:not(.pace-done) > :not(.pace),body:not(.pace-done):before,body:not(.pace-done):after { - opacity:0 + opacity:0; +} +body.blocklyMinimalBody * { + opacity:1 !important; + overflow:hidden; } #head-navigation { diff --git a/OpenRobertaServer/staticResources/index.html b/OpenRobertaServer/staticResources/index.html index a9e5d942e..0fd13d22e 100644 --- a/OpenRobertaServer/staticResources/index.html +++ b/OpenRobertaServer/staticResources/index.html @@ -33,13 +33,13 @@ - - + + @@ -602,8 +604,8 @@

Do you have an EV3 robot? - Click here!

-

Du hast keinen EV3 Roboter? - Dann programmiere unseren simulierten Roboter

-

You don't have an EV3 robot? - Start coding with our simulated robot

+

Du hast keinen EV3 Roboter? - Dann programmiere unseren simulierten Roboter, hier klicken!

+

You don't have an EV3 robot? - Start coding with our simulated robot, click here!

Simulation diff --git a/OpenRobertaServer/staticResources/roberta/roberta.js b/OpenRobertaServer/staticResources/roberta/roberta.js index 274537ca6..3f330c908 100644 --- a/OpenRobertaServer/staticResources/roberta/roberta.js +++ b/OpenRobertaServer/staticResources/roberta/roberta.js @@ -7,6 +7,9 @@ var id; * Initialize user-state-object */ function initUserState() { + USER.clear(function(result) { + response(result); + }); userState.version = 'xx.xx.xx'; userState.language = 'DE'; userState.robot = 'ev3'; diff --git a/OpenRobertaServer/staticResources/roberta/user.js b/OpenRobertaServer/staticResources/roberta/user.js index 95b2d2a49..9a2e6f1bb 100644 --- a/OpenRobertaServer/staticResources/roberta/user.js +++ b/OpenRobertaServer/staticResources/roberta/user.js @@ -1,5 +1,19 @@ var USER = {}; (function($) { + /** + * Clear user + * @memberof USER + */ + USER.clear = function(successFn) { + COMM.json("/user", { + "cmd" : "clear", + }, successFn, "clear user"); + }; + + /** + * Logout user + * @memberof USER + */ /** * Login user * @memberof USER