changed name of ros_diaply to robot_display, fixed problem with conneciton button the ROS Bridge Connection tab

This commit is contained in:
Glen Turner
2015-06-18 19:20:01 -04:00
parent 4dc8796c44
commit 82196e461f
2 changed files with 51 additions and 54 deletions

View File

@@ -31,7 +31,7 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
<script> <script>
$(function(){ $(function(){
$("#includedContent").load("ros_display.html"); $("#includedContent").load("robot_display.html");
}); });
</script> </script>
@@ -101,8 +101,6 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
<div class="tab-pane" id="rosbridgeconnection"> <div class="tab-pane" id="rosbridgeconnection">
<div class="panel panel-default"> <div class="panel panel-default">
<div class="panel-body"> <div class="panel-body">
@@ -118,7 +116,7 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
<div class="input-group"> <div class="input-group">
<input type="text" id="ConnectionIPInput" class="form-control" placeholder="bag_filename" placeholder="No IP Address yet"> <input type="text" id="ConnectionIPInput" class="form-control" placeholder="bag_filename" placeholder="No IP Address yet">
<span class="input-group-btn"> <span class="input-group-btn">
<button id="ConnectionButton" type="button" onclick="ros.attemptConnection()" class=""btn btn-warning"> <button id="ConnectionButton" type="button" onclick="ros.attemptConnection()" class="btn btn-warning">
Connect Connect
<script type="text/javascript"> <script type="text/javascript">
document.getElementById("ConnectionIPInput").value = ros.connectionName; document.getElementById("ConnectionIPInput").value = ros.connectionName;
@@ -127,7 +125,6 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
</span> </span>
</div> </div>
</span> </span>
</div> </div>
</form> </form>
@@ -163,5 +160,5 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
</div> </div>
</div> </div>
</body> </body>
</html> </html>