1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-09-20 01:08:50 +02:00

Clean up diff view page

Summary: Cleans up some older layouts to new stuffs.

Test Plan: Test with and without a diff ID.

Reviewers: epriestley, btrahan

Reviewed By: epriestley

CC: Korvin, epriestley, aran

Differential Revision: https://secure.phabricator.com/D7949
This commit is contained in:
Chad Little 2014-01-13 12:17:37 -08:00
parent 5f08216a40
commit 51d8570b34
3 changed files with 17 additions and 10 deletions

View file

@ -7,7 +7,7 @@
return array( return array(
'names' => 'names' =>
array( array(
'core.pkg.css' => '52fe21de', 'core.pkg.css' => '6d59624c',
'core.pkg.js' => 'c907bd96', 'core.pkg.js' => 'c907bd96',
'darkconsole.pkg.js' => 'ca8671ce', 'darkconsole.pkg.js' => 'ca8671ce',
'differential.pkg.css' => '827749c1', 'differential.pkg.css' => '827749c1',
@ -23,7 +23,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' => 'dd9db96c', 'rsrc/css/aphront/dialog-view.css' => 'dd9db96c',
'rsrc/css/aphront/error-view.css' => 'ca515eae', 'rsrc/css/aphront/error-view.css' => '16cd9949',
'rsrc/css/aphront/lightbox-attachment.css' => '686f8885', 'rsrc/css/aphront/lightbox-attachment.css' => '686f8885',
'rsrc/css/aphront/list-filter-view.css' => '9f0c29ac', 'rsrc/css/aphront/list-filter-view.css' => '9f0c29ac',
'rsrc/css/aphront/multi-column.css' => '05bbd016', 'rsrc/css/aphront/multi-column.css' => '05bbd016',
@ -475,7 +475,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' => 'dd9db96c', 'aphront-dialog-view-css' => 'dd9db96c',
'aphront-error-view-css' => 'ca515eae', 'aphront-error-view-css' => '16cd9949',
'aphront-list-filter-view-css' => '9f0c29ac', 'aphront-list-filter-view-css' => '9f0c29ac',
'aphront-multi-column-view-css' => '05bbd016', 'aphront-multi-column-view-css' => '05bbd016',
'aphront-notes' => '6acadd3f', 'aphront-notes' => '6acadd3f',

View file

@ -20,10 +20,10 @@ final class DifferentialDiffViewController extends DifferentialController {
return new Aphront404Response(); return new Aphront404Response();
} }
$error_view = id(new AphrontErrorView())
->setSeverity(AphrontErrorView::SEVERITY_NOTICE);
if ($diff->getRevisionID()) { if ($diff->getRevisionID()) {
$top_part = id(new AphrontErrorView()) $error_view->appendChild(
->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
->appendChild(
pht( pht(
'This diff belongs to revision %s.', 'This diff belongs to revision %s.',
phutil_tag( phutil_tag(
@ -85,7 +85,7 @@ final class DifferentialDiffViewController extends DifferentialController {
id(new AphrontFormSubmitControl()) id(new AphrontFormSubmitControl())
->setValue(pht('Continue'))); ->setValue(pht('Continue')));
$top_part = $form; $error_view->appendChild($form);
} }
$props = id(new DifferentialDiffProperty())->loadAllWhere( $props = id(new DifferentialDiffProperty())->loadAllWhere(
@ -148,12 +148,15 @@ final class DifferentialDiffViewController extends DifferentialController {
$crumbs = $this->buildApplicationCrumbs(); $crumbs = $this->buildApplicationCrumbs();
$crumbs->addTextCrumb(pht('Diff %d', $diff->getID())); $crumbs->addTextCrumb(pht('Diff %d', $diff->getID()));
$prop_box = id(new PHUIObjectBoxView())
->setHeader($property_head)
->addPropertyList($property_view)
->setErrorView($error_view);
return $this->buildApplicationPage( return $this->buildApplicationPage(
array( array(
$crumbs, $crumbs,
$top_part, $prop_box,
$property_head,
$property_view,
$table_of_contents, $table_of_contents,
$details, $details,
), ),

View file

@ -23,6 +23,10 @@ form.aphront-dialog-view .aphront-error-view {
margin: 8px; margin: 8px;
} }
.aphront-error-view .phui-form-view {
padding: 0;
}
.aphront-error-view-body { .aphront-error-view-body {
padding: 12px; padding: 12px;
} }