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

Correct logic in PHUIActionPanelView

Browse source 
Summary: We should only be adding space then a status is set, not a state.

Test Plan: Test on UIExamples, still renders as expected.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D11844
This commit is contained in:
Chad Little 2015-02-21 06:38:27 -08:00
parent 7c9e73b31d
commit 1d5825c695
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
resources/celerity/map.php
View file

@ -122,7 +122,7 @@ return array(
'rsrc/css/phui/calendar/phui-calendar.css' => '8675968e', 'rsrc/css/phui/calendar/phui-calendar.css' => '8675968e',
'rsrc/css/phui/phui-action-header-view.css' => '89c497e7', 'rsrc/css/phui/phui-action-header-view.css' => '89c497e7',
'rsrc/css/phui/phui-action-list.css' => '9ee9910a', 'rsrc/css/phui/phui-action-list.css' => '9ee9910a',
'rsrc/css/phui/phui-action-panel.css' => 'd2e088bd', 'rsrc/css/phui/phui-action-panel.css' => '3ee9afd5',
'rsrc/css/phui/phui-box.css' => '7b3a2eed', 'rsrc/css/phui/phui-box.css' => '7b3a2eed',
'rsrc/css/phui/phui-button.css' => 'ffe12633', 'rsrc/css/phui/phui-button.css' => 'ffe12633',
'rsrc/css/phui/phui-crumbs-view.css' => '594d719e', 'rsrc/css/phui/phui-crumbs-view.css' => '594d719e',
@ -771,7 +771,7 @@ return array(
'phrequent-css' => 'ffc185ad', 'phrequent-css' => 'ffc185ad',
'phriction-document-css' => '7d7f0071', 'phriction-document-css' => '7d7f0071',
'phui-action-header-view-css' => '89c497e7', 'phui-action-header-view-css' => '89c497e7',
'phui-action-panel-css' => 'd2e088bd', 'phui-action-panel-css' => '3ee9afd5',
'phui-box-css' => '7b3a2eed', 'phui-box-css' => '7b3a2eed',
'phui-button-css' => 'ffe12633', 'phui-button-css' => 'ffe12633',
'phui-calendar-css' => '8675968e', 'phui-calendar-css' => '8675968e',

7
src/view/phui/PHUIActionPanelView.php
View file

@ -82,8 +82,8 @@ final class PHUIActionPanelView extends AphrontTagView {
$classes = array(); $classes = array();
$classes[] = 'phui-action-panel'; $classes[] = 'phui-action-panel';
if ($this->state) { if ($this->status) {
$classes[] = 'phui-action-panel-has-state'; $classes[] = 'phui-action-panel-has-status';
$classes[] = $this->state; $classes[] = $this->state;
} }
@ -158,9 +158,10 @@ final class PHUIActionPanelView extends AphrontTagView {
if ($this->status && $this->state) { if ($this->status && $this->state) {
$state_icon = $this->getStateIcon(); $state_icon = $this->getStateIcon();
$status = phutil_tag( $status = phutil_tag(
'div', ($this->href) ? 'a' : 'div',
array( array(
'class' => 'phui-action-panel-status', 'class' => 'phui-action-panel-status',
'href' => ($this->href) ? $this->href : null,
), ),
array($state_icon, $this->status)); array($state_icon, $this->status));
} }

6
webroot/rsrc/css/phui/phui-action-panel.css
View file

@ -6,7 +6,7 @@
position: relative; position: relative;
} }
.phui-action-panel-has-state.phui-action-panel { .phui-action-panel-has-status.phui-action-panel {
padding-bottom: 44px; padding-bottom: 44px;
} }
@ -66,6 +66,10 @@
right: 0; right: 0;
} }
.phui-action-panel-status:hover {
text-decoration: none;
}
.phui-action-panel-none .phui-action-panel-status { .phui-action-panel-none .phui-action-panel-status {
background-color: {$lightgreybackground}; background-color: {$lightgreybackground};
border-left: 4px solid {$greyborder}; border-left: 4px solid {$greyborder};