diff --git a/application/default/controllers/HiwaterController.php b/application/default/controllers/HiwaterController.php
index 3bbd5028..88ef6581 100644
--- a/application/default/controllers/HiwaterController.php
+++ b/application/default/controllers/HiwaterController.php
@@ -747,7 +747,7 @@ class HiwaterController extends DataController
}
} else {
//提供全部分类列表
- $sql="select f.id,f.title,f.fund_id,f.fund_type,f.ts_created,count(m.id) as datacount,sum(md.filesize) as filesize from fund f left join mdfund m on f.id=m.fid left join metadata md on m.uuid=md.uuid where m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='hiwater') group by f.id,f.title,f.fund_id,f.fund_type,f.ts_created order by f.ts_created desc";
+ $sql="select f.id,f.title_en,f.fund_id,f.fund_type_en,f.ts_created,count(m.id) as datacount,sum(md.filesize) as filesize from fund f left join mdfund m on f.id=m.fid right join en.normalmetadata md on m.uuid=md.uuid where m.uuid in (select d.uuid from datasource d left join source s on d.sourceid=s.id where s.code='hiwater') group by f.id,f.title,f.fund_id,f.fund_type,f.ts_created order by f.ts_created desc";
$sth = $this->db->prepare($sql);
$sth->execute();
$rows = $sth->fetchAll();
diff --git a/application/default/views/scripts/data/fund-list.phtml b/application/default/views/scripts/data/fund-list.phtml
index 395267c5..335441be 100644
--- a/application/default/views/scripts/data/fund-list.phtml
+++ b/application/default/views/scripts/data/fund-list.phtml
@@ -15,7 +15,7 @@ $this->nav[] = array('link'=>"/data/fund",'title'=>'Funding');
paginator as $md) : ?>
-No.
| Type: | Datasets: ，Total 5000?(round($md['filesize']/1024,2)).'GB':$md['filesize'].'MB'; ?>
+ (No: ), has datasets, volume 5000?(round($md['filesize']/1024,2)).'GB':$md['filesize'].'MB'; ?>
paginator; ?>
diff --git a/application/default/views/scripts/data/fund.phtml b/application/default/views/scripts/data/fund.phtml
index 3c978c73..43e01683 100644
--- a/application/default/views/scripts/data/fund.phtml
+++ b/application/default/views/scripts/data/fund.phtml
@@ -12,7 +12,7 @@ $this->theme->AppendPlus($this,'colorbox');
paginator)) : ?>
diff --git a/application/default/views/scripts/hiwater/fund-list.phtml b/application/default/views/scripts/hiwater/fund-list.phtml
index d06ed26b..6e11cb44 100644
--- a/application/default/views/scripts/hiwater/fund-list.phtml
+++ b/application/default/views/scripts/hiwater/fund-list.phtml
@@ -3,6 +3,7 @@ $this->headTitle($this->config->title->site);
$this->headTitle($this->config->title->data);
$this->headTitle('Fund');
$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/water.css');
$this->nav[] = array('link'=>"/hiwater",'title'=>'HiWATER');
?>
render('breadcrumbs.phtml') ?>
@@ -14,9 +15,9 @@ $this->nav[] = array('link'=>"/hiwater",'title'=>'HiWATER');
paginator)) : ?>
paginator; ?>
paginator as $md) : ?>
-
-
-No: | Type: | Datasets: 条，5000?(round($md['filesize']/1024,2)).'GB':$md['filesize'].'MB'; ?>
+
+ (
No: ), has datasets, volume 5000?(round($md['filesize']/1024,2)).'GB':$md['filesize'].'MB'; ?>
paginator; ?>
diff --git a/application/default/views/scripts/hiwater/fund.phtml b/application/default/views/scripts/hiwater/fund.phtml
index 7df83337..64d39f92 100644
--- a/application/default/views/scripts/hiwater/fund.phtml
+++ b/application/default/views/scripts/hiwater/fund.phtml
@@ -3,6 +3,7 @@ $this->headTitle($this->config->title->site);
$this->headTitle($this->config->title->data);
$this->headTitle('Fund');
$this->headTitle()->setSeparator(' - ');
+$this->headLink()->appendStylesheet('/css/water.css');
$this->nav[] = array('link'=>"/hiwater",'title'=>'HiWATER');
$this->theme->AppendPlus($this,'colorbox');
?>
@@ -13,8 +14,8 @@ $this->theme->AppendPlus($this,'colorbox');
-
-No: fund['fund_id']; ?> | Type: fund['fund_type']; ?>
+
+fund['fund_type_en'],'"'); ?> (
No: fund['fund_id']; ?>)
paginator)) : ?>
@@ -35,6 +36,7 @@ No: fund['fund_id']; ?> | Type: fund['fund
No data.
+