From c12be9a74cc4890b6b64297539130d32493b63d7 Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Mon, 28 Jun 2010 09:37:55 +0000
Subject: [PATCH] =?UTF-8?q?=E6=94=B9=E5=8F=98=E5=85=B3=E9=94=AE=E8=AF=8D?=
 =?UTF-8?q?=E9=93=BE=E6=8E=A5=E5=9C=B0=E5=9D=80=E5=88=B0water?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/views/scripts/water/normalmeteo.phtml      |  2 +-
 application/default/views/scripts/water/view.phtml     | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/application/default/views/scripts/water/normalmeteo.phtml b/application/default/views/scripts/water/normalmeteo.phtml
index 10edafe5..2ba78a03 100644
--- a/application/default/views/scripts/water/normalmeteo.phtml
+++ b/application/default/views/scripts/water/normalmeteo.phtml
@@ -20,9 +20,9 @@ $this->breadcrumb()->setSeparator(' > ');
 <p>试验区内常规业务气象站观测的逐日气象资料从中国气象科学数据共享网：（http://cdc.cma.gov.cn）获取。</p>
 <p>试验区内甘肃省常规业务气象站观测的6时气象资料从甘肃省气象局信息中心获取。</p>
 </div>
-<hr />
 <?php if ($this->metadata) : ?>
 <?php echo $this->page->getNavigation(); ?>
+<hr />
 <div id="mdlist">
 <ol start="<?php echo $this->offset; ?>">
 	<?php foreach($this->metadata as $md) : ?>
diff --git a/application/default/views/scripts/water/view.phtml b/application/default/views/scripts/water/view.phtml
index 103589df..b717152e 100755
--- a/application/default/views/scripts/water/view.phtml
+++ b/application/default/views/scripts/water/view.phtml
@@ -22,7 +22,7 @@ if ($md->title_en) echo '<br />'.$this->escape($md->title_en);?>
 <div id="ItemSummary">
 	<div id="category">
 	<ul><?php foreach($this->category as $cat): ?>
-	<li><a href="/data/category/code/<?php echo $cat['code'];?>"><?php echo $this->escape($cat['name_zh']);?></a></li>
+	<li><a href="/water/category/code/<?php echo $cat['code'];?>"><?php echo $this->escape($cat['name_zh']);?></a></li>
 	<?php endforeach; ?>
 	</ul>
 	</div>
@@ -38,12 +38,12 @@ foreach($this->keys as $cg) :
 		$i=0;
 	endif;
 	if ($i==0) echo '<div id="'.$cg['keytype'].'"><ul>';
-	echo '<li><a href="/data/tag/key/'.urlencode($cg['keyword']).'">'.$cg['keyword'].'</a></li>';
+	echo '<li><a href="/water/tag/key/'.urlencode($cg['keyword']).'">'.$cg['keyword'].'</a></li>';
 endforeach;
 echo '</ul></div>';
 ?>
 
-
+<!--
 	<?php if ($this->series): ?>
 	<div id="series">
 	<ul><?php foreach($this->series as $serie): ?>
@@ -52,7 +52,7 @@ echo '</ul></div>';
 	</ul>
 	</div>
 	<?php endif; ?>
-
+-->
 <ul id=OtherInfo>
 	<li id="filesize">数据大小：<?php echo $md->filesize; ?>MB</li>
 <?php if ($md->fileformat) : ?>	
@@ -232,7 +232,7 @@ function reportError(request)
 </script>
 <?php echo $this->commentForm; ?>
 </div>
--->
+
 </div>