From 8675ca072eea12ed10333a18e7e097a4c747a1b9 Mon Sep 17 00:00:00 2001 From: wlx Date: Wed, 26 Oct 2011 09:31:37 +0000 Subject: [PATCH] =?UTF-8?q?=E7=BC=A9=E7=95=A5=E5=9B=BE=E9=87=87=E7=94=A8se?= =?UTF-8?q?rvice/thumb?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/default/views/scripts/water/advancesearch.phtml | 2 +- application/default/views/scripts/water/browse.phtml | 2 +- application/default/views/scripts/water/download.phtml | 2 +- application/default/views/scripts/water/map.phtml | 4 ++-- application/default/views/scripts/water/search.phtml | 2 +- application/default/views/scripts/water/series.phtml | 2 +- application/default/views/scripts/water/tag.phtml | 2 +- application/default/views/scripts/water/timemap.phtml | 5 ++--- application/default/views/scripts/water/view.phtml | 2 +- 9 files changed, 11 insertions(+), 12 deletions(-) diff --git a/application/default/views/scripts/water/advancesearch.phtml b/application/default/views/scripts/water/advancesearch.phtml index 77996de8..4b0e7549 100644 --- a/application/default/views/scripts/water/advancesearch.phtml +++ b/application/default/views/scripts/water/advancesearch.phtml @@ -20,7 +20,7 @@ $this->breadcrumb()->setSeparator(' > '); foreach($this->metadata as $md) : ?>
-
+

escape($md['title']);?>

400?$this->escape(mb_substr($md['description'],0,400,'UTF-8').'...'):$this->escape($md['description']);?> diff --git a/application/default/views/scripts/water/browse.phtml b/application/default/views/scripts/water/browse.phtml index dd25901b..921d9f97 100755 --- a/application/default/views/scripts/water/browse.phtml +++ b/application/default/views/scripts/water/browse.phtml @@ -16,7 +16,7 @@ $this->breadcrumb()->setSeparator(' > '); metadata as $md) : ?>
-
+

escape($md['title']);?> diff --git a/application/default/views/scripts/water/download.phtml b/application/default/views/scripts/water/download.phtml index d392a707..9cc18f21 100644 --- a/application/default/views/scripts/water/download.phtml +++ b/application/default/views/scripts/water/download.phtml @@ -11,7 +11,7 @@ ?>

md['title']; ?>(md['filesize']; ?>MB)

-
+
FTP下载地址
    diff --git a/application/default/views/scripts/water/map.phtml b/application/default/views/scripts/water/map.phtml index 3eaadef7..aac5e400 100755 --- a/application/default/views/scripts/water/map.phtml +++ b/application/default/views/scripts/water/map.phtml @@ -11,8 +11,8 @@ $this->breadcrumb()->setSeparator(' > '); $this->headScript()->appendFile('/js/OpenLayers.js'); $this->headLink()->appendStylesheet('/js/theme/default/style.css'); + $this->headScript()->appendFile('http://maps.google.cn/maps?file=api&v=2&key='.$this->config->google->maps->api); ?> -
    partial('data/tools.phtml'); ?>
    @@ -56,7 +56,7 @@ popup = new OpenLayers.Popup.FramedCloud("chicken", feature.geometry.getBounds().getCenterLonLat(), null, - "", + "", null, false, onPopupClose); feature.popup = popup; map.addPopup(popup); diff --git a/application/default/views/scripts/water/search.phtml b/application/default/views/scripts/water/search.phtml index 44f43b2a..8e856321 100755 --- a/application/default/views/scripts/water/search.phtml +++ b/application/default/views/scripts/water/search.phtml @@ -38,7 +38,7 @@ $this->breadcrumb()->setSeparator(' > '); foreach($this->metadata as $md) : ?>
    -
    +

    escape($md['title']);?>

    400?$this->escape(mb_substr($md['description'],0,400,'UTF-8').'...'):$this->escape($md['description']);?> diff --git a/application/default/views/scripts/water/series.phtml b/application/default/views/scripts/water/series.phtml index 8a91f765..ce7f092c 100755 --- a/application/default/views/scripts/water/series.phtml +++ b/application/default/views/scripts/water/series.phtml @@ -39,7 +39,7 @@ $this->breadcrumb()->setSeparator(' > '); metadata as $md) : ?>
    -
    +

    escape($md['title']);?>

    400?$this->escape(mb_substr($md['description'],0,400,'UTF-8').'...'):$this->escape($md['description']);?> diff --git a/application/default/views/scripts/water/tag.phtml b/application/default/views/scripts/water/tag.phtml index 434c670f..4d1d3e55 100755 --- a/application/default/views/scripts/water/tag.phtml +++ b/application/default/views/scripts/water/tag.phtml @@ -17,7 +17,7 @@ $this->breadcrumb()->setSeparator(' > '); metadata as $md) : ?>
    -
    +

    escape($md['title']);?>

    diff --git a/application/default/views/scripts/water/timemap.phtml b/application/default/views/scripts/water/timemap.phtml index f32cd921..fc26b603 100644 --- a/application/default/views/scripts/water/timemap.phtml +++ b/application/default/views/scripts/water/timemap.phtml @@ -9,8 +9,7 @@ $this->breadcrumb(''.$this->config->title->data.''); $this->breadcrumb('黑河综合遥感联合试验'); $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'); @@ -48,7 +47,7 @@ window.onload=function() { "title" : "", "options" : { // set the full HTML for the info window - "infoHtml": "
    >
    />
    ", + "infoHtml": "
    >
    />
    ", "theme":"orange" } }, diff --git a/application/default/views/scripts/water/view.phtml b/application/default/views/scripts/water/view.phtml index 54800535..41df86d0 100755 --- a/application/default/views/scripts/water/view.phtml +++ b/application/default/views/scripts/water/view.phtml @@ -153,7 +153,7 @@ endforeach;
    -
    +

    ',$md->description);?>