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

修改后台部分模板，修改前台可视化数据列表中得bug

This commit is contained in:
Li Jianxuan 2014-06-11 01:22:47 +00:00
parent 697dbe4529
commit 3db3e3d690
7 changed files with 2685 additions and 2740 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
application/admin/views/scripts/news/index.phtml
View File

@ -3,36 +3,24 @@
$this->headTitle('后台管理');
$this->headTitle()->setSeparator(' - ');
$this->headScript()->appendFile('/js/jquery-1.7.min.js');
$this->headLink()->appendStylesheet('/css/admin.css');
$this->breadcrumb('<a href="/">首页</a>');
$this->breadcrumb('<a href="/admin">后台首页</a>');
$this->breadcrumb('<a href="/admin/news">新闻中心</a>');
?>
<style>
.listingDetails{position:absolute;width:650px; z-index:999;}
.pad{position:absolute;background:#FFF;border:2px solid #444;border-radius:5px;padding:5px;display:none;}
</style>
<div id="leftPanel">
<?= $this->partial('news/left.phtml'); ?>
</div>
<div id="rightPanel">
<?php if ($this->msg or $this->messages) :?>
<div id="message">
<?php if ($this->msg) : ?>
<p><?php echo $this->msg; ?></p>
<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
<p><?php echo $msg; ?></p>
<?php endforeach;endif; ?>
</div>
<?php endif; ?>
<div class="row-fluid">
<div class="span3">
<?= $this->partial('news/left.phtml'); ?>
</div>
<div class="span9">
<h3>统计</h3>
<hr/>
<ul>
<li>共 <?php echo $this->totle['c'];?> 条档案</li>
<li>栏目 <?php echo $this->typec['c'];?> 个</li>
</ul>
<h3>统计</h3>
<hr/>
<ul>
<li>共 <?php echo $this->totle['c'];?> 条档案</li>
<li>栏目 <?php echo $this->typec['c'];?> 个</li>
</ul>
</div>
</div>
<script type="text/javascript">
$(document).ready(function(){
$('.title').bind('click', function() {

220
application/admin/views/scripts/news/newslist.phtml
View File

@ -2,131 +2,109 @@
$this->headTitle($this->config->title->site);
$this->headTitle('后台管理');
$this->headTitle()->setSeparator(' - ');
$this->headLink()->appendStylesheet('/css/admin.css');
$this->headScript()->appendFile('/js/jquery.colorbox-min.js');
$this->headLink()->appendStylesheet('/css/author.css');
$this->headLink()->appendStylesheet('/css/colorbox.css');
$this->breadcrumb('<a href="/">首页</a>');
$this->breadcrumb('<a href="/admin">后台首页</a>');
$this->breadcrumb('<a href="/admin/news">新闻中心</a>');
$this->breadcrumb('新闻列表');
?>
<style>
.listingDetails{position:absolute;width:650px;}
.pad{position:absolute;background:#FFF;border:2px solid #444;border-radius:5px;padding:5px;display:none;z-index:9999;}
</style>
<script>
$('#divFooter').css('position','absolute');
</script>
<div id="leftPanel">
<?= $this->partial('news/left.phtml'); ?>
</div>
<div id="rightPanel">
<?php if ($this->msg or $this->messages) :?>
<div id="message">
<?php if ($this->msg) : ?>
<p><?php echo $this->msg; ?></p>
<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
<p><?php echo $msg; ?></p>
<?php endforeach;endif; ?>
</div>
<?php endif; ?>
<div>
<select id="navigation">
<option>按栏目查看</option>
<?php
if(count($this->types))
{
foreach($this->types as $v)
{
if(!empty($v[$this->deepField])) {$haed = str_repeat('-',$v[$this->deepField]);}
if($this->type == $v['id'])
echo '<option value="/admin/news/newslist/type/'.$v['id'].'" selected="selected">'
.$haed
.$v['title'].'</option>';
else
echo '<option value="/admin/news/newslist/type/'.$v['id'].'">'.$haed.$v['title'].'</option>';
}
}
?>
</select>
&nbsp;
<a href="/admin/news/newslist">所有新闻列表</a>
</div>
<table id="report" class="stylized full">
<thead>
<tr>
<th width="50%">新闻标题</th>
<th width="15%">栏目</th>
<th width="15%">状态</th>
<th width="20%">新闻管理</th>
</tr>
</thead>
<tbody>
<?php
if(count($this->paginator))
{
$list = "";
foreach ($this->paginator as $v)
{
$list .= '
<tr>
<td>
<a id="titlebtn'.$v['id'].'" class="title"><b>'.$v['title'].'</b></a>
</td>
<td>
<a href="'.$v['type_url'].'"><b>'.$v['type_title'].'</b></a>
</td>
<td>';
if($v['ts_published']<time() and $v['is_pub']>0)
{
$list.="已发布";
}
if($v['ts_published']>time() and $v['is_pub']>0)
{
$list.= date('Y-m-d H:i',$v['ts_published']) . '发布';
}
if($v['is_pub']==0)
{
$list.="草稿";
}
if($v['is_pub']<0)
{
$list.="未发布";
}
$list .= '</td>
<td>
<a href="'.$v['url'].'">浏览</a>
<a href="/admin/news/newsedit/id/'.$v['id'].'"><b>编辑</b></a>
<a href="/admin/news/delete/id/'.$v['id'].'" onclick="return confirm(\'是否确定删除该文章\')">删除</a></td>
</tr>
';
}
echo $list;
}
else
{
echo '
<tr><td>暂无数据</td><td></td></tr>
';
}
?>
<div class="row-fluid">
<div class="span3">
<?= $this->partial('news/left.phtml'); ?>
</div>
</tbody>
</table>
<div class="pagenavi"><?= $this->paginator; ?></div>
<div class="span9">
<?php if ($this->msg or $this->messages) :?>
<div id="message">
<?php if ($this->msg) : ?>
<p><?php echo $this->msg; ?></p>
<?php endif; if ($this->messages): foreach($this->messages as $msg): ?>
<p><?php echo $msg; ?></p>
<?php endforeach;endif; ?>
</div>
<?php endif; ?>
<div>
<select id="navigation">
<option>按栏目查看</option>
<?php
if(count($this->types))
{
foreach($this->types as $v)
{
if(!empty($v[$this->deepField])) {$haed = str_repeat('-',$v[$this->deepField]);}
if($this->type == $v['id'])
echo '<option value="/admin/news/newslist/type/'.$v['id'].'" selected="selected">'
.$haed
.$v['title'].'</option>';
else
echo '<option value="/admin/news/newslist/type/'.$v['id'].'">'.$haed.$v['title'].'</option>';
}
}
?>
</select>
&nbsp;
<a href="/admin/news/newslist">所有新闻列表</a>
</div>
<table id="report" class="table table-hover">
<thead>
<tr>
<th width="50%">新闻标题</th>
<th width="15%">栏目</th>
<th width="15%">状态</th>
<th width="20%">新闻管理</th>
</tr>
</thead>
<tbody>
<?php
if(count($this->paginator))
{
$list = "";
foreach ($this->paginator as $v)
{
$list .= '
<tr>
<td>
<a id="titlebtn'.$v['id'].'" class="title"><b>'.$v['title'].'</b></a>
</td>
<td>
<a href="'.$v['type_url'].'"><b>'.$v['type_title'].'</b></a>
</td>
<td>';
if($v['ts_published']<time() and $v['is_pub']>0)
{
$list.="已发布";
}
if($v['ts_published']>time() and $v['is_pub']>0)
{
$list.= date('Y-m-d H:i',$v['ts_published']) . '发布';
}
if($v['is_pub']==0)
{
$list.="草稿";
}
if($v['is_pub']<0)
{
$list.="未发布";
}
$list .= '</td>
<td>
<a href="'.$v['url'].'">浏览</a>
<a href="/admin/news/newsedit/id/'.$v['id'].'"><b>编辑</b></a>
<a href="/admin/news/delete/id/'.$v['id'].'" onclick="return confirm(\'是否确定删除该文章\')">删除</a></td>
</tr>
';
}
echo $list;
}
else
{
echo '
<tr><td>暂无数据</td><td></td></tr>
';
}
?>
</tbody>
</table>
<div class="pagenavi"><?= $this->paginator; ?></div>
</div>
</div>
<script type="text/javascript">
$(document).ready(function(){
$('.title').bind('click', function() {
$.colorbox({'innerWidth':'50%','html':$(this).next('.listingDetails').children('.pad').html()});
});
$("#navigation").change(function()
{
window.location.href = $(this).val();
});
});
function showpad(id){
$('#titlebtn'+id).click();
}
</script>

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

@ -2317,9 +2317,7 @@ order by m.title";
public function visualAction()
{
$visual = new \Westdc\Visual\Visual;
view::addPaginator($visual->getVisualMetadata(),$this,10);
return true;
}
}

2
application/default/views/scripts/account/login.phtml
View File

@ -13,7 +13,9 @@
请输入用户名和密码登录
</div>
<? }else{ ?>
<div class="alert alert-error">
<?= $this->error ?>
</div>
<?php } ?>
<div class="control-group">
<label class="control-label" for="username">用户名</label>

1
application/default/views/scripts/data/tools.phtml
View File

@ -7,5 +7,6 @@
<!-- <li><a href="/data/map"><i class="icon-globe"></i>空间浏览</a></li> -->
<li><a href="/data/timemap"><i class="icon-film"></i>时空浏览</a></li>
<li><a href="/data/browse"><i class="icon-align-justify"></i>全部浏览</a></li>
<li><a href="/data/browse"><i class="icon-align-justify"></i>可视化数据</a></li>
<!-- <li><a href="/data/advancesearch"><i class="icon-search"></i>高级搜索</a></li> -->
</ul>

30
application/default/views/scripts/data/visual.phtml
View File

@ -4,16 +4,15 @@ $this->headTitle($this->config->title->data);
if (!empty($this->codename)) $this->headTitle($this->codename);
$this->headTitle()->setSeparator(' - ');
$this->headLink()->appendStylesheet('/css/metadata.css');
$this->nav[] = array('link'=>"/data/tag",'title'=>'关键词浏览');
$this->nav[] = array('link'=>"/data/visual",'title'=>'可视化数据列表');
$this->theme->AppendPlus($this,'colorbox');
?>
<div id='row-fluid'>
<?= $this->render('breadcrumbs.phtml') ?>
<?= $this->partial('data/tools.phtml'); ?>
<div class="row-fluid">
<?= $this->render('breadcrumbs.phtml') ?>
<?= $this->partial('data/tools.phtml'); ?>
</div>
<?php if (!empty($this->paginator)) : ?>
<div id='metacontent'>
<h1>当前浏览：<?php echo $this->codename; ?></h1>
<?php echo $this->paginator; ?>
<hr />
<?php foreach($this->paginator as $md) : ?>
@ -29,27 +28,6 @@ $this->theme->AppendPlus($this,'colorbox');
<?php endforeach; ?>
<?php echo $this->paginator; ?>
</div>
<?php else : ?>
<div id='leftnav'>
<?php
$keytypezh=array('place'=>'地点关键词','theme'=>'主题关键词','discipline'=>'学科关键词','stratum'=>'地层关键词','temporal'=>'时间关键词');
$type='';
foreach($this->keywords as $cg) :
if ($type!=$cg['keytype']) :
if ($type!='') : ?>
</ul></fieldset>
<?php endif;
$type=$cg['keytype'];
?>
<fieldset><legend><?php echo $keytypezh[$type]; ?></legend>
<ul>
<li><a href='/data/tag/<?php echo urlencode($cg['keyword']); ?>'><?php echo $cg['keyword']; ?></a><span class="note">(<?php echo $cg['count']; ?>)</span></li>
<?php else : ?>
<li><a href='/data/tag/<?php echo urlencode($cg['keyword']); ?>'><?php echo $cg['keyword']; ?></a><span class="note">(<?php echo $cg['count']; ?>)</span></li>
<?php endif; ?>
<?php endforeach; ?>
</ul>
</fieldset></div>
<?php endif; ?>
<script>
$(document).ready(function(){

6
application/module/Westdc/Visual/Visual.php
View File

@ -103,9 +103,9 @@ class Visual
{
$sql = "SELECT * FROM metadata md
LEFT JOIN {$this->mainTable} v ON v.uuid = md.uuid
WHERE v.uuid IS NOT NULL
";
WHERE v.uuid IS NOT NULL";
$rs = $this->db->query($sql);
return $rs->fetch(\PDO::FETCH_ASSOC);
return $rs->fetchAll(\PDO::FETCH_ASSOC);
}
}