From 124ad5263a2b9a2f60930b32af5472a61683590b Mon Sep 17 00:00:00 2001
From: Li Jianxuan <la5c@qq.com>
Date: Tue, 7 Jan 2014 07:43:07 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=86=E7=A6=BB=E7=BA=BF?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E7=94=B3=E8=AF=B7=E9=A1=B5=E9=9D=A2=E7=9A=84?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=EF=BC=8C=E5=88=A0=E9=99=A4=E4=BA=86=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E4=B8=AD=E6=96=B0=E7=A6=BB=E7=BA=BF=E7=94=B3=E8=AF=B7?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E7=9A=84=E9=93=BE=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../admin/views/scripts/down/left.phtml       |  1 -
 .../admin/views/scripts/down/offlineapp.phtml | 74 ++++++++++---------
 2 files changed, 39 insertions(+), 36 deletions(-)

diff --git a/application/admin/views/scripts/down/left.phtml b/application/admin/views/scripts/down/left.phtml
index 610988ed..6ba5d2ab 100644
--- a/application/admin/views/scripts/down/left.phtml
+++ b/application/admin/views/scripts/down/left.phtml
@@ -1,7 +1,6 @@
 <ul class="nav nav-pills nav-stacked well">
 <span class="label"><h4>申请管理与在线下载记录</h4></span>
 <li><a href="/admin/down/offlineapp">离线数据申请管理</a></li>
-<li><a href="/admin/down/offlineapps">离线数据申请管理(新)</a></li>
 <li><a href="/admin/down/offline">离线数据服务记录</a></li>
 <li><a href="/admin/down/fixoffline">手动同步离线申请用户与网站帐号</a></li>
 <li><a href="/admin/down/online">在线数据下载记录（从20110908开始）</a></li>
diff --git a/application/admin/views/scripts/down/offlineapp.phtml b/application/admin/views/scripts/down/offlineapp.phtml
index c274cba7..99598dda 100644
--- a/application/admin/views/scripts/down/offlineapp.phtml
+++ b/application/admin/views/scripts/down/offlineapp.phtml
@@ -2,55 +2,58 @@
 	$this->headTitle($this->config->title->site);
 	$this->headTitle('后台管理');
 	$this->headTitle()->setSeparator(' - ');
-	$this->headLink()->appendStylesheet('/css/admin.css');
 	$this->breadcrumb('<a href="/">首页</a>');
 	$this->breadcrumb('<a href="/admin">后台首页</a>');
 	$this->breadcrumb('<a href="/admin/down">申请管理</a>');
 	$this->Theme->AppendPlus($this,'colorbox');
 	$this->Theme->AppendPlus($this,'uploadify');
-	$this->headLink()->appendStylesheet('/css/author.css');
 	$this->breadcrumb('离线数据申请管理</a>');
 	$this->breadcrumb()->setSeparator(' > ');
 ?>
-<div id="leftPanel">
-<?= $this->partial('down/left.phtml'); ?>
-</div>
-<div id="rightPanel">
+<div class="row-fluid">
+    <div class="span3">
+    	<?= $this->partial('down/left.phtml'); ?>
+    </div>
+	<div class="span9">
+		<?php if ($this->msg or $this->messages) :?>
+        <div id="message">
+        <?php if ($this->msg) : ?>
+            <p><?php echo $this->msg; ?></p>
+        <?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
+            <p><?php echo $msg; ?></p>
+        <?php endforeach;endif; ?>
+        </div>
+        <?php endif; ?>
 
-<?php if ($this->msg or $this->messages) :?>
-<div id="message">
-<?php if ($this->msg) : ?>
-	<p><?php echo $this->msg; ?></p>
-<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
-	<p><?php echo $msg; ?></p>
-<?php endforeach;endif; ?>
-</div>
-<?php endif; ?>
-
-<div class="right_title">离线数据申请管理</div>
-
-<a href="/admin/down/offlineapp/reset/-1" onclick="return confirm('是否重置该申请？')">重置1年前的所有未收到申请表的记录</a>
- | <a href="/admin/down/offlineapp/status/4">已收到的申请</a>
- | <a href="/admin/down/offlineapp/status/-1">已拒绝的申请</a>
- | <a href="/admin/down/offlineapp/ac/pending">待处理的申请</a>  
- | <a href="/admin/down/offline">已通过的申请(离线服务记录)</a> 
- <div class="search">
-	<form action="/admin/down/offlineapp" method="get">
-    <input name="search" value="1" type="hidden">
-    	<ul>
-    	<li><input name="q" value="" type="text" placeholder="搜索关键字"></li>
-    	<li><input class="searchbtn" value="搜索" type="submit"></li>
-    	</ul>
-    </form>
- </div>
- <div id="datalist">
+        <h4>离线数据申请管理</h4>
+        
+        <div style="overflow:hidden">
+            <div class="pull-left">
+            <a href="/admin/down/offlineapp/reset/-1" onclick="return confirm('是否重置该申请？')" class="btn btn-info">重置1年前的所有未收到申请表的记录</a>
+            <a href="/admin/down/offlineapp/status/4" class="btn btn-info">已收到的申请</a>
+            <a href="/admin/down/offlineapp/status/-1" class="btn btn-info">已拒绝的申请</a>
+            <a href="/admin/down/offlineapp/ac/pending" class="btn btn-info">待处理的申请</a>  
+            <a href="/admin/down/offline" class="btn btn-info">已通过的申请(离线服务记录)</a> 
+            </div>
+            
+            <div class="input-append pull-right">
+                <form id="datasearch" class="search_form" action="">
+                    <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
+                    <input type="hidden" name="order" value="<?php if(!empty($this->search_order)) echo $this->search_order; ?>" />
+                    <input type="hidden" name="sort" value="<?php if(!empty($this->search_sort)) echo $this->search_sort; ?>" />
+                    <button type="submit" class="btn" id="search_btn">搜索</button>
+                </form>
+            </div>
+		</div>
+    
+ 		<div id="datalist" style="overflow:hidden">
 		<?php
 		if (count($this->paginator)): 
-		echo "<ul>";
+		echo '<ul class="unstyled">';
 			$autoindex=0;
 			foreach ($this->paginator as $item): 
 			$autoindex++;?>
-			<li id="list_<?php echo $item['id'];?>">
+			<li id="list_<?php echo $item['id'];?>" class="well well-small">
 				<p>
                 <?= $autoindex ?>. 
                 <a href="mailto:<?= $item['email']; ?>?subject=答复数据申请问题"><?= $item['username']; ?></a> | 
@@ -90,6 +93,7 @@
 		endif; ?>
         <div class="pagenavi"><?= $this->paginator; ?></div>
     </div>
+    </div>
  </div>
 <div id="upload-form" class="modal hide fade" tabindex="-1" aria-hidden="true">
     <div class="modal-header">