From 85d46cfad3b8d42da232c3d0ffee8c63214601e3 Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Tue, 29 Jun 2010 03:41:06 +0000
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=97=B6=E7=A9=BA=E5=AF=BC?=
 =?UTF-8?q?=E8=88=AA=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 application/default/controllers/WaterController.php   | 6 ++++++
 application/default/views/scripts/water/index.phtml   | 1 +
 application/default/views/scripts/water/timemap.phtml | 3 ++-
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/application/default/controllers/WaterController.php b/application/default/controllers/WaterController.php
index e73ce985..533f88a3 100644
--- a/application/default/controllers/WaterController.php
+++ b/application/default/controllers/WaterController.php
@@ -188,6 +188,12 @@ class WaterController extends DataController
     	}
    }
 
+	function timemapAction()
+	{
+    	$sql='select id,uuid,west,south,north,east,title,timebegin,timeend from metadata where source='0595169a-279e-4b95-819f-129d0ba4280d' and timebegin is not null';
+    	$this->view->rows=$this->db->fetchAll($sql);
+	}
+    
    function timelineAction()
    {
     	$fn="watertime.xml";
diff --git a/application/default/views/scripts/water/index.phtml b/application/default/views/scripts/water/index.phtml
index d0e71c81..68f611fb 100755
--- a/application/default/views/scripts/water/index.phtml
+++ b/application/default/views/scripts/water/index.phtml
@@ -20,6 +20,7 @@ $this->breadcrumb()->setSeparator(' > ');
 <li><input type="submit" name="submit" id="submit" value="搜索"></li>
 <li><button type="button" onclick="show('keyword');return false;">试验数据的关键词列表</button></li>
 <li><button class="float" type="button" onclick="location.href='/water/timeline'">试验数据的时间轴导航</button></li>
+<li><button class="float" type="button" onclick="location.href='/water/timemap'">试验数据的时空联合导航</button></li>
 </form>
 </ul>
 </div>
diff --git a/application/default/views/scripts/water/timemap.phtml b/application/default/views/scripts/water/timemap.phtml
index a7000e2e..b159f2a9 100644
--- a/application/default/views/scripts/water/timemap.phtml
+++ b/application/default/views/scripts/water/timemap.phtml
@@ -6,7 +6,8 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/metadata.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/data/timeline">时空导航</a>');
+$this->breadcrumb('<a href="/water/">黑河综合遥感联合试验</a>');
+$this->breadcrumb('时空联合导航');
 $this->breadcrumb()->setSeparator(' > ');
 $this->headScript()->appendFile('http://maps.google.com/maps?file=api&v=2&key=ABQIAAAACD-MqkkoOm60o_dvwdcKVhRBSKpgcP88GYi6r2Of16IkMX_4YhSBQsywCi4J2_fh4nBuWmK7gyRjLg');
 $this->headScript()->appendFile('/js/timeline_var.js');