From 9284c85876f0c177d1525d85764daa56cec99f2e Mon Sep 17 00:00:00 2001 From: epriestley Date: Tue, 7 Jun 2011 18:59:42 -0700 Subject: [PATCH] Display property changes on files Summary: Never converted this TODO over from XHP. NOTE: This looks terrible since the CSS didn't make it over, can one of you grab the rules for .differential-property-table and .property-table-header? If they aren't still in trunk, try history for html/intern/css/tools/differential/ Test Plan: Made a property change, looked at it in Differentila. Reviewed By: aran Reviewers: jungejason, tuomaspelkonen, aran CC: codeblock, aran Differential Revision: 409 --- src/__celerity_resource_map__.php | 22 ++++----- .../changeset/DifferentialChangesetParser.php | 47 +++++++++--------- .../differential/changeset-view.css | 49 +++++++++++++++++++ 3 files changed, 85 insertions(+), 33 deletions(-) diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php index 65c37615a7..bb9b2f8b90 100644 --- a/src/__celerity_resource_map__.php +++ b/src/__celerity_resource_map__.php @@ -145,7 +145,7 @@ celerity_register_resource_map(array( ), 'differential-changeset-view-css' => array( - 'uri' => '/res/a239213a/rsrc/css/application/differential/changeset-view.css', + 'uri' => '/res/d92a2fb5/rsrc/css/application/differential/changeset-view.css', 'type' => 'css', 'requires' => array( @@ -1057,7 +1057,7 @@ celerity_register_resource_map(array( 'uri' => '/res/pkg/33f413ef/typeahead.pkg.js', 'type' => 'js', ), - '613cf273' => + '3bf80070' => array ( 'name' => 'differential.pkg.css', 'symbols' => @@ -1071,7 +1071,7 @@ celerity_register_resource_map(array( 6 => 'differential-revision-add-comment-css', 7 => 'differential-revision-comment-list-css', ), - 'uri' => '/res/pkg/613cf273/differential.pkg.css', + 'uri' => '/res/pkg/3bf80070/differential.pkg.css', 'type' => 'css', ), '64383b02' => @@ -1159,14 +1159,14 @@ celerity_register_resource_map(array( 'aphront-table-view-css' => '64383b02', 'aphront-tokenizer-control-css' => '64383b02', 'aphront-typeahead-control-css' => '64383b02', - 'differential-changeset-view-css' => '613cf273', - 'differential-core-view-css' => '613cf273', - 'differential-revision-add-comment-css' => '613cf273', - 'differential-revision-comment-css' => '613cf273', - 'differential-revision-comment-list-css' => '613cf273', - 'differential-revision-detail-css' => '613cf273', - 'differential-revision-history-css' => '613cf273', - 'differential-table-of-contents-css' => '613cf273', + 'differential-changeset-view-css' => '3bf80070', + 'differential-core-view-css' => '3bf80070', + 'differential-revision-add-comment-css' => '3bf80070', + 'differential-revision-comment-css' => '3bf80070', + 'differential-revision-comment-list-css' => '3bf80070', + 'differential-revision-detail-css' => '3bf80070', + 'differential-revision-history-css' => '3bf80070', + 'differential-table-of-contents-css' => '3bf80070', 'diffusion-commit-view-css' => '03ef179e', 'javelin-behavior' => 'db95a6d0', 'javelin-behavior-aphront-basic-tokenizer' => '33f413ef', diff --git a/src/applications/differential/parser/changeset/DifferentialChangesetParser.php b/src/applications/differential/parser/changeset/DifferentialChangesetParser.php index e4bd9cde87..b3a52ead5e 100644 --- a/src/applications/differential/parser/changeset/DifferentialChangesetParser.php +++ b/src/applications/differential/parser/changeset/DifferentialChangesetParser.php @@ -1340,41 +1340,44 @@ EOSYNTHETIC; return null; } - return null; -/* - TODO - - $table = ; - $table->appendChild( - - - - - ); - $keys = array_keys($old + $new); sort($keys); + + $rows = array(); foreach ($keys as $key) { $oval = idx($old, $key); $nval = idx($new, $key); if ($oval !== $nval) { if ($oval === null) { - $oval = null; + $oval = 'null'; + } else { + $oval = phutil_escape_html($oval); } + if ($nval === null) { - $nval = null; + $nval = 'null'; + } else { + $nval = phutil_escape_html($nval); } - $table->appendChild( - - - - - ); + + $rows[] = + ''. + ''. + ''. + ''. + ''; } } - return $table; -*/ + return + '
Property ChangesOld ValueNew Value
{$key}{$oval}{$nval}
'.phutil_escape_html($key).''.$oval.''.$nval.'
'. + ''. + ''. + ''. + ''. + ''. + implode('', $rows). + '
Property ChangesOld ValueNew Value
'; } protected function renderChangesetTable($changeset, $contents) { diff --git a/webroot/rsrc/css/application/differential/changeset-view.css b/webroot/rsrc/css/application/differential/changeset-view.css index b58b8aec9b..9599b1f7a5 100644 --- a/webroot/rsrc/css/application/differential/changeset-view.css +++ b/webroot/rsrc/css/application/differential/changeset-view.css @@ -180,3 +180,52 @@ .differential-changeset-buttons a.button { margin-left: 8px; } + + +.differential-property-table { + width: auto; + margin: .75em auto; + background: #e3e3e3; +} + +.differential-property-table th { + text-align: right; + width: 10em; + font-weight: bold; + color: #666666; + white-space: nowrap; + padding: 4px 8px; + border-right: 1px solid #666666; +} + +.differential-property-table td { + padding: 4px 8px; + width: 35em; +} + +.differential-property-table td em { + color: #888888; +} + +.differential-property-table tr.property-table-header th, +.differential-property-table tr.property-table-header td { + text-align: center; + font-weight: bold; + border-bottom: 1px solid #666666; +} + +.differential-property-table td.oval { + background: #ffd0d0; +} + +.differential-property-table td.nval { + background: #d0ffd0; +} + +.differential-property-table tr.property-table-header td.oval { + background: #ffaaaa; +} + +.differential-property-table tr.property-table-header td.nval { + background: #aaffaa; +}