revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-10 00:42:41 +01:00
Code Issues Releases Wiki Activity

Add colgroup in differential "shield" tables

Browse source 
Summary: Fixes minor brokenness from D8686.

Test Plan: Expanded a generated file, saw a normal-looking diff.

Reviewers: epriestley, #blessed_reviewers

Reviewed By: epriestley, #blessed_reviewers

Subscribers: epriestley, Korvin

Differential Revision: https://secure.phabricator.com/D8693
This commit is contained in:
Ben Alpert 2014-04-03 15:11:06 -07:00 committed by epriestley
parent 7446402f92
commit a0ac3d6716
3 changed files with 19 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/celerity/map.php
View file

@ -7,7 +7,7 @@
return array( return array(
'names' => 'names' =>
array( array(
'core.pkg.css' => 'fb144113', 'core.pkg.css' => '1f7a202d',
'core.pkg.js' => '57d0e1c4', 'core.pkg.js' => '57d0e1c4',
'darkconsole.pkg.js' => 'ca8671ce', 'darkconsole.pkg.js' => 'ca8671ce',
'differential.pkg.css' => '331c38d9', 'differential.pkg.css' => '331c38d9',
@ -22,7 +22,7 @@ return array(
'rsrc/css/aphront/context-bar.css' => '1c3b0529', 'rsrc/css/aphront/context-bar.css' => '1c3b0529',
'rsrc/css/aphront/dark-console.css' => '6378ef3d', 'rsrc/css/aphront/dark-console.css' => '6378ef3d',
'rsrc/css/aphront/dialog-view.css' => 'c01d24b4', 'rsrc/css/aphront/dialog-view.css' => 'c01d24b4',
'rsrc/css/aphront/error-view.css' => '16cd9949', 'rsrc/css/aphront/error-view.css' => '9f1d5518',
'rsrc/css/aphront/lightbox-attachment.css' => '7acac05d', 'rsrc/css/aphront/lightbox-attachment.css' => '7acac05d',
'rsrc/css/aphront/list-filter-view.css' => 'ef989c67', 'rsrc/css/aphront/list-filter-view.css' => 'ef989c67',
'rsrc/css/aphront/multi-column.css' => '12f65921', 'rsrc/css/aphront/multi-column.css' => '12f65921',
@ -486,7 +486,7 @@ return array(
'aphront-contextbar-view-css' => '1c3b0529', 'aphront-contextbar-view-css' => '1c3b0529',
'aphront-dark-console-css' => '6378ef3d', 'aphront-dark-console-css' => '6378ef3d',
'aphront-dialog-view-css' => 'c01d24b4', 'aphront-dialog-view-css' => 'c01d24b4',
'aphront-error-view-css' => '16cd9949', 'aphront-error-view-css' => '9f1d5518',
'aphront-list-filter-view-css' => 'ef989c67', 'aphront-list-filter-view-css' => 'ef989c67',
'aphront-multi-column-view-css' => '12f65921', 'aphront-multi-column-view-css' => '12f65921',
'aphront-notes' => '6acadd3f', 'aphront-notes' => '6acadd3f',

16
src/applications/differential/render/DifferentialChangesetHTMLRenderer.php
View file

@ -358,6 +358,17 @@ abstract class DifferentialChangesetHTMLRenderer
$content))); $content)));
} }
private function renderColgroup() {
return phutil_tag('colgroup', array(), array(
phutil_tag('col', array('class' => 'num')),
phutil_tag('col', array('class' => 'left')),
phutil_tag('col', array('class' => 'num')),
phutil_tag('col', array('class' => 'copy')),
phutil_tag('col', array('class' => 'right')),
phutil_tag('col', array('class' => 'cov')),
));
}
protected function wrapChangeInTable($content) { protected function wrapChangeInTable($content) {
if (!$content) { if (!$content) {
return null; return null;
@ -369,7 +380,10 @@ abstract class DifferentialChangesetHTMLRenderer
'class' => 'differential-diff remarkup-code PhabricatorMonospaced', 'class' => 'differential-diff remarkup-code PhabricatorMonospaced',
'sigil' => 'differential-diff', 'sigil' => 'differential-diff',
), ),
$content); array(
$this->renderColgroup(),
$content,
));
} }
protected function renderInlineComment( protected function renderInlineComment(

17
src/applications/differential/render/DifferentialChangesetTwoUpRenderer.php
View file

@ -7,17 +7,6 @@ final class DifferentialChangesetTwoUpRenderer
return false; return false;
} }
private function renderColgroup() {
return phutil_tag('colgroup', array(), array(
phutil_tag('col', array('class' => 'num')),
phutil_tag('col', array('class' => 'left')),
phutil_tag('col', array('class' => 'num')),
phutil_tag('col', array('class' => 'copy')),
phutil_tag('col', array('class' => 'right')),
phutil_tag('col', array('class' => 'cov')),
));
}
public function renderTextChange( public function renderTextChange(
$range_start, $range_start,
$range_len, $range_len,
@ -42,7 +31,6 @@ final class DifferentialChangesetTwoUpRenderer
} }
$html = array(); $html = array();
$html[] = $this->renderColgroup();
$old_lines = $this->getOldLines(); $old_lines = $this->getOldLines();
$new_lines = $this->getNewLines(); $new_lines = $this->getNewLines();
@ -438,10 +426,7 @@ final class DifferentialChangesetTwoUpRenderer
$th_new = phutil_tag('th', array('id' => "C{$id}OL1"), 1); $th_new = phutil_tag('th', array('id' => "C{$id}OL1"), 1);
} }
$output = array(); $output = hsprintf(
$output[] = $this->renderColgroup();
$output[] = hsprintf(
'<tr class="differential-image-diff">'. '<tr class="differential-image-diff">'.
'%s'. '%s'.
'<td class="differential-old-image">%s</td>'. '<td class="differential-old-image">%s</td>'.