Commit ede12b58c99e4a17bfb9a20f57b9b0b6e7631f27
1. added missing navigator images
2. hiding navigator image containers when image is not available in json. 3. Order by title the tile data
Too many changes.
To preserve performance only 100 of 258 files are displayed.
... | ... | @@ -213,6 +213,19 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
213 | 213 | |
214 | 214 | .then( |
215 | 215 | function (result) { |
216 | + | |
217 | + //load navigator image | |
218 | + if (result.data.Root._NavigatorImage != undefined) { | |
219 | + document.getElementById('navimg').src = '~/../content/images/aa/images/navigator/' + result.data.Root._NavigatorImage; | |
220 | + } | |
221 | + else { | |
222 | + document.getElementById('navimg').style.visibility = 'hidden'; | |
223 | + document.getElementById('navigatorBtn').style.visibility = 'hidden'; | |
224 | + document.getElementById('navigatorDiv').style.visibility = 'hidden'; | |
225 | + | |
226 | + } | |
227 | + | |
228 | + //draw pins | |
216 | 229 | $scope.aaPinData = result.data.Root.Item; |
217 | 230 | if ($scope.aaPinData != null && $scope.aaPinData.length > 0) { |
218 | 231 | |
... | ... | @@ -221,8 +234,7 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo |
221 | 234 | $scope.drawStaticPinsOnImage('aaDetailViewCanvas', value._PinId, value._PinX, value._PinY, value._HeadX, value._HeadY) |
222 | 235 | }) |
223 | 236 | |
224 | - //load navigator image | |
225 | - document.getElementById('navimg').src = '~/../content/images/aa/images/navigator/' + result.data.Root._NavigatorImage; | |
237 | + | |
226 | 238 | |
227 | 239 | //load search/vocab data |
228 | 240 | $rootScope.loadSearchData(); | ... | ... |
... | ... | @@ -107,7 +107,7 @@ |
107 | 107 | |
108 | 108 | |
109 | 109 | <div class="btn-group open" id="da-body-nav"> |
110 | - <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"> | |
110 | + <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"> | |
111 | 111 | <img src="~/../content/images/DA/navigator-view.png" style="height:30px; width:50px" /> |
112 | 112 | </button> |
113 | 113 | ... | ... |
... | ... | @@ -85,7 +85,7 @@ |
85 | 85 | <div class="row tab-content"> |
86 | 86 | <!--<div role="tabpanel" class="tab-pane active" id="grid-view">--> |
87 | 87 | <div role="tabpanel" class="tab-pane active" id="grid-view"> |
88 | - <div ng-repeat="(key,val) in moduleLandingData.data.root.Item"> | |
88 | + <div ng-repeat="(key,val) in moduleLandingData.data.root.Item | orderBy:'_Title' "> | |
89 | 89 | <div id="{{val._Id}}" class="col-sm-3 col-lg-2" title="{{val._Title}}" ng-click="openModuleItemView($event)"> |
90 | 90 | <div class="thumbnail"> |
91 | 91 | <a href="#"> | ... | ... |
4.47 KB
5.94 KB
5 KB
4.42 KB
4.44 KB
4.56 KB
5.85 KB
5.27 KB
4.87 KB
5.19 KB
4.1 KB
4.14 KB
7.42 KB
4.12 KB
6.31 KB
5.34 KB
5.81 KB
5.19 KB
5.33 KB
4.6 KB
4.4 KB
5.83 KB
4.49 KB
5.91 KB
4.16 KB
5.72 KB
6.34 KB
5.99 KB
6.02 KB
6.06 KB
4.15 KB
4.87 KB
4.96 KB
4.88 KB
4.86 KB
5.13 KB
4.09 KB
5.99 KB
6.65 KB
6.01 KB
5.48 KB
7.23 KB
5.46 KB
5.71 KB
4.72 KB
4.83 KB
4.89 KB
5.98 KB
4.22 KB
5.66 KB
4.89 KB
6 KB
4.89 KB
5.98 KB
4.87 KB
5.98 KB
4.75 KB
6.06 KB
4.87 KB
6.11 KB
4.16 KB
5.05 KB
4.73 KB
4.09 KB
3.1 KB
6.18 KB
4.36 KB
4.71 KB
5.79 KB
2.86 KB
4.15 KB
2.74 KB
3.82 KB
3.29 KB
3.95 KB
3.88 KB
3.79 KB
4.74 KB
4.74 KB
3.57 KB
6.67 KB
4.71 KB
5.43 KB
3.77 KB
4.72 KB
4.78 KB
4.46 KB
4.99 KB
3.22 KB
4.67 KB
2.68 KB
2.64 KB
6.26 KB
1.95 KB
2.1 KB
6.6 KB
4.04 KB