From fd5436c41ab4fd1221f53cbce0cbad52950bf76a Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Wed, 24 Oct 2012 09:52:06 +0000
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=95=B0=E6=8D=AE=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../scripts/heihe/submit-newdata-add.phtml    |  4 +--
 .../views/scripts/heihe/submit-newdata.phtml  | 31 +++++++++++++++++--
 2 files changed, 29 insertions(+), 6 deletions(-)

diff --git a/application/default/views/scripts/heihe/submit-newdata-add.phtml b/application/default/views/scripts/heihe/submit-newdata-add.phtml
index 9e8292a6..c99e0fe2 100644
--- a/application/default/views/scripts/heihe/submit-newdata-add.phtml
+++ b/application/default/views/scripts/heihe/submit-newdata-add.phtml
@@ -31,14 +31,12 @@ $this->headLink()->appendStylesheet('/css/colorbox.css');
                 <li class="box-shadow"><a class="text-shadow" href="/heihe/submit/ac/unsubmit">未提交元数据</a></li>
             </ul>
         </div>
-        <div style="width:70%;overflow:hidden;padding-left:20px;">
+        <div id="datalist">
         <h2>根据已有元数据来创建数据</h2>
         <form id="datasearch" class="search_form" action="/submit/newdata/ac/add">
             <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
             <button type="submit" class="btn" id="search_btn">搜索</button>
         </form>
-        </div>
-        <div id="datalist">
             <?php
                 if (count($this->paginator)): 
                 echo "<ul>";
diff --git a/application/default/views/scripts/heihe/submit-newdata.phtml b/application/default/views/scripts/heihe/submit-newdata.phtml
index a8bd32d0..96c5a6d7 100644
--- a/application/default/views/scripts/heihe/submit-newdata.phtml
+++ b/application/default/views/scripts/heihe/submit-newdata.phtml
@@ -32,9 +32,34 @@ $this->headLink()->appendStylesheet('/css/colorbox.css');
             </ul>
         </div>
         
-        
-    </div>
-    
+<div id="datalist">
+<h2>根据预制元数据模板创建数据</h2>
+<form id="datasearch" class="search_form" action="/submit/newdata/">
+    <input type="text" id="keyword" name="q" value="<?php if(!empty($this->q)) echo $this->q; ?>" />
+    <button type="submit" class="btn" id="search_btn">搜索</button>
+</form>
+    <?php
+		if (count($this->paginator)): 
+		echo "<ul>";
+			$autoindex=0;
+			foreach ($this->paginator as $item): 
+			$autoindex++;
+			?>
+   <li>
+				<p><span class="title"><?php echo $item['title'];?></span>
+				【<a href="/service/geonetwork?url=metadata.create?group=2<?php echo urlencode('&id='.$item['id']); ?>" target="_blank">以此为模板新建</a>
+				<?php if ($this->isadmin || $item['isowner']==0) : ?>
+				| <a href="/service/geonetwork?url=metadata.edit?id=<?php echo $item['id'];?>" target="_blank">修改此模板</a>
+				<?php endif; ?>
+				】</p>
+			</li>
+     <?php
+		endforeach; 
+		echo "</ul>";
+		endif; ?>
+</div>
+<div class="pagenavi"><?= $this->paginator; ?></div>       
+    </div>     
     <?php } ?>
 </div>
 <script type="text/javascript" charset="utf-8">