ADAM / AIAHTML5

Commit 2cb60e3bfac5f4f98821cdab2ab370f2334a06b3

Authored by Amrita Vishnoi
2 parents 9f4465d6 15683ca1

Merge branch 'showhidestructurename' into Develop

Inline Side-by-side
Showing 2 changed files with 13 additions and 11 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @2cb60e3
@@ -297,6 +297,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -297,6 +297,7 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
297 $rootScope.shapestyle = function (id) { 297 $rootScope.shapestyle = function (id) {
298 298
299 document.getElementById('modelbackground').style.display = "none"; 299 document.getElementById('modelbackground').style.display = "none";
  300 + document.getElementById('modeleditstyle').style.display = "none";
300 301
301 $rootScope.shapestyleOpacity = $("#" + id).css('opacity'); 302 $rootScope.shapestyleOpacity = $("#" + id).css('opacity');
302 $rootScope.shapestyleFillColor = $("#" + id).parent().css('background-color'); 303 $rootScope.shapestyleFillColor = $("#" + id).parent().css('background-color');
@@ -319,15 +320,17 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -319,15 +320,17 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
319 } 320 }
320 321
321 $rootScope.enableAnnotationToolBar = function () { 322 $rootScope.enableAnnotationToolBar = function () {
322 - 323 +
323 document.getElementById('modelbackground').style.display = "block"; 324 document.getElementById('modelbackground').style.display = "block";
324 - $("#editshapestyle").modal('show'); 325 + //$("#editshapestyle").modal('show');
  326 + document.getElementById('modeleditstyle').style.display = "block";
325 327
326 } 328 }
327 329
328 $rootScope.disableAnnotationToolBar = function () { 330 $rootScope.disableAnnotationToolBar = function () {
329 331
330 document.getElementById('modelbackground').style.display = "none"; 332 document.getElementById('modelbackground').style.display = "none";
  333 + document.getElementById('modeleditstyle').style.display = "none";
331 334
332 } 335 }
333 336
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
  View file @2cb60e3
@@ -55,19 +55,18 @@ @@ -55,19 +55,18 @@
55 display: none; 55 display: none;
56 } 56 }
57 .customTooltip { 57 .customTooltip {
58 - background-color: #fff !important;  
59 - color: #000 !important; 58 + background: #333 !important;
  59 + color: #fff !important;
60 opacity: 0.9 !important; 60 opacity: 0.9 !important;
61 -  
62 } 61 }
63 62
64 63
65 64
66 65
67 .custom-tooltip { 66 .custom-tooltip {
68 - background-color: #fff; 67 + background-color: #333;
69 border: 0 none; 68 border: 0 none;
70 - color: #000; 69 + color: #fff !important;
71 left: -52px; 70 left: -52px;
72 opacity: 0.9; 71 opacity: 0.9;
73 padding: 7px; 72 padding: 7px;
@@ -83,9 +82,9 @@ @@ -83,9 +82,9 @@
83 } 82 }
84 83
85 .custom-tooltip1 { 84 .custom-tooltip1 {
86 - background-color: #fff; 85 + background-color: #333;
87 border: 0 none; 86 border: 0 none;
88 - color: #000; 87 + color: #fff !important;
89 left: 52px; 88 left: 52px;
90 opacity: 0.9; 89 opacity: 0.9;
91 padding: 7px; 90 padding: 7px;
@@ -101,9 +100,9 @@ @@ -101,9 +100,9 @@
101 } 100 }
102 101
103 .custom-tooltip2 { 102 .custom-tooltip2 {
104 - background-color: #fff; 103 + background-color: #333;
105 border: 0 none; 104 border: 0 none;
106 - color: #000; 105 + color: #fff !important;
107 right: 10px; 106 right: 10px;
108 opacity: 0.9; 107 opacity: 0.9;
109 padding: 7px; 108 padding: 7px;