Page MenuHomePhabricator

D12802.id.diff
No OneTemporary

D12802.id.diff

diff --git a/src/__phutil_library_map__.php b/src/__phutil_library_map__.php
--- a/src/__phutil_library_map__.php
+++ b/src/__phutil_library_map__.php
@@ -1495,7 +1495,6 @@
'PhabricatorCacheTTLGarbageCollector' => 'applications/cache/garbagecollector/PhabricatorCacheTTLGarbageCollector.php',
'PhabricatorCaches' => 'applications/cache/PhabricatorCaches.php',
'PhabricatorCalendarApplication' => 'applications/calendar/application/PhabricatorCalendarApplication.php',
- 'PhabricatorCalendarBrowseController' => 'applications/calendar/controller/PhabricatorCalendarBrowseController.php',
'PhabricatorCalendarController' => 'applications/calendar/controller/PhabricatorCalendarController.php',
'PhabricatorCalendarDAO' => 'applications/calendar/storage/PhabricatorCalendarDAO.php',
'PhabricatorCalendarEvent' => 'applications/calendar/storage/PhabricatorCalendarEvent.php',
@@ -4520,7 +4519,7 @@
'PHUIHandleListView' => 'AphrontTagView',
'PHUIHandleTagListView' => 'AphrontTagView',
'PHUIHandleView' => 'AphrontView',
- 'PHUIHeaderView' => 'AphrontView',
+ 'PHUIHeaderView' => 'AphrontTagView',
'PHUIIconExample' => 'PhabricatorUIExample',
'PHUIIconView' => 'AphrontTagView',
'PHUIImageMaskExample' => 'PhabricatorUIExample',
@@ -4839,7 +4838,6 @@
'PhabricatorCacheSpec' => 'Phobject',
'PhabricatorCacheTTLGarbageCollector' => 'PhabricatorGarbageCollector',
'PhabricatorCalendarApplication' => 'PhabricatorApplication',
- 'PhabricatorCalendarBrowseController' => 'PhabricatorCalendarController',
'PhabricatorCalendarController' => 'PhabricatorController',
'PhabricatorCalendarDAO' => 'PhabricatorLiskDAO',
'PhabricatorCalendarEvent' => array(
diff --git a/src/view/phui/PHUIHeaderView.php b/src/view/phui/PHUIHeaderView.php
--- a/src/view/phui/PHUIHeaderView.php
+++ b/src/view/phui/PHUIHeaderView.php
@@ -1,6 +1,6 @@
<?php
-final class PHUIHeaderView extends AphrontView {
+final class PHUIHeaderView extends AphrontTagView {
const PROPERTY_STATUS = 1;
@@ -123,7 +123,11 @@
return $this;
}
- public function render() {
+ protected function getTagName() {
+ return 'div';
+ }
+
+ protected function getTagAttributes() {
require_celerity_resource('phui-header-view-css');
$classes = array();
@@ -146,6 +150,16 @@
$classes[] = 'phui-header-tall';
}
+ if ($this->image) {
+ $classes[] = 'phui-header-has-image';
+ }
+
+ return array(
+ 'class' => $classes,
+ );
+ }
+
+ protected function getTagContent() {
$image = null;
if ($this->image) {
$image = phutil_tag(
@@ -156,7 +170,6 @@
'style' => 'background-image: url('.$this->image.')',
),
' ');
- $classes[] = 'phui-header-has-image';
}
$header = array();
@@ -243,20 +256,15 @@
$property_list);
}
- return phutil_tag(
- 'div',
- array(
- 'class' => implode(' ', $classes),
- ),
- array(
- $image,
- phutil_tag(
- 'h1',
- array(
- 'class' => 'phui-header-view grouped',
- ),
- $header),
- ));
+ return array(
+ $image,
+ phutil_tag(
+ 'h1',
+ array(
+ 'class' => 'phui-header-view grouped',
+ ),
+ $header),
+ );
}
private function renderPolicyProperty(PhabricatorPolicyInterface $object) {

File Metadata

Mime Type
text/plain
Expires
Thu, Oct 24, 12:17 PM (3 w, 4 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6721407
Default Alt Text
D12802.id.diff (3 KB)

Event Timeline