diff --git a/www/blocs&generateurs/ffau/css.js b/www/blocs&generateurs/ffau/css.js index 5163fd8e..bf451ec5 100644 --- a/www/blocs&generateurs/ffau/css.js +++ b/www/blocs&generateurs/ffau/css.js @@ -55,7 +55,7 @@ Blockly.Blocks['style'] = { ], "previousStatement": "header", "nextStatement": "header", - "colour": 290 + "colour": 120 }); } }; @@ -81,7 +81,7 @@ Blockly.Blocks['stylearg'] = { ], "previousStatement": "args", "nextStatement": "args", - "colour": 290 + "colour": 120 }); } }; @@ -113,7 +113,7 @@ Blockly.Blocks['cssitem'] = { ], "previousStatement": "style", "nextStatement": "style", - "colour": 290 + "colour": 120 }); } }; @@ -143,7 +143,7 @@ Blockly.Blocks['othercss'] = { ], "previousStatement": "stylecontent", "nextStatement": "stylecontent", - "colour": 290 + "colour": 120 }); } }; @@ -602,6 +602,37 @@ Blockly.html['borderrad'] = function (block) { var content = block.getFieldValue('content'); return 'border-radius: ' + fullEscape(content) + ';\n'; }; +// Border Collapse +Blockly.Blocks['bordercollapse'] = { + init: function () { + this.jsonInit({ + "message0": 'border-collapse: %1 ;', + "args0": [ + { + "type": "field_dropdown", + "name": "content", + "options": [ + [ + "collapse", + "collapse" + ], + [ + "separate", + "separate" + ] + ] + } + ], + "previousStatement": "stylecontent", + "nextStatement": "stylecontent", + "colour": 290 + }); + } +}; +Blockly.html['bordercollapse'] = function (block) { + var content = block.getFieldValue('content'); + return 'border-collapse: ' + fullEscape(content) + ';\n'; +}; // Width height number selector Blockly.Blocks['widthheightnum'] = { init: function () { diff --git a/www/blocs&generateurs/ffau/html.js b/www/blocs&generateurs/ffau/html.js index c6d599ca..f7bbaa40 100644 --- a/www/blocs&generateurs/ffau/html.js +++ b/www/blocs&generateurs/ffau/html.js @@ -51,7 +51,7 @@ Blockly.Blocks['html'] = { "check": "document" } ], - "colour": 210 + "colour": "#4a235a" }); } }; @@ -95,7 +95,7 @@ Blockly.Blocks['head'] = {init:function(){ ], "previousStatement": "document", "nextStatement": "document", - "colour": 210 + "colour": "#4a235a" }); } }; @@ -114,11 +114,11 @@ Blockly.Blocks['title'] = { this.setInputsInline(false); this.setPreviousStatement(true); this.setNextStatement(true); - this.setColour(210)} + this.setColour("#4a235a")} }; Blockly.html['title'] = function (block) { var text_content = block.getFieldValue('_text'); - return '' + text_content + '\n \n'; + return '' + text_content + '\n\n'; }; // Link bootstrap.css Blockly.Blocks['bootstrap'] = { @@ -128,10 +128,10 @@ Blockly.Blocks['bootstrap'] = { this.setInputsInline(false); this.setPreviousStatement(true); this.setNextStatement(true); - this.setColour(210)} + this.setColour("#4a235a")} }; Blockly.html['bootstrap'] = function (block) { - return '' + return '\n\n\n' }; // Link FontAwesome.css Blockly.Blocks['fontawesome'] = { @@ -141,10 +141,10 @@ Blockly.Blocks['fontawesome'] = { this.setInputsInline(false); this.setPreviousStatement(true); this.setNextStatement(true); - this.setColour(210)} + this.setColour("#4a235a")} }; Blockly.html['fontawesome'] = function (block) { - return ''; + return '\n'; }; // Body tag Blockly.Blocks['body'] = { @@ -164,7 +164,7 @@ Blockly.Blocks['body'] = { } ], "previousStatement": "document", - "colour": 210 + "colour": "#4a235a" }); } }; @@ -200,7 +200,7 @@ Blockly.Blocks['button'] = { Blockly.html['button'] = function (block) { var statements_content = Blockly.html.statementToCode(block, 'content'); var block_modifier = Blockly.html.statementToCode(block, 'modifier', Blockly.html.ORDER_ATOMIC); - var code = '\n' + statements_content + '\n'; + var code = '\n' + statements_content + '\n'; return code; }; // Icon tag @@ -223,7 +223,7 @@ Blockly.Blocks['icon'] = { }; Blockly.html['icon'] = function (block) { var text_content = block.getFieldValue('content'); - var code = '\n'; + var code = ''; return code; }; // Divider tag @@ -256,7 +256,7 @@ Blockly.Blocks['divider'] = { "html", "form" ], - "colour": 210 + "colour": "#4a235a" }); } }; @@ -273,7 +273,7 @@ Blockly.Blocks['linebreak'] = { "message0": '
', "previousStatement": "html", "nextStatement": "html", - "colour": 210 + "colour": "#4a235a" }); } }; @@ -294,7 +294,7 @@ Blockly.Blocks['hline'] = { ], "previousStatement": "html", "nextStatement": "html", - "colour": 210 + "colour": "#4a235a" }); } }; @@ -418,7 +418,7 @@ Blockly.Blocks['emptytext'] = { }; Blockly.html['emptytext'] = function (block) { var text_content = block.getFieldValue('content'); - return '\n' + looseEscape(text_content) + '\n'; + return looseEscape(text_content) }; // Text modifier Blockly.Blocks['textmod'] = { @@ -537,7 +537,7 @@ Blockly.Blocks['paragraph'] = { Blockly.html['paragraph'] = function (block) { var statements_content = Blockly.html.statementToCode(block, 'content'); var block_modifier = Blockly.html.statementToCode(block, 'modifier'); - return '' + statements_content + '

\n'; + return '\n' + statements_content + '\n

\n'; }; // Header tag Blockly.Blocks['header'] = { @@ -635,7 +635,7 @@ Blockly.html['link'] = function (block) { if (isNewTabUrl(bareLink)) { target = ' target="_blank"'; } - return '' + text + '\n'; + return '\n' + text + '\n'; }; // Span tag Blockly.Blocks['span'] = { @@ -663,7 +663,7 @@ Blockly.Blocks['span'] = { Blockly.html['span'] = function (block) { var content = Blockly.html.statementToCode(block, 'content'); var block_modifier = Blockly.html.statementToCode(block, 'modifier', Blockly.html.ORDER_ATOMIC); - return '' + content + ''; + return '\n' + content + '\n'; }; //////////////////////// Table //////////////////////// // Table tag @@ -890,10 +890,6 @@ Blockly.Blocks['input'] = { "date", "date" ], - [ - "datetime-local", - "datetime-local" - ], [ "email", "email" @@ -902,10 +898,6 @@ Blockly.Blocks['input'] = { "hidden", "hidden" ], - [ - "month", - "month" - ], [ "number", "number" @@ -929,10 +921,6 @@ Blockly.Blocks['input'] = { [ "time", "time" - ], - [ - "week", - "week" ] ] }, diff --git a/www/ffau.html b/www/ffau.html index cb292e47..501c6fac 100644 --- a/www/ffau.html +++ b/www/ffau.html @@ -83,7 +83,7 @@
- + diff --git a/www/media/lamadrama.mp4 b/www/media/lamadrama.mp4 new file mode 100644 index 00000000..e38135f3 Binary files /dev/null and b/www/media/lamadrama.mp4 differ