ADAM / AIAHTML5

Commit fac07dcbf55f2c99c798b711c1175af59deefc09

Authored by unknown
2 parents 03d4dc6a 2b96c500

Merge branch 'Develop' of http://52.6.196.163/ADAM/AIAHTML5 into AnnotationLineDisplayed

Inline Side-by-side
Showing 2 changed files with 12 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @fac07dc
@@ -422,9 +422,13 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -422,9 +422,13 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
422 document.getElementById('modeleditstyle').style.display = "none"; 422 document.getElementById('modeleditstyle').style.display = "none";
423 423
424 $rootScope.shapestyleOpacity = $("#" + id).css('opacity'); 424 $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
  425 + $("#shapeStyleDiv").parent().css("opacity", $rootScope.shapestyleOpacity);
425 $rootScope.shapestyleFillColor = $("#" + id).css('background-color'); 426 $rootScope.shapestyleFillColor = $("#" + id).css('background-color');
  427 + $("#shapeStyleDiv").css("background-color", $rootScope.shapestyleFillColor);
426 $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color"); 428 $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color");
  429 + $("#shapeStyleDiv").parent().css("border-color", $rootScope.shapestyleborderColor);
427 $rootScope.shapestyleborderWidthSeparatingPixel = $("#" + id).parent().css("border-top-width"); 430 $rootScope.shapestyleborderWidthSeparatingPixel = $("#" + id).parent().css("border-top-width");
  431 + $("#shapeStyleDiv").parent().css("border-width", $rootScope.shapestyleborderWidthSeparatingPixel);
428 var pixelSeparation = $rootScope.shapestyleborderWidthSeparatingPixel; 432 var pixelSeparation = $rootScope.shapestyleborderWidthSeparatingPixel;
429 var intPart = pixelSeparation.split("p"); 433 var intPart = pixelSeparation.split("p");
430 434
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @fac07dc
@@ -504,12 +504,16 @@ @@ -504,12 +504,16 @@
504 </div> 504 </div>
505 </div> 505 </div>
506 </div> 506 </div>
507 - <div class="well-popup well"> 507 + <div class="well-popup well blankshapediv">
508 <!--#7931--> 508 <!--#7931-->
509 - 509 +
510 <div id="edit-block" style="display: none; font-size: 13px;">Edit Shape Style</div> 510 <div id="edit-block" style="display: none; font-size: 13px;">Edit Shape Style</div>
511 - <img id="OnEdtShape" src="content/images/blank-shape.jpg" alt="..." class="img-rounded img-responsive" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()">  
512 - 511 + <div class="outlinediv">
  512 + <div id="shapeStyleDiv" class="fullcolordiv" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()">
  513 +
  514 + </div>
  515 +
  516 + </div>
513 </div> 517 </div>
514 <div class="well well-popup"> 518 <div class="well well-popup">
515 <div class="" role="group" aria-label="..."> 519 <div class="" role="group" aria-label="...">