From bdef44427dffe52e0191c23547ab1d3a912bcf72 Mon Sep 17 00:00:00 2001
From: jack <la5c@qq.com>
Date: Sat, 12 May 2018 16:32:22 +0800
Subject: [PATCH] update search form

---
 application/default/controllers/DataController.php  |  1 +
 application/default/views/scripts/data/index.phtml  |  6 ++++--
 application/default/views/scripts/data/order.phtml  |  7 +++----
 .../default/views/scripts/sanji-header.phtml        | 13 ++++++-------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/application/default/controllers/DataController.php b/application/default/controllers/DataController.php
index d6e11508..4c65c784 100755
--- a/application/default/controllers/DataController.php
+++ b/application/default/controllers/DataController.php
@@ -1656,6 +1656,7 @@ where ds.uuid=? )) ) a ) p on r.id=p.refid order by p.place";
     */
     function orderAction()
     {
+        $this->_helper->layout->setLayout('layout');
 		$this->view->pageID = "account-dataorder";
 		$ac = $this->_request->getParam('ac');
 		
diff --git a/application/default/views/scripts/data/index.phtml b/application/default/views/scripts/data/index.phtml
index eca3e6de..fd9596ec 100755
--- a/application/default/views/scripts/data/index.phtml
+++ b/application/default/views/scripts/data/index.phtml
@@ -10,9 +10,11 @@ $this->headLink()->appendStylesheet('/static-sanji-v2/css/header-position.css');
     <div class="container">
         <div class="col-sm-12">
             <div class="form-group">
-                <input type="text" class="form-control" placeholder="搜素关键词">
+                <form action="/search" id="search-form">
+                    <input type="text" name="q" id="q" class="form-control" placeholder="搜素关键词">
+                </form>
             </div>
-            <i></i>
+            <i onclick="$('#search-form').submit()"></i>
         </div>
     </div>
 </div>
diff --git a/application/default/views/scripts/data/order.phtml b/application/default/views/scripts/data/order.phtml
index 8b3a3397..8bb4b693 100644
--- a/application/default/views/scripts/data/order.phtml
+++ b/application/default/views/scripts/data/order.phtml
@@ -8,7 +8,6 @@
 	$this->theme->AppendPlus($this,'uploadify');
 	$this->theme->AppendModel($this,'offlineapp-uploader');
 ?>
-  <?= $this->render('breadcrumbs.phtml') ?>
   <div class="row">
 
     <div class="span3">
@@ -35,9 +34,9 @@
 </ul>    	
         <!-- content -->
 <?php if (!empty($this->paginator)) : ?>
-<div class="pagenavi"><?= $this->paginator; ?></div>
-<?php  if ($this->tabID=='order-offline2') { ?>
-<div class="well alert alert-error">重要说明：完成一个订单需要三个步骤，即<strong>生成pdf</strong>、<strong>上传签字后的pdf</strong>、<strong>确认订单</strong>。请确保上传的pdf和当前订单中的数据相同，否则无法受理。若不相同，请重新生成、上传。</div>
+<div class="pagenavi"><?= $this->paginator; ?></div>
+<?php  if ($this->tabID=='order-offline2') { ?>
+<div class="well alert alert-error">重要说明：完成一个订单需要三个步骤，即<strong>生成pdf</strong>、<strong>上传签字后的pdf</strong>、<strong>确认订单</strong>。请确保上传的pdf和当前订单中的数据相同，否则无法受理。若不相同，请重新生成、上传。</div>
 <?php } ?>
 	<table class="table table-bordered table-striped">
 		<thead>
diff --git a/application/default/views/scripts/sanji-header.phtml b/application/default/views/scripts/sanji-header.phtml
index 5fe1dfc9..85e76b86 100755
--- a/application/default/views/scripts/sanji-header.phtml
+++ b/application/default/views/scripts/sanji-header.phtml
@@ -19,19 +19,18 @@
                     <li><a href="/about" class="scroll-link">关于本站</a></li>
                     <li><a href="/author" class="scroll-link">数据提交</a></li>
                     <li class="search">
-                        <input type="text" class="form-control" placeholder="搜索">
-                        <i></i>
+                        <form action="/search" id="search-form">
+                            <input type="text" name="q" id="q" class="form-control" placeholder="搜索">
+                            <i onclick="$('#search-form').submit()"></i>
+                        </form>
                     </li>
                     <?php
                     $auth = Zend_Auth::getInstance();
                     if($auth->hasIdentity())
                     {
-                        $user = $auth->getIdentity();
-                        echo '<li class="pull-right"><a href="/account">'.$user->username.'</a></li>';
-                        if ($user->usertype=="administrator") echo '<li class="pull-right"><a href="/admin"><i class="icon-cog"></i>后台</a></li>';
-                        echo '<li class="pull-right"><a href="/data/order"><i class="icon-shopping-cart"></i> 数据篮</a></li><li class="pull-right"><a href="/account/logout">注销</a></li>';
+                        echo '<li><a href="/data/order">数据篮</a></li>';
                     } else {
-                        echo '<li id="login">登录</li>';
+                        echo '<li id="login" onclick="self.location = \'/account/login\'">登录</li>';
                     } ?>
                 </ul>
             </div>