Commit eb3658e4e9cd6c7f08a2ec09d687dcad1c6f7af6
1 parent
252ec15b
this is table issues with ipad latest
Showing
7 changed files
with
19 additions
and
57 deletions
400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js
@@ -182,7 +182,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -182,7 +182,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
182 | $('#' + $rootScope.getLocalStorageValue("currentBodyViewId")).find('.thumbnail').addClass('HightLightThumbnail'); | 182 | $('#' + $rootScope.getLocalStorageValue("currentBodyViewId")).find('.thumbnail').addClass('HightLightThumbnail'); |
183 | $timeout(function () | 183 | $timeout(function () |
184 | { | 184 | { |
185 | - $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('CAGridViewScroll') }, 'slow'); | 185 | + if ($rootScope.getLocalStorageValue('CAGridViewScroll') !== null && $location.url() == "/clinical-animations") |
186 | + { | ||
187 | + | ||
188 | + $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('CAGridViewScroll') }, 'slow'); | ||
189 | + } | ||
186 | }, | 190 | }, |
187 | 300); | 191 | 300); |
188 | 192 |
400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js
@@ -202,7 +202,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | @@ -202,7 +202,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout | ||
202 | $timeout(function () | 202 | $timeout(function () |
203 | { | 203 | { |
204 | $('#' + $rootScope.getLocalStorageValue("currentBodyViewId")).find('.thumbnail').addClass('HightLightThumbnail'); | 204 | $('#' + $rootScope.getLocalStorageValue("currentBodyViewId")).find('.thumbnail').addClass('HightLightThumbnail'); |
205 | - if ($rootScope.getLocalStorageValue('CIGridViewScroll') !== null) { | 205 | + if ($rootScope.getLocalStorageValue('CIGridViewScroll') !== null && $location.url() == "/clinical-illustrations") { |
206 | $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('CIGridViewScroll') }); | 206 | $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('CIGridViewScroll') }); |
207 | } | 207 | } |
208 | }, 100); | 208 | }, 100); |
400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js
@@ -78,7 +78,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | @@ -78,7 +78,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou | ||
78 | if ($rootScope.getLocalStorageValue('AAGridViewHighlightThumbnail') !== null) { | 78 | if ($rootScope.getLocalStorageValue('AAGridViewHighlightThumbnail') !== null) { |
79 | $('#' + $rootScope.getLocalStorageValue("AAGridViewHighlightThumbnail")).find('.thumbnail').addClass('HightLightThumbnail'); | 79 | $('#' + $rootScope.getLocalStorageValue("AAGridViewHighlightThumbnail")).find('.thumbnail').addClass('HightLightThumbnail'); |
80 | } | 80 | } |
81 | - if ($rootScope.getLocalStorageValue('AAGridViewScroll') !== null) { | 81 | + if ($rootScope.getLocalStorageValue('AAGridViewScroll') !== null && $location.url() == "/tile-view-list") { |
82 | $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AAGridViewScroll') }, 'slow'); | 82 | $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AAGridViewScroll') }, 'slow'); |
83 | } | 83 | } |
84 | }, 100); | 84 | }, 100); |
400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html
@@ -84,13 +84,13 @@ | @@ -84,13 +84,13 @@ | ||
84 | </tbody> | 84 | </tbody> |
85 | <tbody id="ListViewDiv" ng-if="filterstring" class="clstbody"> | 85 | <tbody id="ListViewDiv" ng-if="filterstring" class="clstbody"> |
86 | <tr ng-click="showItem(item._id)" ng-class="{selected: item._id === idSelected}" ng-dblclick="openView($event)" ng-repeat="item in searchCAListViewData"> | 86 | <tr ng-click="showItem(item._id)" ng-class="{selected: item._id === idSelected}" ng-dblclick="openView($event)" ng-repeat="item in searchCAListViewData"> |
87 | - <td> | 87 | + <td width="25%"> |
88 | {{item._Title}} | 88 | {{item._Title}} |
89 | </td> | 89 | </td> |
90 | - <td> | 90 | + <td width="25%"> |
91 | {{item._BodyRegion}} | 91 | {{item._BodyRegion}} |
92 | </td> | 92 | </td> |
93 | - <td> | 93 | + <td width="25%"> |
94 | {{item._BodySystem}} | 94 | {{item._BodySystem}} |
95 | </td> | 95 | </td> |
96 | <td> | 96 | <td> |
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
@@ -144,10 +144,10 @@ | @@ -144,10 +144,10 @@ | ||
144 | <td width="20%"> | 144 | <td width="20%"> |
145 | {{item._BodySystem}} | 145 | {{item._BodySystem}} |
146 | </td> | 146 | </td> |
147 | - <td width="20%"> | 147 | + <td width="10%"> |
148 | {{item._ViewOrientation}} | 148 | {{item._ViewOrientation}} |
149 | </td> | 149 | </td> |
150 | - <td width="20%"> | 150 | + <td width="10%"> |
151 | {{item._ImageType}} | 151 | {{item._ImageType}} |
152 | </td> | 152 | </td> |
153 | <td> | 153 | <td> |
400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html
@@ -139,16 +139,16 @@ | @@ -139,16 +139,16 @@ | ||
139 | </tbody> | 139 | </tbody> |
140 | <tbody id="ListViewDiv" ng-if="filterstring" class="clstbody"> | 140 | <tbody id="ListViewDiv" ng-if="filterstring" class="clstbody"> |
141 | <tr id="{{item._Id}}" ng-class="{selected: item._Id === idSelected}" data-ng-click="openListViewModuleItem($event)" data-ng-dblclick="openModuleItemView($event)" ng-repeat="item in searchAAListViewData"> | 141 | <tr id="{{item._Id}}" ng-class="{selected: item._Id === idSelected}" data-ng-click="openListViewModuleItem($event)" data-ng-dblclick="openModuleItemView($event)" ng-repeat="item in searchAAListViewData"> |
142 | - <td> | 142 | + <td width="20%"> |
143 | {{item._Title}} | 143 | {{item._Title}} |
144 | </td> | 144 | </td> |
145 | - <td> | 145 | + <td width="20%"> |
146 | {{item._BodyRegion}} | 146 | {{item._BodyRegion}} |
147 | </td> | 147 | </td> |
148 | - <td> | 148 | + <td width="20%"> |
149 | {{item._BodySystem}} | 149 | {{item._BodySystem}} |
150 | </td> | 150 | </td> |
151 | - <td> | 151 | + <td width="10%"> |
152 | {{item._ViewOrientation}} | 152 | {{item._ViewOrientation}} |
153 | </td> | 153 | </td> |
154 | <td> | 154 | <td> |
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -804,67 +804,25 @@ textarea { | @@ -804,67 +804,25 @@ textarea { | ||
804 | 804 | ||
805 | .clsstickydiv{padding-left:19px; width:99%} | 805 | .clsstickydiv{padding-left:19px; width:99%} |
806 | 806 | ||
807 | -/*.clsthead tr,.clstheadca tr { | ||
808 | - display: block; | ||
809 | - position: relative; | ||
810 | -}*/ | 807 | + |
811 | /*.clsthead tr th { | 808 | /*.clsthead tr th { |
812 | min-width: 180px; | 809 | min-width: 180px; |
813 | text-align: left; | 810 | text-align: left; |
814 | }*/ | 811 | }*/ |
815 | -.clstheadca tr th { | ||
816 | - /*min-width: 255px;*/ | ||
817 | - text-align: left; | ||
818 | -} | ||
819 | 812 | ||
820 | -/*.clstbody,.clstbodyca { | ||
821 | - display: block; | ||
822 | - height: 200px; | ||
823 | - width: 100%; | ||
824 | - overflow:auto; | ||
825 | -}*/ | ||
826 | 813 | ||
827 | -.clstbodyca { | ||
828 | - display: block; | ||
829 | - height: 200px; | ||
830 | - width: 100%; | ||
831 | - overflow:auto; | ||
832 | -} | 814 | + |
815 | + | ||
833 | 816 | ||
834 | /*.clstbody tr td { | 817 | /*.clstbody tr td { |
835 | min-width: 180px; | 818 | min-width: 180px; |
836 | text-align: left; | 819 | text-align: left; |
837 | }*/ | 820 | }*/ |
838 | 821 | ||
839 | -.clstbodyca tr td { | ||
840 | - min-width: 275px; | ||
841 | - /*max-width: 260px;*/ | ||
842 | - text-align: left; | ||
843 | - word-wrap:break-word; | ||
844 | - | ||
845 | -} | ||
846 | 822 | ||
847 | 823 | ||
848 | 824 | ||
849 | 825 | ||
850 | -.tablecaview .clstbody tr td { | ||
851 | - min-width: 275px; | ||
852 | - text-align: left; | ||
853 | -} | ||
854 | - | ||
855 | -.tablecaview .clstheadca tr th { | ||
856 | - min-width: 275px; | ||
857 | - text-align: left; | ||
858 | -} | ||
859 | - | ||
860 | - | ||
861 | -.tablecaview .clstbody,.tablecaview .clstbodyca { | ||
862 | - display: block; | ||
863 | - height: 200px; | ||
864 | - width: 100%; | ||
865 | - overflow:scroll; | ||
866 | -} | ||
867 | - | ||
868 | 826 | ||
869 | 827 | ||
870 | .cur-pot { | 828 | .cur-pot { |