ADAM / AIAHTML5

Commit 43643a2951e48f9edcf790cfbcde06887ef65c4b

Authored by Nikita Kulshreshtha
2 parents f7ea690c fbc14498

Merge branch 'Hide/ShowAnnotationTabs' into Develop

Inline Side-by-side
Showing 2 changed files with 16 additions and 2 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js
  View file @43643a2
@@ -119,6 +119,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -119,6 +119,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
119 //annotation tool custom events 119 //annotation tool custom events
120 $rootScope.ShowAnnotationWindow = function () { 120 $rootScope.ShowAnnotationWindow = function () {
121 //7904 121 //7904
  122 +
  123 + $("#OnIdentify").addClass("annotationtoolbartab");
122 $("#annotationToolBarOptions").addClass("active"); 124 $("#annotationToolBarOptions").addClass("active");
123 $("#annotationButton").addClass("active"); 125 $("#annotationButton").addClass("active");
124 126
@@ -131,6 +133,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -131,6 +133,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
131 133
132 $rootScope.CloseAnnotationTool = function () { 134 $rootScope.CloseAnnotationTool = function () {
133 console.log('close'); 135 console.log('close');
  136 + $("#OnIdentify").removeClass("annotationtoolbartab");
  137 + $("#DrawMode").removeClass("annotationtoolbartab");
134 $('.btnCursor').removeClass('activebtncolor'); 138 $('.btnCursor').removeClass('activebtncolor');
135 $("#annotationButton").removeClass("active"); 139 $("#annotationButton").removeClass("active");
136 $("#annotationToolBarOptions").removeClass("active"); 140 $("#annotationToolBarOptions").removeClass("active");
@@ -143,6 +147,9 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -143,6 +147,9 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
143 } 147 }
144 148
145 $rootScope.OnIdentifyClick = function () { 149 $rootScope.OnIdentifyClick = function () {
  150 +
  151 + $("#OnIdentify").addClass("annotationtoolbartab");
  152 + $("#DrawMode").removeClass("annotationtoolbartab");
146 // $rootScope.isIdetifyClicked = true; 153 // $rootScope.isIdetifyClicked = true;
147 // $rootScope.isDrawingToolSelected = false; 154 // $rootScope.isDrawingToolSelected = false;
148 $("#canvasPaint").css("display", "none"); 155 $("#canvasPaint").css("display", "none");
@@ -157,7 +164,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location", @@ -157,7 +164,8 @@ AIA.controller("HomeController", ["$rootScope", "Modules", "$log", "$location",
157 164
158 165
159 $rootScope.DrawingMode = function () { 166 $rootScope.DrawingMode = function () {
160 - 167 + $("#OnIdentify").removeClass("annotationtoolbartab");
  168 + $("#DrawMode").addClass("annotationtoolbartab");
161 $('.btnCursor').addClass('activebtncolor'); 169 $('.btnCursor').addClass('activebtncolor');
162 $rootScope.switchCanvas(); 170 $rootScope.switchCanvas();
163 $("#canvasPaint").css("display", "block"); 171 $("#canvasPaint").css("display", "block");
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
  View file @43643a2
@@ -857,4 +857,10 @@ cursor:pointer; @@ -857,4 +857,10 @@ cursor:pointer;
857 display:none; 857 display:none;
858 } 858 }
859 /*#7904*/ 859 /*#7904*/
860 -.dropdown-menu > li > a.active{background-color:#0095da;color:#fff;text-decoration:none;}  
861 \ No newline at end of file 860 \ No newline at end of file
  861 +.dropdown-menu > li > a.active{background-color:#0095da;color:#fff;text-decoration:none;}
  862 +
  863 +
  864 +.annotationtoolbartab
  865 + {
  866 + background:#626c34 !important;
  867 +}
862 \ No newline at end of file 868 \ No newline at end of file