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

Move Conpherence when warning is present

Browse source 
Summary: Turns out only Conpherence/Durable Column still have issues. Workboards is OK. Simple 2 new CSS classes and punt the issue down the road.

Test Plan: Test Workboards, Conpherence, Durable Column with a setup check issue.

Reviewers: btrahan, epriestley

Reviewed By: epriestley

Subscribers: Korvin, epriestley

Differential Revision: https://secure.phabricator.com/D12394
This commit is contained in:
Chad Little 2015-04-13 10:30:13 -07:00
parent 4ab9ebd901
commit d56012ce26
4 changed files with 18 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
resources/celerity/map.php
View file

@ -44,8 +44,8 @@ return array(
'rsrc/css/application/config/config-welcome.css' => '6abd79be', 'rsrc/css/application/config/config-welcome.css' => '6abd79be',
'rsrc/css/application/config/setup-issue.css' => '22270af2', 'rsrc/css/application/config/setup-issue.css' => '22270af2',
'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2', 'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2',
'rsrc/css/application/conpherence/durable-column.css' => 'caa12d4a', 'rsrc/css/application/conpherence/durable-column.css' => 'f0c208ac',
'rsrc/css/application/conpherence/menu.css' => '7c900089', 'rsrc/css/application/conpherence/menu.css' => 'f389e048',
'rsrc/css/application/conpherence/message-pane.css' => 'e44b667b', 'rsrc/css/application/conpherence/message-pane.css' => 'e44b667b',
'rsrc/css/application/conpherence/notification.css' => '04a6e10a', 'rsrc/css/application/conpherence/notification.css' => '04a6e10a',
'rsrc/css/application/conpherence/update.css' => '1099a660', 'rsrc/css/application/conpherence/update.css' => '1099a660',
@ -515,8 +515,8 @@ return array(
'changeset-view-manager' => '58562350', 'changeset-view-manager' => '58562350',
'config-options-css' => '7fedf08b', 'config-options-css' => '7fedf08b',
'config-welcome-css' => '6abd79be', 'config-welcome-css' => '6abd79be',
'conpherence-durable-column-view' => 'caa12d4a', 'conpherence-durable-column-view' => 'f0c208ac',
'conpherence-menu-css' => '7c900089', 'conpherence-menu-css' => 'f389e048',
'conpherence-message-pane-css' => 'e44b667b', 'conpherence-message-pane-css' => 'e44b667b',
'conpherence-notification-css' => '04a6e10a', 'conpherence-notification-css' => '04a6e10a',
'conpherence-thread-manager' => '0a5192c4', 'conpherence-thread-manager' => '0a5192c4',

9
src/view/page/PhabricatorStandardPageView.php
View file

@ -348,6 +348,8 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
$header_chrome = $this->menuContent; $header_chrome = $this->menuContent;
} }
$classes = array();
$classes[] = 'main-page-frame';
$developer_warning = null; $developer_warning = null;
if (PhabricatorEnv::getEnvConfig('phabricator.developer-mode') && if (PhabricatorEnv::getEnvConfig('phabricator.developer-mode') &&
DarkConsoleErrorLogPluginAPI::getErrors()) { DarkConsoleErrorLogPluginAPI::getErrors()) {
@ -363,6 +365,7 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
if ($user && $user->getIsAdmin()) { if ($user && $user->getIsAdmin()) {
$open = PhabricatorSetupCheck::getOpenSetupIssueKeys(); $open = PhabricatorSetupCheck::getOpenSetupIssueKeys();
if ($open) { if ($open) {
$classes[] = 'page-has-warning';
$setup_warning = phutil_tag_div( $setup_warning = phutil_tag_div(
'setup-warning-callout', 'setup-warning-callout',
phutil_tag( phutil_tag(
@ -389,8 +392,6 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
'class' => 'phabricator-standard-page', 'class' => 'phabricator-standard-page',
), ),
array( array(
$developer_warning,
$setup_warning,
$header_chrome, $header_chrome,
phutil_tag( phutil_tag(
'div', 'div',
@ -418,9 +419,11 @@ final class PhabricatorStandardPageView extends PhabricatorBarePageView {
return phutil_tag( return phutil_tag(
'div', 'div',
array( array(
'class' => 'main-page-frame', 'class' => implode(' ', $classes),
), ),
array( array(
$developer_warning,
$setup_warning,
$main_page, $main_page,
$durable_column, $durable_column,
)); ));

4
webroot/rsrc/css/application/conpherence/durable-column.css
View file

@ -29,6 +29,10 @@
background: #fff; background: #fff;
} }
.page-has-warning .conpherence-durable-column {
top: 32px;
}
.conpherence-durable-column .loading-mask { .conpherence-durable-column .loading-mask {
position: absolute; position: absolute;
top: 90px; top: 90px;

4
webroot/rsrc/css/application/conpherence/menu.css
View file

@ -11,6 +11,10 @@
background: #fff; background: #fff;
} }
.page-has-warning .conpherence-layout {
top: 76px;
}
.conpherence-layout .conpherence-no-threads { .conpherence-layout .conpherence-no-threads {
text-align: center; text-align: center;
position: fixed; position: fixed;