From 078d8deef839039fc14cf7197c99426276f17421 Mon Sep 17 00:00:00 2001
From: Li Heng <shayupi@qq.com>
Date: Tue, 4 Mar 2014 10:49:28 +0000
Subject: [PATCH] =?UTF-8?q?=20=E7=BD=91=E7=AB=99=E9=83=A8=E9=83=A8?=
 =?UTF-8?q?=E6=A0=B7=E5=BC=8F=E3=80=81LOGO=EF=BC=8C=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E4=BF=AE=E6=94=B9=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../view/application/index/index.phtml        |  8 +++----
 module/Application/view/layout/footer.phtml   |  2 +-
 module/Application/view/layout/header.phtml   | 22 ++++++++++++-------
 3 files changed, 19 insertions(+), 13 deletions(-)

diff --git a/module/Application/view/application/index/index.phtml b/module/Application/view/application/index/index.phtml
index 488d0b75..565db327 100644
--- a/module/Application/view/application/index/index.phtml
+++ b/module/Application/view/application/index/index.phtml
@@ -2,7 +2,7 @@
   <div class="row-fluid">
       <div class="span4">
         <div class="box">
-          <h4 class="box-title">最近更新 <small>Latest news</small></h4>
+          <h4 class="box-title">新闻动态 </h4>
           <ul> 
           	 <?php if(!empty($this->articles)) { ?>
              <?php foreach($this->articles as $k=>$v){ ?>
@@ -25,7 +25,7 @@
           <h4 class="box-title">最新数据</h4>
          <ul>
              <?php foreach($this->metadata as $k=>$v){ ?>
-    			<li><a href="<?= $this->url('data/view',array('uuid'=>$v['uuid'])) ?>"><?= $v['title'] ?></a><small style=" padding-left:20px;">[<?= $v['ts_published'] ?>]</small></li>
+    			<li><small style=" padding-right:10px;">[<?= $v['ts_published'] ?>]</small><a href="<?= $this->url('data/view',array('uuid'=>$v['uuid'])) ?>"><?= $v['title'] ?></a></li>
 			 <?php } ?>
 
             <span class="pull-right" style="color:#000000; font-size:9px;">
@@ -42,7 +42,7 @@
     <div class="row-fluid">
       <div class="span4">
         <div class="box">
-          <h4 class="box-title">新闻</h4>
+          <h4 class="box-title">青海湖数据集</h4>
          <ul>          
              <?php foreach($this->news as $k=>$v){ ?>
     			<li>
@@ -72,7 +72,7 @@
       <!-- /.span4 -->
       <div class="span4">
         <div class="box">
-          <h4 class="box-title">最新数据集</h4>
+          <h4 class="box-title">三江源数据集</h4>
          <ul>          
              <?php foreach($this->articles as $k=>$v){ ?>
     			<li><a href="<?= $v['url'] ?>"><?= $v['title'] ?></a></li>
diff --git a/module/Application/view/layout/footer.phtml b/module/Application/view/layout/footer.phtml
index c3c40b56..335e2f6d 100644
--- a/module/Application/view/layout/footer.phtml
+++ b/module/Application/view/layout/footer.phtml
@@ -5,7 +5,7 @@
 <footer class="footer">
   <div class="container">
     <p class="pull-right"><a href="#" class="icon-arrow-up"></a></p>
-    <p>CopyRight &copy; 2014-2015 青海省生态环境遥感监测中心. &middot; <a href="#">中科院寒区旱区数据中心</a> </p>
+    <p>CopyRight &copy; 2014-2015 青海省生态环境遥感监测中心. &middot; power by&nbsp;<a href="http://westdc.westgis.ac.cn/">westdc</a> </p>
   </div>
 </footer>
 
diff --git a/module/Application/view/layout/header.phtml b/module/Application/view/layout/header.phtml
index 89a676e3..9cf858e3 100644
--- a/module/Application/view/layout/header.phtml
+++ b/module/Application/view/layout/header.phtml
@@ -1,18 +1,16 @@
 
-
+<link href="../../../../public/sjyportal/css/style.css" rel="stylesheet" type="text/css" />
 <?php $config = \Sookon\Helpers\Config::get(); ?>
 <header>
-  <div class="container">
-    <div class="row-fluid">
-      <div class="span12">
-        <div class="span3"><img src="/sjyportal/img/logo.png"</img></div>
-        <div class="span9 inline">
-                <ul class="pull-right inline" style="color:#000000; font-size:9px;">
+  <div class="container-fluid">
+  		<div class="row-fluid">
+          <div class="span12 inline">
+                <ul class="pull-right inline" style="color:#000000; font-size:12px; a">
                   <?php
                     $user = \Sookon\Helpers\View::User();
                     if($user)
                     {
-                        echo '<li><a href="/account"><i class="icon-user"></i> '.$user->username.'</a></li> ';
+                        echo '<li><a href="/account"><img src="/sjyportal/img/user.png"</img> '.$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 { 
@@ -20,6 +18,13 @@
              } ?> 
 
         </ul>
+        </div>
+        </div>
+	<div class="container">
+    <div class="row-fluid">
+      <div class="span12">
+        <div class="span4"><img src="/sjyportal/img/logo.png"</img></div>
+        <div class="span8 inline">
           <ul class="nav nav-pills pull-right">
             <li id="page-nav-index"><a href="<?= $this->url('home') ?>">首 页</a></li>
             <li id="page-nav-news"><a href="<?= $this->url('news',array('category'=>'index')) ?>">新 闻</a></li>
@@ -34,6 +39,7 @@
       </div>
     </div>
   </div>
+  </div>
 </header>
 <!--  /.header    -->