From 5c945ea49dc46446db458ff791d4aa795bbc8548 Mon Sep 17 00:00:00 2001
From: Li Heng <shayupi@qq.com>
Date: Thu, 29 May 2014 03:56:05 +0000
Subject: [PATCH] =?UTF-8?q?=E6=95=B0=E6=8D=AE=E9=A1=B5=E9=9D=A2=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2=E6=A0=8F=E7=9B=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/default/views/scripts/header.phtml | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/application/default/views/scripts/header.phtml b/application/default/views/scripts/header.phtml
index b292c8dd..75dae9fe 100755
--- a/application/default/views/scripts/header.phtml
+++ b/application/default/views/scripts/header.phtml
@@ -11,7 +11,7 @@
         </div>
         <div class="span9 inline">
         <p class="pull-right" style="color:#000000; font-size:9px;">
-                  			          	<?php
+             <?php
                     $auth = Zend_Auth::getInstance();
                     if($auth->hasIdentity())
                     {
@@ -24,14 +24,18 @@
 
         </p>
         <?php $current_url =$_SERVER["REQUEST_URI"]?>
+        <p>
           <ul class="nav nav-pills">
             <li style="padding-right:20px"<?php if($current_url=='/') echo " class='active'";?> ><a href="/">首 页</a></li>
             <li style="padding-right:20px"<?php if($current_url=='/archives/news/localnews') echo " class='active'";?> ><a href="/archives/news/localnews">新 闻</a></li>
             <li style="padding-right:20px"<?php if($current_url=='/data') echo " class='active'";?> ><a href="/data">数 据</a></li>
             <li style="padding-right:20px"<?php if($current_url=='/about') echo " class='active'";?> ><a href="/about">关于我们</a></li>
-            <li style="padding-right:20px" class="input-append "><!--<form action="/search" method="get"><input class="input-medium"  placeholder="关键字" type="text" name="q"><button class="btn" type="submit">搜索</button></form></li>
-          	-->
+            <li style="padding-right:20px" class="input-append ">
+            <form action="/search" method="get"><input class="input-medium"  placeholder="关键字" type="text" name="q"><button class="btn" type="submit">搜索</button></form>
+            </li>
+          	
           </ul>
+         </p>
         </div>
       </div>
     </div>