From 4699c29017657611fe950716c81898e63d7e4338 Mon Sep 17 00:00:00 2001 From: epriestley Date: Thu, 30 Apr 2015 17:09:45 -0700 Subject: [PATCH] Fix calendar z-index and Conpherence/Calendar integration Summary: Fixes T7975. Long ago, this element looked like this when you expanded it: ``` +-------------------+ | 3 4 5 6 7 X | | 8 9 1 2 3 4 5 +---+ | 6 7 8 9 1 2 3 | | 4 5 6 7 | +---------------+ ``` That was why the icon needed a z-index. See T5880. @chad fixed this a while ago so it looks like this: ``` +---------------+ | 3 4 5 6 7 | X | 8 9 1 2 3 4 5 | | 6 7 8 9 1 2 3 | | 4 5 6 7 | +---------------+ ``` ...but we never stripped the z-index off, causing the bug in T7975. Also fix some collateral damage from the recent calendar refactoring and the Conpherence widget. Test Plan: - Created a new event via Conpherence - Created a new event normally. - Browsed a typeahead in Calendar without icons showing through. Reviewers: lpriestley, chad, btrahan Reviewed By: btrahan Subscribers: chad, epriestley Maniphest Tasks: T7975 Differential Revision: https://secure.phabricator.com/D12639 --- resources/celerity/map.php | 66 +++++++++---------- .../PhabricatorCalendarController.php | 2 +- ...PhabricatorCalendarEventEditController.php | 21 ++++-- webroot/rsrc/css/core/z-index.css | 4 -- 4 files changed, 49 insertions(+), 44 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 7dd232fa83..759847af9f 100644 --- 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 @@ return array( '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 @@ return array( '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 @@ return array( '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 @@ return array( '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 @@ return array( '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 @@ return array( '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 @@ return array( '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 @@ return array( '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 @@ return array( '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 @@ return array( '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 index 1340196240..ee104a9bd2 100644 --- a/src/applications/calendar/controller/PhabricatorCalendarController.php +++ b/src/applications/calendar/controller/PhabricatorCalendarController.php @@ -29,7 +29,7 @@ abstract class PhabricatorCalendarController extends PhabricatorController { $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 index a258af5893..b829a538b2 100644 --- a/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php +++ b/src/applications/calendar/controller/PhabricatorCalendarEventEditController.php @@ -41,6 +41,7 @@ final class PhabricatorCalendarEventEditController $redirect = 'created'; $subscribers = array(); $invitees = array($user_phid); + $cancel_uri = $this->getApplicationURI(); } else { $event = id(new PhabricatorCalendarEventQuery()) ->setViewer($user) @@ -71,6 +72,8 @@ final class PhabricatorCalendarEventEditController $invitees[] = $invitee->getInviteePHID(); } } + + $cancel_uri = '/'.$event->getMonogram(); } $errors = array(); @@ -227,14 +230,20 @@ final class PhabricatorCalendarEventEditController ->appendControl($invitees) ->appendChild($description); - $submit = id(new AphrontFormSubmitControl()) - ->setValue($submit_label); - if ($this->isCreate()) { - $submit->addCancelButton($this->getApplicationURI()); - } else { - $submit->addCancelButton('/E'.$event->getID()); + + 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); + $form->appendChild($submit); $form_box = id(new PHUIObjectBoxView()) diff --git a/webroot/rsrc/css/core/z-index.css b/webroot/rsrc/css/core/z-index.css index d9bea528c8..30fc5368c2 100644 --- a/webroot/rsrc/css/core/z-index.css +++ b/webroot/rsrc/css/core/z-index.css @@ -135,10 +135,6 @@ div.jx-typeahead-results { z-index: 15; } -.calendar-button { - z-index: 16; -} - .jx-hovercard-container { z-index: 17; }