diff --git a/module/common/view/datatable.html.php b/module/common/view/datatable.html.php index d28132e25f..4d441faa9c 100644 --- a/module/common/view/datatable.html.php +++ b/module/common/view/datatable.html.php @@ -121,10 +121,12 @@ function fixScroll() if($('div.datatable.head-fixed').size() == 0) scrollOffset -= '34'; var windowH = $(window).height(); var bottom = $tfoot.hasClass('fixedTfootAction') ? 53 + $tfoot.height() : 53; + if(typeof(ssoRedirect) != "undefined") bottom = 53; if(scrollOffset > windowH + $(window).scrollTop()) $scrollwrapper.css({'position': 'fixed', 'bottom': bottom + 'px'}); $(window).scroll(function() { - newBottom = $tfoot.hasClass('fixedTfootAction') ? 53 + $tfoot.height() : 53; + newBottom = $tfoot.hasClass('fixedTfootAction') ? 53 + $tfoot.height() : 53; + if(typeof(ssoRedirect) != "undefined") newBottom = 53; if(scrollOffset <= windowH + $(window).scrollTop()) { $scrollwrapper.css({'position':'relative', 'bottom': '0px'}); diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php index e813913dc3..8c363207c5 100755 --- a/module/common/view/header.html.php +++ b/module/common/view/header.html.php @@ -6,6 +6,9 @@ include 'chosen.html.php'; ?> app->loadConfig('sso');?> +config->sso->redirect)) js::set('ssoRedirect', $this->config->sso->redirect); +?> -
+
config->sso->redirect)) echo "class='ranzhiFixedTfootAction'";?> >
diff --git a/www/js/my.full.js b/www/js/my.full.js index 74a0bfcfe4..ed0ea9713a 100644 --- a/www/js/my.full.js +++ b/www/js/my.full.js @@ -1471,6 +1471,7 @@ function fixedTfootAction(formID) tableOffset, hasFixed; if(!$tbody.length) return false; + if(typeof(ssoRedirect) != "undefined") pageFooterHeight = 0; function fixTfoot() { tableWidth = $table.width(); diff --git a/www/theme/default/style.css b/www/theme/default/style.css index ccb6937357..cb85b8b444 100644 --- a/www/theme/default/style.css +++ b/www/theme/default/style.css @@ -751,6 +751,7 @@ body {color:#141414; padding-bottom: 40px;} #passwordStrength{display:none;} .fixedTfootAction {background-color: #f5f5f5; position: fixed; bottom: 40px; box-shadow: 0 -3px 4px rgba(0,0,0,0.05);} +.ranzhiFixedTfootAction .fixedTfootAction {bottom: 0px;} .table > .fixedTfootAction > tr > td {border-bottom: none} .table > .fixedTfootAction.scrolled > tr > td {background: #2e6dad; border: none; color: #fff} .fixedTfootAction.scrolled .btn {border: 1px solid #fff; border-color: rgba(255,255,255,.5); background-color: #2e6dad!important; text-shadow: none; color: #e5e5e5!important;}