Commit 3f454990436497e2558e92e21861465cf0479e04
1 parent
ef51a5f7
Refs: #6615
Should highlight left menu bar button only one at a time
Showing
4 changed files
with
21 additions
and
4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js
@@ -252,6 +252,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -252,6 +252,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
252 | var view_list = angular.element($event.currentTarget); | 252 | var view_list = angular.element($event.currentTarget); |
253 | var view_list_male_female = view_list.attr('title'); | 253 | var view_list_male_female = view_list.attr('title'); |
254 | 254 | ||
255 | + $rootScope.Normal = "LeftButtonsDefaultState"; | ||
255 | 256 | ||
256 | if (view_list_male_female == "Male") { | 257 | if (view_list_male_female == "Male") { |
257 | 258 | ||
@@ -4446,6 +4447,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -4446,6 +4447,9 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
4446 | $timeout(function () { $scope.highLightBody() }, 50); | 4447 | $timeout(function () { $scope.highLightBody() }, 50); |
4447 | 4448 | ||
4448 | } | 4449 | } |
4450 | + | ||
4451 | + // unhighlight other | ||
4452 | + $scope.Normal = ""; | ||
4449 | } | 4453 | } |
4450 | 4454 | ||
4451 | $scope.enableNormalMode = function () { | 4455 | $scope.enableNormalMode = function () { |
@@ -4503,7 +4507,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | @@ -4503,7 +4507,11 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo | ||
4503 | //1. | 4507 | //1. |
4504 | $scope.highLightBody(); | 4508 | $scope.highLightBody(); |
4505 | 4509 | ||
4510 | + | ||
4506 | } | 4511 | } |
4512 | + | ||
4513 | + // unhighlight other | ||
4514 | + $scope.Normal = ""; | ||
4507 | } | 4515 | } |
4508 | 4516 | ||
4509 | $scope.enableShowHideStructureBox = function () { | 4517 | $scope.enableShowHideStructureBox = function () { |
400-SOURCECODE/AIAHTML5.Web/app/views/da/da-view.html
@@ -113,13 +113,13 @@ | @@ -113,13 +113,13 @@ | ||
113 | <button id="btnTranparency" class="btn btn-black btn-sm btn-block marginTop5 tooltip-custom" ng-click="createTransparencyBox()" data-toggle="tooltip" data-placement="bottom" title="Transparency Box"><img src="content/images/icon-transparency.png" alt="" title=""></button> | 113 | <button id="btnTranparency" class="btn btn-black btn-sm btn-block marginTop5 tooltip-custom" ng-click="createTransparencyBox()" data-toggle="tooltip" data-placement="bottom" title="Transparency Box"><img src="content/images/icon-transparency.png" alt="" title=""></button> |
114 | </div> | 114 | </div> |
115 | <div class="col-sm-6"> | 115 | <div class="col-sm-6"> |
116 | - <button class="btn btn-primary btn-sm marginTop5 tooltip-custom" ng-click="enableNormalMode()" data-toggle=" tooltip" data-placement="bottom" title="Normal"> <img src="content/images/bulb1.png" alt="" title=""></button> | 116 | + <button ng-class="Normal" class="btn btn-black btn-sm marginTop5 tooltip-custom" ng-click="enableNormalMode()" data-toggle=" tooltip" data-placement="bottom" title="Normal"> <img src="content/images/bulb1.png" alt="" title=""></button> |
117 | </div> | 117 | </div> |
118 | <div class="col-sm-6"> | 118 | <div class="col-sm-6"> |
119 | - <button class="btn btn-black btn-sm pull-right marginTop5 tooltip-custom" ng-click="enableExtract()" data-toggle="tooltip" data-placement="bottom" title="Extract"><img src="content/images/bulb1.png" alt="" title=""></button> | 119 | + <button ng-class="Extract" class="btn btn-black btn-sm pull-right marginTop5 tooltip-custom" ng-click="enableExtract()" data-toggle="tooltip" data-placement="bottom" title="Extract"><img src="content/images/bulb1.png" alt="" title=""></button> |
120 | </div> | 120 | </div> |
121 | <div class="col-sm-6"> | 121 | <div class="col-sm-6"> |
122 | - <button id="btnHighLight" class="btn btn-black btn-sm marginTop5 tooltip-custom btn-resize" ng-click="enableHighlight()" data-toggle="tooltip" data-placement="bottom" title="Highlight"> <img src="content/images/bulb.png" alt="" title=""></button> | 122 | + <button ng-class="Highlight" id="btnHighLight" class="btn btn-black btn-sm marginTop5 tooltip-custom btn-resize" ng-click="enableHighlight()" data-toggle="tooltip" data-placement="bottom" title="Highlight"> <img src="content/images/bulb.png" alt="" title=""></button> |
123 | </div> | 123 | </div> |
124 | <div class="col-sm-6 dropdown hover-tool"> | 124 | <div class="col-sm-6 dropdown hover-tool"> |
125 | <div class="custom-tooltip">Highlight Options</div> | 125 | <div class="custom-tooltip">Highlight Options</div> |
400-SOURCECODE/AIAHTML5.Web/content/css/main.css
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -813,3 +813,11 @@ cursor:pointer; | @@ -813,3 +813,11 @@ cursor:pointer; | ||
813 | max-width: 300px; | 813 | max-width: 300px; |
814 | width: 100%; | 814 | width: 100%; |
815 | } | 815 | } |
816 | + | ||
817 | +.LeftButtonsDefaultState | ||
818 | +{ | ||
819 | + background-color: #0095da; | ||
820 | + border-color: #007ab3; | ||
821 | + color: #ffffff; | ||
822 | +} | ||
823 | + |