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

moved ROSBag pannel on top of display

Browse Source
This commit is contained in:
Glen Turner
2015-07-01 12:14:16 -07:00
parent df8c8da618
commit df0a745522
1 changed files with 37 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
index.html
View File

@@ -32,36 +32,21 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
<script>
$(function(){
$("#includedContent").load("robot_display.html");
$("#includedContent").load("robot_display/robot_display.html");
});
</script>
<script type="text/javascript" src="robot_display/js/ros_scripts.js"></script>
<script type="text/javascript" src="robot_display/js/update_guis.js"></script>
</head>
<body>
<div class="container">
<div id="jumbotronTitle" class="jumbotron">
<h1>Example GUI</h1>
<h1>ROS Display</h1>
</div>
<ul id="tabs" class="nav nav-pills" data-tabs="tabs" >
<li class="active">
<a href="#RobotInfo" data-toggle="tab">
Robot Display
</a>
</li>
<li> <a href="#rosbridgeconnection" data-toggle="tab">
ROS Bridge Connection
<span id="rosbridgeconnection_badge" class="badge">
Not Connected
</span></a></li>
</ul>
<div id="my-tab-content" class="tab-content">
<div class="tab-pane active" id="RobotInfo">
<!-- ##################################### ROS BAG PANEL ######################################### -->
<!-- ROS Bag Panel -->
<div class="panel panel-default">
@@ -90,6 +75,25 @@ Tutorials can be found here: http://www.w3schools.com/bootstrap/default.asp
</div>
<!-- ##################################### END ROS BAG PANEL ######################################### -->
<ul id="tabs" class="nav nav-pills" data-tabs="tabs" >
<li class="active">
<a href="#DataDisplay" data-toggle="tab">
Data Display
</a>
</li>
<li> <a href="#rosbridgeconnection" data-toggle="tab">
ROS Bridge Connection
<span id="rosbridgeconnection_badge" class="badge">
Not Connected
</span></a></li>
</ul>
<div id="my-tab-content" class="tab-content">
<div class="tab-pane active" id="DataDisplay">
<!-- ##################################### ROBOT DISPLAY PANEL ######################################### -->
<div id="includedContent"></div>
<!-- ##################################### END DISPLAY PANEL ######################################### -->