Page MenuHomePhabricator
Files F15340998

D16528.diff
No OneTemporary
Actions

D16528.diff
View Options

diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -45,8 +45,8 @@
'rsrc/css/application/config/setup-issue.css' => 'f794cfc3',
'rsrc/css/application/config/unhandled-exception.css' => '4c96257a',
'rsrc/css/application/conpherence/durable-column.css' => '86396117',
- 'rsrc/css/application/conpherence/menu.css' => '90bdf85c',
- 'rsrc/css/application/conpherence/message-pane.css' => '5c7b7b17',
+ 'rsrc/css/application/conpherence/menu.css' => '26283353',
+ 'rsrc/css/application/conpherence/message-pane.css' => '8b994132',
'rsrc/css/application/conpherence/notification.css' => '6cdcc253',
'rsrc/css/application/conpherence/transaction.css' => '85d0974c',
'rsrc/css/application/conpherence/update.css' => 'faf6be09',
@@ -549,8 +549,8 @@
'config-options-css' => '0ede4c9b',
'config-page-css' => '8798e14f',
'conpherence-durable-column-view' => '86396117',
- 'conpherence-menu-css' => '90bdf85c',
- 'conpherence-message-pane-css' => '5c7b7b17',
+ 'conpherence-menu-css' => '26283353',
+ 'conpherence-message-pane-css' => '8b994132',
'conpherence-notification-css' => '6cdcc253',
'conpherence-thread-manager' => '01774ab2',
'conpherence-transaction-css' => '85d0974c',
diff --git a/src/applications/conpherence/controller/ConpherenceController.php b/src/applications/conpherence/controller/ConpherenceController.php
--- a/src/applications/conpherence/controller/ConpherenceController.php
+++ b/src/applications/conpherence/controller/ConpherenceController.php
@@ -36,6 +36,13 @@
protected function buildConpherenceApplicationCrumbs($is_rooms = false) {
$crumbs = parent::buildApplicationCrumbs();
+ $crumbs->setBorder(true);
+
+ $crumbs->addAction(
+ id(new PHUIListItemView())
+ ->setName(pht('Search'))
+ ->setHref($this->getApplicationURI('search/'))
+ ->setIcon('fa-search'));
if ($is_rooms) {
$crumbs
diff --git a/src/applications/conpherence/view/ConpherenceLayoutView.php b/src/applications/conpherence/view/ConpherenceLayoutView.php
--- a/src/applications/conpherence/view/ConpherenceLayoutView.php
+++ b/src/applications/conpherence/view/ConpherenceLayoutView.php
@@ -148,6 +148,13 @@
javelin_tag(
'a',
array(
+ 'href' => '/conpherence/search/',
+ 'class' => 'button grey mlr',
+ ),
+ pht('Join a Room')),
+ javelin_tag(
+ 'a',
+ array(
'href' => '/conpherence/new/',
'class' => 'button grey',
'sigil' => 'workflow',
diff --git a/src/applications/conpherence/view/ConpherenceMenuItemView.php b/src/applications/conpherence/view/ConpherenceMenuItemView.php
--- a/src/applications/conpherence/view/ConpherenceMenuItemView.php
+++ b/src/applications/conpherence/view/ConpherenceMenuItemView.php
@@ -63,9 +63,11 @@
}
protected function getTagAttributes() {
- $classes = array('conpherence-menu-item-view');
+ $classes = array();
+ $classes[] = 'conpherence-menu-item-view';
+ $classes[] = 'phui-list-item-href';
return array(
- 'class' => $classes,
+ 'class' => implode(' ', $classes),
'href' => $this->href,
);
}
diff --git a/src/applications/conpherence/view/ConpherenceThreadListView.php b/src/applications/conpherence/view/ConpherenceThreadListView.php
--- a/src/applications/conpherence/view/ConpherenceThreadListView.php
+++ b/src/applications/conpherence/view/ConpherenceThreadListView.php
@@ -31,6 +31,9 @@
$this->addRoomsToMenu($menu, $this->threads, $policy_objects);
+ $menu = phutil_tag_div('phabricator-side-menu', $menu);
+ $menu = phutil_tag_div('phui-basic-nav', $menu);
+
return $menu;
}
@@ -99,11 +102,6 @@
$header = $this->renderMenuItemHeader(
pht('Rooms'),
'conpherence-room-list-header');
- $header->appendChild(
- id(new PHUIIconView())
- ->setIcon('fa-search')
- ->setHref('/conpherence/search/')
- ->setText(pht('Search')));
$menu->addMenuItem($header);
if (empty($rooms)) {
diff --git a/webroot/rsrc/css/application/conpherence/menu.css b/webroot/rsrc/css/application/conpherence/menu.css
--- a/webroot/rsrc/css/application/conpherence/menu.css
+++ b/webroot/rsrc/css/application/conpherence/menu.css
@@ -15,7 +15,7 @@
text-align: center;
position: fixed;
left: 240px;
- right: 241px;
+ right: 240px;
top: 76px;
bottom: 0px;
min-width: 300px;
@@ -39,10 +39,14 @@
overflow-y: auto;
top: 0;
bottom: 0;
- background: #f7f7f7;
- border-right: 1px solid {$lightblueborder}
+ background-color: {$page.sidenav};
}
+.conpherence-menu-pane .phui-basic-nav .phabricator-side-menu
+ .phui-list-item-href {
+ padding: 4px 0 4px 8px;
+ }
+
.conpherence-menu-pane .phui-list-item-view.hidden {
display: none;
}
@@ -69,7 +73,8 @@
}
.device-desktop .conpherence-layout .conpherence-menu-pane {
- width: 240px;
+ width: 232px;
+ padding-right: 8px;
}
.device .conpherence-menu-pane {
@@ -89,7 +94,7 @@
}
.device-desktop .conpherence-content-pane {
- margin-left: 241px;
+ margin-left: 240px;
}
.conpherence-content-pane {
diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css
--- a/webroot/rsrc/css/application/conpherence/message-pane.css
+++ b/webroot/rsrc/css/application/conpherence/message-pane.css
@@ -7,8 +7,8 @@
.loading .messages-loading-icon,
.conpherence-layout .conpherence-no-threads {
position: fixed;
- left: 241px;
- right: 241px;
+ left: 240px;
+ right: 240px;
top: 76px;
bottom: 0px;
min-width: 300px;
@@ -52,8 +52,8 @@
.conpherence-message-pane .conpherence-messages {
position: fixed;
- left: 241px;
- right: 241px;
+ left: 240px;
+ right: 240px;
top: 78px;
bottom: 172px;
overflow-x: hidden;
@@ -109,7 +109,7 @@
position: fixed;
bottom: 0;
border-top: 1px solid {$thinblueborder};
- left: 241px;
+ left: 240px;
right: 241px;
}

File Metadata

Mime Type
text/plain
Expires
Mon, Mar 10, 5:55 PM (1 d, 7 h ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7462524
Default Alt Text
D16528.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility