Page MenuHomestyx hydra

No OneTemporary

diff --git a/src/applications/conpherence/view/ConpherenceLayoutView.php b/src/applications/conpherence/view/ConpherenceLayoutView.php
index 6b29921bc3..7f682799b8 100644
--- a/src/applications/conpherence/view/ConpherenceLayoutView.php
+++ b/src/applications/conpherence/view/ConpherenceLayoutView.php
@@ -1,234 +1,234 @@
<?php
final class ConpherenceLayoutView extends AphrontView {
private $thread;
private $baseURI;
private $threadView;
private $role;
private $header;
private $messages;
private $replyForm;
public function setMessages($messages) {
$this->messages = $messages;
return $this;
}
public function setReplyForm($reply_form) {
$this->replyForm = $reply_form;
return $this;
}
public function setHeader($header) {
$this->header = $header;
return $this;
}
public function setRole($role) {
$this->role = $role;
return $this;
}
public function getThreadView() {
return $this->threadView;
}
public function setBaseURI($base_uri) {
$this->baseURI = $base_uri;
return $this;
}
public function setThread(ConpherenceThread $thread) {
$this->thread = $thread;
return $this;
}
public function setThreadView(ConpherenceThreadListView $thead_view) {
$this->threadView = $thead_view;
return $this;
}
public function render() {
require_celerity_resource('conpherence-menu-css');
require_celerity_resource('conpherence-message-pane-css');
require_celerity_resource('conpherence-widget-pane-css');
$layout_id = celerity_generate_unique_node_id();
$selected_id = null;
$selected_thread_id = null;
if ($this->thread) {
$selected_id = $this->thread->getPHID() . '-nav-item';
$selected_thread_id = $this->thread->getID();
}
Javelin::initBehavior('conpherence-menu',
array(
'baseURI' => $this->baseURI,
'layoutID' => $layout_id,
'selectedID' => $selected_id,
'selectedThreadID' => $selected_thread_id,
'role' => $this->role,
'hasThreadList' => (bool)$this->threadView,
'hasThread' => (bool)$this->messages,
'hasWidgets' => false,
));
Javelin::initBehavior(
'conpherence-widget-pane',
array(
'widgetBaseUpdateURI' => $this->baseURI . 'update/',
'widgetRegistry' => array(
'conpherence-message-pane' => array(
'name' => pht('Thread'),
'deviceOnly' => true,
'hasCreate' => false
),
'widgets-people' => array(
'name' => pht('Participants'),
'deviceOnly' => false,
'hasCreate' => true,
'createData' => array(
'refreshFromResponse' => true,
'action' => ConpherenceUpdateActions::ADD_PERSON,
'customHref' => null
)
),
'widgets-files' => array(
'name' => pht('Files'),
'deviceOnly' => false,
'hasCreate' => false
),
'widgets-calendar' => array(
'name' => pht('Calendar'),
'deviceOnly' => false,
'hasCreate' => true,
'createData' => array(
'refreshFromResponse' => false,
'action' => ConpherenceUpdateActions::ADD_STATUS,
'customHref' => '/calendar/status/create/'
)
),
'widgets-settings' => array(
'name' => pht('Settings'),
'deviceOnly' => false,
'hasCreate' => false
),
)));
return javelin_tag(
'div',
array(
'id' => $layout_id,
'sigil' => 'conpherence-layout',
'class' => 'conpherence-layout conpherence-role-'.$this->role,
),
array(
javelin_tag(
'div',
array(
'class' => 'phabricator-nav-column-background',
'sigil' => 'phabricator-nav-column-background',
),
''),
javelin_tag(
'div',
array(
'id' => 'conpherence-menu-pane',
'class' => 'conpherence-menu-pane phabricator-side-menu',
'sigil' => 'conpherence-menu-pane',
),
$this->threadView),
javelin_tag(
'div',
array(
'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(
'class' => 'conpherence-no-threads',
'sigil' => 'conpherence-no-threads',
'style' => 'display: none;',
),
array(
phutil_tag(
'div',
array(
'class' => 'text'
),
pht('You do not have any messages yet.')),
javelin_tag(
'a',
array(
'href' => '/conpherence/new/',
- 'class' => 'button',
+ 'class' => 'button grey',
'sigil' => 'workflow',
),
pht('Send a Message'))
)),
javelin_tag(
'div',
array(
'class' => 'conpherence-widget-pane',
'id' => 'conpherence-widget-pane',
'sigil' => 'conpherence-widget-pane',
),
array(
phutil_tag(
'div',
array(
'class' => 'widgets-loading-mask'
),
''),
javelin_tag(
'div',
array(
'sigil' => 'conpherence-widgets-holder'
),
''))),
javelin_tag(
'div',
array(
'class' => 'conpherence-message-pane',
'id' => 'conpherence-message-pane',
'sigil' => 'conpherence-message-pane'
),
array(
javelin_tag(
'div',
array(
'class' => 'conpherence-messages',
'id' => 'conpherence-messages',
'sigil' => 'conpherence-messages',
),
nonempty($this->messages, '')),
phutil_tag(
'div',
array(
'class' => 'messages-loading-mask',
),
''),
javelin_tag(
'div',
array(
'id' => 'conpherence-form',
'sigil' => 'conpherence-form'
),
nonempty($this->replyForm, ''))
)),
)),
));
}
}
diff --git a/webroot/rsrc/css/application/conpherence/message-pane.css b/webroot/rsrc/css/application/conpherence/message-pane.css
index 0fcb81d04a..757d315f7c 100644
--- a/webroot/rsrc/css/application/conpherence/message-pane.css
+++ b/webroot/rsrc/css/application/conpherence/message-pane.css
@@ -1,225 +1,224 @@
/**
* @provides conpherence-message-pane-css
*/
.conpherence-message-pane,
.loading .messages-loading-mask,
.loading .messages-loading-icon,
.conpherence-layout .conpherence-no-threads {
position: fixed;
left: 280px;
right: 241px;
top: 76px;
bottom: 0px;
min-width: 300px;
width: auto;
}
.device .conpherence-message-pane,
.device .loading .messages-loading-mask,
.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;
margin: 10px;
text-align: center;
padding: 10px;
color: #18559D;
}
.conpherence-show-older-messages-loading {
font-style: italic;
}
.conpherence-message-pane .conpherence-messages {
position: fixed;
left: 280px;
right: 241px;
top: 76px;
bottom: 190px;
overflow-y: auto;
box-shadow: inset 1px 4px 5px rgba(0,0,0,0.1);
-webkit-overflow-scrolling: touch;
}
.device .conpherence-message-pane .conpherence-messages {
left: 0;
right: 0;
bottom: 3em;
width: 100%;
box-shadow: none;
}
.conpherence-message-pane .messages-loading-mask {
opacity: .6;
background: #fff;
display: none;
}
.loading .messages-loading-mask {
display: block;
- z-index: 500;
}
.conpherence-message-pane .phabricator-form-view {
border-width: 0;
background: none;
height: 190px;
padding: 0;
position: fixed;
bottom: 0;
left: 280px;
right: 241px;
}
.device .conpherence-message-pane .remarkup-assist-bar {
height: 0px;
}
.device .conpherence-message-pane .phabricator-form-view {
left: 0;
right: 0;
background-color: #d8dce2;
height: 3em;
width: 100%;
}
.conpherence-layout .conpherence-message-pane .phabricator-form-view
div.aphront-form-input {
margin: 0;
width: 100%;
}
.conpherence-message-pane .phabricator-transaction-view {
margin: 5px 15px;
background-size: 35px;
min-height: auto;
}
.device-phone .conpherence-message-pane .phabricator-transaction-view {
margin: 0 10px 0 0;
}
.conpherence-message-pane .phabricator-transaction-detail {
border-width: 0;
margin-left: 45px;
}
.conpherence-message-pane .date-marker {
border-top: 1px solid #d7d7d7;
margin: 5px 15px;
min-height: auto;
}
.conpherence-message-pane .date-marker .date {
position: relative;
top: -8px;
left: 40px;
background-color: #FFF;
color: #bfbfbf;
font-size: 11px;
padding: 0px 5px;
}
.device-phone .conpherence-message-pane .phabricator-transaction-detail {
min-height: auto;
}
.conpherence-message-pane .conpherence-edited {
color: #888;
margin: 0;
}
.device-phone .conpherence-message-pane .conpherence-edited {
color: #888;
margin: 0 10px;
}
.conpherence-message-pane .conpherence-edited .phabricator-transaction-content {
padding: 0 0 5px 45px;
font-style: italic;
}
.device-phone .conpherence-message-pane .conpherence-edited .phabricator-transaction-content {
padding: 0 0 5px 35px;
}
.conpherence-message-pane .phabricator-transaction-info,
.conpherence-message-pane .phabricator-content-source-view {
color: #b7b7b7;
line-height: 16px;
}
.conpherence-message-pane .phabricator-transaction-header,
.conpherence-message-pane .phabricator-transaction-info,
.conpherence-message-pane .phabricator-transaction-content {
background: none;
padding: 0;
}
.conpherence-message-pane .phabricator-transaction-content {
padding: 2px 0 8px 0;
}
.conpherence-message-pane .aphront-form-control {
padding: 0;
}
.conpherence-message-pane .aphront-form-control-submit {
margin-right: 8px;
}
.conpherence-message-pane .remarkup-assist-bar {
border-width: 1px 0 0;
border-color: #CCC;
border-bottom: transparent;
}
.conpherence-message-pane .remarkup-assist-textarea {
height: 124px;
padding: 6px;
border-width: 0 0 1px 0;
border-color: #e7e7e7;
box-sizing: border-box;
-moz-box-sizing: border-box;
-webkit-box-sizing: border-box;
resize: none;
}
.device .conpherence-message-pane .remarkup-assist-textarea {
margin: 0.5em 0em 0em 2%;
padding: 6px 1%;
width: 98%;
height: 2em;
resize: none;
}
.conpherence-message-pane .remarkup-assist-textarea:focus {
outline: none;
}
.device .conpherence-message-pane .aphront-form-control-textarea {
float: left;
height: 2em;
}
.device-tablet .conpherence-message-pane .aphront-form-control-textarea {
width: 76%;
}
.device-phone .conpherence-message-pane .aphront-form-control-textarea {
width: 63%;
}
.device .conpherence-message-pane .aphront-form-control-submit button {
margin: 0.6em 0 0 2%;
}
diff --git a/webroot/rsrc/css/application/conpherence/widget-pane.css b/webroot/rsrc/css/application/conpherence/widget-pane.css
index d7479c76d4..513e2eb85a 100644
--- a/webroot/rsrc/css/application/conpherence/widget-pane.css
+++ b/webroot/rsrc/css/application/conpherence/widget-pane.css
@@ -1,382 +1,381 @@
/**
* @provides conpherence-widget-pane-css
*/
.conpherence-widget-pane,
.loading .widgets-loading-mask {
position: fixed;
right: 0px;
top: 76px;
bottom: 0px;
width: 240px;
border-width: 0 0 0 1px;
border-color: #CCC;
border-style: solid;
overflow-y: auto;
-webkit-overflow-scrolling: touch;
}
.device .conpherence-widget-pane,
.device .loading .widgets-loading-mask {
top: 44px;
width: 100%;
}
.conpherence-widget-pane .widgets-loading-mask {
opacity: .6;
background: #fff;
display: none;
}
.loading .widgets-loading-mask {
display: block;
- z-index: 500;
}
.conpherence-widget-pane .aphront-form-input {
margin: 0;
width: 100%;
}
.conpherence-widget-pane .aphront-form-inset {
border: 0;
}
.conpherence-widget-pane .widgets-header {
background: #F5F5F5;
border-bottom: 1px solid #ccc;
}
.device .conpherence-widget-pane .widgets-header {
display: none;
}
.conpherence-widget-pane .widgets-header .caret {
float: none;
height: 0px;
width: 0px;
margin-right: 0px;
border-top-color: #000;
}
.device-desktop .conpherence-layout .device-widgets-selector {
display: none;
}
.dropdown-menu-frame {
width: 200px !important;
margin-top: 4px;
}
.conpherence-widget-pane .widgets-body {
position: fixed;
overflow-y: auto;
bottom: 0px;
width: 100%;
top: 76px;
}
#widgets-settings {
padding: 3px 6px;
}
.device-desktop .conpherence-widget-pane .widgets-body {
top: 108px;
width: 240px;
}
/* files widget */
.conpherence-widget-pane #widgets-files .no-files {
width: 200px;
padding: 20px;
text-align: center;
color: #555;
}
.device .conpherence-widget-pane #widgets-files .no-files {
width: 60px;
margin: 0px auto 0px auto;
}
.conpherence-widget-pane #widgets-files .file-entry {
padding: 10px 0;
margin: 0 5px 0 10px;
border-bottom: 1px solid #e7e7e7;
}
.conpherence-widget-pane #widgets-files .file-icon {
width: 32px;
height: 32px;
float: left;
}
.conpherence-widget-pane #widgets-files .file-title {
display: block;
position: relative;
top: -4px;
left: 10px;
overflow-x: hidden;
width: 165px;
font-weight: bold;
text-overflow: ellipsis;
}
.conpherence-widget-pane #widgets-files .file-uploaded-by {
color: #a1a5a9;
position: relative;
top: 0px;
left: 10px;
width: 170px;
font-size: 11px;
}
.device .conpherence-widget-pane #widgets-files .file-title,
.device .conpherence-widget-pane #widgets-files .file-uploaded-by {
width: 82%;
}
.device .conpherence-widget-pane #widgets-files .divider {
width: 80%;
margin: 8px 0px 0px 10%;
}
/* calendar widget */
.conpherence-widget-pane #widgets-calendar .aphront-multi-column-view {
width: 240px;
}
.device-phone .conpherence-widget-pane #widgets-calendar
.aphront-multi-column-view {
display: none;
}
.device-tablet .conpherence-widget-pane #widgets-calendar
.aphront-multi-column-view {
width: 100%;
}
.conpherence-widget-pane #widgets-calendar .aphront-multi-column-view
.aphront-multi-column-column {
background: white;
border-right: 1px solid #bfbfbf;
text-align: center;
}
.device-phone .conpherence-widget-pane #widgets-calendar
.aphront-multi-column-view .aphront-multi-column-column {
border-right: 0;
}
.device-phone .conpherence-widget-pane #widgets-calendar
.aphront-multi-column-fluid .aphront-multi-column-5-up
.aphront-multi-column-column-outer {
width: 20%;
margin-bottom: 0px;
float: left;
clear: none;
}
.conpherence-widget-pane .no-events {
color: #999;
}
.conpherence-widget-pane #widgets-calendar .aphront-multi-column-view
.aphront-multi-column-column-last {
border-right: 0;
}
.conpherence-widget-pane #widgets-calendar .aphront-multi-column-view
.aphront-multi-column-column .day-column,
.conpherence-widget-pane #widgets-calendar .aphront-multi-column-view
.aphront-multi-column-column .day-column-active {
color: #bfbfbf;
background-color: white;
font-weight: bold;
padding: 0px 0px 10px 0px;
}
.conpherence-widget-pane #widgets-calendar .aphront-multi-column-view
.aphront-multi-column-column .day-column-active {
color: black;
}
.conpherence-widget-pane #widgets-calendar .aphront-multi-column-view
.aphront-multi-column-column .present ,
.conpherence-widget-pane #widgets-calendar .aphront-multi-column-view
.aphront-multi-column-column .sporadic ,
.conpherence-widget-pane #widgets-calendar .aphront-multi-column-view
.aphront-multi-column-column .away {
height: 10px;
margin: 5px 0px 5px 0px;
width: 100%;
}
.conpherence-widget-pane #widgets-calendar .aphront-multi-column-view
.aphront-multi-column-column .present {
background-color: white;
}
.conpherence-widget-pane #widgets-calendar .aphront-multi-column-view
.aphront-multi-column-column .sporadic {
background-color: rgb(222, 226, 232);
}
.conpherence-widget-pane #widgets-calendar .aphront-multi-column-view
.aphront-multi-column-column .away {
background-color: rgb(102, 204, 255);
}
.conpherence-widget-pane #widgets-calendar .aphront-multi-column-view
.day-name {
padding: 5px 0px 0px 0px;
font-size: 12px;
}
.conpherence-widget-pane #widgets-calendar .aphront-multi-column-view
.day-number {
font-size: 16px;
padding: 0 0 5px 0;
}
.conpherence-widget-pane #widgets-calendar .day-header {
overflow: hidden;
background-image: linear-gradient(to bottom, #ffffff, #e6e6e6);
background-image: -webkit-linear-gradient(top, #ffffff, #e6e6e6);
border-top: 1px solid #e7e7e7;
border-bottom: 1px solid #d7d7d7;
padding: 5px 10px 5px 10px;
}
.conpherence-widget-pane #widgets-calendar .day-header.today {
background-image: linear-gradient(to bottom, #3b86c4, #2b628f);
background-image: -webkit-linear-gradient(top, #3b86c4, #2b628f);
border-top: none;
border-bottom: none;
}
.conpherence-widget-pane #widgets-calendar .day-header.today .day-name,
.conpherence-widget-pane #widgets-calendar .day-header.today .day-date {
color: #fff;
}
.conpherence-widget-pane #widgets-calendar .day-header .day-name {
float: left;
color: #555759;
font-weight: bold;
text-transform: uppercase;
font-size: 11px;
}
.conpherence-widget-pane #widgets-calendar .day-header .day-date {
float: right;
color: #555759;
font-size: 11px;
}
.conpherence-widget-pane #widgets-calendar .top-border {
border-top: 1px solid #E7E7E7;
}
.conpherence-widget-pane #widgets-calendar .user-status {
padding: 10px 0px 10px 0px;
margin: 0px 0px 0px 10px;
}
.conpherence-widget-pane #widgets-calendar .user-status .icon {
border-radius: 8px;
height: 14px;
width: 14px;
margin-top: 7px;
float: left;
}
.conpherence-widget-pane #widgets-calendar .sporadic .icon {
background-color: rgb(222, 226, 232);
}
.conpherence-widget-pane #widgets-calendar .away .icon {
background-color: rgb(102, 204, 255);
}
.conpherence-widget-pane #widgets-calendar .user-status .description {
width: 195px;
text-overflow: ellipsis;
margin: 0 0 0px 20px;
}
.conpherence-widget-pane #widgets-calendar .user-status .participant {
font-size: 11px;
color: #888;
padding-top: 2px;
}
.device .conpherence-widget-pane #widgets-calendar .user-status .description,
.device .conpherence-widget-pane #widgets-calendar .user-status .participant {
/* we keep these short so no need to change the width */
}
.conpherence-widget-pane .widget-icon {
display: block;
height: 14px;
width: 14px;
}
.conpherence-widget-pane .phabricator-remarkup-embed-layout-link {
padding-bottom: 1px;
}
/* people widget */
.conpherence-widget-pane .people-widget-header .add-people-widget {
padding: 10px 0 5px 0;
overflow: hidden;
}
.conpherence-widget-pane .people-widget-header .add-people-widget
.aphront-form-control-tokenizer {
float: left;
width: 150px;
padding: 0px 0px 0px 10px
}
.device .conpherence-widget-pane .people-widget-header .add-people-widget
.aphront-form-control-tokenizer {
width: 70%;
}
.conpherence-widget-pane .people-widget-header .add-people-widget
.people-add-button {
float: right;
margin: 2px 8px 0px 0px;
padding: 3px 16px 4px 16px;
}
.conpherence-widget-pane .person-entry {
padding: 8px 0 0 8px;
}
.conpherence-widget-pane .person-entry a {
float: left;
font-weight: bold;
line-height: 20px;
}
.conpherence-widget-pane .person-entry a img {
height: 35px;
width: 35px;
}
.conpherence-widget-pane .person-entry .pic {
float: left;
margin: 0 8px 0 0;
width: 35px;
padding: 0;
}
.conpherence-widget-pane .person-entry .remove {
float: right;
width: 20px;
font-size: 18px;
padding: 5px 0 8px 0;
}
.conpherence-widget-pane .person-entry .remove:hover {
text-decoration: none;
}
.conpherence-widget-pane .person-entry .remove .close-icon {
color: #bfbfbf;
}
.conpherence-widget-pane .person-entry .remove:hover .close-icon {
color: #000;
}
/* settings widget */
.conpherence-widget-pane .title-update,
.conpherence-widget-pane .notifications-update {
margin: 3px 0px 0px 4px;
}
diff --git a/webroot/rsrc/css/core/z-index.css b/webroot/rsrc/css/core/z-index.css
index cb525d95de..685e810f9b 100644
--- a/webroot/rsrc/css/core/z-index.css
+++ b/webroot/rsrc/css/core/z-index.css
@@ -1,129 +1,138 @@
/**
* @provides phabricator-zindex-css
*/
.keyboard-focus-focus-reticle {
z-index: 1;
}
.device-desktop .phabricator-timeline-minor-event .phabricator-timeline-image {
z-index: 2;
}
.differential-reticle {
z-index: 2;
}
.differential-changeset {
z-index: 2;
}
.pholio-new-inline-comment {
z-index: 2;
}
.phabricator-timeline-icon-fill {
z-index: 3;
}
.phabricator-nav-column-background {
z-index: 3;
}
.phabricator-nav-local {
z-index: 4;
}
+.conpherence-layout .conpherence-no-threads {
+ z-index: 4;
+}
+
.conpherence-menu-pane {
z-index: 4;
}
.phabricator-nav-drag {
z-index: 4;
}
+.loading .messages-loading-mask,
+.loading .widgets-loading-mask {
+ z-index: 5;
+}
+
.dark-console {
z-index: 5;
}
.drag-dragging {
z-index: 5;
}
.phabricator-crumbs-view {
z-index: 3;
}
.phabricator-main-menu {
z-index: 6;
}
.setup-warning-callout,
.aphront-developer-error-callout {
z-index: 6;
}
.jx-notification-container {
z-index: 7;
}
.fancy-datepicker {
z-index: 7;
}
.calendar-button {
z-index: 8;
}
div.jx-typeahead-results {
z-index: 8;
}
.differential-haunt-mode-1 .differential-add-comment-panel,
.differential-haunt-mode-2 .differential-add-comment-panel {
z-index: 8;
}
.device-desktop .phabricator-notification-menu {
z-index: 9;
}
.jx-mask {
z-index: 10;
}
.phabricator-global-upload-instructions {
z-index: 11;
}
.lightbox-attachment {
z-index: 12;
}
.jx-client-dialog {
z-index: 14;
}
.jx-hovercard-container {
z-index: 16;
}
.jx-tooltip-container {
z-index: 18;
}
.pholio-device-lightbox {
z-index: 20;
}
.dropdown-menu-frame {
z-index: 32;
}
.busy {
z-index: 40;
}
.remarkup-control-order-mode {
z-index: 50;
}

File Metadata

Mime Type
text/x-diff
Expires
Sun, Nov 16, 3:28 AM (8 m, 6 s)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
338704
Default Alt Text
(23 KB)

Event Timeline