ADAM / AIAHTML5

Commit c538cb1a7a6811c7e155d0b894be2d52262a4cb8

Authored by Nikita Kulshreshtha
2 parents 613b1a7c 0b276ebf

Merge branch 'Bugs_v12' into Develop

Inline Side-by-side
Showing 1 changed file with 8 additions and 8 deletions
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @c538cb1
@@ -520,11 +520,11 @@ @@ -520,11 +520,11 @@
520 </div> 520 </div>
521 </div> 521 </div>
522 </div> 522 </div>
523 - <div class="well-popup well blankshapediv"> 523 + <div class="well-popup well blankshapediv" ng-mouseover="mouseMoveToolTip(200, 170, 120, 'Edit Style')" ng-mouseleave="mouseOutToolTip()">
524 <!--#7931--> 524 <!--#7931-->
525 525
526 <div id="edit-block" style="display: none; font-size: 13px;">Edit Shape Style</div> 526 <div id="edit-block" style="display: none; font-size: 13px;">Edit Shape Style</div>
527 - <div class="outlinediv"> 527 + <div class="outlinediv" ng-mouseover="mouseMoveToolTip(170, 170, 120, 'Edit Style')" ng-mouseleave="mouseOutToolTip()">
528 <div id="shapeStyleDiv" class="fullcolordiv" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()"> 528 <div id="shapeStyleDiv" class="fullcolordiv" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()">
529 529
530 </div> 530 </div>
@@ -534,21 +534,21 @@ @@ -534,21 +534,21 @@
534 <div class="well well-popup"> 534 <div class="well well-popup">
535 <div class="" role="group" aria-label="..."> 535 <div class="" role="group" aria-label="...">
536 <div> 536 <div>
537 - <a href="#canvasPaint" data-size="1" data-color="#fff" id="annotationpaintbrushsize" class="btn btn-primary btn-xs pull-left btn-annotation" role="button" data-toggle="tooltip" data-placement="top" title="Paint" style="margin-right:1%;" ng-click="paintBrush()"><i class="fa fa-paint-brush"></i></a>  
538 - <button type="button" class="btn btn-primary btn-xs pull-left btn-annotation" data-toggle="tooltip" data-placement="top" title="Erase" ng-click="EraseDrawing()"><i class="fa fa-eraser"></i></button>&nbsp; 537 + <a href="#canvasPaint" data-size="1" data-color="#fff" id="annotationpaintbrushsize" ng-mouseover="mouseMoveToolTip(270, 50, 120, 'Paint')" ng-mouseleave="mouseOutToolTip()" class="btn btn-primary btn-xs pull-left btn-annotation" role="button" data-placement="top" style="margin-right:1%;" ng-click="paintBrush()"><i class="fa fa-paint-brush"></i></a>
  538 + <button type="button" class="btn btn-primary btn-xs pull-left btn-annotation" data-placement="top" ng-click="EraseDrawing()" ng-mouseover="mouseMoveToolTip(270, 70, 120, 'Erase')" ng-mouseleave="mouseOutToolTip()"><i class="fa fa-eraser"></i></button>&nbsp;
539 <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;"> 539 <div style="width: 80px; margin: 0px 0px 0px 4px; display: inline-block;float:left;">
540 - <div style="width: 58px; float: left;"> 540 + <div style="width: 58px; float: left;" ng-mouseover="mouseMoveToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="mouseOutToolTip()">
541 <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="Brushsize(this)"> 541 <input type="text" id="btnBrushSize" class="form-control" value="1" style="height:32px;border-radius:0;" oninput="Brushsize(this)">
542 </div> 542 </div>
543 <div style="width: 22px; float: left;"> 543 <div style="width: 22px; float: left;">
544 <div style="width: 100%; float: left; height: 16px;"> 544 <div style="width: 100%; float: left; height: 16px;">
545 - <button type="button" id="btnBrushSizeIncrement" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;"> 545 + <button type="button" id="btnBrushSizeIncrement" ng-mouseover="mouseMoveToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="mouseOutToolTip()" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;">
546 546
547 <img style="width:10px;height:10px;" src="~/../content/images/DA/angle-up.png"> 547 <img style="width:10px;height:10px;" src="~/../content/images/DA/angle-up.png">
548 </button> 548 </button>
549 </div> 549 </div>
550 <div style="width: 100%; float: left; height: 16px;"> 550 <div style="width: 100%; float: left; height: 16px;">
551 - <button type="button" id="btnBrushSizeDecrease" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;"> 551 + <button type="button" id="btnBrushSizeDecrease" ng-mouseover="mouseMoveToolTip(270, 100, 120, 'Brush Size')" ng-mouseleave="mouseOutToolTip()" class="btn btn-default" style="padding:0 5px;border-radius:0;font-size: 10px;vertical-align:top;">
552 <img style="width:10px;height:10px;" src="~/../content/images/DA/angle-down.png"> 552 <img style="width:10px;height:10px;" src="~/../content/images/DA/angle-down.png">
553 </button> 553 </button>
554 </div> 554 </div>
@@ -557,7 +557,7 @@ @@ -557,7 +557,7 @@
557 </div> 557 </div>
558 558
559 <div class="pull-left" style="width:45%; margin-left:2%;margin-top:5px;"> 559 <div class="pull-left" style="width:45%; margin-left:2%;margin-top:5px;">
560 - <div id="slider-range-min-2"></div> 560 + <div id="slider-range-min-2" ng-mouseover="mouseMoveToolTip(270, 170, 120, 'Brush Size')" ng-mouseleave="mouseOutToolTip()"></div>
561 </div> 561 </div>
562 <div class="clearfix"></div> 562 <div class="clearfix"></div>
563 </div> 563 </div>