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

Update PHUIDocument to use new header gradients

Browse source 
Summary: Adds the new gradient to document views

Test Plan: Tested multiple pages in my sandbox in Phriction, UIExamples.

Reviewers: epriestley, btrahan

Reviewed By: epriestley

CC: Korvin, aran

Differential Revision: https://secure.phabricator.com/D6827
This commit is contained in:
Chad Little 2013-08-28 10:29:02 -07:00
parent 730fe53dfa
commit 55e2efc6fc
8 changed files with 80 additions and 62 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

94
src/__celerity_resource_map__.php
View file

@ -3183,7 +3183,7 @@ celerity_register_resource_map(array(
), ),
'phabricator-header-view-css' => 'phabricator-header-view-css' =>
array( array(
'uri' => '/res/da35cfa0/rsrc/css/layout/phabricator-header-view.css', 'uri' => '/res/0c8871dc/rsrc/css/layout/phabricator-header-view.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@ -3386,7 +3386,7 @@ celerity_register_resource_map(array(
), ),
'phabricator-property-list-view-css' => 'phabricator-property-list-view-css' =>
array( array(
'uri' => '/res/1b2f0fa9/rsrc/css/layout/phabricator-property-list-view.css', 'uri' => '/res/c4c66f5e/rsrc/css/layout/phabricator-property-list-view.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@ -3748,7 +3748,7 @@ celerity_register_resource_map(array(
), ),
'phriction-document-css' => 'phriction-document-css' =>
array( array(
'uri' => '/res/754f6b37/rsrc/css/application/phriction/phriction-document-css.css', 'uri' => '/res/200bbf46/rsrc/css/application/phriction/phriction-document-css.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@ -3775,7 +3775,7 @@ celerity_register_resource_map(array(
), ),
'phui-document-view-css' => 'phui-document-view-css' =>
array( array(
'uri' => '/res/fe374dee/rsrc/css/phui/phui-document.css', 'uri' => '/res/0c895688/rsrc/css/phui/phui-document.css',
'type' => 'css', 'type' => 'css',
'requires' => 'requires' =>
array( array(
@ -4172,7 +4172,7 @@ celerity_register_resource_map(array(
), array( ), array(
'packages' => 'packages' =>
array( array(
'0b011853' => 'a75e0dea' =>
array( array(
'name' => 'core.pkg.css', 'name' => 'core.pkg.css',
'symbols' => 'symbols' =>
@ -4219,7 +4219,7 @@ celerity_register_resource_map(array(
39 => 'phabricator-property-list-view-css', 39 => 'phabricator-property-list-view-css',
40 => 'phabricator-tag-view-css', 40 => 'phabricator-tag-view-css',
), ),
'uri' => '/res/pkg/0b011853/core.pkg.css', 'uri' => '/res/pkg/a75e0dea/core.pkg.css',
'type' => 'css', 'type' => 'css',
), ),
'4f81c788' => '4f81c788' =>
@ -4410,15 +4410,15 @@ celerity_register_resource_map(array(
), ),
'reverse' => 'reverse' =>
array( array(
'aphront-dialog-view-css' => '0b011853', 'aphront-dialog-view-css' => 'a75e0dea',
'aphront-error-view-css' => '0b011853', 'aphront-error-view-css' => 'a75e0dea',
'aphront-list-filter-view-css' => '0b011853', 'aphront-list-filter-view-css' => 'a75e0dea',
'aphront-pager-view-css' => '0b011853', 'aphront-pager-view-css' => 'a75e0dea',
'aphront-panel-view-css' => '0b011853', 'aphront-panel-view-css' => 'a75e0dea',
'aphront-table-view-css' => '0b011853', 'aphront-table-view-css' => 'a75e0dea',
'aphront-tokenizer-control-css' => '0b011853', 'aphront-tokenizer-control-css' => 'a75e0dea',
'aphront-tooltip-css' => '0b011853', 'aphront-tooltip-css' => 'a75e0dea',
'aphront-typeahead-control-css' => '0b011853', 'aphront-typeahead-control-css' => 'a75e0dea',
'differential-changeset-view-css' => '09216861', 'differential-changeset-view-css' => '09216861',
'differential-core-view-css' => '09216861', 'differential-core-view-css' => '09216861',
'differential-inline-comment-editor' => 'd07a3bc2', 'differential-inline-comment-editor' => 'd07a3bc2',
@ -4432,7 +4432,7 @@ celerity_register_resource_map(array(
'differential-table-of-contents-css' => '09216861', 'differential-table-of-contents-css' => '09216861',
'diffusion-commit-view-css' => 'c8ce2d88', 'diffusion-commit-view-css' => 'c8ce2d88',
'diffusion-icons-css' => 'c8ce2d88', 'diffusion-icons-css' => 'c8ce2d88',
'global-drag-and-drop-css' => '0b011853', 'global-drag-and-drop-css' => 'a75e0dea',
'inline-comment-summary-css' => '09216861', 'inline-comment-summary-css' => '09216861',
'javelin-aphlict' => '4f81c788', 'javelin-aphlict' => '4f81c788',
'javelin-behavior' => '2dbbb7d1', 'javelin-behavior' => '2dbbb7d1',
@ -4505,55 +4505,55 @@ celerity_register_resource_map(array(
'javelin-util' => '2dbbb7d1', 'javelin-util' => '2dbbb7d1',
'javelin-vector' => '2dbbb7d1', 'javelin-vector' => '2dbbb7d1',
'javelin-workflow' => '2dbbb7d1', 'javelin-workflow' => '2dbbb7d1',
'lightbox-attachment-css' => '0b011853', 'lightbox-attachment-css' => 'a75e0dea',
'maniphest-task-summary-css' => '06bacb9a', 'maniphest-task-summary-css' => '06bacb9a',
'maniphest-transaction-detail-css' => '06bacb9a', 'maniphest-transaction-detail-css' => '06bacb9a',
'phabricator-action-list-view-css' => '0b011853', 'phabricator-action-list-view-css' => 'a75e0dea',
'phabricator-application-launch-view-css' => '0b011853', 'phabricator-application-launch-view-css' => 'a75e0dea',
'phabricator-busy' => '4f81c788', 'phabricator-busy' => '4f81c788',
'phabricator-content-source-view-css' => '09216861', 'phabricator-content-source-view-css' => '09216861',
'phabricator-core-css' => '0b011853', 'phabricator-core-css' => 'a75e0dea',
'phabricator-crumbs-view-css' => '0b011853', 'phabricator-crumbs-view-css' => 'a75e0dea',
'phabricator-drag-and-drop-file-upload' => 'd07a3bc2', 'phabricator-drag-and-drop-file-upload' => 'd07a3bc2',
'phabricator-dropdown-menu' => '4f81c788', 'phabricator-dropdown-menu' => '4f81c788',
'phabricator-file-upload' => '4f81c788', 'phabricator-file-upload' => '4f81c788',
'phabricator-filetree-view-css' => '0b011853', 'phabricator-filetree-view-css' => 'a75e0dea',
'phabricator-flag-css' => '0b011853', 'phabricator-flag-css' => 'a75e0dea',
'phabricator-header-view-css' => '0b011853', 'phabricator-header-view-css' => 'a75e0dea',
'phabricator-hovercard' => '4f81c788', 'phabricator-hovercard' => '4f81c788',
'phabricator-jump-nav' => '0b011853', 'phabricator-jump-nav' => 'a75e0dea',
'phabricator-keyboard-shortcut' => '4f81c788', 'phabricator-keyboard-shortcut' => '4f81c788',
'phabricator-keyboard-shortcut-manager' => '4f81c788', 'phabricator-keyboard-shortcut-manager' => '4f81c788',
'phabricator-main-menu-view' => '0b011853', 'phabricator-main-menu-view' => 'a75e0dea',
'phabricator-menu-item' => '4f81c788', 'phabricator-menu-item' => '4f81c788',
'phabricator-nav-view-css' => '0b011853', 'phabricator-nav-view-css' => 'a75e0dea',
'phabricator-notification' => '4f81c788', 'phabricator-notification' => '4f81c788',
'phabricator-notification-css' => '0b011853', 'phabricator-notification-css' => 'a75e0dea',
'phabricator-notification-menu-css' => '0b011853', 'phabricator-notification-menu-css' => 'a75e0dea',
'phabricator-object-item-list-view-css' => '0b011853', 'phabricator-object-item-list-view-css' => 'a75e0dea',
'phabricator-object-selector-css' => '09216861', 'phabricator-object-selector-css' => '09216861',
'phabricator-phtize' => '4f81c788', 'phabricator-phtize' => '4f81c788',
'phabricator-prefab' => '4f81c788', 'phabricator-prefab' => '4f81c788',
'phabricator-project-tag-css' => '06bacb9a', 'phabricator-project-tag-css' => '06bacb9a',
'phabricator-property-list-view-css' => '0b011853', 'phabricator-property-list-view-css' => 'a75e0dea',
'phabricator-remarkup-css' => '0b011853', 'phabricator-remarkup-css' => 'a75e0dea',
'phabricator-shaped-request' => 'd07a3bc2', 'phabricator-shaped-request' => 'd07a3bc2',
'phabricator-side-menu-view-css' => '0b011853', 'phabricator-side-menu-view-css' => 'a75e0dea',
'phabricator-standard-page-view' => '0b011853', 'phabricator-standard-page-view' => 'a75e0dea',
'phabricator-tag-view-css' => '0b011853', 'phabricator-tag-view-css' => 'a75e0dea',
'phabricator-textareautils' => '4f81c788', 'phabricator-textareautils' => '4f81c788',
'phabricator-tooltip' => '4f81c788', 'phabricator-tooltip' => '4f81c788',
'phabricator-transaction-view-css' => '0b011853', 'phabricator-transaction-view-css' => 'a75e0dea',
'phabricator-zindex-css' => '0b011853', 'phabricator-zindex-css' => 'a75e0dea',
'phui-button-css' => '0b011853', 'phui-button-css' => 'a75e0dea',
'phui-form-css' => '0b011853', 'phui-form-css' => 'a75e0dea',
'phui-form-view-css' => '0b011853', 'phui-form-view-css' => 'a75e0dea',
'phui-icon-view-css' => '0b011853', 'phui-icon-view-css' => 'a75e0dea',
'phui-spacing-css' => '0b011853', 'phui-spacing-css' => 'a75e0dea',
'sprite-apps-large-css' => '0b011853', 'sprite-apps-large-css' => 'a75e0dea',
'sprite-gradient-css' => '0b011853', 'sprite-gradient-css' => 'a75e0dea',
'sprite-icons-css' => '0b011853', 'sprite-icons-css' => 'a75e0dea',
'sprite-menu-css' => '0b011853', 'sprite-menu-css' => 'a75e0dea',
'syntax-highlighting-css' => '0b011853', 'syntax-highlighting-css' => 'a75e0dea',
), ),
)); ));

5
src/applications/phriction/controller/PhrictionDocumentController.php
View file

@ -164,9 +164,9 @@ final class PhrictionDocumentController
$page_content = id(new PHUIDocumentView()) $page_content = id(new PHUIDocumentView())
->setOffset(true) ->setOffset(true)
->setHeader($header)
->appendChild( ->appendChild(
array( array(
$header,
$actions, $actions,
$properties, $properties,
$move_notice, $move_notice,
@ -412,7 +412,8 @@ final class PhrictionDocumentController
phutil_tag( phutil_tag(
'div', 'div',
array( array(
'class' => 'phriction-children-header', 'class' => 'phriction-children-header '.
'sprite-gradient gradient-lightblue-header',
), ),
pht('Document Hierarchy')), pht('Document Hierarchy')),
phutil_tag( phutil_tag(

11
src/view/layout/PhabricatorHeaderView.php
View file

@ -7,6 +7,7 @@ final class PhabricatorHeaderView extends AphrontView {
private $tags = array(); private $tags = array();
private $image; private $image;
private $subheader; private $subheader;
private $gradient;
public function setHeader($header) { public function setHeader($header) {
$this->header = $header; $this->header = $header;
@ -33,12 +34,22 @@ final class PhabricatorHeaderView extends AphrontView {
return $this; return $this;
} }
public function setGradient($gradient) {
$this->gradient = $gradient;
return $this;
}
public function render() { public function render() {
require_celerity_resource('phabricator-header-view-css'); require_celerity_resource('phabricator-header-view-css');
$classes = array(); $classes = array();
$classes[] = 'phabricator-header-shell'; $classes[] = 'phabricator-header-shell';
if ($this->gradient) {
$classes[] = 'sprite-gradient';
$classes[] = 'gradient-'.$this->gradient.'-header';
}
$image = null; $image = null;
if ($this->image) { if ($this->image) {
$image = phutil_tag( $image = phutil_tag(

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

@ -21,6 +21,7 @@ final class PHUIDocumentView extends AphrontTagView {
} }
public function setHeader(PhabricatorHeaderView $header) { public function setHeader(PhabricatorHeaderView $header) {
$header->setGradient(PhabricatorActionHeaderView::HEADER_LIGHTBLUE);
$this->header = $header; $this->header = $header;
return $this; return $this;
} }

5
webroot/rsrc/css/application/phriction/phriction-document-css.css
View file

@ -35,9 +35,12 @@
.phriction-children-header { .phriction-children-header {
background: #f7f7f7; background: #f7f7f7;
padding: 10px 0 10px 20px; padding: 8px 0 8px 16px;
font-weight: bold; font-weight: bold;
margin-bottom: 15px; margin-bottom: 15px;
border-bottom: 1px solid #BFCFDA;
color: #6b748c;
text-shadow: 0 1px 2px #fff;
} }
.phriction-document-history-diff { .phriction-document-history-diff {

2
webroot/rsrc/css/layout/phabricator-header-view.css
View file

@ -3,7 +3,7 @@
*/ */
.phabricator-header-shell { .phabricator-header-shell {
background: #e0e3ec; background-color: #e0e3ec;
border-width: 1px 0; border-width: 1px 0;
border-style: solid; border-style: solid;
border-color: #c0c5d1; border-color: #c0c5d1;

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

@ -28,7 +28,7 @@
border-color: #c0c5d1; border-color: #c0c5d1;
border-style: solid; border-style: solid;
border-width: 0 0 1px; border-width: 0 0 1px;
background-color: #f6f6f6; background-color: #F7F7F8;
} }
.device-desktop .phabricator-property-list-container { .device-desktop .phabricator-property-list-container {

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

@ -8,9 +8,8 @@
} }
.device-desktop .phui-document-view { .device-desktop .phui-document-view {
border-left: 1px solid #e7e7e7; border: 1px solid #BFCFDA;
border-right: 1px solid #e7e7e7; border-bottom: 1px solid #95A6C5;
border-bottom: 1px solid #c0c5d1;
max-width: 960px; max-width: 960px;
margin: 16px auto; margin: 16px auto;
} }
@ -47,27 +46,31 @@
.phui-document-bookname { .phui-document-bookname {
padding: 8px 16px; padding: 8px 16px;
color: #9ca5b5; color: #9ca5b5;
background-color: #fff;
border-bottom: 1px solid #BFCFDA;
} }
.phui-document-bookname .bookname { .phui-document-bookname .bookname {
font-size: 14px;
font-weight: bold;
float: left; float: left;
} }
.phui-document-bookname .bookdescription { .phui-document-bookname .bookdescription {
font-size: 14px;
float: right; float: right;
} }
.phui-document-content .phabricator-header-shell { .phui-document-content .phabricator-header-shell {
background-color: #f6f7f8; border-top: none;
border-top: 1px solid #e7e7e7; border-bottom: 1px solid #BFCFDA;
border-bottom: 1px solid #e7e7e7;
} }
.phui-document-content .phabricator-header-view { .phui-document-content .phabricator-header-view {
padding: 16px; padding: 16px;
color: #6b748c;
text-shadow: 0 1px 2px #fff;
}
.phui-document-content .phabricator-property-list-container {
border-color: #BFCFDA;
} }
.phui-document-content .phabricator-property-list-view { .phui-document-content .phabricator-property-list-view {
@ -78,7 +81,6 @@
} }
.phui-document-content { .phui-document-content {
box-shadow: 0 1px 2px rgba(0,0,0,0.2);
min-height: 240px; min-height: 240px;
background: #fff; background: #fff;