Finish task#2994 禅道如果和然之集成后,样式做调整,cost:3 left:0

This commit is contained in:
wangyidong
2017-05-03 14:39:38 +08:00
parent 4463151d96
commit 099bd94ebb
4 changed files with 52 additions and 4 deletions
+14 -4
View File
@@ -17,23 +17,33 @@
<?php commonModel::printNotifyLink();?>
</div>
</div>
<?php endif;?>
<?php if(!isset($config->global->browserNotice)):?>
<script>
<?php if(!isset($config->global->browserNotice)):?>
browserNotice = '<?php echo $lang->browserNotice?>'
function ajaxIgnoreBrowser(){$.get(createLink('misc', 'ajaxIgnoreBrowser'));}
$(function(){showBrowserNotice()});
</script>
<?php endif;?>
<?php if(!isset($config->global->novice) and $this->loadModel('tutorial')->checkNovice()):?>
<script>
novice = confirm('<?php echo $lang->tutorial->novice?>');
$.get(createLink('tutorial', 'ajaxSaveNovice', 'novice=' + (novice ? 'true' : 'false')), function()
{
if(novice) location.href=createLink('tutorial', 'index');
});
<?php endif;?>
<?php if(!empty($this->config->sso->turnon)):?>
<?php
$ranzhiAddr = $this->config->sso->addr;
$ranzhiURL = substr($ranzhiAddr, 0, strrpos($ranzhiAddr, '/sys/'));
?>
<?php if(!empty($ranzhiURL)):?>
$(function(){ redirect('<?php echo $ranzhiURL?>', '<?php echo $this->config->sso->code?>'); });
<?php endif;?>
<?php endif;?>
</script>
<?php endif;?>
<script>config.onlybody = '<?php echo $onlybody?>';</script>
+10
View File
@@ -5,13 +5,23 @@ include 'chosen.html.php';
//include 'validation.html.php';
?>
<?php if(empty($_GET['onlybody']) or $_GET['onlybody'] != 'yes'):?>
<?php $this->app->loadConfig('sso');?>
<header id='header'>
<?php if(empty($this->config->sso->turnon)):?>
<div id='topbar'>
<div class='pull-right' id='topnav'><?php commonModel::printTopBar();?></div>
<h5 id='companyname'>
<?php printf($lang->welcome, $app->company->name);?>
</h5>
</div>
<?php endif;?>
<?php
if(!empty($this->config->sso->turnon))
{
css::import($defaultTheme . 'bindranzhi.css');
js::import($jsRoot . 'bindranzhi.js');
}
?>
<nav id='mainmenu'>
<?php commonModel::printMainmenu($this->moduleName); commonModel::printSearchBox();?>
</nav>
+22
View File
@@ -0,0 +1,22 @@
function redirect(ranzhiURL, ranzhiCode)
{
var notInIframe = (self == parent);
var entryUrl = encodeURIComponent(window.location.href);
if(notInIframe) location.href = ranzhiURL + '/sys/index.php?entryID=' + ranzhiCode + '&entryUrl=' + entryUrl;
}
function setOuterBox()
{
var side = $('#wrap .outer > .side');
var resetOuterHeight = function()
{
var sideH = side.length ? (side.outerHeight() + $('#featurebar').outerHeight() + 20) : 0;
var height = Math.max(sideH, $(window).height() - $('#header').outerHeight() || 0) - 20;
if(navigator.userAgent.indexOf("MSIE 8.0") >= 0) height -= 40;
$('#wrap .outer').css('min-height', height);
}
side.resize(resetOuterHeight);
$(window).resize(resetOuterHeight);
resetOuterHeight();
}
+6
View File
@@ -0,0 +1,6 @@
body{padding-bottom:0px;}
#header{padding-top:0px;}
#mainmenu{margin-top:0px;margin-left:-20px;}
#mainmenu .nav li a{height:40px; line-height:25px;}
#searchbox{top:8px;}
#footer{display:none;}