senaduka/old-lab_ui
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

moved files around to make it more user friendly

Browse Source
This commit is contained in:
GLEN TURNER (8GT6)
2015-06-01 09:12:32 -04:00
parent dc267a4606
commit 9e263201a3
4 changed files with 55 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
index.html
View File

@@ -19,7 +19,7 @@
<script>
$(function(){
$("#RobotInfo").load("RobotDisplayPanel.html");
$("#RobotInfo").load("ProjectFiles/HTML/RobotDisplayPanel.html");
});
</script>
@@ -27,15 +27,15 @@
<script src="include/js/roslib.js"></script>
<script type="text/javascript" src="include/js/roslib.min.js"></script>
<script type="text/javascript" src="include/js/ros_scripts.js"></script>
<script type="text/javascript" src="include/js/update_guis.js"></script>
<script type="text/javascript" src="ProjectFiles/js/ros_scripts.js"></script>
<script type="text/javascript" src="ProjectFiles/js/update_guis.js"></script>
<audio id="audio" src="audio/beep-04.mp3" autostart="false" ></audio>
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="import" href="RobotDisplayPanel.html">
<link rel="import" href="ProjectFiles/HTML/RobotDisplayPanel.html">
@@ -84,15 +84,15 @@
<div class="col-sm-6">
<input type="text" class="form-control" id="ConnectionIPInput" value="No IP Address yet"/>
<script type="text/javascript">
document.getElementById("ConnectionIPInput").value = ros.connectionName;
</script>
</div>
<div class="col-sm-2">
<button id="ConnectionButton" type="button" onclick="ros.attemptConnection()">
Connect
</button>
<script type="text/javascript">
document.getElementById("ConnectionIPInput").value = ros.connectionName;
</script>
</div>
</div>
@@ -100,7 +100,6 @@
</div>
</div>
<br>
<div class="panel panel-default">
<div class="panel-heading">
ROS Topics
@@ -112,6 +111,19 @@
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
ROS Nodes
</div>
<div class="panel-body">
<div class="col-sm-1" id="ROSNodes">
N/A
</div>
</div>
</div>
</div>
</div>
</div>