mirror of
https://we.phorge.it/source/phorge.git
synced 2024-12-25 06:50:55 +01:00
Minor, fix a resource include order issue.
This commit is contained in:
parent
9092994e45
commit
9eb6d4dded
2 changed files with 6 additions and 6 deletions
|
@ -62,11 +62,9 @@ abstract class AphrontPageView extends AphrontView {
|
||||||
$this->willRenderPage();
|
$this->willRenderPage();
|
||||||
|
|
||||||
$title = phutil_escape_html($this->getTitle());
|
$title = phutil_escape_html($this->getTitle());
|
||||||
|
$head = $this->getHead();
|
||||||
$body = $this->getBody();
|
$body = $this->getBody();
|
||||||
$tail = $this->getTail();
|
$tail = $this->getTail();
|
||||||
// NOTE: Render HEAD last so we can pick up resources required by the other
|
|
||||||
// parts.
|
|
||||||
$head = $this->getHead();
|
|
||||||
|
|
||||||
$body_classes = $this->getBodyClasses();
|
$body_classes = $this->getBodyClasses();
|
||||||
|
|
||||||
|
|
|
@ -24,6 +24,7 @@ final class PhabricatorStandardPageView extends AphrontPageView {
|
||||||
private $selectedTab;
|
private $selectedTab;
|
||||||
private $glyph;
|
private $glyph;
|
||||||
private $bodyContent;
|
private $bodyContent;
|
||||||
|
private $menuContent;
|
||||||
private $request;
|
private $request;
|
||||||
private $isAdminInterface;
|
private $isAdminInterface;
|
||||||
private $showChrome = true;
|
private $showChrome = true;
|
||||||
|
@ -168,6 +169,7 @@ final class PhabricatorStandardPageView extends AphrontPageView {
|
||||||
'header' => AphrontRequest::getCSRFHeaderName(),
|
'header' => AphrontRequest::getCSRFHeaderName(),
|
||||||
'current' => $current_token,
|
'current' => $current_token,
|
||||||
));
|
));
|
||||||
|
Javelin::initBehavior('device', array('id' => 'base-page'));
|
||||||
|
|
||||||
if ($console) {
|
if ($console) {
|
||||||
require_celerity_resource('aphront-dark-console-css');
|
require_celerity_resource('aphront-dark-console-css');
|
||||||
|
@ -182,6 +184,7 @@ final class PhabricatorStandardPageView extends AphrontPageView {
|
||||||
require_celerity_resource('javelin-behavior-error-log');
|
require_celerity_resource('javelin-behavior-error-log');
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$this->menuContent = $this->renderMainMenu();
|
||||||
$this->bodyContent = $this->renderChildren();
|
$this->bodyContent = $this->renderChildren();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -361,7 +364,7 @@ final class PhabricatorStandardPageView extends AphrontPageView {
|
||||||
$header_chrome = null;
|
$header_chrome = null;
|
||||||
$footer_chrome = null;
|
$footer_chrome = null;
|
||||||
if ($this->getShowChrome()) {
|
if ($this->getShowChrome()) {
|
||||||
$header_chrome = $this->renderMainMenu();
|
$header_chrome = $this->menuContent;
|
||||||
$footer_chrome =
|
$footer_chrome =
|
||||||
'<div class="phabricator-page-foot">'.
|
'<div class="phabricator-page-foot">'.
|
||||||
$foot_links.
|
$foot_links.
|
||||||
|
@ -378,7 +381,6 @@ final class PhabricatorStandardPageView extends AphrontPageView {
|
||||||
'</div>';
|
'</div>';
|
||||||
}
|
}
|
||||||
|
|
||||||
Javelin::initBehavior('device', array('id' => 'base-page'));
|
|
||||||
$agent = idx($_SERVER, 'HTTP_USER_AGENT');
|
$agent = idx($_SERVER, 'HTTP_USER_AGENT');
|
||||||
|
|
||||||
// Try to guess the device resolution based on UA strings to avoid a flash
|
// Try to guess the device resolution based on UA strings to avoid a flash
|
||||||
|
@ -450,7 +452,7 @@ final class PhabricatorStandardPageView extends AphrontPageView {
|
||||||
'id' => $aphlict_container_id,
|
'id' => $aphlict_container_id,
|
||||||
'style' => 'position: absolute; width: 0; height: 0;',
|
'style' => 'position: absolute; width: 0; height: 0;',
|
||||||
),
|
),
|
||||||
'asdb');
|
'');
|
||||||
}
|
}
|
||||||
|
|
||||||
$response = CelerityAPI::getStaticResourceResponse();
|
$response = CelerityAPI::getStaticResourceResponse();
|
||||||
|
|
Loading…
Reference in a new issue