Skip to content

Commit 9363640

Browse files
previprevi
committed
-
1 parent b6bd867 commit 9363640

File tree

8 files changed

+10
-3
lines changed

8 files changed

+10
-3
lines changed

‎coderbot.cfg

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
{"move_tr_speed": "75", "move_fw_elapse": "1.5", "show_page_program": "true", "load_at_start": "", "move_tr_elapse": "1", "sound_start": "$startup.mp3", "sound_stop": "$shutdown.mp3", "camera_exposure_mode": "auto", "prog_video_rec": "true", "show_control_move_commands": "true", "prog_level": "basic_move", "prog_scrollbars": "true", "ctrl_fw_speed": "100", "move_fw_speed": "100", "sound_shutter": "$shutter.mp3", "show_page_prefs": "true", "prog_maxblocks": "-1", "ctrl_hud_image": "coderbot_hud_2.png", "move_motor_mode": "dc", "ctrl_fw_elapse": "-1", "ctrl_tr_elapse": "-1", "show_page_control": "true", "ctrl_tr_speed": "80"}
1+
{"move_tr_speed": "75", "move_fw_elapse": "1.5", "show_page_program": "true", "load_at_start": "", "move_tr_elapse": "1", "sound_start": "$startup.mp3", "sound_stop": "$shutdown.mp3", "camera_exposure_mode": "auto", "prog_video_rec": "true", "show_control_move_commands": "true", "prog_level": "basic_move", "prog_scrollbars": "true", "ctrl_fw_speed": "100", "move_fw_speed": "100", "sound_shutter": "$shutter.mp3", "show_page_prefs": "true", "prog_maxblocks": "5", "ctrl_hud_image": "coderbot_hud_2.png", "move_motor_mode": "dc", "ctrl_fw_elapse": "-1", "ctrl_tr_elapse": "-1", "show_page_control": "true", "ctrl_tr_speed": "80"}

‎data/program_00-ufoprova1.data

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"dom_code": "<xml xmlns=\"http://www.w3.org/1999/xhtml\"><block type=\"coderbot_turnLeft\" id=\"11\" x=\"326\" y=\"10\"><next><block type=\"coderbot_turnLeft\" id=\"12\"><next><block type=\"coderbot_moveForward\" id=\"13\"><next><block type=\"coderbot_moveForward\" id=\"14\"><next><block type=\"coderbot_moveForward\" id=\"15\"></block></next></block></next></block></next></block></next></block></xml>", "code": "get_bot().left(speed=75, elapse=1)\nget_bot().left(speed=75, elapse=1)\nget_bot().forward(speed=100, elapse=1.5)\nget_bot().forward(speed=100, elapse=1.5)\nget_bot().forward(speed=100, elapse=1.5)\n", "name": "00-ufoprova1"}

‎data/program_i6alieni-prova1.data

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"dom_code": "<xml xmlns=\"http://www.w3.org/1999/xhtml\"><block type=\"coderbot_turnRight\" id=\"5\" x=\"185\" y=\"26\"><next><block type=\"coderbot_moveForward\" id=\"6\"><next><block type=\"coderbot_moveForward\" id=\"8\"><next><block type=\"coderbot_turnLeft\" id=\"9\"><next><block type=\"coderbot_moveForward\" id=\"10\"></block></next></block></next></block></next></block></next></block></xml>", "code": "get_bot().right(speed=75, elapse=1)\nget_bot().forward(speed=100, elapse=1.5)\nget_bot().forward(speed=100, elapse=1.5)\nget_bot().left(speed=75, elapse=1)\nget_bot().forward(speed=100, elapse=1.5)\n", "name": "i6alieni-prova1"}

‎data/program_scienziatistellari1.data

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"dom_code": "<xml xmlns=\"http://www.w3.org/1999/xhtml\"><block type=\"coderbot_moveBackward\" id=\"16\" x=\"203\" y=\"34\"><next><block type=\"coderbot_turnRight\" id=\"17\"><next><block type=\"coderbot_moveForward\" id=\"18\"><next><block type=\"coderbot_moveForward\" id=\"19\"><next><block type=\"coderbot_turnLeft\" id=\"20\"></block></next></block></next></block></next></block></next></block></xml>", "code": "get_bot().backward(speed=100, elapse=1.5)\nget_bot().right(speed=75, elapse=1)\nget_bot().forward(speed=100, elapse=1.5)\nget_bot().forward(speed=100, elapse=1.5)\nget_bot().left(speed=75, elapse=1)\n", "name": "scienziatistellari1"}

‎data/program_thespaceguys-prova1.data

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"dom_code": "<xml xmlns=\"http://www.w3.org/1999/xhtml\"><block type=\"coderbot_moveForward\" id=\"8\" x=\"294\" y=\"43\"><next><block type=\"coderbot_moveForward\" id=\"6\"><next><block type=\"coderbot_turnRight\" id=\"5\"><next><block type=\"coderbot_turnRight\" id=\"9\"><next><block type=\"coderbot_moveForward\" id=\"10\"></block></next></block></next></block></next></block></next></block></xml>", "code": "get_bot().forward(speed=100, elapse=1.5)\nget_bot().forward(speed=100, elapse=1.5)\nget_bot().right(speed=75, elapse=1)\nget_bot().right(speed=75, elapse=1)\nget_bot().forward(speed=100, elapse=1.5)\n", "name": "thespaceguys-prova1"}

‎static/js/control.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -120,7 +120,7 @@ $(document).on( "pageshow", '#page-photos', function( event ) {
120120
var media_name = media.substring(0, media.indexOf('.'));
121121
var media_thumb = media_name + '_thumb.jpg';
122122
var media_type = media.indexOf('jpg') > 0 ? 'photo' : 'video';
123-
media_list.append('<li class="ui-li-has-thumb"><a href="#popup-' + media_type + '" data-rel="popup" data-position-to="window" class="ui-btn ui-corner-all ui-shadow ui-btn-inline"><img class="ui-li-thumb" data-src="' + media + '" src="http://github.com/photos/' + media_thumb + '"><div class="ui-content-hud" style="position:absolute;"></div><p class="p_photo_cmd" style="display:none;"><button class="ui-btn ui-btn-inline ui-btn-mini ui-icon-delete ui-btn-icon-left b_photo_delete">' + BotMessages.DeletePhoto + '</button></p></a></li>');
123+
media_list.append('<li class="ui-li-has-thumb"><a href="#popup-' + media_type + '" data-rel="popup" data-position-to="window" class="ui-btn ui-corner-all ui-shadow ui-btn-inline"><img class="ui-li-thumb" data-src="' + media + '" src="http://github.com/photos/' + media_thumb + '"><div class="ui-content-hud" style="position:absolute;"></div><p class="p_photo_cmd" style="display:none;"><span>' + media_name + '</span><br/><button class="ui-btn ui-btn-inline ui-mini ui-icon-delete ui-btn-icon-left b_photo_delete">' + BotMessages.DeletePhoto + '</button></p></a></li>');
124124
}
125125
$('li.ui-li-has-thumb').hover( function( event ) {
126126
$(this).find('.p_photo_cmd').show();

‎static/js/program.js

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ $(document).on( "pagecreate", '#page-program', function( event ) {
6060
}
6161
}
6262
prog.name = name;
63+
$('#id_prog_name').text("[ " + prog.name + " ]");
6364
}
6465

6566
function loadProg() {
@@ -85,6 +86,7 @@ $(document).on( "pagecreate", '#page-program', function( event ) {
8586
var xml = Blockly.Xml.textToDom(data);
8687
Blockly.Xml.domToWorkspace(Blockly.mainWorkspace, xml);
8788
$.mobile.loading("hide");
89+
$('#id_prog_name').text("[ " + prog.name + " ]");
8890
}});
8991
} catch (e) {
9092
alert(e);
@@ -122,6 +124,7 @@ $(document).on( "pagecreate", '#page-program', function( event ) {
122124
}
123125
}
124126
prog.name = name;
127+
$('#id_prog_name').text("[ " + prog.name + " ]");
125128
saveProg();
126129
}
127130

‎templates/program.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ <h1>CoderBot</h1>
66
<div data-role="navbar">
77
<ul>
88
{%if config.show_page_control%}<li><a href="#page-control">{% trans %}Control{% endtrans %}</a></li>{%endif%}
9-
<li><a href="#page-program">{% trans %}Program{% endtrans %}</a></li>
9+
<li><a href="#page-program">{% trans %}Program{% endtrans %}<span style="margin-left:10pt;" id="id_prog_name"></span></a></li>
1010
</ul>
1111
</div><!-- /navbar -->
1212
</div>

0 commit comments

Comments
 (0)