mirror of
https://github.com/Lastorder-DC/rhymix.git
synced 2026-01-29 08:09:58 +09:00
source_compare
git-svn-id: http://xe-core.googlecode.com/svn/sandbox@5956 201d5d3c-b55e-5fd7-737f-ddc643e51545
This commit is contained in:
parent
9b4a5489d0
commit
0919ae7e03
3 changed files with 100 additions and 62 deletions
|
|
@ -296,3 +296,6 @@ dt span.closed { text-decoration: line-through; }
|
|||
.extraVarForm ul { margin:0; padding:0; list-style:none; }
|
||||
.extraVarForm .date { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px; margin-right:10px; width:100px; }
|
||||
.extraVarForm .address { border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:3px; margin-right:10px; width:300px; }
|
||||
|
||||
.diff .deleted { background: #FFDDDD none; }
|
||||
.diff .added { background: #DDFFDD none; }
|
||||
|
|
|
|||
|
|
@ -10,30 +10,38 @@
|
|||
<!--@if($comp)-->
|
||||
<!--@foreach($comp as $item)-->
|
||||
<table>
|
||||
<col width="*" />
|
||||
<col width="20" />
|
||||
<col width="20" />
|
||||
<col width="*" />
|
||||
<thead>
|
||||
<tr>
|
||||
<th colspan="2" class="filename">{$item->filename}</th>
|
||||
<th colspan="3" class="filename">{$item->filename}</th>
|
||||
</tr>
|
||||
</thead>
|
||||
<tbody>
|
||||
<tbody class="diff">
|
||||
<tr class="revision">
|
||||
<td class="before">Rev. {$item->before_revision}</td>
|
||||
<td class="after">Rev. {$item->after_revision}</td>
|
||||
<td class="before">{$item->before_revision}</td>
|
||||
<td class="after">{$item->after_revision}</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<!--@foreach($item->changed as $change)-->
|
||||
<tr class="line">
|
||||
<td class="before">line {$change->before_line}</td>
|
||||
<td class="after">line {$change->after_line}</td>
|
||||
</tr>
|
||||
<!--@for($i=0;$i<count($change->before_code);$i++)-->
|
||||
<tr class="code">
|
||||
<td>{nl2br(str_replace(' ',' ',htmlspecialchars($change->before_code[$i])))}</td>
|
||||
<td>{nl2br(str_replace(' ',' ',htmlspecialchars($change->after_code[$i])))}</td>
|
||||
</tr>
|
||||
<!--@end-->
|
||||
<!--@end-->
|
||||
{@ $bStart = true }
|
||||
<!--@foreach($item->blocks as $block)-->
|
||||
<!--@if(!$bStart)-->
|
||||
<tr>
|
||||
<td>...</td>
|
||||
<td>...</td>
|
||||
<td></td>
|
||||
</tr>
|
||||
<!--@endif-->
|
||||
<!--@foreach($block->lines as $line)-->
|
||||
<tr>
|
||||
<td>{$line->before_line_number}</td>
|
||||
<td>{$line->after_line_number}</td>
|
||||
<td <!--@if($line->type)-->class="{$line->type}"<!--@endif--> >{nl2br(str_replace("\t"," ",str_replace(' ',' ',htmlspecialchars($line->data))))}</td>
|
||||
</tr>
|
||||
<!--@endforeach-->
|
||||
{@ $bStart = false }
|
||||
<!--@endforeach-->
|
||||
</tbody>
|
||||
</table>
|
||||
<!--@end-->
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue