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

Conpherence - fix a few bugs

Browse source 
Summary: Fixes T3280 - when a pontificate brought back multiple transactions, we were rendering a comma. Yay hsprintf. Also fixes the noconpherences view, which broke at some point recently.

Test Plan: sent comment, then replied from different browser. when both comments loaded noted no comma. loaded a conpherence view with no conpherences and verified it looked good.

Reviewers: epriestley

Reviewed By: epriestley

CC: aran, Korvin, chad

Maniphest Tasks: T3280

Differential Revision: https://secure.phabricator.com/D6079
This commit is contained in:
Bob Trahan 2013-05-30 12:42:55 -07:00
parent 6008559b35
commit cf5009d5fb
6 changed files with 39 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/__celerity_resource_map__.php
View file

@ -918,7 +918,7 @@ celerity_register_resource_map(array(
),
'conpherence-menu-css' =>
array(
'uri' => '/res/60f38fbd/rsrc/css/application/conpherence/menu.css',
'uri' => '/res/61b6e414/rsrc/css/application/conpherence/menu.css',
'type' => 'css',
'requires' =>
array(
@ -927,7 +927,7 @@ celerity_register_resource_map(array(
),
'conpherence-message-pane-css' =>
array(
'uri' => '/res/d9e90066/rsrc/css/application/conpherence/message-pane.css',
'uri' => '/res/cbd704df/rsrc/css/application/conpherence/message-pane.css',
'type' => 'css',
'requires' =>
array(
@ -1294,7 +1294,7 @@ celerity_register_resource_map(array(
),
'javelin-behavior-conpherence-menu' =>
array(
'uri' => '/res/87e901c2/rsrc/js/application/conpherence/behavior-menu.js',
'uri' => '/res/567585ab/rsrc/js/application/conpherence/behavior-menu.js',
'type' => 'js',
'requires' =>
array(

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

@ -320,7 +320,7 @@ final class ConpherenceUpdateController
}
$content = array(
'transactions' => $rendered_transactions,
'transactions' => hsprintf('%s', $rendered_transactions),
'latest_transaction_id' => $new_latest_transaction_id,
'nav_item' => hsprintf('%s', $nav_item),
'conpherence_phid' => $conpherence->getPHID(),

16
src/applications/conpherence/view/ConpherenceLayoutView.php
View file

@ -155,6 +155,14 @@ final class ConpherenceLayoutView extends AphrontView {
'class' => 'conpherence-content-pane',
),
array(
javelin_tag(
'div',
array(
'class' => 'conpherence-header-pane',
'id' => 'conpherence-header-pane',
'sigil' => 'conpherence-header-pane',
),
nonempty($this->header, '')),
javelin_tag(
'div',
array(
@ -178,14 +186,6 @@ final class ConpherenceLayoutView extends AphrontView {
),
pht('Send a Message'))
)),
javelin_tag(
'div',
array(
'class' => 'conpherence-header-pane',
'id' => 'conpherence-header-pane',
'sigil' => 'conpherence-header-pane',
),
nonempty($this->header, '')),
javelin_tag(
'div',
array(

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

@ -11,10 +11,20 @@
}
.conpherence-layout .conpherence-no-threads {
height 80%;
width: 80%;
padding: 10%;
text-align: center;
position: fixed;
left: 280px;
right: 241px;
top: 76px;
bottom: 0px;
min-width: 300px;
width: auto;
}
.device .conpherence-layout .conpherence-no-threads {
left: 0;
right: 0;
width: 100%;
}
.conpherence-layout .conpherence-no-threads .text {

14
webroot/rsrc/css/application/conpherence/message-pane.css
View file

@ -4,7 +4,8 @@
.conpherence-message-pane,
.loading .messages-loading-mask,
.loading .messages-loading-icon {
.loading .messages-loading-icon,
.conpherence-layout .conpherence-no-threads {
position: fixed;
left: 280px;
right: 241px;
@ -16,12 +17,21 @@
.device .conpherence-message-pane,
.device .loading .messages-loading-mask,
.device .loading .messages-loading-icon {
.device .loading .messages-loading-icon,
.device .conpherence-layout .conpherence-no-threads {
left: 0;
right: 0;
width: 100%;
}
.conpherence-layout .conpherence-no-threads {
text-align: center;
}
.conpherence-layout .conpherence-no-threads .text {
margin: 16px 0px 16px 0px;
}
.conpherence-show-older-messages {
display: block;
background: #e0e3ec;

2
webroot/rsrc/js/application/conpherence/behavior-menu.js
View file

@ -451,6 +451,8 @@ JX.behavior('conpherence-menu', function(config) {
} else {
var nothreads = JX.DOM.find(layout, 'div', 'conpherence-no-threads');
nothreads.style.display = 'block';
markThreadLoading(false);
markWidgetLoading(false);
}
}
}