From 9320c2fd6b775c9cc2f4a833484898ac5b6fd387 Mon Sep 17 00:00:00 2001
From: Li Heng <shayupi@qq.com>
Date: Mon, 16 Jun 2014 13:25:52 +0000
Subject: [PATCH] =?UTF-8?q?=E4=B8=89=E6=B1=9F=E6=BA=90=E6=80=BB=E7=AB=99?=
 =?UTF-8?q?=E5=A4=B4=E9=83=A8=E6=94=B9=E9=80=A0=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/views/scripts/header.phtml        | 47 ++++++++++---------
 1 file changed, 25 insertions(+), 22 deletions(-)

diff --git a/application/default/views/scripts/header.phtml b/application/default/views/scripts/header.phtml
index 045947bb..3d977b23 100755
--- a/application/default/views/scripts/header.phtml
+++ b/application/default/views/scripts/header.phtml
@@ -1,9 +1,27 @@
 <div class="container">
-    <div class="masthead">
-      <div class="row banner">
-      <div class="span6"><h3 class="head-title">三江源生态监测综合数据服务平台</h3></div>
-      <div class="span6">
-        
+    <div class="masthead1">
+      <div class="row-fluid banner" style="margin:5px 0px;">
+      <div class="span4"><a><img src="/images/logo.png" /></a></div>
+      <div class="span8">
+            <span class="pull-right">
+                <?php
+                        $auth = Zend_Auth::getInstance();
+                        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>'; 
+                 } else { 
+                      echo '<a href="/account/login"><i class="icon-user"></i> 登录  </a> | <a href="/account/register">  注册 </a>';
+                 } ?>
+                </span>
+                
+      			<span class="pull-right" style="margin-top:20px;">
+                 <form method="get" action="/search" id="search" class="navbar-search pull-left">
+                <input type="text" value="" id="q" name="q" class="input-xlarge search-query " placeholder="搜索">
+            </form>
+            </span>
         </div>
       </div>
       <div class="navbar">
@@ -24,23 +42,8 @@
               <li><a href="/about"><span>关于本站</span></a></li>
             </ul>
             
-            <form method="get" action="/search" id="search" class="navbar-search pull-left">
-                <input type="text" value="" id="q" name="q" class="search-query" placeholder="搜索">
-            </form>
-            
-            <p class="navbar-text pull-right">
-                <?php
-                        $auth = Zend_Auth::getInstance();
-                        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>'; 
-                 } else { 
-                      echo '<a href="/account/login"><i class="icon-user"></i>登录</a> <a href="/account/register">注册</a>';
-                 } ?>
-                </p>
+   
+          
                 </div>
           </div>
         </div>