opensensemap/blockly-app
1
0
Fork 0
mirror of https://github.com/sensebox/blockly-app synced 2025-04-19 16:07:33 +02:00
Code Issues Releases Wiki Activity

Merge branch 'development_yannick'

Browse source
This commit is contained in:
Norwin 2018-12-10 17:48:30 +01:00
commit 0257ce8576
1 changed files with 61 additions and 67 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
src/assets/blockly.html
View file

@ -96,7 +96,7 @@
<!-- Sidebar navigation --> <!-- Sidebar navigation -->
<ul id="slide-out" class="side-nav hidden"> <ul id="slide-out" class="side-nav hidden">
<li class="logo"><img src="img/sidenav_header.png" alt="Ardublockly block image"></li> <li class="logo"><img src="blockly/ardublockly/img/sidenav_header.png" alt="Ardublockly block image"></li>
<li class="no-padding"> <li class="no-padding">
<ul> <ul>
<li id="menu_load"><a href="#"><span class="translatable_open">Open</span><i class="mdi-file-file-upload left"></i></a></li> <li id="menu_load"><a href="#"><span class="translatable_open">Open</span><i class="mdi-file-file-upload left"></i></a></li>
@ -125,9 +125,6 @@
</ul> </ul>
<!-- Content --> <!-- Content -->
<div class="container">
<div class="row">
<div class="col s12 m12 l8" style="position:relative">
<!-- Toolbox visibility button --> <!-- Toolbox visibility button -->
<a id="button_toggle_toolbox" class="waves-effect waves-light btn-flat button_toggle_toolbox_off hidden" style="display: none"><i id="button_toggle_toolbox_icon" class="mdi-action-visibility-off"></i></a> <a id="button_toggle_toolbox" class="waves-effect waves-light btn-flat button_toggle_toolbox_off hidden" style="display: none"><i id="button_toggle_toolbox_icon" class="mdi-action-visibility-off"></i></a>
<!-- Arduino IDE action buttons --> <!-- Arduino IDE action buttons -->
@ -183,13 +180,13 @@
</div> </div>
</div> </div>
<!-- Blockly Panel --> <!-- Blockly Panel -->
<div class="card-panel white resize" style="padding: 0"> <div class="card-panel white" style="padding: 0">
<div id="blocks_panel" class="content blocks_panel_large"> <div id="blocks_panel" class="content blocks_panel_large">
<div id="content_blocks" class="content z-depth-1"></div> <div id="content_blocks" class="content z-depth-1"></div>
</div> </div>
</div> </div>
</div>
<div class="col s12 m12 l4 hidden"> <div class="hidden">
<ul class="collapsible z-depth-1" data-collapsible="accordion"> <ul class="collapsible z-depth-1" data-collapsible="accordion">
<li> <li>
<div class="collapsible-header active"> <div class="collapsible-header active">
@ -212,8 +209,6 @@
</li> </li>
</ul> </ul>
</div> </div>
</div>
</div>
<!-- IDE Output content --> <!-- IDE Output content -->
<div class="ide_output_wrapper hidden"> <div class="ide_output_wrapper hidden">
@ -229,11 +224,10 @@
</li> </li>
</ul> </ul>
</div> </div>
<div id="ide_output_spacer"></div>
<!-- Settings: Displayed as a Materialize Modal --> <!-- Settings: Displayed as a Materialize Modal -->
<div id="settings_dialog" class="modal modal-fixed-footer"> <div id="settings_dialog" class="modal modal-fixed-footer hidden">
<div class="modal-content"> <div class="modal-content hidden">
<h4><span class="translatable_settings">Settings</span></h4> <h4><span class="translatable_settings">Settings</span></h4>
<div class="modal_section online"> <div class="modal_section online">
<label><span class="translatable_compilerLocation">Compiler Location</span>:</label> <label><span class="translatable_compilerLocation">Compiler Location</span>:</label>
@ -279,7 +273,7 @@
</div> </div>
<!-- Select Additional Blocks menu --> <!-- Select Additional Blocks menu -->
<div id="blocks_menu" class="modal modal-fixed-footer"> <div id="blocks_menu" class="modal modal-fixed-footer hidden">
<div class="modal-content"> <div class="modal-content">
<div> <div>
<h4><span class="translatable_addBlocksTitle">Additional Blocks</span></h4> <h4><span class="translatable_addBlocksTitle">Additional Blocks</span></h4>
@ -292,7 +286,7 @@
</div> </div>
<!-- General Alert: Content is loaded using JavaScript to display alerts --> <!-- General Alert: Content is loaded using JavaScript to display alerts -->
<div id="gen_alert" class="modal modal_small modal-fixed-footer"> <div id="gen_alert" class="modal modal_small modal-fixed-footer hidden">
<div class="modal-content"> <div class="modal-content">
<h5 id="gen_alert_title">Empty Alert</h4> <h5 id="gen_alert_title">Empty Alert</h4>
<p><span id="gen_alert_body">Empty alert text</span></p> <p><span id="gen_alert_body">Empty alert text</span></p>
@ -304,7 +298,7 @@
</div> </div>
<!-- Prompt: Content is loaded using JavaScript to display input prompt --> <!-- Prompt: Content is loaded using JavaScript to display input prompt -->
<div id="gen_prompt" class="modal modal_small modal-fixed-footer"> <div id="gen_prompt" class="modal modal_small modal-fixed-footer hidden">
<div class="modal-content"> <div class="modal-content">
<p><span id="gen_prompt_message">Prompt message</span></p> <p><span id="gen_prompt_message">Prompt message</span></p>
<p><input id="gen_prompt_input" value="test" /></p> <p><input id="gen_prompt_input" value="test" /></p>