From f615c51fd04f3d953157ae625ace2cc120a5bcd4 Mon Sep 17 00:00:00 2001
From: Li Jianxuan <la5c@qq.com>
Date: Tue, 15 Oct 2013 10:06:42 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9search=20form=E4=BD=8D?=
 =?UTF-8?q?=E7=BD=AE=EF=BC=8C=E4=BF=AE=E6=94=B9=E9=A1=B5=E8=84=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/default/views/scripts/footer.phtml |  3 +--
 application/default/views/scripts/header.phtml | 15 +++++++--------
 2 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/application/default/views/scripts/footer.phtml b/application/default/views/scripts/footer.phtml
index 11a8324c..e01ad96c 100755
--- a/application/default/views/scripts/footer.phtml
+++ b/application/default/views/scripts/footer.phtml
@@ -1,7 +1,6 @@
 <footer>
 	<div class="container">
-	<p>© 青海省生态环境遥感监测中心 2013 | <a href="/about/contact" ><i class="icon-envelope"></i>联系我们</a> | <a href="/about/terms">使用条款和免责申明</a>
-    | <a href="http://www.miibeian.gov.cn" target="_blank">陇ICP备05000491号</a></p>
+	<p>© 青海省生态环境遥感监测中心 2013 | <a href="/about/contact" ><i class="icon-envelope"></i>联系我们</a> | <a href="/about/terms">使用条款和免责申明</a></p>
     </div>
 </footer>
 <?php if(!empty($this->pageID)) {?>
diff --git a/application/default/views/scripts/header.phtml b/application/default/views/scripts/header.phtml
index df61456b..d69d3b5a 100755
--- a/application/default/views/scripts/header.phtml
+++ b/application/default/views/scripts/header.phtml
@@ -3,11 +3,7 @@
       <div class="row banner">
       <div class="span6"><h3 class="head-title">三江源生态监测数据的服务管理平台</h3></div>
       <div class="span6">
-        <form method="get" action="/search" id="search" class="pull-right">
-        <div class="input-append">
-            <input type="text" value="" id="q" name="q" class="span4" placeholder="全文搜索">
-            <button type="submit" class="btn"><i class="icon-search"></i>搜索</button>
-        </div></form>
+        
         </div>
       </div>
       <div class="navbar">
@@ -18,17 +14,20 @@
                 <span class="icon-bar"></span>
                 <span class="icon-bar"></span>
               </button>
-              <div class="nav-collapse collapse">
+            <div class="nav-collapse collapse">
             <ul class="nav" id="mainmenu">
               <li id="main-nav-index"><a href="/"><span>首页</span></a></li>
               <li id="main-nav-data"><a href="/data"><span>数据产品</span></a></li>
               <li id="main-nav-review"><a href="/review"><span>数据评审</span></a></li>
-              <li id="main-nav-author"><a href="/author"><span>数据作者</span></a></li>
-              <li id="main-nav-knowledge"><a href="/knowledge"><span>知识积累</span></a></li>
+              <li id="main-nav-author"><a href="/author"><span>数据管理</span></a></li>
               <li><a href="/archives"><span>新闻动态</span></a></li>
               <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();