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

将版本对比功能修改为弹窗查看

This commit is contained in:
Li Jianxuan 2012-04-13 07:38:21 +00:00
parent d0bfabe0f2
commit dbc466b034
3 changed files with 471 additions and 478 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1993,7 +1993,10 @@ class AuthorController extends Zend_Controller_Action
//与前一个版本对比
else if($ac == "diff")
{
$this->_helper->layout->disableLayout();
$this->_helper->viewRenderer('version-diff');
$id = $this->_request->getParam('id');
if(empty($id) || !is_numeric($id))
{

25
application/default/views/scripts/author/version-diff.phtml
View File

@ -5,6 +5,7 @@ $this->headTitle()->setSeparator(' - ');
$this->headScript()->appendFile('/js/jquery-1.7.min.js');
$this->headScript()->appendFile('/js/diffview.js');
$this->headScript()->appendFile('/js/difflib.js');
$this->headScript()->appendFile('/static/js/menuctrl.js');
$this->headLink()->appendStylesheet('/css/author.css');
$this->headLink()->appendStylesheet('/css/diffview.css');
$this->breadcrumb('<a href="/">首页</a>');
@ -13,21 +14,11 @@ $this->breadcrumb('查看数据作者');
$this->breadcrumb()->setSeparator(' > ');
?>
<!-- 左侧导航 -->
<div id='sidebar'>
<div id='leftnavi'>
<?= $this->partial('author/navi.phtml'); ?>
</div>
</div>
<!-- //左侧导航 -->
<!-- 页面内容 -->
<div id="wapper">
<div id="tabs-controller">
<ul>
<li class="box-shadow"><a class="text-shadow" href="/author/version">所有版本概况</a></li>
<li class="box-shadow"><a class="text-shadow" href="/author/version/ac/bydata">逐数据浏览</a></li>
</ul>
</div>
<script type="text/javascript" language="javascript" src="/js/jquery-1.7.min.js"></script>
<script type="text/javascript" language="javascript" src="/js/diffview.js"></script>
<script type="text/javascript" language="javascript" src="/js/difflib.js"></script>
<script type="text/javascript" language="javascript" src="/static/js/menuctrl.js"></script>
<link href="/css/diffview.css" rel="stylesheet" type="text/css" media="screen" />
<?php
if(!empty($this->error))
{
@ -36,15 +27,13 @@ $this->breadcrumb()->setSeparator(' > ');
else
{?>
<h2><?php echo $this->info['title'];?></h2>
<div id="diffoutput" style="width:100%"> </div>
<div id="diffoutput" style="width:100%;"> </div>
<textarea id="basetext" style="display:none;"><?php echo $this->data[1]['xml'];?></textarea>
<textarea id="newtext" style="display:none;"><?php echo $this->data[0]['xml'];?></textarea>
<?php
}
?>
</div>
<!-- //页面内容 -->
<script>
function diffUsingJS() {

3
application/default/views/scripts/author/version.phtml
View File

@ -46,7 +46,7 @@ $this->breadcrumb()->setSeparator(' > ');
【<a onclick="return confirm('是否确定删除该版本？');" href="javascript:action('delete','<?php echo $item['id'];?>');" class="more">删除</a>
<?php endif; ?>
<a onclick="return confirm('是否确定将这个版本恢复到geonetwork？');" href="javascript:action('restore','<?php echo $item['id'];?>');" class="more">恢复到geonetwork</a>
<a href="/author/version/ac/diff/id/<?php echo $item['id'];?>" class="more">与前一版对比</a>
<a href="/author/version/ac/diff/id/<?php echo $item['id'];?>" class="more iframe">与前一版对比</a>
<a onclick="$('#commit_submit').attr('onclick','commit(\'<?php echo $item['id'];?>\');');" href="#commitform" class="more inline">提交评审发布</a>
】</p>
<?php if ($item['changelog']) : ?>
@ -90,6 +90,7 @@ $(".inline").colorbox({inline:true, width:"50%"});
function commit(id){
action('commit&changelog='+$('#changelog').val(),id);
}
$(".iframe").colorbox({iframe:true, width:"80%", height:"80%"});
</script>
<div class="colorbox" style="display:none;">
<div id="commitform">