From f455b7bada62408c4361d67591ffca89c8823654 Mon Sep 17 00:00:00 2001
From: unknown <Ayush.Jain@NOIAYJAALL.indiaebix.com>
Date: Wed, 11 Jan 2017 13:27:13 +0530
Subject: [PATCH] DA > Annotation Toolbar > Default color "White" in Fill Option and "Black" in Outline Option is display in the below mention case.

---
 400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js           | 6 ++++++
 400-SOURCECODE/AIAHTML5.Web/index.html                                  | 8 ++++----
 400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css | 2 +-
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
index 032f92f..d6a1c41 100644
--- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
+++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
@@ -505,6 +505,12 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", 
             else {
                 document.getElementById('modelbackground').style.display = "block";
                 document.getElementById('modeleditstyle').style.display = "block";
+
+              //  alert(document.getElementById('outlinedivId').style.border);
+              //  alert(document.getElementById('imgOpacity').style.backgroundColor);
+                $('#editstylebackgroundcolor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", document.getElementById('imgOpacity').style.backgroundColor);
+                $('#outlineColor .minicolors >.minicolors-swatch > .minicolors-swatch-color').css("background-color", document.getElementById('outlinedivId').style.border);
+              
                 if ($('#modeleditstyle').css("display") == "block") { //Check if the modal is already showing
                     var previewOpacity = $('#imgOpacity').css("opacity");
                     $('#slider-range-min-4 div.ui-slider-range-min').css("width", (previewOpacity * 100) + "%");
diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html
index 43673bc..bf1940f 100644
--- a/400-SOURCECODE/AIAHTML5.Web/index.html
+++ b/400-SOURCECODE/AIAHTML5.Web/index.html
@@ -524,8 +524,8 @@
                                 <!--#7931-->
 
                                 <div id="edit-block" style="display: none; font-size: 13px;">Edit Shape Style</div>
-                                <div class="outlinediv" ng-mouseover="mouseMoveToolTip(170, 170, 120, 'Edit Style')" ng-mouseleave="mouseOutToolTip()">
-                                    <div id="shapeStyleDiv" class="fullcolordiv" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()">
+                                <div class="outlinediv" style="border: 1px solid #000000;" ng-mouseover="mouseMoveToolTip(170, 170, 120, 'Edit Style')" ng-mouseleave="mouseOutToolTip()">
+                                    <div id="shapeStyleDiv" style="background-color: #ffffff;" class="fullcolordiv" ng-click="disableAnnotationtoolOnListManager||enableAnnotationToolBar()">
 
                                     </div>
 
@@ -877,8 +877,8 @@
                 <div class="marginTopBtm10">
 
                     <div class="well well-sm no-margin-btm blankshapediv">
-                        <div class="outlinediv">
-                            <div id="imgOpacity" class="fullcolordiv imgopacity">
+                        <div class="outlinediv" id="outlinedivId" style="border: 1px solid #000000;">
+                            <div id="imgOpacity" style="background-color: #ffffff" class="fullcolordiv imgopacity">
                             </div>
                         </div>
                     </div>
diff --git a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
index 7a50516..9f33cbc 100644
--- a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
+++ b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -919,7 +919,7 @@ background-size:cover;
 }
 .outlinediv
 {
-     border:1px solid black;
+     /*border:1px solid black;*/
   width: 72%;
  margin-left: auto;
  margin-right: auto;
--
libgit2 0.21.4