From 093d8db854c9351858d7d24975567e14d3e143cf Mon Sep 17 00:00:00 2001 From: wlx Date: Sat, 20 Jun 2015 09:58:23 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20westdc/westdc-zf1#15,=20=E4=BF=AE?= =?UTF-8?q?=E5=A4=8Dfund=E9=A1=B5=E9=9D=A2=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../default/controllers/HiwaterController.php | 2 +- .../default/views/scripts/data/fund-list.phtml | 2 +- application/default/views/scripts/data/fund.phtml | 2 +- .../default/views/scripts/hiwater/fund-list.phtml | 7 ++++--- application/default/views/scripts/hiwater/fund.phtml | 6 ++++-- application/default/views/scripts/hiwater/navi.phtml | 12 ++++++------ 6 files changed, 17 insertions(+), 14 deletions(-) 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) : ?>

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

-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');

escape($this->fund['title_en']);?>

-No. fund['fund_id']; ?> | Type: fund['fund_type_en']; ?> +fund['fund_type_en'],'"'); ?> (No: fund['fund_id']; ?>)
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) : ?> -
-

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

-No: | Type: | Datasets: 条，5000?(round($md['filesize']/1024,2)).'GB':$md['filesize'].'MB'; ?>
+
+

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

+ (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');
-

escape($this->fund['title']);?>

-No: fund['fund_id']; ?> | Type: fund['fund_type']; ?> +

escape($this->fund['title_en']);?>

+fund['fund_type_en'],'"'); ?> (No: fund['fund_id']; ?>)
paginator)) : ?>
@@ -35,6 +36,7 @@ No: fund['fund_id']; ?> | Type: fund['fund No data.
+