@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
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
+48
-43
+33
-33
resources/celerity/map.php
+33
-33
resources/celerity/map.php
···
7
7
*/
8
8
return array(
9
9
'names' => array(
10
-
'core.pkg.css' => 'fa185729',
10
+
'core.pkg.css' => 'fabe73f9',
11
11
'core.pkg.js' => '59d01bb7',
12
12
'darkconsole.pkg.js' => 'e7393ebb',
13
13
'differential.pkg.css' => '3500921f',
···
46
46
'rsrc/css/application/config/unhandled-exception.css' => '37d4f9a2',
47
47
'rsrc/css/application/conpherence/durable-column.css' => '2e68a92f',
48
48
'rsrc/css/application/conpherence/menu.css' => 'f389e048',
49
-
'rsrc/css/application/conpherence/message-pane.css' => '3150e2a2',
49
+
'rsrc/css/application/conpherence/message-pane.css' => 'e7c09fda',
50
50
'rsrc/css/application/conpherence/notification.css' => 'd208f806',
51
51
'rsrc/css/application/conpherence/transaction.css' => '25138b7f',
52
52
'rsrc/css/application/conpherence/update.css' => '1099a660',
···
110
110
'rsrc/css/core/core.css' => '76e8ee93',
111
111
'rsrc/css/core/remarkup.css' => '0037bdbf',
112
112
'rsrc/css/core/syntax.css' => '56c1ba38',
113
-
'rsrc/css/core/z-index.css' => '5a2b9d9d',
113
+
'rsrc/css/core/z-index.css' => '3b612549',
114
114
'rsrc/css/diviner/diviner-shared.css' => '38813222',
115
115
'rsrc/css/font/font-awesome.css' => 'e2e712fe',
116
116
'rsrc/css/font/font-source-sans-pro.css' => '8906c07b',
···
355
355
'rsrc/js/application/aphlict/behavior-aphlict-status.js' => 'ea681761',
356
356
'rsrc/js/application/auth/behavior-persona-login.js' => '9414ff18',
357
357
'rsrc/js/application/config/behavior-reorder-fields.js' => '14a827de',
358
-
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '6709c934',
358
+
'rsrc/js/application/conpherence/ConpherenceThreadManager.js' => '0a5192c4',
359
359
'rsrc/js/application/conpherence/behavior-durable-column.js' => '657c2b50',
360
-
'rsrc/js/application/conpherence/behavior-menu.js' => '804b0773',
360
+
'rsrc/js/application/conpherence/behavior-menu.js' => '077a1dab',
361
361
'rsrc/js/application/conpherence/behavior-pontificate.js' => '21ba5861',
362
362
'rsrc/js/application/conpherence/behavior-quicksand-blacklist.js' => '7927a7d3',
363
363
'rsrc/js/application/conpherence/behavior-widget-pane.js' => '93568464',
···
519
519
'config-welcome-css' => '6abd79be',
520
520
'conpherence-durable-column-view' => '2e68a92f',
521
521
'conpherence-menu-css' => 'f389e048',
522
-
'conpherence-message-pane-css' => '3150e2a2',
522
+
'conpherence-message-pane-css' => 'e7c09fda',
523
523
'conpherence-notification-css' => 'd208f806',
524
-
'conpherence-thread-manager' => '6709c934',
524
+
'conpherence-thread-manager' => '0a5192c4',
525
525
'conpherence-transaction-css' => '25138b7f',
526
526
'conpherence-update-css' => '1099a660',
527
527
'conpherence-widget-pane-css' => '2af42ebe',
···
561
561
'javelin-behavior-audit-preview' => 'd835b03a',
562
562
'javelin-behavior-choose-control' => '6153c708',
563
563
'javelin-behavior-config-reorder-fields' => '14a827de',
564
-
'javelin-behavior-conpherence-menu' => '804b0773',
564
+
'javelin-behavior-conpherence-menu' => '077a1dab',
565
565
'javelin-behavior-conpherence-pontificate' => '21ba5861',
566
566
'javelin-behavior-conpherence-widget-pane' => '93568464',
567
567
'javelin-behavior-countdown-timer' => 'e4cc26b3',
···
765
765
'phabricator-uiexample-reactor-select' => 'a155550f',
766
766
'phabricator-uiexample-reactor-sendclass' => '1def2711',
767
767
'phabricator-uiexample-reactor-sendproperties' => 'b1f0ccee',
768
-
'phabricator-zindex-css' => '5a2b9d9d',
768
+
'phabricator-zindex-css' => '3b612549',
769
769
'phame-css' => '88bd4705',
770
770
'pholio-css' => '95174bdd',
771
771
'pholio-edit-css' => '3ad9d1ee',
···
873
873
'javelin-stratcom',
874
874
'javelin-workflow',
875
875
),
876
+
'077a1dab' => array(
877
+
'javelin-behavior',
878
+
'javelin-dom',
879
+
'javelin-util',
880
+
'javelin-stratcom',
881
+
'javelin-workflow',
882
+
'javelin-behavior-device',
883
+
'javelin-history',
884
+
'javelin-vector',
885
+
'javelin-scrollbar',
886
+
'phabricator-title',
887
+
'phabricator-shaped-request',
888
+
'conpherence-thread-manager',
889
+
),
876
890
'07de8873' => array(
877
891
'javelin-install',
878
892
'javelin-util',
···
888
902
'javelin-dom',
889
903
'javelin-router',
890
904
),
905
+
'0a5192c4' => array(
906
+
'javelin-dom',
907
+
'javelin-util',
908
+
'javelin-stratcom',
909
+
'javelin-install',
910
+
'javelin-workflow',
911
+
'javelin-router',
912
+
'javelin-behavior-device',
913
+
'javelin-vector',
914
+
),
891
915
'0c6946e7' => array(
892
916
'javelin-install',
893
917
'javelin-dom',
···
1287
1311
'phabricator-keyboard-shortcut',
1288
1312
'conpherence-thread-manager',
1289
1313
),
1290
-
'6709c934' => array(
1291
-
'javelin-dom',
1292
-
'javelin-util',
1293
-
'javelin-stratcom',
1294
-
'javelin-install',
1295
-
'javelin-workflow',
1296
-
'javelin-router',
1297
-
'javelin-behavior-device',
1298
-
'javelin-vector',
1299
-
),
1300
1314
'6882e80a' => array(
1301
1315
'javelin-dom',
1302
1316
),
···
1425
1439
'7ee2b591' => array(
1426
1440
'javelin-behavior',
1427
1441
'javelin-history',
1428
-
),
1429
-
'804b0773' => array(
1430
-
'javelin-behavior',
1431
-
'javelin-dom',
1432
-
'javelin-util',
1433
-
'javelin-stratcom',
1434
-
'javelin-workflow',
1435
-
'javelin-behavior-device',
1436
-
'javelin-history',
1437
-
'javelin-vector',
1438
-
'javelin-scrollbar',
1439
-
'phabricator-title',
1440
-
'phabricator-shaped-request',
1441
-
'conpherence-thread-manager',
1442
1442
),
1443
1443
82439934 => array(
1444
1444
'javelin-behavior',
+1
-1
src/applications/calendar/controller/PhabricatorCalendarController.php
+1
-1
src/applications/calendar/controller/PhabricatorCalendarController.php
+14
-5
src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
+14
-5
src/applications/calendar/controller/PhabricatorCalendarEventEditController.php
···
41
41
$redirect = 'created';
42
42
$subscribers = array();
43
43
$invitees = array($user_phid);
44
+
$cancel_uri = $this->getApplicationURI();
44
45
} else {
45
46
$event = id(new PhabricatorCalendarEventQuery())
46
47
->setViewer($user)
···
71
72
$invitees[] = $invitee->getInviteePHID();
72
73
}
73
74
}
75
+
76
+
$cancel_uri = '/'.$event->getMonogram();
74
77
}
75
78
76
79
$errors = array();
···
227
230
->appendControl($invitees)
228
231
->appendChild($description);
229
232
233
+
234
+
if ($request->isAjax()) {
235
+
return $this->newDialog()
236
+
->setTitle($page_title)
237
+
->setWidth(AphrontDialogView::WIDTH_FULL)
238
+
->appendForm($form)
239
+
->addCancelButton($cancel_uri)
240
+
->addSubmitButton($submit_label);
241
+
}
242
+
230
243
$submit = id(new AphrontFormSubmitControl())
244
+
->addCancelButton($cancel_uri)
231
245
->setValue($submit_label);
232
-
if ($this->isCreate()) {
233
-
$submit->addCancelButton($this->getApplicationURI());
234
-
} else {
235
-
$submit->addCancelButton('/E'.$event->getID());
236
-
}
237
246
238
247
$form->appendChild($submit);
239
248