From 64f458422a18e6a5b6b8645494f28f2938d193ee Mon Sep 17 00:00:00 2001
From: jack <la5c@qq.com>
Date: Mon, 5 Feb 2018 16:23:40 +0800
Subject: [PATCH] update header style

---
 .../default/views/scripts/index/index.phtml    | 18 +++++++++---------
 .../default/views/scripts/sanji-header.phtml   |  6 +++---
 htdocs/static-sanji/css/common.css             |  1 +
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/application/default/views/scripts/index/index.phtml b/application/default/views/scripts/index/index.phtml
index eaf26cee..48c4f618 100755
--- a/application/default/views/scripts/index/index.phtml
+++ b/application/default/views/scripts/index/index.phtml
@@ -232,22 +232,22 @@
         <div class="swiper-container cooperation">
             <div class="swiper-wrapper">
                 <div class="swiper-slide">
-                    <div class="col-md-3">
-                        <img src="/static-sanji/images/cooperator/cooperator34.png"><p>中国科学院西北生态环境资源研究院</p>
-                        <img src="/static-sanji/images/cooperator/cooperator35.jpg"><p>中国科学院遥感与数字地球研究所</p>
-                    </div>
                     <div class="col-md-3">
                         <img src="/static-sanji/images/cooperator/cooperator32.jpg"><p>中国科学院青藏高原研究所</p>
-                        <img src="/static-sanji/images/cooperator/cooperator26.jpg"><p>中国科学院大气物理研究所</p>
-                    </div>
-                    <div class="col-md-3">
-                        <img src="/static-sanji/images/cooperator/cooperator28.jpg"><p>中国科学院地理科学与资源研究所</p>
                         <img src="/static-sanji/images/cooperator/cooperator25.png"><p>中国科学院测量与地球物理研究所</p>
                     </div>
                     <div class="col-md-3">
-                        <img src="/static-sanji/images/cooperator/cooperator30.jpg"><p>中国科学院东北地理与农业生态研究所</p>
+                        <img src="/static-sanji/images/cooperator/cooperator34.png"><p>中国科学院西北生态环境资源研究院</p>
+                        <img src="/static-sanji/images/cooperator/cooperator28.jpg"><p>中国科学院地理科学与资源研究所</p>
+                    </div>
+                    <div class="col-md-3">
+                        <img src="/static-sanji/images/cooperator/cooperator35.jpg"><p>中国科学院遥感与数字地球研究所</p>
                         <img src="/static-sanji/images/cooperator/cooperator29.jpg"><p>中国科学院地质与地球物理研究所</p>
                     </div>
+                    <div class="col-md-3">
+                        <img src="/static-sanji/images/cooperator/cooperator26.jpg"><p>中国科学院大气物理研究所</p>
+                        <img src="/static-sanji/images/cooperator/cooperator30.jpg"><p>中国科学院东北地理与农业生态研究所</p>
+                    </div>
                 </div>
                 <div class="swiper-slide">
                     <div class="col-md-3">
diff --git a/application/default/views/scripts/sanji-header.phtml b/application/default/views/scripts/sanji-header.phtml
index e944b073..bdf9f071 100755
--- a/application/default/views/scripts/sanji-header.phtml
+++ b/application/default/views/scripts/sanji-header.phtml
@@ -30,9 +30,9 @@
                         if($auth->hasIdentity())
                         {
                             $user = $auth->getIdentity();
-                            echo '<a href="/account"><i class="icon-user"></i>'.$user->username.'</a> ';
-                            if ($user->usertype=="administrator") echo '<a href="/admin"><i class="icon-cog"></i>后台</a> ';
-                            echo '<a href="/data/order"><i class="icon-shopping-cart"></i>数据篮</a> <a href="/account/logout">注销</a>';
+                            echo '<li class="pull-right"><a href="/account">'.$user->username.'</a></li>';
+                            if ($user->usertype=="administrator") echo '<li class="pull-right"><a href="/admin"><i class="icon-cog"></i>后台</a></li>';
+                            echo '<li class="pull-right"><a href="/data/order"><i class="icon-shopping-cart"></i> 数据篮</a></li><li class="pull-right"><a href="/account/logout">注销</a></li>';
                         } else {
                             echo '<li class="user pull-right"><a href="/account/login"></a></li>';
                         } ?>
diff --git a/htdocs/static-sanji/css/common.css b/htdocs/static-sanji/css/common.css
index 90abf92c..2bbabd3c 100644
--- a/htdocs/static-sanji/css/common.css
+++ b/htdocs/static-sanji/css/common.css
@@ -42,6 +42,7 @@ ul,li,p,h1,h2,h3,h4,h5,h6{
 .navbar-nav>li>a{
     padding-top: 10px !important;
     padding-bottom: 10px !important;
+    border: 1px solid white;
 }
 .search a{
     width:30px;