diff options
| author | Tom N Harris <tnharris@whoopdedo.org> | 2013-02-16 18:15:13 -0500 |
|---|---|---|
| committer | Tom N Harris <tnharris@whoopdedo.org> | 2013-02-16 18:15:13 -0500 |
| commit | 56133a04d1c5dcd4825f4c0c978b8a9336d603d0 (patch) | |
| tree | 62956619448c344e1a0a2827626082d2a4a9e0a3 /inc | |
| parent | c0e94f2ae82b91c9a8af05eea8443b37eef52ba7 (diff) | |
| download | rpg-56133a04d1c5dcd4825f4c0c978b8a9336d603d0.tar.gz rpg-56133a04d1c5dcd4825f4c0c978b8a9336d603d0.tar.bz2 | |
Fix width of indicator column.
Diffstat (limited to 'inc')
| -rw-r--r-- | inc/DifferenceEngine.php | 10 | ||||
| -rw-r--r-- | inc/html.php | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/inc/DifferenceEngine.php b/inc/DifferenceEngine.php index 1099f40eb..2125ad879 100644 --- a/inc/DifferenceEngine.php +++ b/inc/DifferenceEngine.php @@ -1151,7 +1151,7 @@ class InlineDiffFormatter extends DiffFormatter { $xbeg .= "," . $xlen; if ($ylen != 1) $ybeg .= "," . $ylen; - $r = '<tr><td colspan="'.$this->colspan.'" '.HTMLDiff::css('diff-blockheader').'>@@ '.$lang['line']." -$xbeg +$ybeg @@"; + $r = '<tr><td colspan="2" '.HTMLDiff::css('diff-blockheader').'>@@ '.$lang['line']." -$xbeg +$ybeg @@"; $r .= ' <span '.HTMLDiff::css('diff-deletedline').'><del>'.$lang['deleted'].'</del></span>'; $r .= ' <span '.HTMLDiff::css('diff-addedline').'>'.$lang['created'].'</span>'; $r .= "</td></tr>\n"; @@ -1170,19 +1170,19 @@ class InlineDiffFormatter extends DiffFormatter { function _added($lines) { foreach ($lines as $line) { - print('<tr><td '.HTMLDiff::css('diff-lineheader').'>+</td><td colspan="'.($this->colspan-1).'" '.HTMLDiff::css('diff-addedline').'>'. $line . "</td></tr>\n"); + print('<tr><td '.HTMLDiff::css('diff-lineheader').'>+</td><td '.HTMLDiff::css('diff-addedline').'>'. $line . "</td></tr>\n"); } } function _deleted($lines) { foreach ($lines as $line) { - print('<tr><td '.HTMLDiff::css('diff-lineheader').'>-</td><td colspan="'.($this->colspan-1).'" '.HTMLDiff::css('diff-deletedline').'><del>' . $line . "</del></td></tr>\n"); + print('<tr><td '.HTMLDiff::css('diff-lineheader').'>-</td><td '.HTMLDiff::css('diff-deletedline').'><del>' . $line . "</del></td></tr>\n"); } } function _context($lines) { foreach ($lines as $line) { - print('<tr><td '.HTMLDiff::css('diff-lineheader').'> </td><td colspan="'.($this->colspan-1).'" '.HTMLDiff::css('diff-context').'>'.$line."</td></tr>\n"); + print('<tr><td '.HTMLDiff::css('diff-lineheader').'> </td><td '.HTMLDiff::css('diff-context').'>'.$line."</td></tr>\n"); } } @@ -1191,7 +1191,7 @@ class InlineDiffFormatter extends DiffFormatter { $add = $diff->inline(); foreach ($add as $line) - print('<tr><td '.HTMLDiff::css('diff-lineheader').'>!</td><td colspan="'.($this->colspan-1).'">'.$line."</td></tr>\n"); + print('<tr><td '.HTMLDiff::css('diff-lineheader').'>!</td><td>'.$line."</td></tr>\n"); } } diff --git a/inc/html.php b/inc/html.php index 420efd633..e657d2c78 100644 --- a/inc/html.php +++ b/inc/html.php @@ -1209,12 +1209,12 @@ function html_diff($text='',$intro=true,$type=null){ <table class="diff diff_<?php echo $type?>"> <?php if ($type == 'inline') { ?> <tr> - <td>---</td><th <?php echo $l_minor?>> + <th class="diff-lineheader">-</th><th <?php echo $l_minor?>> <?php echo $l_head?> </th> </tr> <tr> - <td>+++</td><th <?php echo $r_minor?>> + <th class="diff-lineheader">+</th><th <?php echo $r_minor?>> <?php echo $r_head?> </th> </tr> |