diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js index 9ad54ed..3d76088 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js @@ -182,7 +182,11 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout $('#' + $rootScope.getLocalStorageValue("currentBodyViewId")).find('.thumbnail').addClass('HightLightThumbnail'); $timeout(function () { - $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('CAGridViewScroll') }, 'slow'); + if ($rootScope.getLocalStorageValue('CAGridViewScroll') !== null && $location.url() == "/clinical-animations") + { + + $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('CAGridViewScroll') }, 'slow'); + } }, 300); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js index f4aa0c1..90a483b 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js @@ -202,7 +202,7 @@ function ($scope, $window, $rootScope, $compile, $http, log, $location, $timeout $timeout(function () { $('#' + $rootScope.getLocalStorageValue("currentBodyViewId")).find('.thumbnail').addClass('HightLightThumbnail'); - if ($rootScope.getLocalStorageValue('CIGridViewScroll') !== null) { + if ($rootScope.getLocalStorageValue('CIGridViewScroll') !== null && $location.url() == "/clinical-illustrations") { $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('CIGridViewScroll') }); } }, 100); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js index 848452c..6f36d07 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js @@ -78,7 +78,7 @@ function ($scope, $window, $rootScope, $compile, $http, $log, $location, $timeou if ($rootScope.getLocalStorageValue('AAGridViewHighlightThumbnail') !== null) { $('#' + $rootScope.getLocalStorageValue("AAGridViewHighlightThumbnail")).find('.thumbnail').addClass('HightLightThumbnail'); } - if ($rootScope.getLocalStorageValue('AAGridViewScroll') !== null) { + if ($rootScope.getLocalStorageValue('AAGridViewScroll') !== null && $location.url() == "/tile-view-list") { $('html, body').animate({ scrollTop: $rootScope.getLocalStorageValue('AAGridViewScroll') }, 'slow'); } }, 100); diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html index b29eacf..7c4dd75 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html @@ -2,8 +2,6 @@
- -
@@ -53,55 +51,55 @@
-
+
-
-
- - +
+
+
+ - - - - + + + + - + - - - - - + - - - - + + -->
TitleRegionSystemSpecialtyTitleRegionSystemSpecialty
+ {{item._Title}} + {{item._BodyRegion}} + {{item._BodySystem}} + {{item._MedicalSpecialty}}
+ {{item._Title}} + {{item._BodyRegion}} + {{item._BodySystem}} + {{item._MedicalSpecialty}}
No animation found for the selected search criteria!
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html index 65cc3a7..819bf23 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html @@ -72,112 +72,109 @@
-
-
-
-
--> - -
-
- -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+ +
+ +
TitleRegionSystemViewTypeSpecialty
- {{item._Title}} - - {{item._BodyRegion}} - - {{item._BodySystem}} - - {{item._ViewOrientation}} - - {{item._ImageType}} - - {{item._MedicalSpecialty}} -
- {{item._Title}} - - {{item._BodyRegion}} - - {{item._BodySystem}} - - {{item._ViewOrientation}} - - {{item._ImageType}} - - {{item._MedicalSpecialty}} -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - -
TitleRegionSystemViewTypeSpecialty
+ {{item._Title}} + + {{item._BodyRegion}} + + {{item._BodySystem}} + + {{item._ViewOrientation}} + + {{item._ImageType}} + + {{item._MedicalSpecialty}} +
+ {{item._Title}} + + {{item._BodyRegion}} + + {{item._BodySystem}} + + {{item._ViewOrientation}} + + {{item._ImageType}} + + {{item._MedicalSpecialty}} +
-
-
-
-
-
- -
-
-
-

- -
- -
- - -
+ No illustration found for the selected search criteria! + --> + + + +
+
+
+
+
+ +
+
+
+

+ +
+
+ +
diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html index 2ee553c..c257b6f 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html @@ -84,7 +84,8 @@
-
+ +
@@ -97,87 +98,89 @@
-
+
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +
+
TitleRegionSystemViewType
- {{val._Title}} - - {{val._BodyRegion}} - - {{val._BodySystem}} - - {{val._ViewOrientation}} - - {{val._ImageType}} -
- {{item._Title}} - - {{item._BodyRegion}} - - {{item._BodySystem}} - - {{item._ViewOrientation}} - - {{item._ImageType}} -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - -
TitleRegionSystemViewType
+ {{val._Title}} + + {{val._BodyRegion}} + + {{val._BodySystem}} + + {{val._ViewOrientation}} + + {{val._ImageType}} +
+ {{item._Title}} + + {{item._BodyRegion}} + + {{item._BodySystem}} + + {{item._ViewOrientation}} + + {{item._ImageType}} +
- -
-
-
-
- + + +
+ +
+
+
+
+ +
+
+
+

+
-
-

- -
-
+
-
diff --git a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css index a6623a1..91f8272 100644 --- a/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css +++ b/400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css @@ -804,59 +804,24 @@ textarea { .clsstickydiv{padding-left:19px; width:99%} -.clsthead tr,.clstheadca tr { - display: block; - position: relative; -} -.clsthead tr th { - min-width: 180px; - text-align: left; -} -.clstheadca tr th { - /*min-width: 255px;*/ - text-align: left; -} -.clstbody,.clstbodyca { - display: block; - height: 200px; - width: 100%; - overflow:auto; -} - -.clstbody tr td { +/*.clsthead tr th { min-width: 180px; text-align: left; -} +}*/ -.clstbodyca tr td { - min-width: 275px; - /*max-width: 260px;*/ - text-align: left; - word-wrap:break-word; - -} -.tablecaview .clstbody tr td { - min-width: 275px; +/*.clstbody tr td { + min-width: 180px; text-align: left; -} +}*/ + -.tablecaview .clstheadca tr th { - min-width: 275px; - text-align: left; -} -.tablecaview .clstbody,.tablecaview .clstbodyca { - display: block; - height: 200px; - width: 100%; - overflow:scroll; -} @@ -1113,3 +1078,34 @@ a[disabled] { opacity : 0.5; } .loginBox input::-ms-clear{display:none;} + + +/*06-12-2017*/ +.customTable .table-responsive{padding-left:0; padding-right:0;width: 99%; margin-left: 11px;} +.customTable .table-fixed .table { + max-width:980px; + table-layout:fixed; + margin:auto; +} +.customTable .table-fixed th, .table-fixed td { + padding:5px 10px; +} +.customTable .table-fixed thead { + background:#f9f9f9; + display:table; + width:100%; + width:calc(100% - 0); +} +.customTable .table-fixed tbody { + height:300px; + overflow:auto; + overflow-x:hidden; + display:block; + width:100%; +} +.customTable .table-fixed tbody tr { + display:table; + width:100%; + table-layout:fixed; +} +