From 1db396820735f0d4ddf1dbb4ecc72a57d2e23ebc Mon Sep 17 00:00:00 2001
From: wlx <wangliangxu@lzb.ac.cn>
Date: Mon, 7 Nov 2011 15:10:10 +0000
Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4=E5=AF=BC=E8=88=AA=E6=A0=8F?=
 =?UTF-8?q?=E8=AF=B4=E6=98=8E=EF=BC=8C=E8=B0=83=E6=95=B4=E7=BC=A9=E7=95=A5?=
 =?UTF-8?q?=E5=9B=BE=E5=AF=BC=E8=88=AA=EF=BC=8C=20=E8=B0=83=E6=95=B4?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B5=8F=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../default/views/scripts/heihe/base.phtml    |  2 +-
 .../default/views/scripts/heihe/browse.phtml  |  2 +-
 .../views/scripts/heihe/category.phtml        |  2 +-
 .../default/views/scripts/heihe/core.phtml    |  2 +-
 .../default/views/scripts/heihe/dem.phtml     |  2 +-
 .../default/views/scripts/heihe/doc.phtml     | 33 ---------------
 .../views/scripts/heihe/document.phtml        |  4 +-
 .../views/scripts/heihe/economic.phtml        |  2 +-
 .../default/views/scripts/heihe/geobase.phtml |  2 +-
 .../default/views/scripts/heihe/hydro.phtml   |  2 +-
 .../default/views/scripts/heihe/index.phtml   |  2 +-
 .../views/scripts/heihe/irragation.phtml      |  2 +-
 .../views/scripts/heihe/landsurface.phtml     |  2 +-
 .../default/views/scripts/heihe/landuse.phtml |  2 +-
 .../default/views/scripts/heihe/list.phtml    | 42 +++++++++++++++++++
 .../default/views/scripts/heihe/meteo.phtml   |  2 +-
 .../default/views/scripts/heihe/model.phtml   |  2 +-
 .../default/views/scripts/heihe/navi.phtml    |  2 +-
 .../default/views/scripts/heihe/obs.phtml     |  2 +-
 .../default/views/scripts/heihe/rs.phtml      |  2 +-
 .../default/views/scripts/heihe/search.phtml  |  2 +-
 .../default/views/scripts/heihe/soil.phtml    |  2 +-
 .../default/views/scripts/heihe/tag.phtml     |  2 +-
 .../default/views/scripts/heihe/thumb.phtml   | 19 ++++-----
 .../views/scripts/heihe/timeline.phtml        |  2 +-
 .../default/views/scripts/heihe/timemap.phtml |  5 +--
 .../default/views/scripts/heihe/view.phtml    |  2 +-
 .../default/views/scripts/heihe/water.phtml   |  2 +-
 28 files changed, 77 insertions(+), 72 deletions(-)
 delete mode 100644 application/default/views/scripts/heihe/doc.phtml
 create mode 100644 application/default/views/scripts/heihe/list.phtml

diff --git a/application/default/views/scripts/heihe/base.phtml b/application/default/views/scripts/heihe/base.phtml
index 7768364d..3640a522 100644
--- a/application/default/views/scripts/heihe/base.phtml
+++ b/application/default/views/scripts/heihe/base.phtml
@@ -5,7 +5,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('基础数据');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
diff --git a/application/default/views/scripts/heihe/browse.phtml b/application/default/views/scripts/heihe/browse.phtml
index 00ff0fa1..c766dea1 100755
--- a/application/default/views/scripts/heihe/browse.phtml
+++ b/application/default/views/scripts/heihe/browse.phtml
@@ -6,7 +6,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('浏览');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
diff --git a/application/default/views/scripts/heihe/category.phtml b/application/default/views/scripts/heihe/category.phtml
index 56ce7433..0a5a3adf 100755
--- a/application/default/views/scripts/heihe/category.phtml
+++ b/application/default/views/scripts/heihe/category.phtml
@@ -7,7 +7,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('分类浏览：'.$this->codename);
 $this->breadcrumb()->setSeparator(' > ');
 ?>
diff --git a/application/default/views/scripts/heihe/core.phtml b/application/default/views/scripts/heihe/core.phtml
index 9cec864a..578bddc9 100644
--- a/application/default/views/scripts/heihe/core.phtml
+++ b/application/default/views/scripts/heihe/core.phtml
@@ -5,7 +5,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('核心数据');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
diff --git a/application/default/views/scripts/heihe/dem.phtml b/application/default/views/scripts/heihe/dem.phtml
index 598e6ed0..8672db44 100644
--- a/application/default/views/scripts/heihe/dem.phtml
+++ b/application/default/views/scripts/heihe/dem.phtml
@@ -5,7 +5,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('DEM数据');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
diff --git a/application/default/views/scripts/heihe/doc.phtml b/application/default/views/scripts/heihe/doc.phtml
deleted file mode 100644
index a683a8ae..00000000
--- a/application/default/views/scripts/heihe/doc.phtml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?php
-$this->headTitle($this->config->title->site);
-$this->headTitle($this->config->title->data);
-$this->headTitle()->setSeparator(' - ');
-$this->headLink()->appendStylesheet('/css/water.css');
-$this->breadcrumb('<a href="/">首页</a>');
-$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
-$this->breadcrumb('word版元数据');
-$this->breadcrumb()->setSeparator(' > ');
-?>
-
-<div id='sidebar'>
-<div id='leftnavi'>
-<?= $this->partial('heihe/navi.phtml'); ?>
-</div>
-</div>
-<div id='right'>
-<div class="clear">&nbsp;</div>
-<div id="intro">
-</div>
-<?php if ($this->metadata) : ?>
-<div id="mdlist">
-<ol>
-	<?php foreach($this->metadata as $md) : ?>
-	<li><a href="/heihe/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a> 
-<a href="/data/doc/uuid/<?php echo $md['uuid']; ?>"><img src="/images/doc-icon.png" alt="Word doc格式"></a>	
-	</li>
-	<?php endforeach; ?>
-</ol>	
-</div>
-<?php endif; ?>
-</div>
diff --git a/application/default/views/scripts/heihe/document.phtml b/application/default/views/scripts/heihe/document.phtml
index 08702931..36ad82c1 100644
--- a/application/default/views/scripts/heihe/document.phtml
+++ b/application/default/views/scripts/heihe/document.phtml
@@ -5,8 +5,8 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
-$this->breadcrumb('试验文档');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
+$this->breadcrumb('数据文档');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
 
diff --git a/application/default/views/scripts/heihe/economic.phtml b/application/default/views/scripts/heihe/economic.phtml
index 6e426cff..d7a7eba2 100644
--- a/application/default/views/scripts/heihe/economic.phtml
+++ b/application/default/views/scripts/heihe/economic.phtml
@@ -5,7 +5,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('社会经济数据');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
diff --git a/application/default/views/scripts/heihe/geobase.phtml b/application/default/views/scripts/heihe/geobase.phtml
index ea83ecbe..ff051fc7 100644
--- a/application/default/views/scripts/heihe/geobase.phtml
+++ b/application/default/views/scripts/heihe/geobase.phtml
@@ -5,7 +5,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('基础地理数据');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
diff --git a/application/default/views/scripts/heihe/hydro.phtml b/application/default/views/scripts/heihe/hydro.phtml
index 5afb6f2c..40f254d9 100644
--- a/application/default/views/scripts/heihe/hydro.phtml
+++ b/application/default/views/scripts/heihe/hydro.phtml
@@ -5,7 +5,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('水文观测数据');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
diff --git a/application/default/views/scripts/heihe/index.phtml b/application/default/views/scripts/heihe/index.phtml
index fb62d096..53f6d5d4 100755
--- a/application/default/views/scripts/heihe/index.phtml
+++ b/application/default/views/scripts/heihe/index.phtml
@@ -5,7 +5,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('数字黑河');
+$this->breadcrumb($this->config->title->heihe);
 $this->breadcrumb()->setSeparator(' > ');
 ?>
 <div id='sidebar'>
diff --git a/application/default/views/scripts/heihe/irragation.phtml b/application/default/views/scripts/heihe/irragation.phtml
index 36200d3f..c7fe442d 100644
--- a/application/default/views/scripts/heihe/irragation.phtml
+++ b/application/default/views/scripts/heihe/irragation.phtml
@@ -5,7 +5,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('水文观测数据');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
diff --git a/application/default/views/scripts/heihe/landsurface.phtml b/application/default/views/scripts/heihe/landsurface.phtml
index 223d4e62..1c41fcf5 100644
--- a/application/default/views/scripts/heihe/landsurface.phtml
+++ b/application/default/views/scripts/heihe/landsurface.phtml
@@ -5,7 +5,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('陆地表层数据');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
diff --git a/application/default/views/scripts/heihe/landuse.phtml b/application/default/views/scripts/heihe/landuse.phtml
index 248b2c6d..28e94b0c 100644
--- a/application/default/views/scripts/heihe/landuse.phtml
+++ b/application/default/views/scripts/heihe/landuse.phtml
@@ -5,7 +5,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('土地利用数据');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
diff --git a/application/default/views/scripts/heihe/list.phtml b/application/default/views/scripts/heihe/list.phtml
new file mode 100644
index 00000000..9ab3e5fd
--- /dev/null
+++ b/application/default/views/scripts/heihe/list.phtml
@@ -0,0 +1,42 @@
+<?php
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->data);
+$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/water.css');
+$this->breadcrumb('<a href="/">首页</a>');
+$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
+$this->breadcrumb('数据列表');
+$this->breadcrumb()->setSeparator(' > ');
+$this->headScript()->appendFile('/js/jquery-1.7.min.js');
+$this->headScript()->appendFile('/js/jquery.colorbox-min.js');
+$this->headLink()->appendStylesheet('/css/colorbox.css');
+?>
+
+<div id='sidebar'>
+<div id='leftnavi'>
+<?= $this->partial('heihe/navi.phtml'); ?>
+</div>
+</div>
+<div id='right'>
+<div class="clear">&nbsp;</div>
+<div id="intro">
+</div>
+<?php if ($this->metadata) : ?>
+<div id="mdlist">
+<ol>
+	<?php foreach($this->metadata as $md) : ?>
+	<li class="singleline"><a href="/heihe/view/uuid/<?php echo $md['uuid']; ?>"><?php echo $md['title']; ?></a> 
+    [<a class="colorbox" href="/service/bigthumb/uuid/<?php echo $md['uuid']; ?>" title="<?php echo $md['title']; ?>"><img src="/images/westdc_40w.gif" alt="缩略图幻灯片"/>缩略图幻灯片</a>]
+    [<a href="/service/pdf/review/1/uuid/<?php echo $md['uuid']; ?>"><img src="/images/pdf_icon.jpg" alt="Adobe PDF格式">PDF版本下载</a>]
+    [<a href="/service/odt/review/1/uuid/<?php echo $md['uuid']; ?>"><img src="/images/odt_icon.png" alt="OpenOffice odt格式">ODT版本下载</a>]
+    [<a href="/service/doc/review/1/uuid/<?php echo $md['uuid']; ?>"><img src="/images/doc_icon.gif" alt="MS Word doc格式">DOC版本下载</a>]
+	</li>
+	<?php endforeach; ?>
+</ol>	
+</div>
+<?php endif; ?>
+</div>
+<script type="text/javascript" charset="utf-8">
+$(document).ready(function(){$(".colorbox").colorbox({slideshow:"true",rel:"colorbox",photo:"true",transition:"fade"});});
+</script>
\ No newline at end of file
diff --git a/application/default/views/scripts/heihe/meteo.phtml b/application/default/views/scripts/heihe/meteo.phtml
index 1bdeb2d6..85898d51 100644
--- a/application/default/views/scripts/heihe/meteo.phtml
+++ b/application/default/views/scripts/heihe/meteo.phtml
@@ -5,7 +5,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('气象观测数据');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
diff --git a/application/default/views/scripts/heihe/model.phtml b/application/default/views/scripts/heihe/model.phtml
index 2edebda8..83db3080 100644
--- a/application/default/views/scripts/heihe/model.phtml
+++ b/application/default/views/scripts/heihe/model.phtml
@@ -5,7 +5,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('模型数据');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
diff --git a/application/default/views/scripts/heihe/navi.phtml b/application/default/views/scripts/heihe/navi.phtml
index 24373201..8ffb290c 100644
--- a/application/default/views/scripts/heihe/navi.phtml
+++ b/application/default/views/scripts/heihe/navi.phtml
@@ -23,7 +23,7 @@
 </ul>
 <ul>
 <li><a href="/heihe/document">黑河文档</a></li>
- <li><a href="/heihe/doc">word版元数据</a></li>
+ <li><a href="/heihe/list">数据列表</a></li>
 <li><a href="/heihe/browse">整体浏览</a></li>
 <li><a href="/heihe/category">ISO19115分类</a></li>
 <li><a href="/heihe/thumb">缩略图浏览</a></li>
diff --git a/application/default/views/scripts/heihe/obs.phtml b/application/default/views/scripts/heihe/obs.phtml
index b654907b..0a4a599e 100644
--- a/application/default/views/scripts/heihe/obs.phtml
+++ b/application/default/views/scripts/heihe/obs.phtml
@@ -5,7 +5,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('观测试验数据');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
diff --git a/application/default/views/scripts/heihe/rs.phtml b/application/default/views/scripts/heihe/rs.phtml
index de9ed4f9..f1757413 100644
--- a/application/default/views/scripts/heihe/rs.phtml
+++ b/application/default/views/scripts/heihe/rs.phtml
@@ -5,7 +5,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('遥感数据');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
diff --git a/application/default/views/scripts/heihe/search.phtml b/application/default/views/scripts/heihe/search.phtml
index 8af04b21..8da068d0 100644
--- a/application/default/views/scripts/heihe/search.phtml
+++ b/application/default/views/scripts/heihe/search.phtml
@@ -8,7 +8,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('快速搜索');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
diff --git a/application/default/views/scripts/heihe/soil.phtml b/application/default/views/scripts/heihe/soil.phtml
index 960f3ac6..3c27eb36 100644
--- a/application/default/views/scripts/heihe/soil.phtml
+++ b/application/default/views/scripts/heihe/soil.phtml
@@ -5,7 +5,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('土壤数据');
 $this->breadcrumb()->setSeparator(' > ');
 ?>
diff --git a/application/default/views/scripts/heihe/tag.phtml b/application/default/views/scripts/heihe/tag.phtml
index 8889beb3..eb5a2728 100755
--- a/application/default/views/scripts/heihe/tag.phtml
+++ b/application/default/views/scripts/heihe/tag.phtml
@@ -6,7 +6,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('关键词导航'.(($this->codename)?'：'.$this->codename:''));
 $this->breadcrumb()->setSeparator(' > ');
 ?>
diff --git a/application/default/views/scripts/heihe/thumb.phtml b/application/default/views/scripts/heihe/thumb.phtml
index 0d455dda..8df31626 100644
--- a/application/default/views/scripts/heihe/thumb.phtml
+++ b/application/default/views/scripts/heihe/thumb.phtml
@@ -1,17 +1,17 @@
 <?php
-	$this->headTitle($this->config->title->site);
-	$this->headTitle($this->config->title->data);
-	$this->headTitle('全部浏览');
+$this->headTitle($this->config->title->site);
+$this->headTitle($this->config->title->data);
+$this->headTitle('全部浏览');
 $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('缩略图浏览');
 $this->breadcrumb()->setSeparator(' > ');
-	$this->headScript()->appendFile('/js/jquery-1.7.min.js');
-	$this->headScript()->appendFile('/js/jquery.colorbox-min.js');
-	$this->headLink()->appendStylesheet('/css/colorbox.css');
+$this->headScript()->appendFile('/js/jquery-1.7.min.js');
+$this->headScript()->appendFile('/js/jquery.colorbox-min.js');
+$this->headLink()->appendStylesheet('/css/colorbox.css');
 ?>
 <div id='sidebar'>
 <div id='leftnavi'>
@@ -22,10 +22,7 @@ $this->breadcrumb()->setSeparator(' > ');
 <?php echo $this->page->getNavigation(); ?>
 <hr />
 <div id="mdlist">
-<?php foreach($this->metadata as $md) : 
-   	$thumburl='/gndata/'.sprintf('%05d',floor(($md['gid']+0.1)/100)*100).'-'.sprintf('%05d',ceil(($md['gid']+0.1)/100)*100-1)."/".$md['gid'];
-    	$thumburl.='/public/'.str_replace('_s.','.',$md['filename']);	
-?>
+<?php foreach($this->metadata as $md) : ?>
  <div class="thumb">
  
  <div class="thumbtitle">
diff --git a/application/default/views/scripts/heihe/timeline.phtml b/application/default/views/scripts/heihe/timeline.phtml
index ddedbed6..433cbe0c 100755
--- a/application/default/views/scripts/heihe/timeline.phtml
+++ b/application/default/views/scripts/heihe/timeline.phtml
@@ -6,7 +6,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('时间轴导航');
 $this->breadcrumb()->setSeparator(' > ');
 $this->headScript()->appendFile('/js/timeline_var.js');
diff --git a/application/default/views/scripts/heihe/timemap.phtml b/application/default/views/scripts/heihe/timemap.phtml
index 02d71e6f..111d1d6d 100644
--- a/application/default/views/scripts/heihe/timemap.phtml
+++ b/application/default/views/scripts/heihe/timemap.phtml
@@ -6,11 +6,10 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</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('http://maps.google.com/maps?file=api&v=2&key=ABQIAAAACD-MqkkoOm60o_dvwdcKVhThiRESR0xRCe9JKd36EL3glTk0OxTsRzifkUWmTTrYWaE7dY1lYUlGxA');
+$this->headScript()->appendFile('http://maps.google.cn/maps?file=api&v=2&key='.$this->config->google->maps->api);
 $this->headScript()->appendFile('/js/timeline_var.js');
 $this->headScript()->appendFile('/js/timeline_js/timeline-api.js');
 $this->headScript()->appendFile('/js/timemap/timemap.js');
diff --git a/application/default/views/scripts/heihe/view.phtml b/application/default/views/scripts/heihe/view.phtml
index 3074cf5c..5ab5d806 100755
--- a/application/default/views/scripts/heihe/view.phtml
+++ b/application/default/views/scripts/heihe/view.phtml
@@ -7,7 +7,7 @@
 	$this->headLink()->appendStylesheet('/css/heihemdview.css');
 	$this->breadcrumb('<a href="/">首页</a>');
 	$this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-	$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+	$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 	$this->breadcrumb('查看元数据');
 	$this->breadcrumb()->setSeparator(' > ');
 	$this->headScript()->appendFile('http://maps.google.cn/maps?file=api&v=2&key='.$this->config->google->maps->api);
diff --git a/application/default/views/scripts/heihe/water.phtml b/application/default/views/scripts/heihe/water.phtml
index 3cefc15f..640fca65 100644
--- a/application/default/views/scripts/heihe/water.phtml
+++ b/application/default/views/scripts/heihe/water.phtml
@@ -5,7 +5,7 @@ $this->headTitle()->setSeparator(' - ');
 $this->headLink()->appendStylesheet('/css/water.css');
 $this->breadcrumb('<a href="/">首页</a>');
 $this->breadcrumb('<a href="/data">'.$this->config->title->data.'</a>');
-$this->breadcrumb('<a href="/heihe/">数字黑河</a>');
+$this->breadcrumb('<a href="/heihe/">'.$this->config->title->heihe.'</a>');
 $this->breadcrumb('水文水资源数据');
 $this->breadcrumb()->setSeparator(' > ');
 ?>