From 099bd94ebbe922c7b580190ebae7aba68bd2bf02 Mon Sep 17 00:00:00 2001
From: wangyidong <yidong@cnezsoft.com>
Date: Wed, 3 May 2017 14:39:38 +0800
Subject: [PATCH] =?UTF-8?q?Finish=20task#2994=20=E7=A6=85=E9=81=93?=
 =?UTF-8?q?=E5=A6=82=E6=9E=9C=E5=92=8C=E7=84=B6=E4=B9=8B=E9=9B=86=E6=88=90?=
 =?UTF-8?q?=E5=90=8E=EF=BC=8C=E6=A0=B7=E5=BC=8F=E5=81=9A=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?,cost:3=20left:0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/common/view/footer.html.php | 18 ++++++++++++++----
 module/common/view/header.html.php | 10 ++++++++++
 www/js/bindranzhi.js               | 22 ++++++++++++++++++++++
 www/theme/default/bindranzhi.css   |  6 ++++++
 4 files changed, 52 insertions(+), 4 deletions(-)
 create mode 100644 www/js/bindranzhi.js
 create mode 100644 www/theme/default/bindranzhi.css

diff --git a/module/common/view/footer.html.php b/module/common/view/footer.html.php
index fe5cde58b7..05c609dfdd 100755
--- a/module/common/view/footer.html.php
+++ b/module/common/view/footer.html.php
@@ -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>
diff --git a/module/common/view/header.html.php b/module/common/view/header.html.php
index 291bb398e1..69f53686b6 100755
--- a/module/common/view/header.html.php
+++ b/module/common/view/header.html.php
@@ -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>
diff --git a/www/js/bindranzhi.js b/www/js/bindranzhi.js
new file mode 100644
index 0000000000..e013a11ada
--- /dev/null
+++ b/www/js/bindranzhi.js
@@ -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();
+}
diff --git a/www/theme/default/bindranzhi.css b/www/theme/default/bindranzhi.css
new file mode 100644
index 0000000000..69732fba70
--- /dev/null
+++ b/www/theme/default/bindranzhi.css
@@ -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;}