@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
Update AphrontRequestFailure to common display libs
Summary: Moves to PHUIObjectBox, removes old CSS
Test Plan: Pull up 404 page.
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: epriestley, Korvin
Differential Revision: https://secure.phabricator.com/D10578
+32
-100
-2
resources/celerity/map.php
-2
resources/celerity/map.php
···
28
28
'rsrc/css/aphront/pager-view.css' => '2e3539af',
29
29
'rsrc/css/aphront/panel-view.css' => '5846dfa2',
30
30
'rsrc/css/aphront/phabricator-nav-view.css' => '9283c2df',
31
-
'rsrc/css/aphront/request-failure-view.css' => '7a83dc3a',
32
31
'rsrc/css/aphront/table-view.css' => 'b22b7216',
33
32
'rsrc/css/aphront/tokenizer.css' => '82ce2142',
34
33
'rsrc/css/aphront/tooltip.css' => '9c90229d',
···
506
505
'aphront-multi-column-view-css' => '1b95ab2e',
507
506
'aphront-pager-view-css' => '2e3539af',
508
507
'aphront-panel-view-css' => '5846dfa2',
509
-
'aphront-request-failure-view-css' => '7a83dc3a',
510
508
'aphront-table-view-css' => 'b22b7216',
511
509
'aphront-tokenizer-control-css' => '82ce2142',
512
510
'aphront-tooltip-css' => '9c90229d',
-2
src/__phutil_library_map__.php
-2
src/__phutil_library_map__.php
···
79
79
'AphrontRedirectResponseTestCase' => 'aphront/response/__tests__/AphrontRedirectResponseTestCase.php',
80
80
'AphrontReloadResponse' => 'aphront/response/AphrontReloadResponse.php',
81
81
'AphrontRequest' => 'aphront/AphrontRequest.php',
82
-
'AphrontRequestFailureView' => 'view/page/AphrontRequestFailureView.php',
83
82
'AphrontRequestTestCase' => 'aphront/__tests__/AphrontRequestTestCase.php',
84
83
'AphrontResponse' => 'aphront/response/AphrontResponse.php',
85
84
'AphrontSideNavFilterView' => 'view/layout/AphrontSideNavFilterView.php',
···
2923
2922
'AphrontRedirectResponse' => 'AphrontResponse',
2924
2923
'AphrontRedirectResponseTestCase' => 'PhabricatorTestCase',
2925
2924
'AphrontReloadResponse' => 'AphrontRedirectResponse',
2926
-
'AphrontRequestFailureView' => 'AphrontView',
2927
2925
'AphrontRequestTestCase' => 'PhabricatorTestCase',
2928
2926
'AphrontSideNavFilterView' => 'AphrontView',
2929
2927
'AphrontStackTraceView' => 'AphrontView',
+15
-8
src/aphront/response/Aphront403Response.php
+15
-8
src/aphront/response/Aphront403Response.php
···
19
19
$forbidden_text = $this->getForbiddenText();
20
20
if (!$forbidden_text) {
21
21
$forbidden_text =
22
-
'You do not have privileges to access the requested page.';
22
+
pht('You do not have privileges to access the requested page.');
23
23
}
24
-
$failure = new AphrontRequestFailureView();
25
-
$failure->setHeader('403 Forbidden');
26
-
$failure->appendChild(phutil_tag('p', array(), $forbidden_text));
24
+
25
+
$request = $this->getRequest();
26
+
$user = $request->getUser();
27
+
28
+
$dialog = id(new AphrontDialogView())
29
+
->setUser($user)
30
+
->setTitle(pht('403 Forbidden'))
31
+
->addCancelButton('/', pht('Peace Out'))
32
+
->appendParagraph($forbidden_text);
27
33
28
-
$view = new PhabricatorStandardPageView();
29
-
$view->setTitle('403 Forbidden');
30
-
$view->setRequest($this->getRequest());
31
-
$view->appendChild($failure);
34
+
$view = id(new PhabricatorStandardPageView())
35
+
->setTitle(pht('403 Forbidden'))
36
+
->setRequest($request)
37
+
->setDeviceReady(true)
38
+
->appendChild($dialog);
32
39
33
40
return $view->render();
34
41
}
+12
-6
src/aphront/response/Aphront404Response.php
+12
-6
src/aphront/response/Aphront404Response.php
···
7
7
}
8
8
9
9
public function buildResponseString() {
10
-
$failure = id(new AphrontRequestFailureView())
11
-
->setHeader(pht('404 Not Found'))
12
-
->appendChild(phutil_tag('p', array(), pht(
13
-
'The page you requested was not found.')));
10
+
$request = $this->getRequest();
11
+
$user = $request->getUser();
12
+
13
+
$dialog = id(new AphrontDialogView())
14
+
->setUser($user)
15
+
->setTitle(pht('404 Not Found'))
16
+
->addCancelButton('/', pht('Focus'))
17
+
->appendParagraph(pht(
18
+
'Do not dwell in the past, do not dream of the future, '.
19
+
'concentrate the mind on the present moment.'));
14
20
15
21
$view = id(new PhabricatorStandardPageView())
16
22
->setTitle('404 Not Found')
17
-
->setRequest($this->getRequest())
23
+
->setRequest($request)
18
24
->setDeviceReady(true)
19
-
->appendChild($failure);
25
+
->appendChild($dialog);
20
26
21
27
return $view->render();
22
28
}
+5
-10
src/applications/auth/controller/PhabricatorDisabledUserController.php
+5
-10
src/applications/auth/controller/PhabricatorDisabledUserController.php
···
14
14
return new Aphront404Response();
15
15
}
16
16
17
-
$failure_view = new AphrontRequestFailureView();
18
-
$failure_view->setHeader(pht('Account Disabled'));
19
-
$failure_view->appendChild(phutil_tag('p', array(), pht(
20
-
'Your account has been disabled.')));
21
-
22
-
return $this->buildStandardPageResponse(
23
-
$failure_view,
24
-
array(
25
-
'title' => pht('Account Disabled'),
26
-
));
17
+
return id(new AphrontDialogView())
18
+
->setUser($user)
19
+
->setTitle(pht('Account Disabled'))
20
+
->addCancelButton('/logout/', pht('Okay'))
21
+
->appendParagraph(pht('Your account has been disabled.'));
27
22
}
28
23
29
24
}
-27
src/view/page/AphrontRequestFailureView.php
-27
src/view/page/AphrontRequestFailureView.php
···
1
-
<?php
2
-
3
-
final class AphrontRequestFailureView extends AphrontView {
4
-
5
-
private $header;
6
-
7
-
public function setHeader($header) {
8
-
$this->header = $header;
9
-
return $this;
10
-
}
11
-
12
-
13
-
final public function render() {
14
-
require_celerity_resource('aphront-request-failure-view-css');
15
-
16
-
$head = phutil_tag_div(
17
-
'aphront-request-failure-head',
18
-
phutil_tag('h1', array(), $this->header));
19
-
20
-
$body = phutil_tag_div(
21
-
'aphront-request-failure-body',
22
-
$this->renderChildren());
23
-
24
-
return phutil_tag_div('aphront-request-failure-view', array($head, $body));
25
-
}
26
-
27
-
}
-45
webroot/rsrc/css/aphront/request-failure-view.css
-45
webroot/rsrc/css/aphront/request-failure-view.css
···
1
-
/**
2
-
* @provides aphront-request-failure-view-css
3
-
*/
4
-
5
-
.aphront-request-failure-view {
6
-
margin: 16px auto;
7
-
background: #eff2f7;
8
-
width: 600px;
9
-
}
10
-
11
-
.device .aphront-request-failure-view {
12
-
width: 90%;
13
-
}
14
-
15
-
.aphront-request-failure-view .aphront-request-failure-head {
16
-
padding: 1em 2em;
17
-
border-bottom: 1px solid #afb2b7;
18
-
background: #dfe2e7;
19
-
}
20
-
21
-
.aphront-request-failure-view .aphront-request-failure-head h1 {
22
-
font-size: 24px;
23
-
}
24
-
25
-
.aphront-request-failure-view .aphront-request-failure-body {
26
-
padding: 1em 2em 1.5em;
27
-
}
28
-
29
-
.aphront-request-failure-view .aphront-request-failure-body p {
30
-
margin: .5em 0;
31
-
}
32
-
33
-
.aphront-failure-continue {
34
-
margin-top: 1.5em;
35
-
text-align: right;
36
-
}
37
-
38
-
.aphront-failure-continue a.button {
39
-
margin-left: 1em;
40
-
}
41
-
42
-
.aphront-request-failure-view ul {
43
-
list-style: disc;
44
-
margin-left: 3em;
45
-
}