From eb3658e4e9cd6c7f08a2ec09d687dcad1c6f7af6 Mon Sep 17 00:00:00 2001 From: Mukul Date: Fri, 8 Dec 2017 18:19:29 +0530 Subject: [PATCH] this is table issues with ipad latest --- 400-SOURCECODE/AIAHTML5.Web/app/controllers/CAController.js | 6 +++++- 400-SOURCECODE/AIAHTML5.Web/app/controllers/CIController.js | 2 +- 400-SOURCECODE/AIAHTML5.Web/app/controllers/TileViewListController.js | 2 +- 400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html | 6 +++--- 400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html | 4 ++-- 400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html | 8 ++++---- 400-SOURCECODE/AIAHTML5.Web/themes/default/css/bootstrap/3.3.6/main.css | 48 +++--------------------------------------------- 7 files changed, 19 insertions(+), 57 deletions(-) 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 83bb6fd..26db6b8 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 092c630..7c4dd75 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/ca/ca-view.html @@ -84,13 +84,13 @@ - + {{item._Title}} - + {{item._BodyRegion}} - + {{item._BodySystem}} 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 8356ba4..819bf23 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/ci/ci-view.html @@ -144,10 +144,10 @@ {{item._BodySystem}} - + {{item._ViewOrientation}} - + {{item._ImageType}} diff --git a/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html b/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html index 5789c46..c257b6f 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html +++ b/400-SOURCECODE/AIAHTML5.Web/app/views/tile-view.html @@ -139,16 +139,16 @@ - + {{item._Title}} - + {{item._BodyRegion}} - + {{item._BodySystem}} - + {{item._ViewOrientation}} 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 ee19070..954170d 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,67 +804,25 @@ 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; -}*/ -.clstbodyca { - display: block; - height: 200px; - width: 100%; - overflow:auto; -} + + /*.clstbody tr td { 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; - 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; -} - .cur-pot { -- libgit2 0.21.4