185 lines
8.4 KiB
PHP
185 lines
8.4 KiB
PHP
<?php
|
|
/**
|
|
* The diff view file of repo module of ZenTaoPMS.
|
|
*
|
|
* @copyright Copyright 2009-2012 禅道软件（青岛）有限公司(ZenTao Software (Qingdao) Co., Ltd. www.cnezsoft.com)
|
|
* @author Wang Yidong, Zhu Jinyong
|
|
* @package repo
|
|
* @version $Id: browse.html.php $
|
|
*/
|
|
?>
|
|
<?php include '../../common/view/header.html.php';?>
|
|
<?php include '../../common/view/form.html.php';?>
|
|
<?php include '../../common/view/kindeditor.html.php';?>
|
|
<?php
|
|
$browser = helper::getBrowser();
|
|
js::set('browser', $browser['name']);
|
|
js::set('edition', $config->edition);
|
|
?>
|
|
<?php if(!isonlybody()):?>
|
|
<div id='mainMenu' class='clearfix'>
|
|
<div class='btn-toolbar pull-left'>
|
|
<?php
|
|
$backURI = $this->session->repoView ? $this->session->repoView : $this->session->repoList;
|
|
if($backURI)
|
|
{
|
|
echo html::a($backURI, "<i class='icon icon-back icon-sm'></i> " . $lang->goback, '', "class='btn btn-link' data-app='{$app->tab}'");
|
|
}
|
|
else
|
|
{
|
|
echo html::backButton("<i class='icon icon-back icon-sm'></i> " . $lang->goback, '', "btn btn-link");
|
|
}
|
|
?>
|
|
<div class="divider"></div>
|
|
<div class="page-title">
|
|
<?php
|
|
echo html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=&objectID=$objectID"), $repo->name, '', "data-app='{$app->tab}'");
|
|
$paths = explode('/', $entry);
|
|
$fileName = array_pop($paths);
|
|
$postPath = '';
|
|
$base64BranchID = helper::safe64Encode(base64_encode($branchID));
|
|
foreach($paths as $pathName)
|
|
{
|
|
$postPath .= $pathName . '/';
|
|
echo '/' . ' ' . html::a($this->repo->createLink('browse', "repoID=$repoID&branchID=$base64BranchID&objectID=$objectID&path=" . $this->repo->encodePath($postPath)), trim($pathName, '/'), '', "data-app='{$app->tab}'");
|
|
}
|
|
echo '/' . ' ' . $fileName;
|
|
if(strpos($repo->SCM, 'Subversion') === false)
|
|
{
|
|
$oldRevision = $oldRevision == '^' ? "$newRevision" : $oldRevision;
|
|
echo " <span class='label label-info'>" . substr($oldRevision, 0, 10) . " : " . substr($newRevision, 0, 10) . ' (' . zget($historys, $oldRevision, '') . ' : ' . zget($historys, $newRevision, '') . ')</span>';
|
|
}
|
|
else
|
|
{
|
|
$oldRevision = $oldRevision == '^' ? $newRevision - 1 : $oldRevision;
|
|
echo " <span class='label label-info'>$oldRevision : $newRevision</span>";
|
|
}
|
|
?>
|
|
<span class='label label-exchange'><i class="icon icon-exchange"></i></span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<?php endif;?>
|
|
<?php if($browser['name'] == 'ie'):?>
|
|
<div class="repo panel">
|
|
<div class='panel-heading'>
|
|
<form method='post'>
|
|
<div class='btn-group pull-right'>
|
|
<?php echo html::commonButton($lang->repo->viewDiffList['inline'], "id='inline'", $arrange == 'inline' ? 'active btn btn-sm' : 'btn btn-sm')?>
|
|
<?php echo html::commonButton($lang->repo->viewDiffList['appose'], "id='appose'", $arrange == 'appose' ? 'active btn btn-sm' : 'btn btn-sm')?>
|
|
</div>
|
|
<div class='btn-toolbar'>
|
|
<div class='btn-group'>
|
|
<?php if(common::hasPriv('repo', 'download')) echo html::a($this->repo->createLink('download', "repoID=$repoID&path=" . $this->repo->encodePath($entry) . "&fromRevison=$oldRevision&toRevision=$newRevision&type=path"), $lang->repo->downloadDiff, 'hiddenwin', "class='btn btn-sm btn-download'");?>
|
|
<div class='btn-group'>
|
|
<?php echo html::commonButton(zget($lang->repo->encodingList, $encoding, $lang->repo->encoding) . "<span class='caret'></span>", "data-toggle='dropdown'", 'btn dropdown-toggle btn-sm')?>
|
|
<ul class='dropdown-menu' role='menu'>
|
|
<?php foreach($lang->repo->encodingList as $key => $val):?>
|
|
<li><?php echo html::a('javascript:changeEncoding("'. $key . '")', $val)?></li>
|
|
<?php endforeach;?>
|
|
</ul>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
<?php echo html::hidden('arrange', $arrange) . html::hidden('encoding', $encoding) . html::hidden('revision[]', $newRevision) . html::hidden('revision[]', $oldRevision)?>
|
|
</form>
|
|
</div>
|
|
<?php foreach($diffs as $diffFile):?>
|
|
<div class='repoCode'>
|
|
<table class='table diff' id='diff'>
|
|
<caption><?php echo $diffFile->fileName;?></caption>
|
|
<?php if(empty($diffFile->contents)) continue;?>
|
|
<?php foreach($diffFile->contents as $content):?>
|
|
<?php
|
|
$oldCurrentLine = $content->oldStartLine;
|
|
$newCurrentLine = $content->newStartLine;
|
|
?>
|
|
<?php if(!in_array($oldCurrentLine, array('0', '1')) and !in_array($newCurrentLine, array('0', '1'))):?>
|
|
<tr data-line='<?php echo $newCurrentLine ?>' class='empty'>
|
|
<th class='w-num text-center'>...</th>
|
|
<?php if($arrange == 'appose'):?>
|
|
<td class='none code'></td>
|
|
<?php endif;?>
|
|
<th class='w-num text-center'>...</th>
|
|
<td class='none code'></td>
|
|
</tr>
|
|
<?php endif?>
|
|
<?php if($arrange == 'inline'):?>
|
|
<?php foreach($content->lines as $line):?>
|
|
<tr data-line='<?php echo $line->newlc ?>'>
|
|
<th class='w-num text'><?php if($line->type != 'new' and $line->oldlc) echo $line->oldlc?></th>
|
|
<th class='w-num text'><?php if($line->type != 'old' and $line->newlc) echo $line->newlc?></th>
|
|
<td class='line-<?php echo $line->type?> code'><?php
|
|
$line->line = $repo->SCM == 'Subversion' ? htmlSpecialString($line->line) : $line->line;
|
|
echo $line->type == 'old' ? preg_replace('/^\-/', '–', $line->line) : ($line->type == 'new' ? $line->line : ' ' . $line->line);
|
|
?></td>
|
|
</tr>
|
|
<?php endforeach;?>
|
|
<?php else:?>
|
|
<?php foreach($content->lines as $line):?>
|
|
<tr data-line='<?php echo $line->newlc ?>'>
|
|
<?php
|
|
if($line->type == 'old')
|
|
{
|
|
$oldlc = $line->oldlc;
|
|
$newlc = '';
|
|
if(isset($content->new[$oldlc]) and !isset($content->new[$oldlc - 1]))
|
|
{
|
|
$newlc = $line->oldlc;
|
|
$line->type = 'custom';
|
|
}
|
|
}
|
|
else
|
|
{
|
|
$oldlc = $line->oldlc > 0 ? $line->oldlc : ' ';
|
|
$newlc = $line->newlc;
|
|
if(!isset($content->new[$newlc])) continue;
|
|
}
|
|
?>
|
|
<th class='w-num text-center'><?php echo $oldlc?></th>
|
|
<td class='w-code line-<?php if($line->type != 'new')echo $line->type?> <?php if($line->type == 'custom') echo "line-old"?> code'><?php
|
|
if(!isset($content->old[$oldlc])) $content->old[$oldlc] = '';
|
|
$content->old[$oldlc] = $repo->SCM == 'Subversion' ? htmlSpecialString($content->old[$oldlc]) : $content->old[$oldlc];
|
|
if(!empty($oldlc)) echo $line->type != 'all' ? preg_replace('/^\-/', '–', $content->old[$oldlc]) : ' ' . $content->old[$oldlc];
|
|
?></td>
|
|
<th class='w-num text-center'><?php echo $newlc?></th>
|
|
<td class='w-code line-<?php if($line->type != 'old') echo $line->type?> <?php if($line->type == 'custom') echo "line-new"?> code'><?php
|
|
if(!isset($content->new[$newlc])) $content->new[$newlc] = '';
|
|
$content->new[$newlc] = $repo->SCM == 'Subversion' ? htmlSpecialString($content->new[$newlc]) : $content->new[$newlc];
|
|
if(!empty($newlc)) echo $line->type != 'all' ? $content->new[$newlc] : ' ' . $content->new[$newlc];
|
|
?></td>
|
|
<?php
|
|
if(isset($content->old[$oldlc])) unset($content->old[$oldlc]);
|
|
if(isset($content->new[$newlc])) unset($content->new[$newlc]);
|
|
?>
|
|
</tr>
|
|
<?php endforeach;?>
|
|
<?php endif;?>
|
|
<?php endforeach;?>
|
|
</table>
|
|
</div>
|
|
<?php endforeach?>
|
|
</div>
|
|
<?php elseif($diffs):?>
|
|
<?php include 'diffeditor.html.php';?>
|
|
<?php endif;?>
|
|
<div class='revisions hidden'>
|
|
<?php
|
|
if(strpos($repo->SCM, 'Subversion') === false)
|
|
{
|
|
$oldRevision = $oldRevision == '^' ? "$newRevision" : $oldRevision;
|
|
echo " <span class='label label-info'>" . substr($oldRevision, 0, 10) . " : " . substr($newRevision, 0, 10) . ' (' . $historys[$oldRevision] . ' : ' . $historys[$newRevision] . ')</span>';
|
|
}
|
|
else
|
|
{
|
|
$oldRevision = $oldRevision == '^' ? $newRevision - 1 : $oldRevision;
|
|
echo " <span class='label label-info'>$oldRevision : $newRevision</span>";
|
|
}
|
|
?>
|
|
</div>
|
|
<form method="post" id="exchange" class="hidden">
|
|
<input type="hidden" name="revision[]" value="<?php echo $oldRevision;?>"/>
|
|
<input type="hidden" name="revision[]" value="<?php echo $newRevision;?>"/>
|
|
</form>
|
|
<?php include '../../common/view/footer.html.php';?>
|