Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

* Fix bug #1127.

Browse Source
This commit is contained in:
pengjiangxiu
2017-07-24 17:02:57 +08:00
parent c555c79de7
commit bc5f724eaa
4 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/common/view/datatable.html.php
+3 -1
View File
@@ -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'});
module/common/view/header.html.php
+4 -1
View File
@@ -6,6 +6,9 @@ include 'chosen.html.php';
?>
<?php if(empty($_GET['onlybody']) or $_GET['onlybody'] != 'yes'):?>
<?php $this->app->loadConfig('sso');?>
<?php
if(!empty($this->config->sso->redirect)) js::set('ssoRedirect', $this->config->sso->redirect);
?>
<header id='header'>
<?php if(empty($this->config->sso->redirect)):?>
<div id='topbar'>
@@ -33,6 +36,6 @@ if(!empty($this->config->sso->redirect))
</nav>
</header>
<div id='wrap'>
<div id='wrap' <?php if(!empty($this->config->sso->redirect)) echo "class='ranzhiFixedTfootAction'";?> >
<?php endif;?>
<div class='outer'>
www/js/my.full.js
+1
View File
@@ -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();
www/theme/default/style.css
+1
View File
@@ -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;}