ADAM / AIAHTML5

Commit 2b96c500bf27fef5b1199d6c00161385feec809c

Authored by Nikita Kulshreshtha
2 parents f4b355e2 3ebe3b56

Merge branch 'colorinannotation' into Develop

Inline Side-by-side
Showing 2 changed files with 12 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @2b96c50
... ... @@ -418,9 +418,13 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
418 418 document.getElementById('modeleditstyle').style.display = "none";
419 419  
420 420 $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
  421 + $("#shapeStyleDiv").parent().css("opacity", $rootScope.shapestyleOpacity);
421 422 $rootScope.shapestyleFillColor = $("#" + id).css('background-color');
  423 + $("#shapeStyleDiv").css("background-color", $rootScope.shapestyleFillColor);
422 424 $rootScope.shapestyleborderColor = $("#" + id).parent().css("border-top-color");
  425 + $("#shapeStyleDiv").parent().css("border-color", $rootScope.shapestyleborderColor);
423 426 $rootScope.shapestyleborderWidthSeparatingPixel = $("#" + id).parent().css("border-top-width");
  427 + $("#shapeStyleDiv").parent().css("border-width", $rootScope.shapestyleborderWidthSeparatingPixel);
424 428 var pixelSeparation = $rootScope.shapestyleborderWidthSeparatingPixel;
425 429 var intPart = pixelSeparation.split("p");
426 430  
... ...
400-SOURCECODE/AIAHTML5.Web/index.html
  View file @2b96c50
... ... @@ -504,12 +504,16 @@
504 504 </div>
505 505 </div>
506 506 </div>
507   - <div class="well-popup well">
  507 + <div class="well-popup well blankshapediv">
508 508 <!--#7931-->
509   -
  509 +
510 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 517 </div>
514 518 <div class="well well-popup">
515 519 <div class="" role="group" aria-label="...">
... ...