revi-archive/phorge-phorge
1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-26 16:52:41 +01:00
Code Issues Releases Wiki Activity

Add Room Image to Conpherence header

Browse source 
Summary: This adds the room image to the main header in full Conpherence. It's nice, plus I plan to move the image edit workflow to it to simplify the move to EditEngine. I plan to build some default images for Conpherence which should be better about denoting the room, not just the last person writing.

Test Plan: Click on lots of rooms with and without topics.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D16666
This commit is contained in:
Chad Little 2016-10-04 16:15:52 -07:00
parent a3b2e422fe
commit 02b5a2b39b
3 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
resources/celerity/map.php
View file

@ -7,7 +7,7 @@
*/ */
return array( return array(
'names' => array( 'names' => array(
'conpherence.pkg.css' => 'd2356a2b', 'conpherence.pkg.css' => '3c08b01f',
'conpherence.pkg.js' => '11f3e07e', 'conpherence.pkg.js' => '11f3e07e',
'core.pkg.css' => '3fa66cb3', 'core.pkg.css' => '3fa66cb3',
'core.pkg.js' => '30185d95', 'core.pkg.js' => '30185d95',
@ -47,7 +47,7 @@ return array(
'rsrc/css/application/config/setup-issue.css' => 'f794cfc3', 'rsrc/css/application/config/setup-issue.css' => 'f794cfc3',
'rsrc/css/application/config/unhandled-exception.css' => '4c96257a', 'rsrc/css/application/config/unhandled-exception.css' => '4c96257a',
'rsrc/css/application/conpherence/durable-column.css' => '44bcaa19', 'rsrc/css/application/conpherence/durable-column.css' => '44bcaa19',
'rsrc/css/application/conpherence/header-pane.css' => '517de9fe', 'rsrc/css/application/conpherence/header-pane.css' => '6a032d4c',
'rsrc/css/application/conpherence/menu.css' => '4f51db5a', 'rsrc/css/application/conpherence/menu.css' => '4f51db5a',
'rsrc/css/application/conpherence/message-pane.css' => '0d7dff02', 'rsrc/css/application/conpherence/message-pane.css' => '0d7dff02',
'rsrc/css/application/conpherence/notification.css' => '965db05b', 'rsrc/css/application/conpherence/notification.css' => '965db05b',
@ -619,7 +619,7 @@ return array(
'config-options-css' => '0ede4c9b', 'config-options-css' => '0ede4c9b',
'config-page-css' => '8798e14f', 'config-page-css' => '8798e14f',
'conpherence-durable-column-view' => '44bcaa19', 'conpherence-durable-column-view' => '44bcaa19',
'conpherence-header-pane-css' => '517de9fe', 'conpherence-header-pane-css' => '6a032d4c',
'conpherence-menu-css' => '4f51db5a', 'conpherence-menu-css' => '4f51db5a',
'conpherence-message-pane-css' => '0d7dff02', 'conpherence-message-pane-css' => '0d7dff02',
'conpherence-notification-css' => '965db05b', 'conpherence-notification-css' => '965db05b',

2
src/applications/conpherence/controller/ConpherenceController.php
View file

@ -59,7 +59,7 @@ abstract class ConpherenceController extends PhabricatorController {
$header = id(new PHUIHeaderView()) $header = id(new PHUIHeaderView())
->setHeader($data['title']) ->setHeader($data['title'])
->setSubheader($data['topic']) ->setSubheader($data['topic'])
->addClass((!$data['topic']) ? 'conpherence-no-topic' : null); ->setImage($data['image']);
$can_edit = PhabricatorPolicyFilter::hasCapability( $can_edit = PhabricatorPolicyFilter::hasCapability(
$viewer, $viewer,

21
webroot/rsrc/css/application/conpherence/header-pane.css
View file

@ -2,9 +2,6 @@
* @provides conpherence-header-pane-css * @provides conpherence-header-pane-css
*/ */
.conpherence-header-pane {
}
.conpherence-header-pane .phui-header-shell { .conpherence-header-pane .phui-header-shell {
padding: 8px 16px 10px; padding: 8px 16px 10px;
min-height: 38px; min-height: 38px;
@ -23,8 +20,22 @@
margin: 0; margin: 0;
} }
.conpherence-header-pane .phui-header-shell.conpherence-no-topic { .conpherence-header-pane .phui-header-col1 {
padding: 15px 16px 5px; width: 46px;
height: 35px;
}
.conpherence-header-pane .phui-header-image {
height: 35px;
width: 35px;
background-size: 35px;
position: absolute;
top: 4px;
left: 0;
}
.conpherence-header-pane .phui-header-col2 {
height: 40px;
} }
.conpherence-header-pane .phui-header-action-list .phui-header-action-item .conpherence-header-pane .phui-header-action-list .phui-header-action-item