Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F21150325
D12639.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
7 KB
Referenced Files
None
Subscribers
None
D12639.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
@@ -7,7 +7,7 @@
*/
return array(
'names' => array(
- 'core.pkg.css' => 'fa185729',
+ 'core.pkg.css' => 'fabe73f9',
'core.pkg.js' => '59d01bb7',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => '3500921f',
@@ -46,7 +46,7 @@
'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2',
'rsrc/css/application/conpherence/durable-column.css' => '2e68a92f',
'rsrc/css/application/conpherence/menu.css' => 'f389e048',
- 'rsrc/css/application/conpherence/message-pane.css' => '3150e2a2',
+ 'rsrc/css/application/conpherence/message-pane.css' => 'e7c09fda',
'rsrc/css/application/conpherence/notification.css' => 'd208f806',
'rsrc/css/application/conpherence/transaction.css' => '25138b7f',
'rsrc/css/application/conpherence/update.css' => '1099a660',
@@ -110,7 +110,7 @@
'rsrc/css/core/core.css' => '76e8ee93',
'rsrc/css/core/remarkup.css' => '0037bdbf',
'rsrc/css/core/syntax.css' => '56c1ba38',
- 'rsrc/css/core/z-index.css' => '5a2b9d9d',
+ 'rsrc/css/core/z-index.css' => '3b612549',
'rsrc/css/diviner/diviner-shared.css' => '38813222',
'rsrc/css/font/font-awesome.css' => 'e2e712fe',
'rsrc/css/font/font-source-sans-pro.css' => '8906c07b',
@@ -355,9 +355,9 @@
'rsrc/js/application/aphlict/behavior-aphlict-status.js' => 'ea681761',
'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18',
'rsrc/js/application/config/behavior-reorder-fields.js' => '14a827de',
- 'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '6709c934',
+ 'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '0a5192c4',
'rsrc/js/application/conpherence/behavior-durable-column.js' => '657c2b50',
- 'rsrc/js/application/conpherence/behavior-menu.js' => '804b0773',
+ 'rsrc/js/application/conpherence/behavior-menu.js' => '077a1dab',
'rsrc/js/application/conpherence/behavior-pontificate.js' => '21ba5861',
'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3',
'rsrc/js/application/conpherence/behavior-widget-pane.js' => '93568464',
@@ -519,9 +519,9 @@
'config-welcome-css' => '6abd79be',
'conpherence-durable-column-view' => '2e68a92f',
'conpherence-menu-css' => 'f389e048',
- 'conpherence-message-pane-css' => '3150e2a2',
+ 'conpherence-message-pane-css' => 'e7c09fda',
'conpherence-notification-css' => 'd208f806',
- 'conpherence-thread-manager' => '6709c934',
+ 'conpherence-thread-manager' => '0a5192c4',
'conpherence-transaction-css' => '25138b7f',
'conpherence-update-css' => '1099a660',
'conpherence-widget-pane-css' => '2af42ebe',
@@ -561,7 +561,7 @@
'javelin-behavior-audit-preview' => 'd835b03a',
'javelin-behavior-choose-control' => '6153c708',
'javelin-behavior-config-reorder-fields' => '14a827de',
- 'javelin-behavior-conpherence-menu' => '804b0773',
+ 'javelin-behavior-conpherence-menu' => '077a1dab',
'javelin-behavior-conpherence-pontificate' => '21ba5861',
'javelin-behavior-conpherence-widget-pane' => '93568464',
'javelin-behavior-countdown-timer' => 'e4cc26b3',
@@ -765,7 +765,7 @@
'phabricator-uiexample-reactor-select' => 'a155550f',
'phabricator-uiexample-reactor-sendclass' => '1def2711',
'phabricator-uiexample-reactor-sendproperties' => 'b1f0ccee',
- 'phabricator-zindex-css' => '5a2b9d9d',
+ 'phabricator-zindex-css' => '3b612549',
'phame-css' => '88bd4705',
'pholio-css' => '95174bdd',
'pholio-edit-css' => '3ad9d1ee',
@@ -873,6 +873,20 @@
'javelin-stratcom',
'javelin-workflow',
),
+ '077a1dab' => array(
+ 'javelin-behavior',
+ 'javelin-dom',
+ 'javelin-util',
+ 'javelin-stratcom',
+ 'javelin-workflow',
+ 'javelin-behavior-device',
+ 'javelin-history',
+ 'javelin-vector',
+ 'javelin-scrollbar',
+ 'phabricator-title',
+ 'phabricator-shaped-request',
+ 'conpherence-thread-manager',
+ ),
'07de8873' => array(
'javelin-install',
'javelin-util',
@@ -888,6 +902,16 @@
'javelin-dom',
'javelin-router',
),
+ '0a5192c4' => array(
+ 'javelin-dom',
+ 'javelin-util',
+ 'javelin-stratcom',
+ 'javelin-install',
+ 'javelin-workflow',
+ 'javelin-router',
+ 'javelin-behavior-device',
+ 'javelin-vector',
+ ),
'0c6946e7' => array(
'javelin-install',
'javelin-dom',
@@ -1287,16 +1311,6 @@
'phabricator-keyboard-shortcut',
'conpherence-thread-manager',
),
- '6709c934' => array(
- 'javelin-dom',
- 'javelin-util',
- 'javelin-stratcom',
- 'javelin-install',
- 'javelin-workflow',
- 'javelin-router',
- 'javelin-behavior-device',
- 'javelin-vector',
- ),
'6882e80a' => array(
'javelin-dom',
),
@@ -1426,20 +1440,6 @@
'javelin-behavior',
'javelin-history',
),
- '804b0773' => array(
- 'javelin-behavior',
- 'javelin-dom',
- 'javelin-util',
- 'javelin-stratcom',
- 'javelin-workflow',
- 'javelin-behavior-device',
- 'javelin-history',
- 'javelin-vector',
- 'javelin-scrollbar',
- 'phabricator-title',
- 'phabricator-shaped-request',
- 'conpherence-thread-manager',
- ),
82439934 => array(
'javelin-behavior',
'javelin-dom',
diff --git a/src/applications/calendar/controller/PhabricatorCalendarController.php b/src/applications/calendar/controller/PhabricatorCalendarController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarController.php
@@ -29,7 +29,7 @@
$crumbs->addAction(
id(new PHUIListItemView())
->setName(pht('Create Event'))
- ->setHref($this->getApplicationURI().'event/create')
+ ->setHref($this->getApplicationURI().'event/create/')
->setIcon('fa-plus-square'));
return $crumbs;
diff --git a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
--- a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
+++ b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
@@ -41,6 +41,7 @@
$redirect = 'created';
$subscribers = array();
$invitees = array($user_phid);
+ $cancel_uri = $this->getApplicationURI();
} else {
$event = id(new PhabricatorCalendarEventQuery())
->setViewer($user)
@@ -71,6 +72,8 @@
$invitees[] = $invitee->getInviteePHID();
}
}
+
+ $cancel_uri = '/'.$event->getMonogram();
}
$errors = array();
@@ -227,13 +230,19 @@
->appendControl($invitees)
->appendChild($description);
+
+ if ($request->isAjax()) {
+ return $this->newDialog()
+ ->setTitle($page_title)
+ ->setWidth(AphrontDialogView::WIDTH_FULL)
+ ->appendForm($form)
+ ->addCancelButton($cancel_uri)
+ ->addSubmitButton($submit_label);
+ }
+
$submit = id(new AphrontFormSubmitControl())
+ ->addCancelButton($cancel_uri)
->setValue($submit_label);
- if ($this->isCreate()) {
- $submit->addCancelButton($this->getApplicationURI());
- } else {
- $submit->addCancelButton('/E'.$event->getID());
- }
$form->appendChild($submit);
diff --git a/webroot/rsrc/css/core/z-index.css b/webroot/rsrc/css/core/z-index.css
--- a/webroot/rsrc/css/core/z-index.css
+++ b/webroot/rsrc/css/core/z-index.css
@@ -135,10 +135,6 @@
z-index: 15;
}
-.calendar-button {
- z-index: 16;
-}
-
.jx-hovercard-container {
z-index: 17;
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Jul 4, 4:15 PM (23 h, 17 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
16358435
Default Alt Text
D12639.diff (7 KB)
Attached To
Mode
D12639: Fix calendar z-index and Conpherence/Calendar integration
Attached
Detach File
Event Timeline
Log In to Comment