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

Moved files around. ROS Display panel html is now back in the index file

Browse Source
This commit is contained in:
GLEN TURNER (8GT6)
2015-06-01 11:50:07 -04:00
parent cdd26f1427
commit 6d395c2bbe
7 changed files with 93 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
index.html
View File

@@ -17,12 +17,6 @@
<script src="include/js/jquery.min.js"></script>
<script src="include/js/bootstrap.min.js"></script>
<script>
$(function(){
$("#RobotInfo").load("ProjectFiles/HTML/RobotDisplayPanel.html");
});
</script>
<script src="include/js/roslib.js"></script>
<script type="text/javascript" src="include/js/roslib.min.js"></script>
@@ -35,15 +29,18 @@
<meta name="viewport" content="width=device-width, initial-scale=1">
<link rel="import" href="ProjectFiles/HTML/RobotDisplayPanel.html">
<!--<script>
$(function(){
$("#RobotInfo").load("ProjectFiles/HTML/RobotDisplayPanel.html");});
</script>
<link rel="import" href="ProjectFiles/HTML/RobotDisplayPanel.html"> -->
</head>
<body>
<div class="container">
<div class="jumbotron">
<div id="jumbotronTitle" class="jumbotron">
<h1>Example GUI</h1>
</div>
@@ -64,12 +61,59 @@
<div class="tab-pane active" id="RobotInfo">
<!-- !!!!!!!!!!!!!!!!!!!!!VERY IMPORTANT !!!!!!!!!!!!!!!!! -->
<!-- The contents of RobotDisplayPannel are goint to be pasted here -->
<link rel="stylesheet" href="../../include/css/bootstrap.min.css">
<script src="../../include/js/jquery.min.js"></script>
<script src="../../include/js/bootstrap.min.js"></script>
<!-- ##################################### ROS BAG PANEL ######################################### -->
<!-- ROS Bag Panel -->
<div class="panel panel-default">
<div class="panel-heading">
ROS Bag
</div>
<div class="panel-body">
<div class="row">
<button id="ConnectionButton" type="button" >
Connect
</button>
</div>
</div>
</div>
<div class="panel panel-default">
<div class="panel-heading">
Example Pannel Heading
</div>
<div class="panel-body">
<div class="row">
<label class="col-sm-2"> Bar Title </label>
<div class="progress">
<div id="progressBar1" class="progress-bar progress-bar-striped active" role="progressbar"
aria-valuenow="40" aria-valuemin="0" aria-valuemax="100" style="width:100%" >
No data recieved yet. </div>
</div>
</div>
</div>
<div class="row">
<label class="col-sm-2"> Up Time (s): </label>
<div class="col-sm-1" id="UpTime">
N/A
</div>
</div>
</div>
</div>
<!-- ##################################### END ROS BAG PANEL ######################################### -->
<div class="tab-pane" id="rosbridgeconnection">
@@ -129,6 +173,5 @@
</div>
</div>
</body>
</html>