revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-28 16:30:59 +01:00
Code Issues Releases Wiki Activity

Add objectheaders to new View

Browse source 
Summary: This adds the 'PHUIObjectBox' to nearly every place that should get it. I need to comb through Diffusion a little more. I've left Differential mostly alone, but may decide to do it anyways this weekend. I'm sure I missed something else, but these are easy enough to update.

Test Plan: tested each new layout.

Reviewers: epriestley, btrahan

Reviewed By: epriestley

CC: Korvin, aran

Differential Revision: https://secure.phabricator.com/D7162
This commit is contained in:
Chad Little 2013-09-28 15:55:38 -07:00
parent 0318cadad4
commit 94d0704fdb
61 changed files with 526 additions and 365 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
resources/sprite/gradients/lightblue-header.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 196 B

After

Width:  |  Height:  |  Size: 195 B

2
resources/sprite/manifest/gradient.json
View file

@ -34,7 +34,7 @@
"gradient-lightblue-header" : {
"name" : "gradient-lightblue-header",
"rule" : ".gradient-lightblue-header",
"hash" : "b838d2eb15f9b620e82b4da240bf464a"
"hash" : "e7753a6ce63c6822a559266eef9e255b"
},
"gradient-menu-label" : {
"name" : "gradient-menu-label",

157
src/__celerity_resource_map__.php
View file

@ -632,8 +632,8 @@ celerity_register_resource_map(array(
),
'/rsrc/image/sprite-gradient.png' =>
array(
'hash' => 'c6c42387e625948e683d9d8c62ea1b7f',
'uri' => '/res/c6c42387/rsrc/image/sprite-gradient.png',
'hash' => '1f0306b0ca281b1e5b96de0096269f1d',
'uri' => '/res/1f0306b0/rsrc/image/sprite-gradient.png',
'disk' => '/rsrc/image/sprite-gradient.png',
'type' => 'png',
),
@ -890,7 +890,7 @@ celerity_register_resource_map(array(
),
'aphront-panel-view-css' =>
array(
'uri' => '/res/915e0a4b/rsrc/css/aphront/panel-view.css',
'uri' => '/res/70d7011b/rsrc/css/aphront/panel-view.css',
'type' => 'css',
'requires' =>
array(
@ -1017,7 +1017,7 @@ celerity_register_resource_map(array(
),
'differential-changeset-view-css' =>
array(
'uri' => '/res/b1c98bac/rsrc/css/application/differential/changeset-view.css',
'uri' => '/res/5fd9d5c0/rsrc/css/application/differential/changeset-view.css',
'type' => 'css',
'requires' =>
array(
@ -1026,7 +1026,7 @@ celerity_register_resource_map(array(
),
'differential-core-view-css' =>
array(
'uri' => '/res/85fe5117/rsrc/css/application/differential/core.css',
'uri' => '/res/7db1595a/rsrc/css/application/differential/core.css',
'type' => 'css',
'requires' =>
array(
@ -3018,7 +3018,7 @@ celerity_register_resource_map(array(
),
'phabricator-action-list-view-css' =>
array(
'uri' => '/res/c6219563/rsrc/css/layout/phabricator-action-list-view.css',
'uri' => '/res/ade71822/rsrc/css/layout/phabricator-action-list-view.css',
'type' => 'css',
'requires' =>
array(
@ -3371,7 +3371,7 @@ celerity_register_resource_map(array(
),
'phabricator-property-list-view-css' =>
array(
'uri' => '/res/abc1bb1c/rsrc/css/layout/phabricator-property-list-view.css',
'uri' => '/res/7835f74e/rsrc/css/layout/phabricator-property-list-view.css',
'type' => 'css',
'requires' =>
array(
@ -3474,7 +3474,7 @@ celerity_register_resource_map(array(
),
'phabricator-timeline-view-css' =>
array(
'uri' => '/res/79b6d385/rsrc/css/layout/phabricator-timeline-view.css',
'uri' => '/res/09567421/rsrc/css/layout/phabricator-timeline-view.css',
'type' => 'css',
'requires' =>
array(
@ -3656,7 +3656,7 @@ celerity_register_resource_map(array(
),
'pholio-css' =>
array(
'uri' => '/res/cfdf017f/rsrc/css/application/pholio/pholio.css',
'uri' => '/res/e64264c9/rsrc/css/application/pholio/pholio.css',
'type' => 'css',
'requires' =>
array(
@ -3742,7 +3742,7 @@ celerity_register_resource_map(array(
),
'phui-document-view-css' =>
array(
'uri' => '/res/7928af2d/rsrc/css/phui/phui-document.css',
'uri' => '/res/40e39942/rsrc/css/phui/phui-document.css',
'type' => 'css',
'requires' =>
array(
@ -3769,7 +3769,7 @@ celerity_register_resource_map(array(
),
'phui-form-view-css' =>
array(
'uri' => '/res/d87bdbeb/rsrc/css/phui/phui-form-view.css',
'uri' => '/res/157ddd8b/rsrc/css/phui/phui-form-view.css',
'type' => 'css',
'requires' =>
array(
@ -3778,7 +3778,7 @@ celerity_register_resource_map(array(
),
'phui-header-view-css' =>
array(
'uri' => '/res/2a60156a/rsrc/css/phui/phui-header-view.css',
'uri' => '/res/94208bd6/rsrc/css/phui/phui-header-view.css',
'type' => 'css',
'requires' =>
array(
@ -3803,6 +3803,15 @@ celerity_register_resource_map(array(
),
'disk' => '/rsrc/css/phui/phui-list.css',
),
'phui-object-box-css' =>
array(
'uri' => '/res/3c1129d2/rsrc/css/phui/phui-object-box.css',
'type' => 'css',
'requires' =>
array(
),
'disk' => '/rsrc/css/phui/phui-object-box.css',
),
'phui-object-item-list-view-css' =>
array(
'uri' => '/res/71f7f081/rsrc/css/phui/phui-object-item-list-view.css',
@ -3877,7 +3886,7 @@ celerity_register_resource_map(array(
),
'ponder-comment-table-css' =>
array(
'uri' => '/res/fd114c83/rsrc/css/application/ponder/comments.css',
'uri' => '/res/4aa4b865/rsrc/css/application/ponder/comments.css',
'type' => 'css',
'requires' =>
array(
@ -4084,7 +4093,7 @@ celerity_register_resource_map(array(
),
'sprite-gradient-css' =>
array(
'uri' => '/res/08c64fb3/rsrc/css/sprite-gradient.css',
'uri' => '/res/e31d9063/rsrc/css/sprite-gradient.css',
'type' => 'css',
'requires' =>
array(
@ -4175,7 +4184,7 @@ celerity_register_resource_map(array(
), array(
'packages' =>
array(
'd72a9463' =>
'9d16ff0b' =>
array(
'name' => 'core.pkg.css',
'symbols' =>
@ -4224,7 +4233,7 @@ celerity_register_resource_map(array(
41 => 'phabricator-tag-view-css',
42 => 'phui-list-view-css',
),
'uri' => '/res/pkg/d72a9463/core.pkg.css',
'uri' => '/res/pkg/9d16ff0b/core.pkg.css',
'type' => 'css',
),
'64eeda79' =>
@ -4286,7 +4295,7 @@ celerity_register_resource_map(array(
'uri' => '/res/pkg/4ccfeb47/darkconsole.pkg.js',
'type' => 'js',
),
'44bfe40c' =>
'b55e602f' =>
array(
'name' => 'differential.pkg.css',
'symbols' =>
@ -4305,7 +4314,7 @@ celerity_register_resource_map(array(
11 => 'differential-local-commits-view-css',
12 => 'inline-comment-summary-css',
),
'uri' => '/res/pkg/44bfe40c/differential.pkg.css',
'uri' => '/res/pkg/b55e602f/differential.pkg.css',
'type' => 'css',
),
'5e9e5c4e' =>
@ -4416,30 +4425,30 @@ celerity_register_resource_map(array(
),
'reverse' =>
array(
'aphront-dialog-view-css' => 'd72a9463',
'aphront-error-view-css' => 'd72a9463',
'aphront-list-filter-view-css' => 'd72a9463',
'aphront-pager-view-css' => 'd72a9463',
'aphront-panel-view-css' => 'd72a9463',
'aphront-table-view-css' => 'd72a9463',
'aphront-tokenizer-control-css' => 'd72a9463',
'aphront-tooltip-css' => 'd72a9463',
'aphront-typeahead-control-css' => 'd72a9463',
'differential-changeset-view-css' => '44bfe40c',
'differential-core-view-css' => '44bfe40c',
'aphront-dialog-view-css' => '9d16ff0b',
'aphront-error-view-css' => '9d16ff0b',
'aphront-list-filter-view-css' => '9d16ff0b',
'aphront-pager-view-css' => '9d16ff0b',
'aphront-panel-view-css' => '9d16ff0b',
'aphront-table-view-css' => '9d16ff0b',
'aphront-tokenizer-control-css' => '9d16ff0b',
'aphront-tooltip-css' => '9d16ff0b',
'aphront-typeahead-control-css' => '9d16ff0b',
'differential-changeset-view-css' => 'b55e602f',
'differential-core-view-css' => 'b55e602f',
'differential-inline-comment-editor' => '5e9e5c4e',
'differential-local-commits-view-css' => '44bfe40c',
'differential-results-table-css' => '44bfe40c',
'differential-revision-add-comment-css' => '44bfe40c',
'differential-revision-comment-css' => '44bfe40c',
'differential-revision-comment-list-css' => '44bfe40c',
'differential-revision-history-css' => '44bfe40c',
'differential-revision-list-css' => '44bfe40c',
'differential-table-of-contents-css' => '44bfe40c',
'differential-local-commits-view-css' => 'b55e602f',
'differential-results-table-css' => 'b55e602f',
'differential-revision-add-comment-css' => 'b55e602f',
'differential-revision-comment-css' => 'b55e602f',
'differential-revision-comment-list-css' => 'b55e602f',
'differential-revision-history-css' => 'b55e602f',
'differential-revision-list-css' => 'b55e602f',
'differential-table-of-contents-css' => 'b55e602f',
'diffusion-commit-view-css' => 'c8ce2d88',
'diffusion-icons-css' => 'c8ce2d88',
'global-drag-and-drop-css' => 'd72a9463',
'inline-comment-summary-css' => '44bfe40c',
'global-drag-and-drop-css' => '9d16ff0b',
'inline-comment-summary-css' => 'b55e602f',
'javelin-aphlict' => '64eeda79',
'javelin-behavior' => '9564fa17',
'javelin-behavior-aphlict-dropdown' => '64eeda79',
@ -4513,56 +4522,56 @@ celerity_register_resource_map(array(
'javelin-util' => '9564fa17',
'javelin-vector' => '9564fa17',
'javelin-workflow' => '9564fa17',
'lightbox-attachment-css' => 'd72a9463',
'lightbox-attachment-css' => '9d16ff0b',
'maniphest-task-summary-css' => '49898640',
'phabricator-action-list-view-css' => 'd72a9463',
'phabricator-application-launch-view-css' => 'd72a9463',
'phabricator-action-list-view-css' => '9d16ff0b',
'phabricator-application-launch-view-css' => '9d16ff0b',
'phabricator-busy' => '64eeda79',
'phabricator-content-source-view-css' => '44bfe40c',
'phabricator-core-css' => 'd72a9463',
'phabricator-crumbs-view-css' => 'd72a9463',
'phabricator-content-source-view-css' => 'b55e602f',
'phabricator-core-css' => '9d16ff0b',
'phabricator-crumbs-view-css' => '9d16ff0b',
'phabricator-drag-and-drop-file-upload' => '5e9e5c4e',
'phabricator-dropdown-menu' => '64eeda79',
'phabricator-file-upload' => '64eeda79',
'phabricator-filetree-view-css' => 'd72a9463',
'phabricator-flag-css' => 'd72a9463',
'phabricator-filetree-view-css' => '9d16ff0b',
'phabricator-flag-css' => '9d16ff0b',
'phabricator-hovercard' => '64eeda79',
'phabricator-jump-nav' => 'd72a9463',
'phabricator-jump-nav' => '9d16ff0b',
'phabricator-keyboard-shortcut' => '64eeda79',
'phabricator-keyboard-shortcut-manager' => '64eeda79',
'phabricator-main-menu-view' => 'd72a9463',
'phabricator-main-menu-view' => '9d16ff0b',
'phabricator-menu-item' => '64eeda79',
'phabricator-nav-view-css' => 'd72a9463',
'phabricator-nav-view-css' => '9d16ff0b',
'phabricator-notification' => '64eeda79',
'phabricator-notification-css' => 'd72a9463',
'phabricator-notification-menu-css' => 'd72a9463',
'phabricator-object-selector-css' => '44bfe40c',
'phabricator-notification-css' => '9d16ff0b',
'phabricator-notification-menu-css' => '9d16ff0b',
'phabricator-object-selector-css' => 'b55e602f',
'phabricator-phtize' => '64eeda79',
'phabricator-prefab' => '64eeda79',
'phabricator-project-tag-css' => '49898640',
'phabricator-property-list-view-css' => 'd72a9463',
'phabricator-remarkup-css' => 'd72a9463',
'phabricator-property-list-view-css' => '9d16ff0b',
'phabricator-remarkup-css' => '9d16ff0b',
'phabricator-shaped-request' => '5e9e5c4e',
'phabricator-side-menu-view-css' => 'd72a9463',
'phabricator-standard-page-view' => 'd72a9463',
'phabricator-tag-view-css' => 'd72a9463',
'phabricator-side-menu-view-css' => '9d16ff0b',
'phabricator-standard-page-view' => '9d16ff0b',
'phabricator-tag-view-css' => '9d16ff0b',
'phabricator-textareautils' => '64eeda79',
'phabricator-tooltip' => '64eeda79',
'phabricator-transaction-view-css' => 'd72a9463',
'phabricator-zindex-css' => 'd72a9463',
'phui-button-css' => 'd72a9463',
'phui-form-css' => 'd72a9463',
'phui-form-view-css' => 'd72a9463',
'phui-header-view-css' => 'd72a9463',
'phui-icon-view-css' => 'd72a9463',
'phui-list-view-css' => 'd72a9463',
'phui-object-item-list-view-css' => 'd72a9463',
'phui-spacing-css' => 'd72a9463',
'sprite-apps-large-css' => 'd72a9463',
'sprite-gradient-css' => 'd72a9463',
'sprite-icons-css' => 'd72a9463',
'sprite-menu-css' => 'd72a9463',
'sprite-status-css' => 'd72a9463',
'syntax-highlighting-css' => 'd72a9463',
'phabricator-transaction-view-css' => '9d16ff0b',
'phabricator-zindex-css' => '9d16ff0b',
'phui-button-css' => '9d16ff0b',
'phui-form-css' => '9d16ff0b',
'phui-form-view-css' => '9d16ff0b',
'phui-header-view-css' => '9d16ff0b',
'phui-icon-view-css' => '9d16ff0b',
'phui-list-view-css' => '9d16ff0b',
'phui-object-item-list-view-css' => '9d16ff0b',
'phui-spacing-css' => '9d16ff0b',
'sprite-apps-large-css' => '9d16ff0b',
'sprite-gradient-css' => '9d16ff0b',
'sprite-icons-css' => '9d16ff0b',
'sprite-menu-css' => '9d16ff0b',
'sprite-status-css' => '9d16ff0b',
'syntax-highlighting-css' => '9d16ff0b',
),
));

6
src/applications/config/controller/PhabricatorConfigAllController.php
View file

@ -72,6 +72,10 @@ final class PhabricatorConfigAllController
$version_property_list->addProperty($name, $hash);
}
$object_box = id(new PHUIObjectBoxView())
->setHeaderText(pht('Current Settings'))
->addContent($version_property_list);
$phabricator_root = dirname(phutil_get_library_root('phabricator'));
$version_path = $phabricator_root.'/conf/local/VERSION';
if (Filesystem::pathExists($version_path)) {
@ -84,7 +88,7 @@ final class PhabricatorConfigAllController
$nav = $this->buildSideNavView();
$nav->selectFilter('all/');
$nav->setCrumbs($crumbs);
$nav->appendChild($version_property_list);
$nav->appendChild($object_box);
$nav->appendChild($panel);

9
src/applications/countdown/controller/PhabricatorCountdownViewController.php
View file

@ -47,11 +47,14 @@ final class PhabricatorCountdownViewController
$actions = $this->buildActionListView($countdown);
$properties = $this->buildPropertyListView($countdown);
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
$content = array(
$crumbs,
$header,
$actions,
$properties,
$object_box,
$countdown_view,
);

32
src/applications/differential/view/DifferentialAddCommentView.php
View file

@ -71,7 +71,6 @@ final class DifferentialAddCommentView extends AphrontView {
$form
->setWorkflow(true)
->setUser($this->user)
->setShaded(true)
->setAction($this->actionURI)
->addHiddenInput('revision_id', $revision->getID())
->appendChild(
@ -176,25 +175,30 @@ final class DifferentialAddCommentView extends AphrontView {
$header = id(new PHUIHeaderView())
->setHeader($is_serious ? pht('Add Comment') : pht('Leap Into Action'));
return hsprintf(
'%s'.
'<div class="differential-add-comment-panel">'.
'%s%s%s'.
$anchor = id(new PhabricatorAnchorView())
->setAnchorName('comment')
->setNavigationMarker(true);
$warn = phutil_tag('div', array('id' => 'warnings'), $warning_container);
$preview = hsprintf(
'<div class="aphront-panel-preview aphront-panel-flush">'.
'<div id="comment-preview">'.
'<span class="aphront-panel-preview-loading-text">%s</span>'.
'</div>'.
'<div id="inline-comment-preview">'.
'</div>'.
'</div>'.
'</div>',
id(new PhabricatorAnchorView())
->setAnchorName('comment')
->setNavigationMarker(true)
->render(),
$header->render(),
$form->render(),
phutil_tag('div', array('id' => 'warnings'), $warning_container),
'</div>',
pht('Loading comment preview...'));
$comment_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($anchor)
->addContent($warn)
->addContent($form);
return array($comment_box, $preview);
}
}

23
src/applications/differential/view/DifferentialChangesetListView.php
View file

@ -200,16 +200,19 @@ final class DifferentialChangesetListView extends AphrontView {
->setHeader($this->getTitle());
}
return array(
$header,
phutil_tag(
'div',
array(
'class' => 'differential-review-stage',
'id' => 'differential-review-stage',
),
$output),
);
$content = phutil_tag(
'div',
array(
'class' => 'differential-review-stage',
'id' => 'differential-review-stage',
),
$output);
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($content);
return $object_box;
}
/**

11
src/applications/differential/view/DifferentialDiffTableOfContentsView.php
View file

@ -213,8 +213,8 @@ final class DifferentialDiffTableOfContentsView extends AphrontView {
$editor_link,
$reveal_link);
return hsprintf(
'%s%s'.
$content = hsprintf(
'%s'.
'<div class="differential-toc differential-panel">'.
'<table>'.
'<tr>'.
@ -232,13 +232,14 @@ final class DifferentialDiffTableOfContentsView extends AphrontView {
->setAnchorName('toc')
->setNavigationMarker(true)
->render(),
id(new PHUIHeaderView())
->setHeader(pht('Table of Contents'))
->render(),
pht('Coverage (All)'),
pht('Coverage (Touched)'),
phutil_implode_html("\n", $rows),
$buttons);
return id(new PHUIObjectBoxView())
->setHeaderText(pht('Table of Contents'))
->addContent($content);
}
private function renderRename($display_file, $other_file, $arrow) {

13
src/applications/differential/view/DifferentialLocalCommitsView.php
View file

@ -128,18 +128,17 @@ final class DifferentialLocalCommitsView extends AphrontView {
$headers = phutil_tag('tr', array(), $headers);
$header = id(new PHUIHeaderView())
->setHeader(pht('Local Commits'))
->render();
return hsprintf(
'%s'.
$content = hsprintf(
'<div class="differential-panel">'.
'<table class="differential-local-commits-table">%s%s</table>'.
'</div>',
$header,
$headers,
phutil_implode_html("\n", $rows));
return id(new PHUIObjectBoxView())
->setHeaderText(pht('Local Commits'))
->addContent($content);
}
private static function formatCommit($commit) {

11
src/applications/differential/view/DifferentialRevisionDetailView.php
View file

@ -111,11 +111,12 @@ final class DifferentialRevisionDetailView extends AphrontView {
}
$properties->setHasKeyboardShortcuts(true);
return hsprintf(
'%s%s%s',
$header->render(),
$actions->render(),
$properties->render());
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
return $object_box;
}
private function renderHeader(DifferentialRevision $revision) {

10
src/applications/differential/view/DifferentialRevisionUpdateHistoryView.php
View file

@ -200,8 +200,7 @@ final class DifferentialRevisionUpdateHistoryView extends AphrontView {
phutil_tag('th', array(), pht('Unit')),
)));
return hsprintf(
'%s'.
$content = hsprintf(
'<div class="differential-revision-history differential-panel">'.
'<form action="#toc">'.
'<table class="differential-revision-history-table">'.
@ -215,12 +214,13 @@ final class DifferentialRevisionUpdateHistoryView extends AphrontView {
'</table>'.
'</form>'.
'</div>',
id(new PHUIHeaderView())
->setHeader(pht('Revision Update History'))
->render(),
phutil_implode_html("\n", $rows),
pht('Whitespace Changes: %s', $select),
pht('Show Diff'));
return id(new PHUIObjectBoxView())
->setHeaderText(pht('Revision Update History'))
->addContent($content);
}
const STAR_NONE = 'none';

20
src/applications/diffusion/controller/DiffusionBrowseDirectoryController.php
View file

@ -22,10 +22,12 @@ final class DiffusionBrowseDirectoryController
$content = array();
$content[] = $this->buildHeaderView($drequest);
$content[] = $this->buildActionView($drequest);
$content[] = $this->buildPropertyView($drequest);
$object_box = id(new PHUIObjectBoxView())
->setHeader($this->buildHeaderView($drequest))
->addContent($this->buildActionView($drequest))
->addContent($this->buildPropertyView($drequest));
$content[] = $object_box;
$content[] = $this->renderSearchForm($collapsed = true);
if (!$results->isValidResults()) {
@ -70,18 +72,14 @@ final class DiffusionBrowseDirectoryController
));
if ($readme) {
$box = new PHUIBoxView();
$box->setShadow(true);
$box->appendChild($readme);
$box->addPadding(PHUI::PADDING_LARGE);
$box->addMargin(PHUI::MARGIN_LARGE);
$header = id(new PHUIHeaderView())
->setHeader(pht('README'));
$object_box = id(new PHUIObjectBoxView())
->setHeaderText(pht('README'))
->addContent($box);
$content[] = array(
$header,
$box,
);
$content[] = $object_box;
}
$crumbs = $this->buildCrumbs(

5
src/applications/diffusion/controller/DiffusionBrowseFileController.php
View file

@ -98,6 +98,11 @@ final class DiffusionBrowseFileController extends DiffusionBrowseController {
require_celerity_resource('diffusion-source-css');
$object_box = id(new PHUIObjectBoxView())
->setHeader($this->buildHeaderView($drequest))
->addContent($this->buildActionView($drequest))
->addContent($this->buildPropertyView($drequest));
// Render the page.
$content = array();

9
src/applications/diffusion/controller/DiffusionBrowseSearchController.php
View file

@ -5,11 +5,14 @@ final class DiffusionBrowseSearchController extends DiffusionBrowseController {
public function processRequest() {
$drequest = $this->diffusionRequest;
$object_box = id(new PHUIObjectBoxView())
->setHeader($this->buildHeaderView($drequest))
->addContent($this->buildActionView($drequest))
->addContent($this->buildPropertyView($drequest));
$content = array();
$content[] = $this->buildHeaderView($drequest);
$content[] = $this->buildActionView($drequest);
$content[] = $this->buildPropertyView($drequest);
$content[] = $object_box;
$content[] = $this->renderSearchForm($collapsed = false);
$content[] = $this->renderSearchResults();

9
src/applications/diffusion/controller/DiffusionChangeController.php
View file

@ -82,12 +82,15 @@ final class DiffusionChangeController extends DiffusionController {
$actions = $this->buildActionView($drequest);
$properties = $this->buildPropertyView($drequest);
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
return $this->buildApplicationPage(
array(
$crumbs,
$header,
$actions,
$properties,
$object_box,
$content,
),
array(

20
src/applications/diffusion/controller/DiffusionCommitController.php
View file

@ -137,9 +137,13 @@ final class DiffusionCommitController extends DiffusionController {
),
$message));
$content[] = $top_anchor;
$content[] = $headsup_view;
$content[] = $headsup_actions;
$content[] = $property_list;
$object_box = id(new PHUIObjectBoxView())
->setHeader($headsup_view)
->addContent($headsup_actions)
->addContent($property_list);
$content[] = $object_box;
}
$content[] = $this->buildComments($commit);
@ -646,7 +650,6 @@ final class DiffusionCommitController extends DiffusionController {
$form = id(new AphrontFormView())
->setUser($user)
->setShaded(true)
->setAction('/audit/addcomment/')
->addHiddenInput('commit', $commit->getPHID())
->appendChild(
@ -738,19 +741,22 @@ final class DiffusionCommitController extends DiffusionController {
// Differential better.
require_celerity_resource('differential-core-view-css');
$comment_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($form);
return phutil_tag(
'div',
array(
'id' => $pane_id,
),
hsprintf(
'<div class="differential-add-comment-panel">%s%s%s%s</div>',
'<div class="differential-add-comment-panel">%s%s%s</div>',
id(new PhabricatorAnchorView())
->setAnchorName('comment')
->setNavigationMarker(true)
->render(),
$header,
$form,
$comment_box,
$preview_panel));
}

9
src/applications/diffusion/controller/DiffusionHistoryController.php
View file

@ -72,6 +72,11 @@ final class DiffusionHistoryController extends DiffusionController {
$actions = $this->buildActionView($drequest);
$properties = $this->buildPropertyView($drequest);
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
$crumbs = $this->buildCrumbs(
array(
'branch' => true,
@ -82,9 +87,7 @@ final class DiffusionHistoryController extends DiffusionController {
return $this->buildApplicationPage(
array(
$crumbs,
$header,
$actions,
$properties,
$object_box,
$content,
),
array(

13
src/applications/diffusion/controller/DiffusionLintController.php
View file

@ -165,19 +165,20 @@ final class DiffusionLintController extends DiffusionController {
$drequest,
$branch,
$total);
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
} else {
$header = null;
$actions = null;
$properties = null;
$object_box = null;
}
return $this->buildApplicationPage(
array(
$crumbs,
$header,
$actions,
$properties,
$object_box,
$content,
),
array(

6
src/applications/diffusion/controller/DiffusionRepositoryController.php
View file

@ -174,7 +174,11 @@ final class DiffusionRepositoryController extends DiffusionController {
$view->addTextContent($description);
}
return array($header, $actions, $view);
return id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($view);
}
private function buildBranchListTable(DiffusionRequest $drequest) {

9
src/applications/drydock/controller/DrydockLeaseViewController.php
View file

@ -45,12 +45,15 @@ final class DrydockLeaseViewController extends DrydockController {
->setName($title)
->setHref($lease_uri));
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
return $this->buildApplicationPage(
array(
$crumbs,
$header,
$actions,
$properties,
$object_box,
$log_table,
),
array(

9
src/applications/drydock/controller/DrydockResourceViewController.php
View file

@ -56,12 +56,15 @@ final class DrydockResourceViewController extends DrydockController {
id(new PhabricatorCrumbView())
->setName(pht('Resource %d', $resource->getID())));
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
return $this->buildApplicationPage(
array(
$crumbs,
$header,
$actions,
$properties,
$object_box,
$lease_header,
$lease_list,
$log_table,

17
src/applications/files/controller/PhabricatorFileInfoController.php
View file

@ -49,12 +49,15 @@ final class PhabricatorFileInfoController extends PhabricatorFileController {
->setName('F'.$file->getID())
->setHref($this->getApplicationURI("/info/{$phid}/")));
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
return $this->buildApplicationPage(
array(
$crumbs,
$header,
$actions,
$properties,
$object_box,
$timeline
),
array(
@ -107,10 +110,14 @@ final class PhabricatorFileInfoController extends PhabricatorFileController {
->setAction($this->getApplicationURI('/comment/'.$file->getID().'/'))
->setSubmitButtonName($submit_button_name);
$comment_box = id(new PHUIObjectBoxView())
->setFlush(true)
->setHeader($add_comment_header)
->addContent($add_comment_form);
return array(
$timeline,
$add_comment_header,
$add_comment_form);
$comment_box);
}
private function buildActionView(PhabricatorFile $file) {

9
src/applications/herald/controller/HeraldRuleViewController.php
View file

@ -32,12 +32,15 @@ final class HeraldRuleViewController extends HeraldController {
id(new PhabricatorCrumbView())
->setName(pht('Rule %d', $rule->getID())));
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
return $this->buildApplicationPage(
array(
$crumbs,
$header,
$actions,
$properties,
$object_box,
),
array(
'title' => $rule->getName(),

18
src/applications/legalpad/controller/LegalpadDocumentViewController.php
View file

@ -86,11 +86,14 @@ final class LegalpadDocumentViewController extends LegalpadController {
->setName('L'.$document->getID())
->setHref($this->getApplicationURI('view/'.$document->getID())));
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
$content = array(
$crumbs,
$header,
$actions,
$properties,
$object_box,
$this->buildDocument($engine, $document_body),
$xaction_view,
$add_comment,
@ -210,10 +213,11 @@ final class LegalpadDocumentViewController extends LegalpadController {
->setAction($this->getApplicationURI('/comment/'.$document->getID().'/'))
->setRequestURI($this->getRequest()->getRequestURI());
return array(
$header,
$form,
);
return id(new PHUIObjectBoxView())
->setFlush(true)
->setHeader($header)
->addContent($form);
}
}

17
src/applications/macro/controller/PhabricatorMacroViewController.php
View file

@ -91,15 +91,22 @@ final class PhabricatorMacroViewController
->setAction($this->getApplicationURI('/comment/'.$macro->getID().'/'))
->setSubmitButtonName($submit_button_name);
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
$comment_box = id(new PHUIObjectBoxView())
->setFlush(true)
->setHeader($add_comment_header)
->addContent($add_comment_form);
return $this->buildApplicationPage(
array(
$crumbs,
$header,
$actions,
$properties,
$object_box,
$timeline,
$add_comment_header,
$add_comment_form,
$comment_box,
),
array(
'title' => $title_short,

18
src/applications/maniphest/controller/ManiphestTaskDetailController.php
View file

@ -209,7 +209,6 @@ final class ManiphestTaskDetailController extends ManiphestController {
$comment_form = new AphrontFormView();
$comment_form
->setUser($user)
->setShaded(true)
->setAction('/maniphest/transaction/save/')
->setEncType('multipart/form-data')
->addHiddenInput('taskID', $task->getID())
@ -364,16 +363,23 @@ final class ManiphestTaskDetailController extends ManiphestController {
$preview_panel = null;
}
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
$comment_box = id(new PHUIObjectBoxView())
->setFlush(true)
->setHeader($comment_header)
->addContent($comment_form);
return $this->buildApplicationPage(
array(
$crumbs,
$context_bar,
$header,
$actions,
$properties,
$object_box,
$timeline,
$comment_header,
$comment_form,
$comment_box,
$preview_panel,
),
array(

9
src/applications/meta/controller/PhabricatorApplicationDetailViewController.php
View file

@ -54,12 +54,15 @@ final class PhabricatorApplicationDetailViewController
$properties = $this->buildPropertyView($selected);
$actions = $this->buildActionView($user, $selected);
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
return $this->buildApplicationPage(
array(
$crumbs,
$header,
$actions,
$properties,
$object_box,
),
array(
'title' => $title,

25
src/applications/paste/controller/PhabricatorPasteViewController.php
View file

@ -68,11 +68,24 @@ final class PhabricatorPasteViewController extends PhabricatorPasteController {
$header = $this->buildHeaderView($paste);
$actions = $this->buildActionView($user, $paste, $file);
$properties = $this->buildPropertyView($paste, $fork_phids);
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
$source_code = $this->buildSourceCodeView(
$paste,
null,
$this->highlightMap);
$source_code = id(new PHUIBoxView())
->appendChild($source_code)
->setBorder(true)
->addMargin(PHUI::MARGIN_LARGE_LEFT)
->addMargin(PHUI::MARGIN_LARGE_RIGHT)
->addMargin(PHUI::MARGIN_LARGE_TOP);
$crumbs = $this->buildApplicationCrumbs($this->buildSideNavView())
->setActionList($actions)
->addCrumb(
@ -123,16 +136,18 @@ final class PhabricatorPasteViewController extends PhabricatorPasteController {
->setAction($this->getApplicationURI('/comment/'.$paste->getID().'/'))
->setSubmitButtonName($submit_button_name);
$comment_box = id(new PHUIObjectBoxView())
->setFlush(true)
->setHeader($add_comment_header)
->addContent($add_comment_form);
return $this->buildApplicationPage(
array(
$crumbs,
$header,
$actions,
$properties,
$object_box,
$source_code,
$timeline,
$add_comment_header,
$add_comment_form
$comment_box,
),
array(
'title' => $paste->getFullName(),

9
src/applications/people/controller/PhabricatorPeopleProfileController.php
View file

@ -76,12 +76,15 @@ final class PhabricatorPeopleProfileController
->setName($user->getUsername()));
$feed = $this->renderUserFeed($user);
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
return $this->buildApplicationPage(
array(
$crumbs,
$header,
$actions,
$properties,
$object_box,
$feed,
),
array(

9
src/applications/phame/controller/blog/PhameBlogViewController.php
View file

@ -63,12 +63,15 @@ final class PhameBlogViewController extends PhameController {
->setName($blog->getName())
->setHref($this->getApplicationURI()));
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
$nav->appendChild(
array(
$crumbs,
$header,
$actions,
$properties,
$object_box,
$post_list,
));

18
src/applications/phame/controller/post/PhamePostViewController.php
View file

@ -42,14 +42,19 @@ final class PhamePostViewController extends PhameController {
->setHref($this->getApplicationURI('post/view/'.$post->getID().'/')));
$nav->appendChild($crumbs);
$nav->appendChild(
id(new PHUIHeaderView())
$header = id(new PHUIHeaderView())
->setHeader($post->getTitle())
->setUser($user)
->setPolicyObject($post));
->setPolicyObject($post);
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
if ($post->isDraft()) {
$nav->appendChild(
$object_box->appendChild(
id(new AphrontErrorView())
->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
->setTitle(pht('Draft Post'))
@ -59,7 +64,7 @@ final class PhamePostViewController extends PhameController {
}
if (!$post->getBlog()) {
$nav->appendChild(
$object_box->appendChild(
id(new AphrontErrorView())
->setSeverity(AphrontErrorView::SEVERITY_WARNING)
->setTitle(pht('Not On A Blog'))
@ -70,8 +75,7 @@ final class PhamePostViewController extends PhameController {
$nav->appendChild(
array(
$actions,
$properties,
$object_box,
));
return $this->buildApplicationPage(

9
src/applications/phlux/controller/PhluxViewController.php
View file

@ -74,12 +74,15 @@ final class PhluxViewController extends PhluxController {
->setTransactions($xactions)
->setMarkupEngine($engine);
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
return $this->buildApplicationPage(
array(
$crumbs,
$header,
$actions,
$properties,
$object_box,
$xaction_view,
),
array(

17
src/applications/pholio/controller/PholioMockViewController.php
View file

@ -103,12 +103,15 @@ final class PholioMockViewController extends PholioController {
->setName('M'.$mock->getID())
->setHref('/M'.$mock->getID()));
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
$content = array(
$crumbs,
$image_status,
$header,
$actions,
$properties,
$object_box,
$output->render(),
$xaction_view,
$add_comment,
@ -251,10 +254,10 @@ final class PholioMockViewController extends PholioController {
->setAction($this->getApplicationURI('/comment/'.$mock->getID().'/'))
->setRequestURI($this->getRequest()->getRequestURI());
return array(
$header,
$form,
);
return id(new PHUIObjectBoxView())
->setFlush(true)
->setHeader($header)
->addContent($form);
}
}

9
src/applications/phortune/controller/PhortuneAccountViewController.php
View file

@ -60,12 +60,15 @@ final class PhortuneAccountViewController extends PhortuneController {
$purchase_history = $this->buildPurchaseHistorySection($account);
$account_history = $this->buildAccountHistorySection($account);
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
return $this->buildApplicationPage(
array(
$crumbs,
$header,
$actions,
$properties,
$object_box,
$payment_methods,
$purchase_history,
$account_history,

9
src/applications/phortune/controller/PhortuneProductViewController.php
View file

@ -81,12 +81,15 @@ final class PhortuneProductViewController extends PhortuneController {
->setTransactions($xactions)
->setMarkupEngine($engine);
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
return $this->buildApplicationPage(
array(
$crumbs,
$header,
$actions,
$properties,
$object_box,
$xaction_view,
),
array(

40
src/applications/ponder/controller/PonderQuestionViewController.php
View file

@ -50,6 +50,11 @@ final class PonderQuestionViewController extends PonderController {
$actions = $this->buildActionListView($question);
$properties = $this->buildPropertyListView($question);
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
$crumbs = $this->buildApplicationCrumbs($this->buildSideNavView());
$crumbs->setActionList($actions);
$crumbs->addCrumb(
@ -60,9 +65,7 @@ final class PonderQuestionViewController extends PonderController {
return $this->buildApplicationPage(
array(
$crumbs,
$header,
$actions,
$properties,
$object_box,
$question_xactions,
$answers,
$answer_add_panel
@ -208,11 +211,16 @@ final class PonderQuestionViewController extends PonderController {
->setAction($this->getApplicationURI("/question/comment/{$id}/"))
->setSubmitButtonName(pht('Comment'));
$object_box = id(new PHUIObjectBoxView())
->setFlush(true)
->setHeaderText(pht('Question Comment'))
->addContent($add_comment);
return $this->wrapComments(
count($xactions),
array(
$timeline,
$add_comment,
$object_box,
));
}
@ -253,13 +261,18 @@ final class PonderQuestionViewController extends PonderController {
$out[] = phutil_tag('br');
$out[] = id(new PhabricatorAnchorView())
->setAnchorName("A$id");
$out[] = id(new PHUIHeaderView())
->setHeader($this->getHandle($author_phid)->getFullName())
->setImage($this->getHandle($author_phid)->getImageURI());
$header = id(new PHUIHeaderView())
->setHeader($this->getHandle($author_phid)->getFullName());
$out[] = $this->buildAnswerActions($answer);
$out[] = $this->buildAnswerProperties($answer);
$actions = $this->buildAnswerActions($answer);
$properties = $this->buildAnswerProperties($answer);
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
$out[] = $object_box;
$details = array();
$details[] = id(new PhabricatorApplicationTransactionView())
@ -268,13 +281,20 @@ final class PonderQuestionViewController extends PonderController {
->setTransactions($xactions)
->setMarkupEngine($engine);
$details[] = id(new PhabricatorApplicationTransactionCommentView())
$form = id(new PhabricatorApplicationTransactionCommentView())
->setUser($viewer)
->setObjectPHID($answer->getPHID())
->setShowPreview(false)
->setAction($this->getApplicationURI("/answer/comment/{$id}/"))
->setSubmitButtonName(pht('Comment'));
$comment_box = id(new PHUIObjectBoxView())
->setFlush(true)
->setHeaderText(pht('Answer Comment'))
->addContent($form);
$details[] = $comment_box;
$out[] = $this->wrapComments(
count($xactions),
$details);

10
src/applications/ponder/view/PonderAddAnswerView.php
View file

@ -43,12 +43,8 @@ final class PonderAddAnswerView extends AphrontView {
pht('Add Answer') :
pht('Bequeath Wisdom')));
return id(new AphrontNullView())
->appendChild(
array(
$header,
$form,
))
->render();
return id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($form);
}
}

25
src/applications/project/controller/PhabricatorProjectProfileController.php
View file

@ -72,12 +72,15 @@ final class PhabricatorProjectProfileController
id(new PhabricatorCrumbView())
->setName($project->getName()));
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
return $this->buildApplicationPage(
array(
$crumbs,
$header,
$actions,
$properties,
$object_box,
$content,
),
array(
@ -173,15 +176,13 @@ final class PhabricatorProjectProfileController
$task_list->setTasks($tasks);
$task_list->setHandles($handles);
$content = hsprintf(
'<div class="phabricator-profile-info-group profile-wrap-responsive">
<h1 class="phabricator-profile-info-header">%s</h1>'.
'<div class="phabricator-profile-info-pane">'.
'%s'.
'</div>
</div>',
pht('Open Tasks'),
$task_list);
$list = id(new PHUIBoxView())
->addPadding(PHUI::PADDING_LARGE)
->appendChild($task_list);
$content = id(new PHUIObjectBoxView())
->setHeaderText(pht('Open Tasks'))
->addContent($list);
return $content;
}

10
src/applications/releeph/controller/branch/ReleephBranchViewController.php
View file

@ -168,11 +168,11 @@ final class ReleephBranchViewController extends ReleephProjectController
pht('Branch'),
$branch->getName());
return array(
$header,
$actions,
$properties,
);
return id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
}
}

9
src/applications/releeph/controller/project/ReleephProjectViewController.php
View file

@ -236,11 +236,10 @@ final class ReleephProjectViewController extends ReleephProjectController
$this->renderHandlesForPHIDs($pushers));
}
return array(
$header,
$actions,
$properties,
);
return id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
}

25
src/applications/slowvote/controller/PhabricatorSlowvotePollController.php
View file

@ -46,9 +46,6 @@ final class PhabricatorSlowvotePollController
->setUser($user)
->setPolicyObject($poll);
$xaction_header = id(new PHUIHeaderView())
->setHeader(pht('Ongoing Deliberations'));
$actions = $this->buildActionView($poll);
$properties = $this->buildPropertyView($poll);
@ -60,19 +57,21 @@ final class PhabricatorSlowvotePollController
$xactions = $this->buildTransactions($poll);
$add_comment = $this->buildCommentForm($poll);
$object_box = id(new PHUIObjectBoxView())
->setHeader($header)
->addContent($actions)
->addContent($properties);
return $this->buildApplicationPage(
array(
$crumbs,
$header,
$actions,
$properties,
$object_box,
phutil_tag(
'div',
array(
'class' => 'ml',
'class' => 'mlt mml mmr',
),
$poll_view),
$xaction_header,
$xactions,
$add_comment,
),
@ -179,11 +178,11 @@ final class PhabricatorSlowvotePollController
->setAction($this->getApplicationURI('/comment/'.$poll->getID().'/'))
->setSubmitButtonName($submit_button_name);
return array(
$add_comment_header,
$add_comment_form,
);
return id(new PHUIObjectBoxView())
->setFlush(true)
->setHeader($add_comment_header)
->addContent($add_comment_form);
}
}

1
src/applications/transactions/view/PhabricatorApplicationTransactionCommentView.php
View file

@ -148,7 +148,6 @@ class PhabricatorApplicationTransactionCommentView extends AphrontView {
->setUser($this->getUser())
->addSigil('transaction-append')
->setWorkflow(true)
->setShaded(true)
->setMetadata(
array(
'objectPHID' => $this->getObjectPHID(),

2
src/infrastructure/celerity/CeleritySpriteGenerator.php
View file

@ -524,7 +524,7 @@ final class CeleritySpriteGenerator {
'yellow-header' => 70,
'grey-header' => 70,
'dark-grey-header' => 70,
'lightblue-header' => 70,
'lightblue-header' => 240,
);
$extra_css = array(

2
src/view/layout/AphrontSideNavFilterView.php
View file

@ -288,7 +288,7 @@ final class AphrontSideNavFilterView extends AphrontView {
phutil_tag(
'div',
array(
'class' => 'phabricator-nav-content',
'class' => 'phabricator-nav-content mlb',
'id' => $content_id,
),
array(

1
src/view/layout/PhabricatorPropertyListView.php
View file

@ -180,7 +180,6 @@ final class PhabricatorPropertyListView extends AphrontView {
$classes[] = 'phabricator-property-list-text-content';
if ($part['type'] == 'image') {
$classes[] = 'phabricator-property-list-image-content';
$classes[] = 'phabricator-remarkup-dark';
}
return phutil_tag(
'div',

1
src/view/phui/PHUIHeaderView.php
View file

@ -195,6 +195,7 @@ final class PHUIHeaderView extends AphrontView {
$link = javelin_tag(
'a',
array(
'class' => 'policy-link',
'href' => '/policy/explain/'.$phid.'/'.$view_capability.'/',
'sigil' => 'workflow',
),

30
src/view/phui/PHUIObjectBoxView.php
View file

@ -7,6 +7,8 @@ final class PHUIObjectBoxView extends AphrontView {
private $form;
private $validationException;
private $content = array();
private $header;
private $flush;
public function setHeaderText($text) {
$this->headerText = $text;
@ -23,11 +25,21 @@ final class PHUIObjectBoxView extends AphrontView {
return $this;
}
public function setHeader(PHUIHeaderView $header) {
$this->header = $header;
return $this;
}
public function addContent($content) {
$this->content[] = $content;
return $this;
}
public function setFlush($flush) {
$this->flush = $flush;
return $this;
}
public function setValidationException(
PhabricatorApplicationTransactionValidationException $ex = null) {
$this->validationException = $ex;
@ -36,9 +48,16 @@ final class PHUIObjectBoxView extends AphrontView {
public function render() {
$header = id(new PhabricatorActionHeaderView())
->setHeaderTitle($this->headerText)
->setHeaderColor(PhabricatorActionHeaderView::HEADER_LIGHTBLUE);
require_celerity_resource('phui-object-box-css');
if ($this->header) {
$header = $this->header;
$header->setGradient(PhabricatorActionHeaderView::HEADER_LIGHTBLUE);
} else {
$header = id(new PHUIHeaderView())
->setHeader($this->headerText)
->setGradient(PhabricatorActionHeaderView::HEADER_LIGHTBLUE);
}
$ex = $this->validationException;
$exception_errors = null;
@ -68,7 +87,10 @@ final class PHUIObjectBoxView extends AphrontView {
->addMargin(PHUI::MARGIN_LARGE_RIGHT)
->addClass('phui-object-box');
return $content;
if ($this->flush) {
$content->addClass('phui-object-box-flush');
}
return $content;
}
}

5
webroot/rsrc/css/aphront/panel-view.css
View file

@ -77,9 +77,7 @@
}
.aphront-panel-preview {
background: #fbfbfb;
border-bottom: 1px solid {$greyborder};
padding: 15px 20px;
padding: 16px;
}
.device-phone .aphront-panel-preview {
@ -124,4 +122,3 @@
font-size: 12px;
color: {$greytext};
}

33
webroot/rsrc/css/application/differential/changeset-view.css
View file

@ -2,21 +2,17 @@
* @provides differential-changeset-view-css
*/
.differential-review-stage {
background: #FFFFFF;
padding: 0em 1.25em 0em 0em;
}
.differential-changeset {
position: relative;
margin: 0;
padding: 10px 0% 20px 2%;
padding: 16px 0;
}
.differential-diff {
background: transparent;
width: 100%;
background: transparent;
width: 100%;
border-top: 1px solid #cca;
border-bottom: 1px solid #cca;
}
.differential-diff td {
@ -45,12 +41,10 @@
min-width: 45px;
max-width: 4%;
vertical-align: top;
background: #eeeeee;
color: {$lightgreytext};
background: {$lightbluebackground};
color: {$bluetext};
cursor: pointer;
border-style: solid;
border-width: 0px 1px;
border-color: #eeeeee #999999 #eeeeee #dddddd;
border-right: 1px solid {$thinblueborder};
font-size: 11px;
overflow: hidden;
@ -168,8 +162,9 @@ td.cov-X {
.differential-diff td.show-context,
.differential-diff td.differential-shield {
background: #ffffee;
padding: 1em 0em;
border: 1px solid #ccccaa;
padding: 12px 0;
border-top: 1px solid #ccccaa;
border-bottom: 1px solid #ccccaa;
}
.differential-diff td.show-more,
@ -218,9 +213,8 @@ td.cov-X {
}
.differential-changeset h1 {
font-size: 14px;
font-weight: bold;
padding: 2px 0 8px;
font-size: 14px;
padding: 2px 0 12px 12px;
}
.differential-reticle {
@ -296,6 +290,7 @@ td.cov-X {
.differential-changeset-buttons {
float: right;
margin-right: 16px;
}
.differential-changeset-buttons a.button {

9
webroot/rsrc/css/application/differential/core.css
View file

@ -9,14 +9,7 @@
}
.differential-panel {
margin: -1px 0px 3.6em 0px;
padding: 15px 2%;
font-size: 13px;
background: #F6F6F6;
border-color: #c0c5d1;
border-style: solid;
border-width: 1px 0 1px 0;
box-shadow: 0 0 1px 1px rgba(192, 197, 209, 0.3);
padding: 16px;
}
.differential-panel h1 {

3
webroot/rsrc/css/application/pholio/pholio.css
View file

@ -2,6 +2,7 @@
* @provides pholio-css
*/
.pholio-mock-image-container {
margin-top: 16px;
background-color: #282828;
text-align: center;
vertical-align: middle;
@ -193,5 +194,5 @@
.pholio-transaction-inline-comment div {
display: table-cell;
vertical-align: middle;
padding-bottom: 2px;
padding-left: 8px;
}

11
webroot/rsrc/css/application/ponder/comments.css
View file

@ -4,11 +4,14 @@
.ponder-show-comments {
text-align: center;
padding: 8px 0;
padding: 8px;
margin: 0 16px;
float: right;
font-weight: bold;
background: #f9f9f9;
box-shadow: inset 0 1px 2px rgba(0, 0, 0, 0.1);
border-bottom: 1px solid #b7b7b7;
background: #fff;
border-bottom: 1px solid {$blueborder};
border-left: 1px solid {$lightblueborder};
border-right: 1px solid {$lightblueborder};
}
.ponder-comments {

1
webroot/rsrc/css/layout/phabricator-action-list-view.css
View file

@ -12,7 +12,6 @@
padding: 4px 0;
float: right;
margin-top: 0px;
margin-right: 1%;
width: 20%;
font-size: 12px;
}

28
webroot/rsrc/css/layout/phabricator-property-list-view.css
View file

@ -3,7 +3,7 @@
*/
.phabricator-property-list-view {
background-color: {$lightgreybackground};
background-color: #fff;
}
.phabricator-property-list-view .keyboard-shortcuts-available {
@ -19,18 +19,19 @@
url('/rsrc/image/icon/fatcow/key_question.png') right center no-repeat;
}
.phabricator-property-list-container {
.phabricator-property-list-container +
.phabricator-property-list-section-header {
border-color: {$lightgreyborder};
border-style: solid;
border-width: 0 0 1px;
border-width: 1px 0 0;
}
.device-desktop .phabricator-property-list-container {
padding: 12px 0 4px 0;
padding: 12px 0 12px 0;
}
.device .phabricator-property-list-container {
padding: 12px 0 0 0;
padding: 12px 0 4px 0;
}
.phabricator-property-list-key {
@ -76,26 +77,23 @@
}
.phabricator-property-list-section-header {
color: #9CA5B5;
color: {$bluetext};
padding: 12px 16px 0px;
text-transform: uppercase;
font-weight: 700;
}
.phabricator-property-list-section-header + .phabricator-property-list-text-content {
border-top: none;
}
.phabricator-property-list-text-content {
padding: 12px 16px;
background: {$lightgreybackground};
border-bottom: 1px solid {$lightgreyborder};
background: #fff;
overflow: hidden;
border-top: 1px solid {$lightblueborder};
}
.phabricator-property-list-image-content {
background: #282828;
border-color: #101010;
color: #fff;
}
/* In the common case where we immediately follow a header, move back up 30px
so we snuggle next to the header. */
.device-desktop .phui-header-view

5
webroot/rsrc/css/layout/phabricator-timeline-view.css
View file

@ -3,7 +3,7 @@
*/
.phabricator-timeline-view {
background: #eeedf0;
padding: 0 16px;
}
.phabricator-timeline-group {
@ -13,8 +13,7 @@
}
.device-desktop .phabricator-timeline-event-view {
margin-left: 80px;
margin-right: 12px;
margin-left: 70px;
position: relative;
}

4
webroot/rsrc/css/phui/phui-document.css
View file

@ -157,3 +157,7 @@
.device-desktop .phui-document-offset {
padding-right: 160px;
}
.phui-document-view .phabricator-property-list-view {
border-bottom: 1px solid {$thinblueborder};
}

14
webroot/rsrc/css/phui/phui-form-view.css
View file

@ -426,20 +426,6 @@ table.aphront-form-control-checkbox-layout th {
display: none;
}
.phui-object-box .phabricator-action-header {
padding: 4px 5px 4px 12px;
border-bottom: 1px solid {$lightblueborder};
}
.phui-object-box .phabricator-action-header h3 {
color: {$bluetext};
text-shadow: 0 1px 2px #fff;
}
.phui-object-box .aphront-error-view {
margin-bottom: 0;
}
.phabricator-standard-custom-field-header {
font-size: 16px;
color: {$bluetext};

6
webroot/rsrc/css/phui/phui-header-view.css
View file

@ -47,10 +47,6 @@ body.device-phone .phui-header-view {
padding: 12px 8px;
}
.device-desktop .phui-header-view {
width: 66%;
}
.phui-header-tags {
margin-left: 12px;
font-size: 13px;
@ -87,7 +83,7 @@ body.device-phone .phui-header-view {
}
.phui-header-subheader .policy-link {
color: {$darkbluetext};
color: {$bluetext};
}
.phui-header-subheader .phui-header-status-dark {

34
webroot/rsrc/css/phui/phui-object-box.css Normal file
View file

@ -0,0 +1,34 @@
/**
* @provides phui-object-box-css
*/
.phui-object-box.phui-object-box-flush {
margin-top: 0;
}
.phui-object-box .phui-header-shell {
padding: 4px 5px 4px 12px;
border-bottom: 1px solid {$lightblueborder};
border-top: none;
}
.phui-object-box .phui-header-image {
margin: 5px 12px 5px 0;
}
.phui-object-box .phui-header-shell h1 {
color: {$bluetext};
text-shadow: 0 1px #fff;
padding: 8px 0;
}
.phui-object-box .aphront-error-view {
margin-bottom: 0;
}
.device-desktop .phui-object-box
.phui-header-shell + .phabricator-action-list-view {
margin-top: 0;
margin-bottom: -12px;
border-width: 0 0 0 1px;
}

6
webroot/rsrc/css/sprite-gradient.css
View file

@ -36,7 +36,7 @@
}
.gradient-lightblue-header {
background-position: 0px -367px;
background-position: 0px -509px;
}
.gradient-menu-label, .phabricator-side-menu .phui-list-item-type-label {
@ -44,9 +44,9 @@
}
.gradient-red-header {
background-position: 0px -438px;
background-position: 0px -367px;
}
.gradient-yellow-header {
background-position: 0px -509px;
background-position: 0px -438px;
}

BIN
webroot/rsrc/image/sprite-gradient.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 559 B

After

Width:  |  Height:  |  Size: 574 B