From 6a98bb51f2088fd32c903a05c57fca52604ec1de Mon Sep 17 00:00:00 2001 From: wlx Date: Tue, 14 May 2013 23:50:42 +0000 Subject: [PATCH 01/14] change featured image style --- application/default/views/scripts/index/index.phtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/default/views/scripts/index/index.phtml b/application/default/views/scripts/index/index.phtml index 7aac4f25..49186209 100755 --- a/application/default/views/scripts/index/index.phtml +++ b/application/default/views/scripts/index/index.phtml @@ -7,7 +7,7 @@ ?>
@@ -129,4 +129,4 @@
\ No newline at end of file + From efb207e9578b94fcd60d661700f11972c0244470 Mon Sep 17 00:00:00 2001 From: wlx Date: Tue, 14 May 2013 23:57:52 +0000 Subject: [PATCH 02/14] =?UTF-8?q?#475,=20=E4=BA=A4=E6=8D=A2=E6=96=B0?= =?UTF-8?q?=E9=97=BB=E6=A0=87=E9=A2=98=E5=8F=8A=E6=97=B6=E9=97=B4=E7=9A=84?= =?UTF-8?q?=E5=85=88=E5=90=8E=E6=AC=A1=E5=BA=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/default/views/scripts/index/index.phtml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/application/default/views/scripts/index/index.phtml b/application/default/views/scripts/index/index.phtml index 49186209..93d42b55 100755 --- a/application/default/views/scripts/index/index.phtml +++ b/application/default/views/scripts/index/index.phtml @@ -15,7 +15,7 @@
    list_news as $k=>$v){ ?> -
  • []
    • +
  • []
@@ -34,7 +34,7 @@ foreach($this->news as $k=>$v) { echo '
'; - echo ''; + echo ''; echo '
'; echo '

'.$v['title'].'['.date("Y-m-d",strtotime($v['ts_published'])).']

'; //echo '

'.$v['description'].'

'; From aa3efdba5ad273af5986c76c553d2ecc51ba9630 Mon Sep 17 00:00:00 2001 From: Li Jianxuan Date: Wed, 15 May 2013 07:49:18 +0000 Subject: [PATCH 03/14] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=96=B0=E9=97=BB?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=A8=A1=E6=9D=BF,=E5=88=A0=E9=99=A4?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84jquery=E7=89=88=E6=9C=AC=E5=BC=95?= =?UTF-8?q?=E7=94=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/views/scripts/news/newsadd.phtml | 173 ++++++++---------- 1 file changed, 78 insertions(+), 95 deletions(-) diff --git a/application/admin/views/scripts/news/newsadd.phtml b/application/admin/views/scripts/news/newsadd.phtml index 922ad554..46bb1aea 100644 --- a/application/admin/views/scripts/news/newsadd.phtml +++ b/application/admin/views/scripts/news/newsadd.phtml @@ -2,7 +2,6 @@ $this->headTitle($this->config->title->site); $this->headTitle('后台管理'); $this->headTitle()->setSeparator(' - '); - $this->headLink()->appendStylesheet('/css/admin.css'); $this->headScript()->appendFile('/static/js/jquery.tagInput.min.js'); $this->headScript()->appendFile('/static/js/kindeditor-min.js'); $this->headScript()->appendFile('/static/js/kindlang/zh_CN.js'); @@ -62,101 +61,85 @@ $(document).ready(function(){ }); }); -
-partial('news/left.phtml'); ?> -
-
-
- -
- -
- 新闻信息 - -

-
- -

- -

-
- -

- -

- 图片: -

    -
- - -

- -

-
- - -

- -

-
- -

- - - -
-
-

-
- - types as $v) - { - $head = ""; - if(!empty($v[$this->deepField])) {$head = str_repeat('-',$v[$this->deepField]);} - echo ''.$head.$v['title'].'
'; - $head = ""; - } - ?> - - e.g. 研究成果 -

-

+ 添加新栏目

-
- -
-

- -

-

-
- " readonly="readonly" /> - e.g. 2011-10-28 9:35 or 2011-10-28 21:35 -

-
-
- -
- -

or

- -
- -
-
-
-

新闻标签

-
-
- 输入Tag标签，多个用半角逗号 " , "隔开，每个Tag标签长度小于6个汉字 -

-
+
+
+ partial('news/left.phtml'); ?> +
+
+

新闻发布

+
+
+ +
+ +
+ " /> +
-
- +
+ +
+ +
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+ +
+
+
+ +
+ types as $v) + { + $head = ""; + if(!empty($v[$this->deepField])) {$head = str_repeat('-',$v[$this->deepField]);} + echo ''.$head.$v['title'].'
'; + $head = ""; + } + ?> +
+
+
+ +
+ + 定时发布? + " readonly="readonly" /> +
+
+
+ +
+ +
+
+
+
+ or +
+ + +
diff --git a/application/admin/views/scripts/data/fund.phtml b/application/admin/views/scripts/data/fund.phtml index f3e7cb89..1964f2b4 100644 --- a/application/admin/views/scripts/data/fund.phtml +++ b/application/admin/views/scripts/data/fund.phtml @@ -1,164 +1,165 @@ -headTitle($this->config->title->site); -$this->headTitle($this->config->title->author); -$this->headTitle()->setSeparator(' - '); -$this->breadcrumb('首页'); -$this->breadcrumb('数据管理'); -$this->breadcrumb('支持项目'); -$this->breadcrumb()->setSeparator(' > '); -$this->theme->AppendPlus($this,'colorbox'); -$this->theme->AppendPlus($this,'admin_plugin'); -?> - -
-
- partial('data/left.phtml'); ?> -
-
-
- -
- md)) { ?> -
- ct)) { ?> - 为此数据添加项目 - - 返回 -
点击“添加此项目”即可将项目添加到元数据
- -

《md['title'] ?>》 的支持项目

-
-
- -
-
-
- - -
-
-
- error)) { ?> - AlertType)) $AlertType = "alert-error";else $AlertType = $this->AlertType;?> -
- × - error)) { ?>

error ?>

-
    - error as $v) { ?> -
    • - -
- -
- - msg)) { ?> -
- × - msg ?> -
- jump_url)) { ?> - - - -
- paginator)): ?> - - - - - - - md) { ?> - - - - - - ct) { ?> - - - - - - - paginator as $item): - $autoindex++;?> - md)) { ?> - - - - - - - - md) { ?> - ct) { ?> - - - - - - - - - ct) { ?> - - - - - - -
名称编号类型排序英文标题英文类型添加操作
添加此项目 - md)) { ?> - 编辑 - 删除 - - ct)) { ?>排序 - 移除 - -
- -
paginator; ?>
-
- -
-
- - +headTitle($this->config->title->site); +$this->headTitle($this->config->title->author); +$this->headTitle()->setSeparator(' - '); +$this->breadcrumb('首页'); +$this->breadcrumb('数据管理'); +$this->breadcrumb('支持项目'); +$this->breadcrumb()->setSeparator(' > '); +$this->theme->AppendPlus($this,'colorbox'); +$this->theme->AppendPlus($this,'admin_plugin'); +?> + +
+
+ partial('data/left.phtml'); ?> +
+
+
+ +
+ md)) { ?> +
+ ct)) { ?> + 为此数据添加项目 + + 返回 +
点击“添加此项目”即可将项目添加到元数据
+ +

《md['title'] ?>》 的支持项目

+
+
+ +
+
+
+ + +
+
+
+ error)) { ?> + AlertType)) $AlertType = "alert-error";else $AlertType = $this->AlertType;?> +
+ × + error)) { ?>

error ?>

+
    + error as $v) { ?> +
    • + +
+ +
+ + msg)) { ?> +
+ × + msg ?> +
+ jump_url)) { ?> + + + +
+ paginator)): ?> + + + + + + + md) { ?> + + + + + + ct) { ?> + + + + + + + paginator as $item): + $autoindex++;?> + md)) { ?> + + + + + + + + md) { ?> + ct) { ?> + + + + + + + + + ct) { ?> + + + + + + +
名称编号类型排序英文标题英文类型添加操作
添加此项目 + md)) { ?> + 数据 + 编辑 + 删除 + + ct)) { ?>排序 + 移除 + +
+ +
paginator; ?>
+
+ +
+
+ + diff --git a/application/models/data/Fund.php b/application/models/data/Fund.php index 8a284c9b..df9b9e28 100644 --- a/application/models/data/Fund.php +++ b/application/models/data/Fund.php @@ -200,16 +200,20 @@ class Fund extends Zend_Controller_Plugin_Abstract } } - function addPaginator($data,$ctl,Zend_Controller_Request_Abstract $request) + function getData($id,$keyword="") { - $page = $request->getParam('page'); - - $paginator = Zend_Paginator::factory($data); - $paginator->setCurrentPageNumber($page); - $paginator->setItemCountPerPage(12); - $paginator->setView($ctl); - Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml'); - $ctl->paginator = $paginator; + $search = ""; + if(!empty($keyword)) + { + $search = " AND md.title LIKE '%$keyword%' "; + } + $sql = "SELECT md.title,mf.id FROM ".$this->tbl_mdfund." mf + LEFT JOIN ".$this->tbl_fund." f ON mf.fid=f.id + LEFT JOIN metadata md ON md.uuid=mf.uuid + WHERE f.id=$id $search"; + $rs = $this->db->query($sql); + $rows = $rs->fetchAll(); + return $rows; } function _getParams(Zend_Controller_Request_Abstract $request)