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

fixed alignment of l/r panels

Browse Source
This commit is contained in:
Rohit Nandwani
2019-06-13 19:01:02 -04:00
parent 30f2460791
commit 52e8c2ff6c
2 changed files with 521 additions and 522 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,7 +1,7 @@
<div id="coordinator"> <div id="coordinator">
<div class="col-md-6"> <div class="col-md-6">
<div class="hand-panel panel panel-default"> <div class="hand-panel hand-panel-left panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
<i class="far fa-2x fa-hand-point-left"></i> <i class="far fa-2x fa-hand-point-left"></i>
Left Arm Left Arm
@@ -179,25 +179,25 @@
<div class="control-container col-md-6"> <div class="control-container col-md-6">
<div class="control-card-six control-card panel panel-default"> <div class="control-card-six control-card panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
Select Operation Mode Operation Mode
<i class="fas fa-info-circle"></i> <i class="fas fa-info-circle"></i>
</div> </div>
<div class="panel-body text-center"> <div class="panel-body text-center">
<div class="button-area"> <div class="button-area">
<button id="left_teachingModeButton" type="button" onclick="triggerService('/left/aescape/mode/activateTeachingController')" class="btn btn-primary col-md-4"> <button id="left_teachingModeButton" type="button" onclick="triggerService('/left/aescape/mode/activateTeachingController')" class="btn btn-primary col-md-4">
Teaching Mode Teaching
</button> </button>
<button id="left_executionModeButton" type="button" onclick="triggerService('/left/aescape/mode/activateExecutionController')" class="btn btn-primary col-md-4"> <button id="left_executionModeButton" type="button" onclick="triggerService('/left/aescape/mode/activateExecutionController')" class="btn btn-primary col-md-4">
Massage Mode Massage
</button> </button>
<button id="left_readyModeButton" type="button" onclick="triggerService('/left/aescape/mode/activateReadyController')" class="btn btn-primary col-md-4"> <button id="left_readyModeButton" type="button" onclick="triggerService('/left/aescape/mode/activateReadyController')" class="btn btn-primary col-md-4">
Ready Mode Ready
</button> </button>
<button id="left_standbyModeButton" type="button" onclick="triggerService('/left/aescape/mode/activateStandbyController')" class="btn btn-primary col-md-4"> <button id="left_standbyModeButton" type="button" onclick="triggerService('/left/aescape/mode/activateStandbyController')" class="btn btn-primary col-md-4">
Standby Mode Standby
</button> </button>
<button id="left_stoppedModeButton" type="button" onclick="triggerService('/left/aescape/mode/stopControllers')" class="btn btn-primary col-md-4"> <button id="left_stoppedModeButton" type="button" onclick="triggerService('/left/aescape/mode/stopControllers')" class="btn btn-primary col-md-4">
Stopped Mode Stopped
</button> </button>
</div> </div>
<!-- <!--
@@ -345,7 +345,7 @@
</div> </div>
<div class="col-md-6"> <div class="col-md-6">
<div class="hand-panel panel panel-default"> <div class="hand-panel hand-panel-right panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
Right Arm Right Arm
<i class="far fa-2x fa-hand-point-right"></i> <i class="far fa-2x fa-hand-point-right"></i>
@@ -490,25 +490,25 @@
<div class="control-container col-md-6"> <div class="control-container col-md-6">
<div class="control-card-six control-card panel panel-default"> <div class="control-card-six control-card panel panel-default">
<div class="panel-heading"> <div class="panel-heading">
Select Operation Mode Operation Mode
<i class="fas fa-info-circle"></i> <i class="fas fa-info-circle"></i>
</div> </div>
<div class="panel-body text-center"> <div class="panel-body text-center">
<div class="button-area"> <div class="button-area">
<button id="right_teachingModeButton" type="button" onclick="triggerService('/right/aescape/mode/activateTeachingController')" class="btn btn-primary col-md-4"> <button id="right_teachingModeButton" type="button" onclick="triggerService('/right/aescape/mode/activateTeachingController')" class="btn btn-primary col-md-4">
Teaching Mode Teaching
</button> </button>
<button id="right_executionModeButton" type="button" onclick="triggerService('/right/aescape/mode/activateExecutionController')" class="btn btn-primary col-md-4"> <button id="right_executionModeButton" type="button" onclick="triggerService('/right/aescape/mode/activateExecutionController')" class="btn btn-primary col-md-4">
Massage Mode Massage
</button> </button>
<button id="right_readyModeButton" type="button" onclick="triggerService('/right/aescape/mode/activateReadyController')" class="btn btn-primary col-md-4"> <button id="right_readyModeButton" type="button" onclick="triggerService('/right/aescape/mode/activateReadyController')" class="btn btn-primary col-md-4">
Ready Mode Ready
</button> </button>
<button id="right_standbyModeButton" type="button" onclick="triggerService('/right/aescape/mode/activateStandbyController')" class="btn btn-primary col-md-4"> <button id="right_standbyModeButton" type="button" onclick="triggerService('/right/aescape/mode/activateStandbyController')" class="btn btn-primary col-md-4">
Standby Mode Standby
</button> </button>
<button id="right_stoppedModeButton" type="button" onclick="triggerService('/right/aescape/mode/stopControllers')" class="btn btn-primary col-md-4"> <button id="right_stoppedModeButton" type="button" onclick="triggerService('/right/aescape/mode/stopControllers')" class="btn btn-primary col-md-4">
Stopped Mode Stopped
</button> </button>
</div> </div>
</div> </div>

7
client/app/components/coordinator/js/update_guis.js
View File

@@ -45,10 +45,9 @@ setTimeout(function(){
}, 1000); }, 1000);
setTimeout(function(){
document.querySelector('.hand-panel-right .status-bar').style.height = document.querySelector('.hand-panel-left .status-bar').offsetHeight + 20 + "px";
}, 100);