diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js index f9c9e63..4321afb 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/DAController.js @@ -558,6 +558,12 @@ function ($scope, $rootScope, $compile, $http, $log, $location, $timeout, DA, Mo $('#daBodyview').css("height", $(window).outerHeight()); $('#daBodyview').css("width", $(window).outerWidth()); + + if ($('#daImagePanel').offset().top == 0) + $('#daImagePanel').css("top", '70px'); + + if ($('#daImagePanel').offset().left == 0) + $('#daImagePanel').css("left", '1px'); }, 350); } diff --git a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js index c953edd..ec6335c 100644 --- a/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js +++ b/400-SOURCECODE/AIAHTML5.Web/app/controllers/HomeController.js @@ -3358,5 +3358,10 @@ function ($rootScope, Modules, $log, $location, $timeout, DataService, Authentic $("#cursor-block").html(); } + + $rootScope.CheckRefresh = function (e) { + if ((e.keyCode === 116) || (e.keyCode == 82 && e.ctrlKey)) + $location.path('/'); + }; }] ); \ No newline at end of file diff --git a/400-SOURCECODE/AIAHTML5.Web/index.html b/400-SOURCECODE/AIAHTML5.Web/index.html index ec400cd..0c63087 100644 --- a/400-SOURCECODE/AIAHTML5.Web/index.html +++ b/400-SOURCECODE/AIAHTML5.Web/index.html @@ -160,7 +160,7 @@ - +
@@ -203,7 +203,7 @@
- Forgot Password? + Forgot Password?
@@ -656,7 +656,7 @@
- +   @@ -795,7 +795,7 @@ left: 140px; display: none; z-index: 780000; - height:auto!important; + height: auto !important; } #listManager .annotation-modal-header { @@ -915,12 +915,12 @@
+ +
-->
-
+
@@ -1149,7 +1149,7 @@ - +