bob
/
westdc-zf1
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/sanji' into sanji

This commit is contained in:
avene 2018-05-12 17:13:33 +08:00
parent 08762fa737 635699cbd2
commit 8a1da68d01
5 changed files with 110 additions and 62 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
application/default/controllers/DataController.php
View File

@ -1192,7 +1192,7 @@ where ds.uuid=? )) ) a ) p on r.id=p.refid order by p.place";
* @param int $userid
*/
function todownloadAction() {
$this->_helper->layout->setLayout('layout');
$this->view->pageID = "account-dataorder";
$this->_helper->viewRenderer('onlineapp-download');
@ -1498,6 +1498,7 @@ where ds.uuid=? )) ) a ) p on r.id=p.refid order by p.place";
*/
function downloadAction()
{
$this->_helper->layout->setLayout('layout');
$uuid=$this->_request->getParam('uuid');
$onlineappid=$this->_request->getParam('onlineappid');
$this->view->pageID = "account-dataorder";

68
application/default/views/scripts/archives/archive.phtml
View File

@ -11,37 +11,49 @@ $this->breadcrumb()->setSeparator(' > ');
if(!empty($this->infos['keyword'])) $keyword = $this->infos['keyword']; else $keyword = $this->infos['title'];
$this->headMeta()->appendName('keywords', $keyword);
$this->headMeta()->appendName('description', mb_substr($this->infos['description'],0,180,'utf-8'));
$this->headLink()->appendStylesheet('/static-sanji/css/new-list.css');
$this->headLink()->appendStylesheet('/static-sanji/css/new-detail.css');
?>
<div class="body-warp">
<div class="nav" id="nav">
<ul>
<?php
if(count($this->types))
{
foreach($this->types as $k=>$v)
{
$haed = "";
if(!empty($v[$this->deepField])) {$haed = str_repeat('　',$v[$this->deepField]);}
echo '<li><a href="'.$v['url'].'">'.$haed.$v['title'].'</a></li>';
$haed = "";
}
}
?>
</ul>
</div>
</div>
$this->headLink()->appendStylesheet('/static-sanji-v2/css/archive.css');
?>
<div class="content-warp">
<div class="container">
<h1 class="text-center"><?php echo $this->infos['title'];?></h1>
<div class="text-center">[<?php echo date("Y-m-d",strtotime($this->infos['ts_published']));?>]&nbsp;&nbsp;来源&nbsp;:&nbsp;<?php echo $this->infos['source'];?></div>
<?php if(!empty($this->mdinfo)){?>
<?php foreach($this->mdinfo as $v){ ?>
<div class="info">相关数据：《<a href="/data/<?= $v['uuid']?>"><?= $v['title']?></a>》</div>
<?php } } ?>
<?php echo $this->infos['body'];?>
<div class="row">
<div class="col-md-3 col-sm-2">
<div class="list-group">
<a href="#" class="list-group-item active">
新闻动态
</a>
<?php
if(count($this->types))
{
foreach($this->types as $k=>$v)
{
$haed = "";
if(!empty($v[$this->deepField])) {$haed = str_repeat('　',$v[$this->deepField]);}
echo '<a href="'.$v['url'].'" class="list-group-item">'.$haed.$v['title'].'</a>';
$haed = "";
}
}
?>
</div>
</div>
<div class="col-md-8 col-sm-10">
<ol class="breadcrumb">
<li><a href="#">首页</a></li>
<li><a href="active">新闻动态</a></li>
</ol>
<h1 class="text-center"><?php echo $this->infos['title'];?></h1>
<div class="text-center">[<?php echo date("Y-m-d",strtotime($this->infos['ts_published']));?>]&nbsp;&nbsp;来源&nbsp;:&nbsp;<?php echo $this->infos['source'];?></div>
<?php if(!empty($this->mdinfo)){?>
<?php foreach($this->mdinfo as $v){ ?>
<div class="info">相关数据：《<a href="/data/<?= $v['uuid']?>"><?= $v['title']?></a>》</div>
<?php } } ?>
<hr>
<?php echo $this->infos['body'];?>
</div>
</div>
</div>
</div>

82
application/default/views/scripts/archives/list.phtml
View File

@ -6,41 +6,57 @@ $this->breadcrumb('<a href="/">首页</a>');
$this->breadcrumb('<a href="/archives/">新闻中心</a>');
$this->breadcrumb($this->title);
$this->breadcrumb()->setSeparator(' > ');
$this->headLink()->appendStylesheet('/static-sanji/css/new-list.css');
$this->headLink()->appendStylesheet('/static-sanji-v2/css/archive.css');
?>
<div class="body-warp">
<div class="nav" id="nav">
<ul>
<?php
if(count($this->types))
{
foreach($this->types as $k=>$v)
{
$haed = "";
if(!empty($v[$this->deepField])) {$haed = str_repeat('　',$v[$this->deepField]);}
echo '<li><a href="'.$v['url'].'">'.$haed.$v['title'].'</a></li>';
$haed = "";
}
}
?>
</ul>
</div>
<div class="list-warp container">
<ul>
<?php
if(count($this->paginator))
{
foreach ($this->paginator as $v)
{
?>
<li><a href="<?php echo $v['url']; ?>"><?php echo $v['title']; ?></a><span><?php echo date("Y-m-d",strtotime( $v['ts_published'] )); ?></span></li>
<div class="content-warp">
<div class="list-warp container" style="min-height: 600px">
<div class="row">
<div class="col-md-3">
<div class="list-group">
<a href="#" class="list-group-item active">
新闻动态
</a>
<?php
}
} else {
echo '暂无数据';
}
?>
</ul>
if(count($this->types))
{
foreach($this->types as $k=>$v)
{
$haed = "";
if(!empty($v[$this->deepField])) {$haed = str_repeat('　',$v[$this->deepField]);}
echo '<a href="'.$v['url'].'" class="list-group-item">'.$haed.$v['title'].'</a>';
$haed = "";
}
}
?>
</div>
</div>
<div class="col-md-8">
<ol class="breadcrumb">
<li><a href="#">首页</a></li>
<li><a href="active">新闻动态</a></li>
</ol>
<ul class="news-list">
<?php
if(count($this->paginator))
{
foreach ($this->paginator as $v)
{
?>
<li><a href="<?php echo $v['url']; ?>"><?php echo $v['title']; ?></a><span class="pull-right"><?php echo date("Y-m-d",strtotime( $v['ts_published'] )); ?></span></li>
<?php
}
} else {
echo '暂无数据';
}
?>
</ul>
</div>
</div>
</div>
<div class="page">
<div class="pagenavi"><?= $this->paginator; ?></div>

3
htdocs/css/archive.css Normal file
View File

@ -0,0 +1,3 @@
.content-warp{
margin-top: 50px;
}

16
htdocs/static-sanji-v2/css/archive.css Normal file
View File

@ -0,0 +1,16 @@
.content-warp{
margin-top: 80px;
}
.breadcrumb > a > .active{
color: #00A9FF;
}
.news-list >li {
padding:8px 0px;
}
.news-list >li >a{
color:#303848;
}
.news-list > li >span{
color:#999;
}