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

Merge remote-tracking branch 'origin/v2' into v2

Browse Source
This commit is contained in:
Matt DiCicco
2019-07-08 10:45:50 -04:00
parent b250ab04ec 3eb37cc14e
commit e8a986b7ea
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
client/app/components/coordinator/coordinator.html
View File

@@ -302,7 +302,7 @@
</div> </div>
</div> </div>
--> -->
<div class="control-container col-md-6"> <div class="control-container col-md-10 col-md-offset-2">
<div class="control-card panel panel-default"> <div class="control-card panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
Teaching Mode Operations Teaching Mode Operations
@@ -332,8 +332,8 @@
<select id="teachBagTags" placeholder="Tags"></select> <select id="teachBagTags" placeholder="Tags"></select>
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<i class="fas fa-check-circle" onclick="hideTaggingOptions('teach', true)"></i> <button class="btn btn-primary" onclick="hideTaggingOptions('teach', true)">Tag</button>
<i class="fas fa-times-circle" onclick="hideTaggingOptions('teach', false)"></i> <button class="btn btn-primary" onclick="hideTaggingOptions('teach', false)">Cancel</button>
</div> </div>
</div> </div>
<div id="teachTagError" class="col-md-10 error"></div> <div id="teachTagError" class="col-md-10 error"></div>
@@ -341,7 +341,7 @@
</div> </div>
</div> </div>
</div> </div>
<div class="control-container col-md-6"> <div class="control-container col-md-10">
<div class="control-card panel panel-default execution-control"> <div class="control-card panel panel-default execution-control">
<div class="panel-heading"> <div class="panel-heading">
Play Mode Operations Play Mode Operations
@@ -384,8 +384,8 @@
<select id="playBagTags" placeholder="Tags"></select> <select id="playBagTags" placeholder="Tags"></select>
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<i class="fas fa-check-circle" onclick="hideTaggingOptions('play', true)"></i> <button class="btn btn-primary" onclick="hideTaggingOptions('play', true)">Tag</button>
<i class="fas fa-times-circle" onclick="hideTaggingOptions('play', false)"></i> <button class="btn btn-primary" onclick="hideTaggingOptions('play', false)">Cancel</button>
</div> </div>
</div> </div>
<div class="slider-options loading-options" id="loadBags"> <div class="slider-options loading-options" id="loadBags">
@@ -400,8 +400,8 @@
</div> </div>
<div class="col-md-2"> <div class="col-md-2">
<!-- <i class="fas fa-check-circle" onclick="hideLoadingOptions(true)"></i> --> <!-- <i class="fas fa-check-circle" onclick="hideLoadingOptions(true)"></i> -->
<button class="primary" onclick="hideLoadingOptions(true)">Load Bag</button> <button class="btn btn-primary" onclick="hideLoadingOptions(true)">Load</button>
<i class="fas fa-times-circle" onclick="hideLoadingOptions(false)"></i> <button class="btn btn-primary" onclick="hideLoadingOptions(false)">Cancel</button>
</div> </div>
</div> </div>
<div id="playTagError" class="col-md-10 error"></div> <div id="playTagError" class="col-md-10 error"></div>