Commit e6cbb37a0cf5471e6924acdb627fd8c8d3f66bbc
commit against Merge Request #783
Showing
7 changed files
with
241 additions
and
243 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
@@ -2,8 +2,6 @@ | @@ -2,8 +2,6 @@ | ||
2 | <div class="bodyWrap row "> | 2 | <div class="bodyWrap row "> |
3 | <div ng-include="'app/widget/MainMenu.html'" /> | 3 | <div ng-include="'app/widget/MainMenu.html'" /> |
4 | <div class="main"> | 4 | <div class="main"> |
5 | - | ||
6 | - <div class="row"> | ||
7 | <div class="col-sm-12 stickey-area clsstickydiv"> | 5 | <div class="col-sm-12 stickey-area clsstickydiv"> |
8 | <div class="breadcrumb"> | 6 | <div class="breadcrumb"> |
9 | <div class="row center-block"> | 7 | <div class="row center-block"> |
@@ -53,55 +51,55 @@ | @@ -53,55 +51,55 @@ | ||
53 | </div> | 51 | </div> |
54 | </div> | 52 | </div> |
55 | </div> | 53 | </div> |
56 | - </div> | 54 | + |
57 | <div class="row tab-content" style="padding-left:25px; width:99%"> | 55 | <div class="row tab-content" style="padding-left:25px; width:99%"> |
58 | <div role="tabpanel" ng-class="{'tab-pane active' : activeTab === 1,'tab-pane' : activeTab !==1 }" id="grid-view"> | 56 | <div role="tabpanel" ng-class="{'tab-pane active' : activeTab === 1,'tab-pane' : activeTab !==1 }" id="grid-view"> |
59 | </div> | 57 | </div> |
60 | - <div role="tabpanel" ng-class="{'tab-pane active' : activeTab === 2,'tab-pane' : activeTab !==2 }" id="list-view"> | ||
61 | - <div class="panel col-sm-12 table-responsive" style="padding-left:0px; padding-right:0; margin-left:11px; margin-bottom:0; width:99%;"> | ||
62 | - <table class="table table-hover table-fixed bg-white table-txt12 tablecaview" style="padding-left:25px; width:100%;"> | ||
63 | - <thead class="clstheadca"> | 58 | + <div class="customTable" role="tabpanel" ng-class="{'tab-pane active' : activeTab === 2,'tab-pane' : activeTab !==2 }" id="list-view"> |
59 | + <div class="panel col-sm-12 table-responsive"> | ||
60 | + <table class="table table-hover table-fixed bg-white table-txt12"> | ||
61 | + <thead class="clsthead"> | ||
64 | <tr class="active" style="background:#f5f5f5;"> | 62 | <tr class="active" style="background:#f5f5f5;"> |
65 | - <th style="width:25%">Title</th> | ||
66 | - <th style="width:25%">Region</th> | ||
67 | - <th style="width:25%">System</th> | ||
68 | - <th style="width:25%">Specialty</th> | 63 | + <th width="25%">Title</th> |
64 | + <th width="25%">Region</th> | ||
65 | + <th width="25%">System</th> | ||
66 | + <th>Specialty</th> | ||
69 | </tr> | 67 | </tr> |
70 | </thead> | 68 | </thead> |
71 | - <tbody id="ListViewDiv" ng-if="!filterstring" class="clstbodyca"> | 69 | + <tbody id="ListViewDiv" ng-if="!filterstring" class="clstbody"> |
72 | <tr id="{{item._id}}" ng-class="{selected: item._id === idSelected}" ng-click="showItem(item._id)" ng-dblclick="openView($event)" ng-repeat="item in selectedCAListViewData"> | 70 | <tr id="{{item._id}}" ng-class="{selected: item._id === idSelected}" ng-click="showItem(item._id)" ng-dblclick="openView($event)" ng-repeat="item in selectedCAListViewData"> |
73 | - <td style="width:25%"> | 71 | + <td width="25%"> |
74 | {{item._Title}} | 72 | {{item._Title}} |
75 | </td> | 73 | </td> |
76 | - <td style="width:25%"> | 74 | + <td width="25%"> |
77 | {{item._BodyRegion}} | 75 | {{item._BodyRegion}} |
78 | </td> | 76 | </td> |
79 | - <td style="width:25%"> | 77 | + <td width="25%"> |
80 | {{item._BodySystem}} | 78 | {{item._BodySystem}} |
81 | </td> | 79 | </td> |
82 | - <td style="width:25%"> | 80 | + <td> |
83 | {{item._MedicalSpecialty}} | 81 | {{item._MedicalSpecialty}} |
84 | </td> | 82 | </td> |
85 | </tr> | 83 | </tr> |
86 | </tbody> | 84 | </tbody> |
87 | - <tbody id="ListViewDiv" ng-if="filterstring" class="clstbodyca"> | 85 | + <tbody id="ListViewDiv" ng-if="filterstring" class="clstbody"> |
88 | <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"> |
89 | - <td style="width:25%"> | 87 | + <td width="25%"> |
90 | {{item._Title}} | 88 | {{item._Title}} |
91 | </td> | 89 | </td> |
92 | - <td style="width:25%"> | 90 | + <td width="25%"> |
93 | {{item._BodyRegion}} | 91 | {{item._BodyRegion}} |
94 | </td> | 92 | </td> |
95 | - <td style="width:25%"> | 93 | + <td width="25%"> |
96 | {{item._BodySystem}} | 94 | {{item._BodySystem}} |
97 | </td> | 95 | </td> |
98 | - <td style="width:25%"> | 96 | + <td> |
99 | {{item._MedicalSpecialty}} | 97 | {{item._MedicalSpecialty}} |
100 | </td> | 98 | </td> |
101 | </tr> | 99 | </tr> |
102 | <!--<tr ng-if="typeof(searchCAListViewData) == 'undefined' || searchCAListViewData == null || searchCAListViewData == ''"> | 100 | <!--<tr ng-if="typeof(searchCAListViewData) == 'undefined' || searchCAListViewData == null || searchCAListViewData == ''"> |
103 | - <td colspan="3"><strong style="color:black;">No animation found for the selected search criteria!</strong></td> | ||
104 | - </tr>--> | 101 | + <td colspan="3"><strong style="color:black;">No animation found for the selected search criteria!</strong></td> |
102 | + </tr>--> | ||
105 | </tbody> | 103 | </tbody> |
106 | </table> | 104 | </table> |
107 | </div> | 105 | </div> |
400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html
@@ -72,112 +72,109 @@ | @@ -72,112 +72,109 @@ | ||
72 | <div class="row tab-content" style="padding-left:25px; width:99%"> | 72 | <div class="row tab-content" style="padding-left:25px; width:99%"> |
73 | 73 | ||
74 | <!--<div role="tabpanel" class="tab-pane active" id="grid-view">--> | 74 | <!--<div role="tabpanel" class="tab-pane active" id="grid-view">--> |
75 | - <div role="tabpanel" ng-class="{'tab-pane active' : activeTab === 1,'tab-pane' : activeTab !==1 }" id="grid-view"> | ||
76 | - <!--<div ng-if="!filterstring" ng-repeat="item in selectedCIListViewData"> | ||
77 | - <div id="{{item._id}}" class="col-sm-3 col-lg-2" title="{{item._Title}}" data-ng-click="openView($event)"> | ||
78 | - <div class="thumbnail"> | ||
79 | - <img ng-src="~ /../content/images/ci/thumbnails/{{item._ThumbnailImage}}" alt="" title=""> | ||
80 | - <div class="caption"> | ||
81 | - <p>{{item._Title}}</p> | ||
82 | - </div> | ||
83 | - </div> | ||
84 | - </div> | ||
85 | - </div> | ||
86 | - | ||
87 | - <div ng-if="filterstring" ng-repeat="item in searchCIListViewData"> | ||
88 | - <div id="{{item._id}}" class="col-sm-3 col-lg-2" title="{{item._Title}}" data-ng-click="openView($event)"> | ||
89 | - <div class="thumbnail"> | ||
90 | - <img ng-src="~ /../content/images/ci/thumbnails/{{item._ThumbnailImage}}" alt="" title=""> | ||
91 | - <div class="caption"> | ||
92 | - <p>{{item._Title}}</p> | ||
93 | - </div> | 75 | + <div class="customTable" role="tabpanel" ng-class="{'tab-pane active' : activeTab === 1,'tab-pane' : activeTab !==1 }" id="grid-view"> |
76 | + <!--<div ng-if="!filterstring" ng-repeat="item in selectedCIListViewData"> | ||
77 | + <div id="{{item._id}}" class="col-sm-3 col-lg-2" title="{{item._Title}}" data-ng-click="openView($event)"> | ||
78 | + <div class="thumbnail"> | ||
79 | + <img ng-src="~ /../content/images/ci/thumbnails/{{item._ThumbnailImage}}" alt="" title=""> | ||
80 | + <div class="caption"> | ||
81 | + <p>{{item._Title}}</p> | ||
82 | + </div> | ||
83 | + </div> | ||
84 | + </div> | ||
85 | + </div> | ||
86 | + | ||
87 | + <div ng-if="filterstring" ng-repeat="item in searchCIListViewData"> | ||
88 | + <div id="{{item._id}}" class="col-sm-3 col-lg-2" title="{{item._Title}}" data-ng-click="openView($event)"> | ||
89 | + <div class="thumbnail"> | ||
90 | + <img ng-src="~ /../content/images/ci/thumbnails/{{item._ThumbnailImage}}" alt="" title=""> | ||
91 | + <div class="caption"> | ||
92 | + <p>{{item._Title}}</p> | ||
93 | + </div> | ||
94 | + </div> | ||
95 | + </div> | ||
96 | + </div>--> | ||
94 | </div> | 97 | </div> |
95 | - </div> | ||
96 | - </div>--> | ||
97 | - | ||
98 | -</div> | ||
99 | <!--<div role="tabpanel" class="tab-pane" id="list-view">--> | 98 | <!--<div role="tabpanel" class="tab-pane" id="list-view">--> |
100 | - <div role="tabpanel" ng-class="{'tab-pane active' : activeTab === 2,'tab-pane' : activeTab !==2 }" id="list-view"> | ||
101 | - <!--<div class="col-sm-12 table-responsive">--> | ||
102 | - <div class="panel col-sm-12 table-responsive" style="padding-left:0px; padding-right:0; margin-left:11px; margin-bottom:0; width:99%;"> | ||
103 | - <!--<table class="table table-hover table-condensed bg-white" style="padding-left:25px; width:99%">--> | ||
104 | - <table class="table table-hover table-fixed bg-white table-txt12" style="padding-left:25px; width:100%;"> | ||
105 | - <thead class="clsthead"> | ||
106 | - <tr class="active"> | ||
107 | - <th width="15%">Title</th> | ||
108 | - <th width="15%">Region</th> | ||
109 | - <th width="15%">System</th> | ||
110 | - <th width="15%">View</th> | ||
111 | - <th width="15%">Type</th> | ||
112 | - <th width="25%">Specialty</th> | ||
113 | - </tr> | ||
114 | - </thead> | ||
115 | - <tbody id="ListViewDiv" ng-if="!filterstring" class="clstbody"> | ||
116 | - <tr id="{{item._id}}" ng-class="{selected: item._id === idSelected}" ng-click="showItem(item._id)" ng-dblclick="openView($event)" ng-repeat="item in selectedCIListViewData"> | ||
117 | - <td width="15%"> | ||
118 | - {{item._Title}} | ||
119 | - </td> | ||
120 | - <td width="15%"> | ||
121 | - {{item._BodyRegion}} | ||
122 | - </td> | ||
123 | - <td width="15%"> | ||
124 | - {{item._BodySystem}} | ||
125 | - </td> | ||
126 | - <td width="15%"> | ||
127 | - {{item._ViewOrientation}} | ||
128 | - </td> | ||
129 | - <td width="15%"> | ||
130 | - {{item._ImageType}} | ||
131 | - </td> | ||
132 | - <td width="25%"> | ||
133 | - {{item._MedicalSpecialty}} | ||
134 | - </td> | ||
135 | - </tr> | ||
136 | - </tbody> | ||
137 | - <tbody id="ListViewDiv" ng-if="filterstring" class="clstbody"> | ||
138 | - <tr ng-click="showItem(item._id)" ng-class="{selected: item._id === idSelected}" ng-dblclick="openView($event)" ng-repeat="item in searchCIListViewData"> | ||
139 | - <td width="15%"> | ||
140 | - {{item._Title}} | ||
141 | - </td> | ||
142 | - <td width="15%"> | ||
143 | - {{item._BodyRegion}} | ||
144 | - </td> | ||
145 | - <td width="15%"> | ||
146 | - {{item._BodySystem}} | ||
147 | - </td> | ||
148 | - <td width="15%"> | ||
149 | - {{item._ViewOrientation}} | ||
150 | - </td> | ||
151 | - <td width="15%"> | ||
152 | - {{item._ImageType}} | ||
153 | - </td> | ||
154 | - <td width="25%"> | ||
155 | - {{item._MedicalSpecialty}} | ||
156 | - </td> | ||
157 | - </tr> | 99 | + <div class="customTable" role="tabpanel" ng-class="{'tab-pane active' : activeTab === 2,'tab-pane' : activeTab !==2 }" id="list-view"> |
100 | + <!--<div class="col-sm-12 table-responsive">--> | ||
101 | + <div class="panel col-sm-12 table-responsive"> | ||
102 | + <!--<table class="table table-hover table-condensed bg-white" style="padding-left:25px; width:99%">--> | ||
103 | + <table class="table table-hover table-fixed bg-white table-txt12"> | ||
104 | + <thead class="clsthead"> | ||
105 | + <tr class="active"> | ||
106 | + <th width="20%">Title</th> | ||
107 | + <th width="20%">Region</th> | ||
108 | + <th width="20%">System</th> | ||
109 | + <th width="10%">View</th> | ||
110 | + <th width="10%">Type</th> | ||
111 | + <th>Specialty</th> | ||
112 | + </tr> | ||
113 | + </thead> | ||
114 | + <tbody id="ListViewDiv" ng-if="!filterstring" class="clstbody"> | ||
115 | + <tr id="{{item._id}}" ng-class="{selected: item._id === idSelected}" ng-click="showItem(item._id)" ng-dblclick="openView($event)" ng-repeat="item in selectedCIListViewData"> | ||
116 | + <td width="20%"> | ||
117 | + {{item._Title}} | ||
118 | + </td> | ||
119 | + <td width="20%"> | ||
120 | + {{item._BodyRegion}} | ||
121 | + </td> | ||
122 | + <td width="20%"> | ||
123 | + {{item._BodySystem}} | ||
124 | + </td> | ||
125 | + <td width="10%"> | ||
126 | + {{item._ViewOrientation}} | ||
127 | + </td> | ||
128 | + <td width="10%"> | ||
129 | + {{item._ImageType}} | ||
130 | + </td> | ||
131 | + <td> | ||
132 | + {{item._MedicalSpecialty}} | ||
133 | + </td> | ||
134 | + </tr> | ||
135 | + </tbody> | ||
136 | + <tbody id="ListViewDiv" ng-if="filterstring" class="clstbody"> | ||
137 | + <tr ng-click="showItem(item._id)" ng-class="{selected: item._id === idSelected}" ng-dblclick="openView($event)" ng-repeat="item in searchCIListViewData"> | ||
138 | + <td width="20%"> | ||
139 | + {{item._Title}} | ||
140 | + </td> | ||
141 | + <td width="20%"> | ||
142 | + {{item._BodyRegion}} | ||
143 | + </td> | ||
144 | + <td width="20%"> | ||
145 | + {{item._BodySystem}} | ||
146 | + </td> | ||
147 | + <td width="10%"> | ||
148 | + {{item._ViewOrientation}} | ||
149 | + </td> | ||
150 | + <td width="10%"> | ||
151 | + {{item._ImageType}} | ||
152 | + </td> | ||
153 | + <td> | ||
154 | + {{item._MedicalSpecialty}} | ||
155 | + </td> | ||
156 | + </tr> | ||
158 | <!--<tr ng-if="typeof(searchCIListViewData) == 'undefined' || searchCIListViewData == null || searchCIListViewData == ''"> | 157 | <!--<tr ng-if="typeof(searchCIListViewData) == 'undefined' || searchCIListViewData == null || searchCIListViewData == ''"> |
159 | - <td colspan="6"><strong id="searchItem" style="color:black;">No illustration found for the selected search criteria!</strong></td> | ||
160 | - </tr>--> | ||
161 | - | ||
162 | - </tbody> | ||
163 | - </table> | ||
164 | - </div> | ||
165 | - <div class="col-sm-12" ng-show="hiderow" style="padding-left:25px;padding-top:10px;"> | ||
166 | - <div class="row well"> | ||
167 | - <div title="{{SelectedCITitle}}" class="col-sm-3 col-lg-2 no-padding"> | ||
168 | - <div class="thumbnail no-margin"> | ||
169 | - <img id="{{SelectedCIId}}" src="{{SelectedCIthumbImage}}" alt="" title="{{SelectedCITitle}}" data-ng-click="openView($event)"> | ||
170 | - </div> | ||
171 | - </div> | ||
172 | - <div class="col-sm-9 col-lg-9" style="padding-left:10px;"> | ||
173 | - <p class="f11" ng-bind-html="SelectedCISummary"></p> | ||
174 | - <button id="{{SelectedCIId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="openView($event)">Open</button> | ||
175 | - </div> | ||
176 | - | ||
177 | - </div> | ||
178 | - | ||
179 | - | ||
180 | - </div> | 158 | + <td colspan="6"><strong id="searchItem" style="color:black;">No illustration found for the selected search criteria!</strong></td> |
159 | + </tr>--> | ||
160 | + | ||
161 | + </tbody> | ||
162 | + </table> | ||
163 | + </div> | ||
164 | + <div class="col-sm-12" ng-show="hiderow" style="padding-left:25px;padding-top:10px;"> | ||
165 | + <div class="row well"> | ||
166 | + <div title="{{SelectedCITitle}}" class="col-sm-3 col-lg-2 no-padding"> | ||
167 | + <div class="thumbnail no-margin"> | ||
168 | + <img id="{{SelectedCIId}}" src="{{SelectedCIthumbImage}}" alt="" title="{{SelectedCITitle}}" data-ng-click="openView($event)"> | ||
169 | + </div> | ||
170 | + </div> | ||
171 | + <div class="col-sm-9 col-lg-9" style="padding-left:10px;"> | ||
172 | + <p class="f11" ng-bind-html="SelectedCISummary"></p> | ||
173 | + <button id="{{SelectedCIId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="openView($event)">Open</button> | ||
174 | + </div> | ||
175 | + </div> | ||
176 | + | ||
177 | + </div> | ||
181 | </div> | 178 | </div> |
182 | </div> | 179 | </div> |
183 | </div> | 180 | </div> |
400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html
@@ -84,7 +84,8 @@ | @@ -84,7 +84,8 @@ | ||
84 | <!-- Tab panes --> | 84 | <!-- Tab panes --> |
85 | <div class="row tab-content" id="viewList"> | 85 | <div class="row tab-content" id="viewList"> |
86 | <!--<div role="tabpanel" class="tab-pane active" id="grid-view">--> | 86 | <!--<div role="tabpanel" class="tab-pane active" id="grid-view">--> |
87 | - <div role="tabpanel" class="tab-pane active" id="grid-view"> | 87 | + |
88 | + <div class="customTable" role="tabpanel" class="tab-pane active" id="grid-view"> | ||
88 | <div ng-repeat="(key,val) in moduleLandingData.data.root.Item | orderBy:'_Title' "> | 89 | <div ng-repeat="(key,val) in moduleLandingData.data.root.Item | orderBy:'_Title' "> |
89 | <div id="{{val._Id}}" class="col-sm-3 col-lg-2" title="{{val._Title}}" ng-click="openModuleItemView($event)"> | 90 | <div id="{{val._Id}}" class="col-sm-3 col-lg-2" title="{{val._Title}}" ng-click="openModuleItemView($event)"> |
90 | <div class="thumbnail"> | 91 | <div class="thumbnail"> |
@@ -97,87 +98,89 @@ | @@ -97,87 +98,89 @@ | ||
97 | </div> | 98 | </div> |
98 | </div> | 99 | </div> |
99 | <!--<div class="col-xs-12" id="list-view"></div>--> | 100 | <!--<div class="col-xs-12" id="list-view"></div>--> |
100 | - <div role="tabpanel" id="list-view" class="col-xs-12"> | 101 | + <div class="customTable" role="tabpanel" id="list-view"> |
101 | <!--ng-class="{'tab-pane active' : activeTab === 2,'tab-pane' : activeTab !==2 }"--> | 102 | <!--ng-class="{'tab-pane active' : activeTab === 2,'tab-pane' : activeTab !==2 }"--> |
102 | <!--<div class="col-sm-12 table-responsive">--> | 103 | <!--<div class="col-sm-12 table-responsive">--> |
103 | <!--<div class="panel col-sm-12 table-responsive" style="padding-left:0px; padding-right:0; margin-left:11px; margin-bottom:0; width:99%;">--> | 104 | <!--<div class="panel col-sm-12 table-responsive" style="padding-left:0px; padding-right:0; margin-left:11px; margin-bottom:0; width:99%;">--> |
104 | <!--<table class="table table-hover table-condensed bg-white" style="padding-left:25px; width:99%">--> | 105 | <!--<table class="table table-hover table-condensed bg-white" style="padding-left:25px; width:99%">--> |
105 | - <table class="table table-hover table-fixed bg-white table-txt12" style="padding-left:25px; width:100%;"> | ||
106 | - <thead class="clsthead"> | ||
107 | - <tr class="active"> | ||
108 | - <th width="25%">Title</th> | ||
109 | - <th width="15%">Region</th> | ||
110 | - <th width="30%">System</th> | ||
111 | - <th width="15%">View</th> | ||
112 | - <th width="25%">Type</th> | ||
113 | - <!--<th width="25%">Specialty</th>--> | ||
114 | - </tr> | ||
115 | - </thead> | ||
116 | - <tbody id="ListViewDiv" ng-if="!filterstring" class="clstbody"> | ||
117 | - <tr id="{{val._Id}}" ng-class="{selected: val._Id === idSelected}" data-ng-click="openListViewModuleItem($event)" data-ng-dblclick=" openModuleItemView($event)" ng-repeat="(key,val) in moduleLandingData.data.root.Item | orderBy:'_Title'"> | ||
118 | - <td width="25%"> | ||
119 | - {{val._Title}} | ||
120 | - </td> | ||
121 | - <td width="15%"> | ||
122 | - {{val._BodyRegion}} | ||
123 | - </td> | ||
124 | - <td width="30%"> | ||
125 | - {{val._BodySystem}} | ||
126 | - </td> | ||
127 | - <td width="15%"> | ||
128 | - {{val._ViewOrientation}} | ||
129 | - </td> | ||
130 | - <td width="25%"> | ||
131 | - {{val._ImageType}} | ||
132 | - </td> | ||
133 | - <!--<td width="25%"> | ||
134 | - {{item._MedicalSpecialty}} | ||
135 | - </td>--> | ||
136 | - </tr> | ||
137 | - </tbody> | ||
138 | - <tbody id="ListViewDiv" ng-if="filterstring" class="clstbody"> | ||
139 | - <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"> | ||
140 | - <td width="25%"> | ||
141 | - {{item._Title}} | ||
142 | - </td> | ||
143 | - <td width="15%"> | ||
144 | - {{item._BodyRegion}} | ||
145 | - </td> | ||
146 | - <td width="30%"> | ||
147 | - {{item._BodySystem}} | ||
148 | - </td> | ||
149 | - <td width="15%"> | ||
150 | - {{item._ViewOrientation}} | ||
151 | - </td> | ||
152 | - <td width="25%"> | ||
153 | - {{item._ImageType}} | ||
154 | - </td> | ||
155 | - <!--<td width="25%"> | ||
156 | - {{item._MedicalSpecialty}} | ||
157 | - </td>--> | ||
158 | - </tr> | ||
159 | - <!--<tr ng-if="typeof(searchCIListViewData) == 'undefined' || searchCIListViewData == null || searchCIListViewData == ''"> | ||
160 | - <td colspan="6"><strong id="searchItem" style="color:black;">No illustration found for the selected search criteria!</strong></td> | ||
161 | - </tr>--> | 106 | + <div class="panel col-sm-12 table-responsive"> |
107 | + <table class="table table-hover table-fixed bg-white table-txt12"> | ||
108 | + <thead class="clsthead"> | ||
109 | + <tr class="active"> | ||
110 | + <th width="20%">Title</th> | ||
111 | + <th width="20%">Region</th> | ||
112 | + <th width="20%">System</th> | ||
113 | + <th width="10%">View</th> | ||
114 | + <th>Type</th> | ||
115 | + <!--<th width="25%">Specialty</th>--> | ||
116 | + </tr> | ||
117 | + </thead> | ||
118 | + <tbody id="ListViewDiv" ng-if="!filterstring" class="clstbody"> | ||
119 | + <tr id="{{val._Id}}" ng-class="{selected: val._Id === idSelected}" data-ng-click="openListViewModuleItem($event)" data-ng-dblclick=" openModuleItemView($event)" ng-repeat="(key,val) in moduleLandingData.data.root.Item | orderBy:'_Title'"> | ||
120 | + <td width="20%"> | ||
121 | + {{val._Title}} | ||
122 | + </td> | ||
123 | + <td width="20%"> | ||
124 | + {{val._BodyRegion}} | ||
125 | + </td> | ||
126 | + <td width="20%"> | ||
127 | + {{val._BodySystem}} | ||
128 | + </td> | ||
129 | + <td width="10%"> | ||
130 | + {{val._ViewOrientation}} | ||
131 | + </td> | ||
132 | + <td> | ||
133 | + {{val._ImageType}} | ||
134 | + </td> | ||
135 | + <!--<td width="25%"> | ||
136 | + {{item._MedicalSpecialty}} | ||
137 | + </td>--> | ||
138 | + </tr> | ||
139 | + </tbody> | ||
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"> | ||
142 | + <td width="20%"> | ||
143 | + {{item._Title}} | ||
144 | + </td> | ||
145 | + <td width="20%"> | ||
146 | + {{item._BodyRegion}} | ||
147 | + </td> | ||
148 | + <td width="20%"> | ||
149 | + {{item._BodySystem}} | ||
150 | + </td> | ||
151 | + <td width="10%"> | ||
152 | + {{item._ViewOrientation}} | ||
153 | + </td> | ||
154 | + <td> | ||
155 | + {{item._ImageType}} | ||
156 | + </td> | ||
157 | + <!--<td width="25%"> | ||
158 | + {{item._MedicalSpecialty}} | ||
159 | + </td>--> | ||
160 | + </tr> | ||
161 | + <!--<tr ng-if="typeof(searchCIListViewData) == 'undefined' || searchCIListViewData == null || searchCIListViewData == ''"> | ||
162 | + <td colspan="6"><strong id="searchItem" style="color:black;">No illustration found for the selected search criteria!</strong></td> | ||
163 | + </tr>--> | ||
162 | 164 | ||
163 | - </tbody> | ||
164 | - </table> | ||
165 | - <!--</div>--> | ||
166 | - <div class="col-sm-12" ng-show="hiderow" style="padding-left:25px;padding-top:10px;"> | ||
167 | - <div class="row well"> | ||
168 | - <div title="{{SelectedAATitle}}" class="col-sm-3 col-lg-2 no-padding"> | ||
169 | - <div class="thumbnail no-margin"> | ||
170 | - <img id="{{SelectedAAId}}" src="{{SelectedAAthumbImage}}" alt="" title="{{SelectedAATitle}}" data-ng-click="openCurrentView($event)"> | 165 | + </tbody> |
166 | + </table> | ||
167 | + </div> | ||
168 | + <!--</div>--> | ||
169 | + <div class="col-sm-12" ng-show="hiderow" style="padding-left:25px;padding-top:10px;"> | ||
170 | + <div class="row well"> | ||
171 | + <div title="{{SelectedAATitle}}" class="col-sm-3 col-lg-2 no-padding"> | ||
172 | + <div class="thumbnail no-margin"> | ||
173 | + <img id="{{SelectedAAId}}" src="{{SelectedAAthumbImage}}" alt="" title="{{SelectedAATitle}}" data-ng-click="openCurrentView($event)"> | ||
174 | + </div> | ||
175 | + </div> | ||
176 | + <div class="col-sm-9 col-lg-9" style="padding-left:10px;"> | ||
177 | + <p class="f11" ng-bind-html="SelectedAASummary"></p> | ||
178 | + <button id="{{SelectedAAId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="openCurrentView($event)">Open</button> | ||
171 | </div> | 179 | </div> |
172 | </div> | 180 | </div> |
173 | - <div class="col-sm-9 col-lg-9" style="padding-left:10px;"> | ||
174 | - <p class="f11" ng-bind-html="SelectedAASummary"></p> | ||
175 | - <button id="{{SelectedAAId}}" type="button" class="btn btn-primary btn-sm pull-right" data-ng-click="openCurrentView($event)">Open</button> | ||
176 | - </div> | ||
177 | - </div> | ||
178 | 181 | ||
182 | + </div> | ||
179 | </div> | 183 | </div> |
180 | - </div> | ||
181 | </div> | 184 | </div> |
182 | </div> | 185 | </div> |
183 | </div> | 186 | </div> |
400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css
@@ -804,59 +804,24 @@ textarea { | @@ -804,59 +804,24 @@ 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 | -} | ||
811 | -.clsthead tr th { | ||
812 | - min-width: 180px; | ||
813 | - text-align: left; | ||
814 | -} | ||
815 | -.clstheadca tr th { | ||
816 | - /*min-width: 255px;*/ | ||
817 | - text-align: left; | ||
818 | -} | ||
819 | 807 | ||
820 | -.clstbody,.clstbodyca { | ||
821 | - display: block; | ||
822 | - height: 200px; | ||
823 | - width: 100%; | ||
824 | - overflow:auto; | ||
825 | -} | ||
826 | - | ||
827 | -.clstbody tr td { | 808 | +/*.clsthead tr th { |
828 | min-width: 180px; | 809 | min-width: 180px; |
829 | text-align: left; | 810 | text-align: left; |
830 | -} | 811 | +}*/ |
831 | 812 | ||
832 | -.clstbodyca tr td { | ||
833 | - min-width: 275px; | ||
834 | - /*max-width: 260px;*/ | ||
835 | - text-align: left; | ||
836 | - word-wrap:break-word; | ||
837 | - | ||
838 | -} | ||
839 | 813 | ||
840 | 814 | ||
841 | 815 | ||
842 | 816 | ||
843 | -.tablecaview .clstbody tr td { | ||
844 | - min-width: 275px; | 817 | +/*.clstbody tr td { |
818 | + min-width: 180px; | ||
845 | text-align: left; | 819 | text-align: left; |
846 | -} | 820 | +}*/ |
821 | + | ||
847 | 822 | ||
848 | -.tablecaview .clstheadca tr th { | ||
849 | - min-width: 275px; | ||
850 | - text-align: left; | ||
851 | -} | ||
852 | 823 | ||
853 | 824 | ||
854 | -.tablecaview .clstbody,.tablecaview .clstbodyca { | ||
855 | - display: block; | ||
856 | - height: 200px; | ||
857 | - width: 100%; | ||
858 | - overflow:scroll; | ||
859 | -} | ||
860 | 825 | ||
861 | 826 | ||
862 | 827 | ||
@@ -1113,3 +1078,34 @@ a[disabled] { | @@ -1113,3 +1078,34 @@ a[disabled] { | ||
1113 | opacity : 0.5; | 1078 | opacity : 0.5; |
1114 | } | 1079 | } |
1115 | .loginBox input::-ms-clear{display:none;} | 1080 | .loginBox input::-ms-clear{display:none;} |
1081 | + | ||
1082 | + | ||
1083 | +/*06-12-2017*/ | ||
1084 | +.customTable .table-responsive{padding-left:0; padding-right:0;width: 99%; margin-left: 11px;} | ||
1085 | +.customTable .table-fixed .table { | ||
1086 | + max-width:980px; | ||
1087 | + table-layout:fixed; | ||
1088 | + margin:auto; | ||
1089 | +} | ||
1090 | +.customTable .table-fixed th, .table-fixed td { | ||
1091 | + padding:5px 10px; | ||
1092 | +} | ||
1093 | +.customTable .table-fixed thead { | ||
1094 | + background:#f9f9f9; | ||
1095 | + display:table; | ||
1096 | + width:100%; | ||
1097 | + width:calc(100% - 0); | ||
1098 | +} | ||
1099 | +.customTable .table-fixed tbody { | ||
1100 | + height:300px; | ||
1101 | + overflow:auto; | ||
1102 | + overflow-x:hidden; | ||
1103 | + display:block; | ||
1104 | + width:100%; | ||
1105 | +} | ||
1106 | +.customTable .table-fixed tbody tr { | ||
1107 | + display:table; | ||
1108 | + width:100%; | ||
1109 | + table-layout:fixed; | ||
1110 | +} | ||
1111 | + |