From 44b52330a67a3de5b6acf4e81fec5c716674516a Mon Sep 17 00:00:00 2001
From: Li Heng <shayupi@qq.com>
Date: Tue, 11 Mar 2014 05:22:19 +0000
Subject: [PATCH] =?UTF-8?q?=09=E9=A6=96=E9=A1=B5=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E9=9B=86=E9=93=BE=E6=8E=A5=E9=97=AE=E9=A2=98=EF=BC=8C=E5=A4=B4?=
 =?UTF-8?q?=E9=83=A8=E9=80=80=E5=87=BA=E9=97=AE=E9=A2=98=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 module/Application/view/application/index/index.phtml | 6 +-----
 module/Application/view/layout/header.phtml           | 4 ++--
 2 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/module/Application/view/application/index/index.phtml b/module/Application/view/application/index/index.phtml
index 49eeac65..4edce8e8 100644
--- a/module/Application/view/application/index/index.phtml
+++ b/module/Application/view/application/index/index.phtml
@@ -45,11 +45,7 @@
           <h4 class="box-title">青海湖数据集</h4>
          <ul>          
              <?php foreach($this->qinghaihu as $k=>$v){ ?>
-    			<li>
-                	<a href="<?= $this->url('news',array('category'=>$v['code'],'article'=>$v['id'])) ?>">
-						<?= mb_strlen($v['title'],"UTF-8") > 27 ? mb_substr($v['title'],0,27,"UTF-8")."..." : $v['title'] ?>
-                    </a>
-                </li>
+    			<li><a href="<?= $v['url'] ?>"><?= $v['title'] ?></a></li>
 			<?php } ?>
 
             <span class="pull-right" style="color:#000000; font-size:9px;"><a href="/archives/news/localnews" target="_blank" class="more">更多>></a></span>
diff --git a/module/Application/view/layout/header.phtml b/module/Application/view/layout/header.phtml
index 161ffe35..cdd50ae7 100644
--- a/module/Application/view/layout/header.phtml
+++ b/module/Application/view/layout/header.phtml
@@ -2,7 +2,7 @@
 
 <?php $config = \Sookon\Helpers\Config::get(); ?>
 <header>
-  <div class="container-fluid">
+  <div class="container">
   		<div class="row-fluid">
           <div class="span12 inline">
                 <ul class="pull-right inline" style="color:#000000; font-size:12px; a">
@@ -10,7 +10,7 @@
                     $user = \Sookon\Helpers\View::User();
                     if($user)
                     {
-                        echo '<li><a href="/account"><i class="icon-user"></i>'.$user->username.'</a><a href="/account/logout">退出</a></li> ';
+                        echo '<li><a href="/account"><i class="icon-user"></i>'.$user->username.'</a></li> ';
                         if ($user->usertype=="administrator")
 						 echo '<li><a href="/admin"><i class="icon-cog"></i> 后台 </a></li><li><a href="/data/order"><i class="icon-shopping-cart"></i> 数据篮 </a></li><li> <a href="/account/logout">退出</a></li> ';
              } else {