Merge branch 'AANavImgIsse' into Develop

Nikita Kulshreshtha
2 parents acff4858 ede12b58
Showing 258 changed files with 16 additions and 4 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
400-SOURCECODE/AIAHTML5.Web/app/views/aa/atlas-anatomy-detail.html
400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html
400-SOURCECODE/AIAHTML5.Web/content/images/aa/images/navigator/aa_oi_2.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/aa/images/navigator/aa_oi_20.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/aa/images/navigator/aa_oi_200.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/aa/images/navigator/aa_oi_201.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/aa/images/navigator/aa_oi_202.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/aa/images/navigator/aa_oi_203.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/aa/images/navigator/aa_oi_204.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/aa/images/navigator/aa_oi_205.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/aa/images/navigator/aa_oi_206.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/aa/images/navigator/aa_oi_207.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/aa/images/navigator/aa_oi_208.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/aa/images/navigator/aa_oi_209.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/aa/images/navigator/aa_oi_21.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/aa/images/navigator/aa_oi_210.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/aa/images/navigator/aa_oi_211.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/aa/images/navigator/aa_oi_212.jpg
400-SOURCECODE/AIAHTML5.Web/content/images/aa/images/navigator/aa_oi_213.jpg
@@ -213,6 +213,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
  
           .then(
             function (result) {
+
+                //load navigator image
+                if (result.data.Root._NavigatorImage != undefined) {
+                    document.getElementById('navimg').src = '~/../content/images/aa/images/navigator/' + result.data.Root._NavigatorImage;
+                }
+                else {
+                    document.getElementById('navimg').style.visibility = 'hidden';
+                    document.getElementById('navigatorBtn').style.visibility = 'hidden';
+                    document.getElementById('navigatorDiv').style.visibility = 'hidden';
+
+                }
+
+                //draw pins
                 $scope.aaPinData = result.data.Root.Item;
                 if ($scope.aaPinData != null && $scope.aaPinData.length > 0) {
  
@@ -221,8 +234,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo
                         $scope.drawStaticPinsOnImage('aaDetailViewCanvas', value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY)
                     })
  
-                    //load navigator image
-                    document.getElementById('navimg').src = '~/../content/images/aa/images/navigator/' + result.data.Root._NavigatorImage;
+                  
  
                     //load search/vocab data
                     $rootScope.loadSearchData();
@@ -107,7 +107,7 @@
  
  
                     <div class="btn-group open" id="da-body-nav">
-                        <button type="button" style="padding:0px 0px 10px 1px !important;background-color:rgba(255,255,255,0.0); border:none;" class="btn btn-primary dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
+                        <button  id="navigatorBtn" type="button" style="padding:0px 0px 10px 1px !important;background-color:rgba(255,255,255,0.0); border:none;" class="btn btn-primary dropdown-toggle btn-sm" data-toggle="dropdown" aria-haspopup="true" aria-expanded="true">
                             <img src="~/../content/images/DA/navigator-view.png" style="height:30px; width:50px" />
                         </button>
  
@@ -85,7 +85,7 @@
                 <div class="row tab-content">
                     <!--<div role="tabpanel" class="tab-pane active" id="grid-view">-->
                     <div role="tabpanel" class="tab-pane active" id="grid-view">
-                        <div ng-repeat="(key,val) in moduleLandingData.data.root.Item">
+                        <div ng-repeat="(key,val) in moduleLandingData.data.root.Item | orderBy:'_Title' ">
                             <div id="{{val._Id}}" class="col-sm-3 col-lg-2" title="{{val._Title}}" ng-click="openModuleItemView($event)">
                                 <div class="thumbnail">
                                     <a href="#">