Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Display elapsed time #31

Merged
merged 4 commits into from
Jun 25, 2015
Merged

Display elapsed time #31

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
7f8fc46
delete config ui and update battery status with bootstrap3 thema
dwlee Jun 24, 2015
1391f46
update delivery status of error and delete unused gocart part
dwlee Jun 24, 2015
b8821ab
separate pickup and vm UI
dwlee Jun 24, 2015
30a58c4
separation of pickup and vm order list ui and robot status position c…
dwlee Jun 24, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 12 additions & 7 deletions concert_delivery_monitor/www/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,11 +50,6 @@
</p>
</div>
</div>
<p class='oa-ui-connection-info rosbridge-ip-info'>ws://localhost:9090</p>
<p class='oa-ui-connection-info rosbridge-connection-info'>connection</p>
</div>
<div class='container-fluid config-layer '>
<h1>Config</h1>
</div>

<!-- Visualizer -->
Expand All @@ -64,12 +59,22 @@ <h1>Config</h1>
<div class="span3 " id="middle-left" >
<div class="well order-list sidebar-nav" id="nav-wrapper">
<center>
<h3> Orders </h3>
<h3> Pickup Orders </h3>
</center>
<hr/>
<ul id="nav-orders">
<ul id="nav-pickup-orders">
</ul>
</div><!-- well -->
<div class="well order-list sidebar-nav" id="nav-wrapper">

<center>
<h3> VM Orders </h3>
</center>
<hr/>
<ul id="nav-vm-orders">
</ul>

</div><!-- well -->
</div>
</div>
</div>
Expand Down
Loading