Indefero

Indefero Commit Details


Date:2011-10-08 20:14:43 (14 years 1 month ago)
Author:Thomas Keller
Branch:develop, feature.diff-whitespace, feature.wiki-default-page, release-1.2, release-1.3
Commit:464c1a8ef5323d5032dacdf86dcbe3167b436dc2
Parents: e5b10a84947fffc17c53de4ac83e3ebbc820cd2a
Message:Fix / adapt the side-by-side review diff rendering.
Changes:

File differences

src/IDF/Diff.php
169169
170170
171171
172
173
172
174173
175174
176175
......
208207
209208
210209
211
210
212211
213212
214213
......
354353
355354
356355
357
356
358357
359
358
359
360
361
362
363
364
360365
361366
362
363
364
367
368
369
370
365371
366
367
372
373
368374
369
370
375
376
371377
372
373
378
379
374380
375
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
376396
377
378
379397
380
381398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
382458
383459
384460
}␊
␊
$offsets[] = sprintf('<td>%s</td><td>%s</td>', $left, $right);␊
$content = Pluf_esc($content);␊
$content = IDF_FileUtil::emphasizeControlCharacters($content);␊
$content = IDF_FileUtil::emphasizeControlCharacters(Pluf_esc($content));␊
$contents[] = sprintf('<td class="%s%s mono">%s</td>', $class, $pretty, $content);␊
}␊
if (count($file['chunks']) > $cc) {␊
'</tr>' ."\n".␊
'</table>' ."\n";␊
␊
$out .= '<table class="diff">' ."\n".␊
$out .= '<table class="diff unified">' ."\n".␊
'<colgroup><col width="'.($leftwidth + $rightwidth + 1).'" /><col width="*" /></colgroup>' ."\n".␊
'<tr id="diff-'.md5($filename).'">'.␊
'<th colspan="2">'.Pluf_esc($filename).'</th>'.␊
if (IDF_FileUtil::isSupportedExtension($fileinfo[2])) {␊
$pretty = ' prettyprint';␊
}␊
$out = '';␊
␊
$cc = 1;␊
$i = 0;␊
$left_offsets = array();␊
$left_contents = array();␊
$right_offsets = array();␊
$right_contents = array();␊
␊
$max_lineno_left = $max_lineno_right = 0;␊
␊
foreach ($chunks as $chunk) {␊
foreach ($chunk as $line) {␊
$line1 = '&nbsp;';␊
$line2 = '&nbsp;';␊
$line[2] = (strlen($line[2])) ? IDF_FileUtil::emphasizeControlCharacters(Pluf_esc($line[2])) : '&nbsp;';␊
$left = '';␊
$right = '';␊
$content = IDF_FileUtil::emphasizeControlCharacters(Pluf_esc($line[2]));␊
␊
if ($line[0] and $line[1]) {␊
$class = 'diff-c';␊
$line1 = $line2 = $line[2];␊
$class = 'context';␊
$left = $right = $content;␊
} elseif ($line[0]) {␊
$class = 'diff-r';␊
$line1 = $line[2];␊
$class = 'removed';␊
$left = $content;␊
} else {␊
$class = 'diff-a';␊
$line2 = $line[2];␊
$class = 'added';␊
$right = $content;␊
}␊
$out .= sprintf('<tr class="diff-line"><td class="diff-lc">%s</td><td class="%s mono%s"><code>%s</code></td><td class="diff-lc">%s</td><td class="%s mono%s"><code>%s</code></td></tr>'."\n", $line[0], $class, $pretty, $line1, $line[1], $class, $pretty, $line2);␊
␊
$left_offsets[] = sprintf('<td>%s</td>', $line[0]);␊
$right_offsets[] = sprintf('<td>%s</td>', $line[1]);␊
$left_contents[] = sprintf('<td class="%s%s mono">%s</td>', $class, $pretty, $left);␊
$right_contents[] = sprintf('<td class="%s%s mono">%s</td>', $class, $pretty, $right);␊
␊
$max_lineno_left = max($max_lineno_left, $line[0]);␊
$max_lineno_right = max($max_lineno_right, $line[1]);␊
}␊
␊
if (count($chunks) > $cc) {␊
$left_offsets[] = '<td class="next">...</td>';␊
$right_offsets[] = '<td class="next">...</td>';␊
$left_contents[] = '<td></td>';␊
$right_contents[] = '<td></td>';␊
}␊
if (count($chunks) > $cc)␊
$out .= '<tr class="diff-next"><td>...</td><td>&nbsp;</td><td>...</td><td>&nbsp;</td></tr>'."\n";␊
$cc++;␊
$i++;␊
}␊
␊
$leftwidth = 1;␊
if ($max_lineno_left > 0)␊
$leftwidth = ((ceil(log10($max_lineno_left)) + 1) * 8) + 12;␊
␊
$rightwidth = 1;␊
if ($max_lineno_right > 0)␊
$rightwidth = ((ceil(log10($max_lineno_right)) + 1) * 8) + 12;␊
␊
$inner_linecounts_left =␊
'<table class="diff-linecounts">' ."\n".␊
'<colgroup><col width="'.$leftwidth.'" /></colgroup>' ."\n".␊
'<tr class="line">' .␊
implode('</tr>'."\n".'<tr class="line">', $left_offsets).␊
'</tr>' ."\n".␊
'</table>' ."\n";␊
␊
$inner_linecounts_right =␊
'<table class="diff-linecounts">' ."\n".␊
'<colgroup><col width="'.$rightwidth.'" /></colgroup>' ."\n".␊
'<tr class="line">' .␊
implode('</tr>'."\n".'<tr class="line">', $right_offsets).␊
'</tr>' ."\n".␊
'</table>' ."\n";␊
␊
$inner_contents_left =␊
'<table class="diff-contents">' ."\n".␊
'<tr class="line">' .␊
implode('</tr>'."\n".'<tr class="line">', $left_contents) .␊
'</tr>' ."\n".␊
'</table>' ."\n";␊
␊
$inner_contents_right =␊
'<table class="diff-contents">' ."\n".␊
'<tr class="line">' .␊
implode('</tr>'."\n".'<tr class="line">', $right_contents) .␊
'</tr>' ."\n".␊
'</table>' ."\n";␊
␊
$out =␊
'<table class="diff context">' ."\n".␊
'<colgroup>' .␊
'<col width="'.($leftwidth + 1).'" /><col width="*" />' .␊
'<col width="'.($rightwidth + 1).'" /><col width="*" />' .␊
'</colgroup>' ."\n".␊
'<tr id="diff-'.md5($filename).'">'.␊
'<th colspan="4">'.Pluf_esc($filename).'</th>'.␊
'</tr>' ."\n".␊
'<tr>' .␊
'<th colspan="2">'.__('Old').'</th><th colspan="2">'.__('New').'</th>' .␊
'</tr>'.␊
'<tr>' .␊
'<td>'. $inner_linecounts_left .'</td>'. "\n".␊
'<td><div class="scroll">'. $inner_contents_left .'</div></td>'. "\n".␊
'<td>'. $inner_linecounts_right .'</td>'. "\n".␊
'<td><div class="scroll">'. $inner_contents_right .'</div></td>'. "\n".␊
'</tr>' ."\n".␊
'</table>' ."\n";␊
␊
return Pluf_Template::markSafe($out);␊
}␊
}␊
src/IDF/templates/idf/review/view.html
1010
1111
1212
13
14
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
1533
1634
1735
......
4563
4664
4765
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
7166
7267
7368
74
75
76
77
78
79
80
69
70
71
8172
8273
8374
{/if}␊
</div>␊
{/if}␊
<table class="disp" summary="">␊
<tr><td>␊
{if !$user.isAnonymous()}␊
<div class="issue-submit-info" style="width: 50%; float: right; position: relative;">␊
<p><strong>{trans 'How to Participate in a Code Review'}</strong></p>␊
␊
<p>{blocktrans}Code review is a process in which␊
after or before changes are commited into the code repository,␊
different people discuss the code changes. The goal is␊
to <strong>improve the quality of the code and the␊
contributions</strong>, as such, you must be pragmatic when writing␊
your review. Correctly mention the line numbers (in the old or in the␊
new file) and try to keep a good balance between seriousness and fun.␊
{/blocktrans}</p>␊
<p>{blocktrans}␊
<strong>Proposing code for review is intimidating</strong>, you know␊
you will receive critics, so please, as a reviewer, <strong>keep this␊
process fun</strong>, use it to help your contributor learn your␊
coding standards and the structure of the code and <strong>make them want␊
to propose more contributions</strong>.␊
{/blocktrans}</p></div>␊
{/if}␊
<table class="commit" summary="">␊
<tr>␊
<th><strong>{trans 'Created:'}</strong></th><td>{$patch.creation_dtime|date:"%Y-%m-%d %H:%M:%S"} ({$patch.creation_dtime|dateago})</td>␊
<th>&nbsp;</th><td><a href="{$url}"><img style="vertical-align: text-bottom;" src="{media '/idf/img/package-grey.png'}" alt="{trans 'Archive'}" align="bottom" /></a> <a href="{$url}" class="soft">{trans 'Download the corresponding diff file'}</a></td>␊
</tr>␊
</table>␊
</td><td>␊
{if !$user.isAnonymous()}␊
<div class="issue-submit-info" style="width: 90%; float: right; position: relative;">␊
<p><strong>{trans 'How to Participate in a Code Review'}</strong></p>␊
␊
<p>{blocktrans}Code review is a process in which␊
after or before changes are commited into the code repository,␊
different people discuss the code changes. The goal is␊
to <strong>improve the quality of the code and the␊
contributions</strong>, as such, you must be pragmatic when writing␊
your review. Correctly mention the line numbers (in the old or in the␊
new file) and try to keep a good balance between seriousness and fun.␊
{/blocktrans}</p>␊
<p>{blocktrans}␊
<strong>Proposing code for review is intimidating</strong>, you know␊
you will receive critics, so please, as a reviewer, <strong>keep this␊
process fun</strong>, use it to help your contributor learn your␊
coding standards and the structure of the code and <strong>make them want␊
to propose more contributions</strong>.␊
{/blocktrans}</p></div>␊
{/if}␊
</td></tr>␊
</table>␊
␊
<form method="post" action=".">␊
{foreach $files as $file=>$def}␊
<table class="diff" summary=" ">␊
<tbody>␊
<tr id="diff-{$file|md5}"><th colspan="4">{$file}</th></tr>␊
<tr><th colspan="2">{trans 'Old'}</th><th colspan="2">{trans 'New'}</th></tr>␊
{$def[0]}␊
</tbody>␊
</table>␊
␊
{$def[0]}␊
␊
{assign $fcomments = $def[2]}␊
{assign $nc = $fcomments.count()}␊
{assign $i = 1}␊
www/media/idf/css/style.css
600600
601601
602602
603
604
603
604
605
605606
606607
607608
padding: 0;␊
}␊
␊
table.diff > tbody > tr > td + td {␊
border-right: 1px solid #d3d7cf;␊
table.diff.unified > tbody > tr > td + td,␊
table.diff.context > tbody > tr > td + td + td + td {␊
border-right: 1px solid #d3d7cf;␊
}␊
␊
table.diff th {␊

Archive Download the corresponding diff file

Page rendered in 0.13474s using 13 queries.