Page MenuHomePhabricator
Files F15384406

D12639.id30348.diff
No OneTemporary
Actions

D12639.id30348.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',
@@ -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',
@@ -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',
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
@@ -30,7 +30,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
@@ -42,6 +42,7 @@
$redirect = 'created';
$subscribers = array();
$invitees = array($user_phid);
+ $cancel_uri = $this->getApplicationURI();
} else {
$event = id(new PhabricatorCalendarEventQuery())
->setViewer($user)
@@ -74,6 +75,8 @@
$invitees[] = $invitee->getInviteePHID();
}
}
+
+ $cancel_uri = '/'.$event->getMonogram();
}
$errors = array();
@@ -230,13 +233,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

Mime Type
text/plain
Expires
Sat, Mar 15, 7:48 PM (1 w, 2 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
7702777
Default Alt Text
D12639.id30348.diff (3 KB)

Event Timeline

Phabricator · Built by Phacility