Skip to content

Commit

Permalink
Update Conpherence layout for logged out view
Browse files Browse the repository at this point in the history
Summary: Fixes T9217, adds detection for logged in users and adjusts the layout accordingly.

Test Plan: View logged in and logged out Conpherence

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Maniphest Tasks: T9217

Differential Revision: https://secure.phabricator.com/D14002
  • Loading branch information
Chad Little committed Aug 29, 2015
1 parent d718415 commit a339e6d
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 5 deletions.
4 changes: 2 additions & 2 deletions resources/celerity/map.php
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@
'rsrc/css/application/config/unhandled-exception.css' => '4c96257a',
'rsrc/css/application/conpherence/durable-column.css' => '86396117',
'rsrc/css/application/conpherence/menu.css' => 'f99fee4c',
'rsrc/css/application/conpherence/message-pane.css' => 'dd4f8a3b',
'rsrc/css/application/conpherence/message-pane.css' => '5897d3ac',
'rsrc/css/application/conpherence/notification.css' => '6cdcc253',
'rsrc/css/application/conpherence/transaction.css' => '85d0974c',
'rsrc/css/application/conpherence/update.css' => 'faf6be09',
Expand Down Expand Up @@ -509,7 +509,7 @@
'config-welcome-css' => '6abd79be',
'conpherence-durable-column-view' => '86396117',
'conpherence-menu-css' => 'f99fee4c',
'conpherence-message-pane-css' => 'dd4f8a3b',
'conpherence-message-pane-css' => '5897d3ac',
'conpherence-notification-css' => '6cdcc253',
'conpherence-thread-manager' => '01774ab2',
'conpherence-transaction-css' => '85d0974c',
Expand Down
9 changes: 8 additions & 1 deletion src/applications/conpherence/view/ConpherenceLayoutView.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,11 @@ public function render() {
'hasWidgets' => false,
));

$class = null;
if (!$this->getUser()->isLoggedIn()) {
$class = 'conpherence-logged-out';
}

$this->initBehavior(
'conpherence-widget-pane',
ConpherenceWidgetConfigConstants::getWidgetPaneBehaviorConfig());
Expand All @@ -99,7 +104,9 @@ public function render() {
array(
'id' => $layout_id,
'sigil' => 'conpherence-layout',
'class' => 'conpherence-layout conpherence-role-'.$this->role,
'class' => 'conpherence-layout '.
$class.
' conpherence-role-'.$this->role,
),
array(
javelin_tag(
Expand Down
8 changes: 6 additions & 2 deletions webroot/rsrc/css/application/conpherence/message-pane.css
Original file line number Diff line number Diff line change
Expand Up @@ -54,13 +54,17 @@
position: fixed;
left: 241px;
right: 241px;
top: 76px;
top: 78px;
bottom: 172px;
overflow-x: hidden;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
}

.conpherence-logged-out .conpherence-message-pane .conpherence-messages {
bottom: 42px;
}

.page-has-warning .conpherence-message-pane .conpherence-messages {
top: 110px;
}
Expand Down Expand Up @@ -114,7 +118,7 @@
}

.conpherence-message-pane .phui-form-view.login-to-participate {
height: 28px;
height: 26px;
}

.conpherence-message-pane .login-to-participate a.button {
Expand Down

0 comments on commit a339e6d

Please sign in to comment.