Merge branch 'sanji' of git.westgis.ac.cn:westdc/westdc-zf1 into sanji

This commit is contained in:
jack 2018-05-12 17:11:51 +08:00
commit c61608873a
4 changed files with 128 additions and 63 deletions

View File

@ -2189,7 +2189,7 @@ where ds.uuid=? )) ) a ) p on r.id=p.refid order by p.place";
$paginator->setCurrentPageNumber($this->_getParam('page')); $paginator->setCurrentPageNumber($this->_getParam('page'));
$paginator->setItemCountPerPage(10); $paginator->setItemCountPerPage(10);
$paginator->setView($this->view); $paginator->setView($this->view);
Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_text.phtml'); Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
$this->view->paginator=$paginator; $this->view->paginator=$paginator;
} }
} else { } else {
@ -2202,7 +2202,7 @@ where ds.uuid=? )) ) a ) p on r.id=p.refid order by p.place";
$paginator->setCurrentPageNumber($this->_getParam('page')); $paginator->setCurrentPageNumber($this->_getParam('page'));
$paginator->setItemCountPerPage(10); $paginator->setItemCountPerPage(10);
$paginator->setView($this->view); $paginator->setView($this->view);
Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_text.phtml'); Zend_View_Helper_PaginationControl::setDefaultViewPartial('pagination_param.phtml');
$this->view->paginator=$paginator; $this->view->paginator=$paginator;
$this->_helper->viewRenderer('fund-list'); $this->_helper->viewRenderer('fund-list');
} }

View File

@ -0,0 +1,51 @@
<?php
$this->headTitle($this->config->title->site);
$this->headTitle($this->config->title->data);
$this->headTitle('支持项目');
$this->headTitle()->setSeparator(' - ');
$this->nav[] = array('link'=>"/data/fund",'title'=>'支持项目浏览');
$this->headLink()->appendStylesheet('/static-sanji/css/data-list.css');
?>
<hr class="c-f">
<div class="container">
<div class="row">
<div class="col-lg-12">
<?= $this->render('breadcrumbs.phtml'); ?>
</div>
</div>
<div class="row">
<div class="col-lg-12">
<?= $this->partial('data/tools.phtml'); ?>
</div>
</div>
</div>
<hr class="c-f">
<div class="container">
<div class="row">
<div class="col-lg-12">
<div class="well">
<h4><a href="/data/fund/id/<?php echo $this->fund['id'];?>"><?php echo $this->escape($this->fund['title']);?></a></h4>
编号:<?php echo $this->fund['fund_id']; ?> | 类型:<?php echo $this->fund['fund_type']; ?>
</div>
<?php if (!empty($this->paginator)) : ?>
<hr />
<?php foreach($this->paginator as $md) : ?>
<div class="media well well-small">
<a class="pull-left colorbox" href="/service/bigthumb/uuid/<?php echo $md['uuid']; ?>">
<img class="media-object" src="/service/thumb/id/<?php echo $md['id'];?>">
</a>
<div class="media-body">
<h4 class="media-heading"><a href="/data/<?php echo $md['uuid'];?>"><?php echo $this->escape($md['title']);?></a></h4>
<div class="summary"><?php echo str_replace(array("\r\n", "\n", "\r"),'<br />',mb_strlen($md['description'])>400?$this->escape(mb_substr($md['description'],0,400,'UTF-8').'...'):$this->escape($md['description']));?></div>
</div>
</div>
<?php endforeach; ?>
<div class="pagenavi"><?= $this->paginator; ?></div>
<?php else : ?>
暂无对应信息。
<?php endif; ?>
</div>
</div>
</div>

View File

@ -3,49 +3,71 @@ $this->headTitle($this->config->title->site);
$this->headTitle($this->config->title->data); $this->headTitle($this->config->title->data);
$this->headTitle('支持项目'); $this->headTitle('支持项目');
$this->headTitle()->setSeparator(' - '); $this->headTitle()->setSeparator(' - ');
$this->nav[] = array('link'=>"/data/fund",'title'=>'支持项目浏览'); $this->nav[] = array('link' => "/data/fund", 'title' => '支持项目浏览');
$this->headLink()->appendStylesheet('/static-sanji/css/data-list.css'); $this->headLink()->appendStylesheet('/static-sanji-v2/css/dataProduct.css');
$this->headLink()->appendStylesheet('/static-sanji-v2/css/header-position.css');
?> ?>
<hr class="c-f"> <?= $this->render('breadcrumbs.phtml') ?>
<div class="container">
<div class="row"> <!--搜索框-->
<div class="col-lg-12"> <div class="searchBox searchBox2">
<?= $this->render('breadcrumbs.phtml'); ?> <div class="container">
<div class="col-sm-12">
<div class="form-group">
<input type="text" class="form-control" placeholder="搜素关键词">
</div>
<i></i>
</div> </div>
</div> </div>
<div class="row"> </div>
<!--固定搜索框-->
<div class="searchBox searchBox1">
<div class="container">
<div class="col-sm-12">
<div class="form-group">
<input type="text" class="form-control" placeholder="搜素关键词">
</div>
<i></i>
</div>
</div>
</div>
<div class="searchOne">
<div class="container">
<div class="col-lg-12"> <div class="col-lg-12">
<?= $this->partial('data/tools.phtml'); ?> <?= $this->partial('data/tools.phtml'); ?>
</div> </div>
</div> </div>
</div> </div>
<hr class="c-f">
<div class="container"> <div class="intro1">
<div class="row"> </div>
<div class="col-lg-12">
<div class="well"> <div class="container" style="min-height: 200px;">
<h4><a href="/data/fund/id/<?php echo $this->fund['id'];?>"><?php echo $this->escape($this->fund['title']);?></a></h4> <div class="col-lg-12">
编号:<?php echo $this->fund['fund_id']; ?> | 类型:<?php echo $this->fund['fund_type']; ?> <div class="well">
</div> <h4>
<?php if (!empty($this->paginator)) : ?> <a href="/data/fund/id/<?php echo $this->fund['id']; ?>"><?php echo $this->escape($this->fund['title']); ?></a>
<hr /> </h4>
<?php foreach($this->paginator as $md) : ?> 编号:<?php echo $this->fund['fund_id']; ?> | 类型:<?php echo $this->fund['fund_type']; ?>
<div class="media well well-small">
<a class="pull-left colorbox" href="/service/bigthumb/uuid/<?php echo $md['uuid']; ?>">
<img class="media-object" src="/service/thumb/id/<?php echo $md['id'];?>">
</a>
<div class="media-body">
<h4 class="media-heading"><a href="/data/<?php echo $md['uuid'];?>"><?php echo $this->escape($md['title']);?></a></h4>
<div class="summary"><?php echo str_replace(array("\r\n", "\n", "\r"),'<br />',mb_strlen($md['description'])>400?$this->escape(mb_substr($md['description'],0,400,'UTF-8').'...'):$this->escape($md['description']));?></div>
</div>
</div>
<?php endforeach; ?>
<div class="pagenavi"><?= $this->paginator; ?></div>
<?php else : ?>
暂无对应信息。
<?php endif; ?>
</div> </div>
<?php if (!empty($this->paginator)) : ?>
<?php foreach ($this->paginator as $md) : ?>
<div class="media well well-small">
<a class="pull-left colorbox" href="/service/bigthumb/uuid/<?php echo $md['uuid']; ?>">
<img class="media-object" src="/service/thumb/id/<?php echo $md['id']; ?>">
</a>
<div class="media-body">
<h4 class="media-heading"><a
href="/data/<?php echo $md['uuid']; ?>"><?php echo $this->escape($md['title']); ?></a>
</h4>
<div class="summary"><?php echo str_replace(array("\r\n", "\n", "\r"), '<br />', mb_strlen($md['description']) > 400 ? $this->escape(mb_substr($md['description'], 0, 400, 'UTF-8') . '...') : $this->escape($md['description'])); ?></div>
</div>
</div>
<?php endforeach; ?>
<div class="pagenavi"><?= $this->paginator; ?></div>
<?php else : ?>
暂无对应信息。
<?php endif; ?>
</div> </div>
</div> </div>

View File

@ -57,38 +57,30 @@ $this->headLink()->appendStylesheet('/static-sanji-v2/css/header-position.css');
</div> </div>
<?php if($this->paginator) { ?> <?php if($this->paginator) { ?>
<div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<h4>当前浏览数据集序列:<?php echo $this->codename; ?></h4> <h4>当前浏览数据集序列:<?php echo $this->codename; ?></h4>
<?php foreach($this->paginator as $md) : ?> <ul class="newUlList">
<div class="row c-list" style="margin-left: 0;"> <?php foreach ($this->paginator as $md) : ?>
<div class="col-md-3 c-img-box"> <li>
<div class="c-cover"></div> <div class="newsImgBox">
<a class="c-cover" href="/data/<?php echo $md['uuid'];?>"></a> <a href="/data/<?php echo $md['uuid'];?>">
<div class="c-img" style="background:url('/service/thumb/id/<?php echo $md['id'];?>') no-repeat center; background-size:cover"></div> <img src="/service/thumb/id/<?php echo $md['id']; ?>">
<!-- <a href="/service/bigthumb/uuid/--><?//= $md['uuid'] ?><!--" class="pull-left colorbox">--> </a>
<!-- <img class="media-object" src="/service/thumb/id/--><?php //echo $md['id'];?><!--">-->
<!-- </a>-->
</div>
<div class="col-md-9 c-list-box">
<h4><a href="/data/<?php echo $md['uuid'];?>"><?php echo $this->escape($md['title']);?></a></h4>
<p class="c-info"><span class="c-click"></span><i><?php echo $md['viewed']?></i> | &nbsp;<span class="c-time"></span><i><?php echo date("d,M,Y",strtotime( $md['ts_published'] )); ?></i></p>
<p class="c-con">
<?php echo str_replace(array("\r\n", "\n", "\r"),'<br />',mb_strlen($md['description'])>200 ? $this->escape(mb_substr($md['description'],0,200,'UTF-8').'...'):$this->escape($md['description']));?>
</p>
<div class="dam clear">
<div class="c-left">
<i>文件大小</i>
<em><?php echo round($md['filesize'] / 2014, 2) > 0.99 ? round($md['filesize'] / 2014, 2) : '小于1'?>MB</em>
</div>
<a class="c-right" href="/data/<?php echo $md['uuid'];?>">更多</a>
</div> </div>
</div> <div class="newRight">
</div> <div class="newTopTitle">
<?php endforeach; ?> <span><a href="/data/<?php echo $md['uuid'];?>"><?php echo $this->escape($md['title']);?></a></span>
<i><?php echo date("Y-m-d", strtotime($md['ts_published'])); ?></i>
</div>
<p>
<?php echo str_replace(array("\r\n", "\n", "\r"), '<br />', mb_strlen($md['description']) > 120 ? $this->escape(mb_substr($md['description'], 0, 120, 'UTF-8') . '...') : $this->escape($md['description'])); ?>
</p>
<a class="more" href="/data/<?php echo $md['uuid']; ?>">更多</a>
</div>
</li>
<?php endforeach; ?>
</ul>
</div> </div>
</div>
<div class="row"> <div class="row">
<div class="col-xs-12"> <div class="col-xs-12">
<div class="page"> <div class="page">