Page MenuHomePhabricator
Files F14005525

D18342.id44095.diff
No OneTemporary
Actions

D18342.id44095.diff
View Options

diff --git a/src/applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php b/src/applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php
--- a/src/applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php
+++ b/src/applications/conduit/settings/PhabricatorConduitTokensSettingsPanel.php
@@ -108,6 +108,7 @@
$panel = id(new PHUIObjectBoxView())
->setHeader($header)
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
->setTable($table);
return $panel;
diff --git a/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php b/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php
--- a/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php
+++ b/src/applications/oauthserver/panel/PhabricatorOAuthServerAuthorizationsSettingsPanel.php
@@ -134,6 +134,7 @@
$panel = id(new PHUIObjectBoxView())
->setHeader($header)
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
->setTable($table);
return $panel;
diff --git a/src/applications/settings/controller/PhabricatorSettingsMainController.php b/src/applications/settings/controller/PhabricatorSettingsMainController.php
--- a/src/applications/settings/controller/PhabricatorSettingsMainController.php
+++ b/src/applications/settings/controller/PhabricatorSettingsMainController.php
@@ -112,15 +112,27 @@
$crumbs = $this->buildApplicationCrumbs();
$crumbs->addTextCrumb($panel->getPanelName());
+ $crumbs->setBorder(true);
+
+ if ($this->user) {
+ $header_text = pht('Edit Settings (%s)', $user->getUserName());
+ } else {
+ $header_text = pht('Edit Global Settings');
+ }
+
+ $header = id(new PHUIHeaderView())
+ ->setHeader($header_text)
+ ->setHeaderIcon('fa-pencil');
$title = $panel->getPanelName();
$view = id(new PHUITwoColumnView())
- ->setNavigation($nav)
- ->setMainColumn($response);
+ ->setHeader($header)
+ ->setFooter($response);
return $this->newPage()
->setTitle($title)
+ ->setNavigation($nav)
->setCrumbs($crumbs)
->appendChild($view);
diff --git a/src/applications/settings/editor/PhabricatorSettingsEditEngine.php b/src/applications/settings/editor/PhabricatorSettingsEditEngine.php
--- a/src/applications/settings/editor/PhabricatorSettingsEditEngine.php
+++ b/src/applications/settings/editor/PhabricatorSettingsEditEngine.php
@@ -63,7 +63,12 @@
}
protected function getObjectEditTitleText($object) {
- return pht('Edit Settings');
+ $user = $object->getUser();
+ if ($user) {
+ return pht('Edit Settings (%s)', $user->getUserName());
+ } else {
+ return pht('Edit Global Settings');
+ }
}
protected function getObjectEditShortText($object) {
diff --git a/src/applications/settings/panel/PhabricatorActivitySettingsPanel.php b/src/applications/settings/panel/PhabricatorActivitySettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorActivitySettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorActivitySettingsPanel.php
@@ -48,6 +48,7 @@
$panel = id(new PHUIObjectBoxView())
->setHeaderText(pht('Account Activity Logs'))
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
->setTable($table);
$pager_box = id(new PHUIBoxView())
diff --git a/src/applications/settings/panel/PhabricatorDesktopNotificationsSettingsPanel.php b/src/applications/settings/panel/PhabricatorDesktopNotificationsSettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorDesktopNotificationsSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorDesktopNotificationsSettingsPanel.php
@@ -157,6 +157,7 @@
->setHeader(pht('Desktop Notifications'))
->addActionLink($test_button))
->setForm($form)
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
->setInfoView($status_box)
->setFormSaved($request->getBool('saved'));
diff --git a/src/applications/settings/panel/PhabricatorEditEngineSettingsPanel.php b/src/applications/settings/panel/PhabricatorEditEngineSettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorEditEngineSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorEditEngineSettingsPanel.php
@@ -22,7 +22,6 @@
$engine = id(new PhabricatorSettingsEditEngine())
->setController($this->getController())
->setNavigation($this->getNavigation())
- ->setHideHeader(true)
->setIsSelfEdit($is_self)
->setProfileURI($profile_uri);
diff --git a/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php b/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorEmailAddressesSettingsPanel.php
@@ -153,6 +153,7 @@
}
$view->setHeader($header);
$view->setTable($table);
+ $view->setBackground(PHUIObjectBoxView::BLUE_PROPERTY);
return $view;
}
diff --git a/src/applications/settings/panel/PhabricatorEmailPreferencesSettingsPanel.php b/src/applications/settings/panel/PhabricatorEmailPreferencesSettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorEmailPreferencesSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorEmailPreferencesSettingsPanel.php
@@ -136,6 +136,7 @@
->setHeaderText(pht('Email Preferences'))
->setFormSaved($request->getStr('saved'))
->setFormErrors($errors)
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
->setForm($form);
return $form_box;
diff --git a/src/applications/settings/panel/PhabricatorExternalAccountsSettingsPanel.php b/src/applications/settings/panel/PhabricatorExternalAccountsSettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorExternalAccountsSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorExternalAccountsSettingsPanel.php
@@ -131,10 +131,12 @@
$linked_box = id(new PHUIObjectBoxView())
->setHeader($linked_head)
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
->setObjectList($linked);
$linkable_box = id(new PHUIObjectBoxView())
->setHeader($linkable_head)
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
->setObjectList($linkable);
return array(
diff --git a/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php b/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorMultiFactorSettingsPanel.php
@@ -126,6 +126,7 @@
$panel->setHeader($header);
$panel->setTable($table);
+ $panel->setBackground(PHUIObjectBoxView::BLUE_PROPERTY);
return $panel;
}
diff --git a/src/applications/settings/panel/PhabricatorPasswordSettingsPanel.php b/src/applications/settings/panel/PhabricatorPasswordSettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorPasswordSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorPasswordSettingsPanel.php
@@ -206,6 +206,7 @@
->setHeaderText(pht('Change Password'))
->setFormSaved($request->getStr('saved'))
->setFormErrors($errors)
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
->setForm($form);
return array(
diff --git a/src/applications/settings/panel/PhabricatorSSHKeysSettingsPanel.php b/src/applications/settings/panel/PhabricatorSSHKeysSettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorSSHKeysSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorSSHKeysSettingsPanel.php
@@ -50,6 +50,7 @@
$panel->setHeader($header);
$panel->setTable($table);
+ $panel->setBackground(PHUIObjectBoxView::BLUE_PROPERTY);
return $panel;
}
diff --git a/src/applications/settings/panel/PhabricatorSessionsSettingsPanel.php b/src/applications/settings/panel/PhabricatorSessionsSettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorSessionsSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorSessionsSettingsPanel.php
@@ -136,7 +136,8 @@
$panel = id(new PHUIObjectBoxView())
->setHeader($header)
- ->setTable($table);
+ ->setTable($table)
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY);
return $panel;
}
diff --git a/src/applications/settings/panel/PhabricatorTokensSettingsPanel.php b/src/applications/settings/panel/PhabricatorTokensSettingsPanel.php
--- a/src/applications/settings/panel/PhabricatorTokensSettingsPanel.php
+++ b/src/applications/settings/panel/PhabricatorTokensSettingsPanel.php
@@ -84,6 +84,7 @@
$panel = id(new PHUIObjectBoxView())
->setHeader($header)
+ ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
->setTable($table);
return $panel;
diff --git a/src/applications/transactions/editengine/PhabricatorEditEngine.php b/src/applications/transactions/editengine/PhabricatorEditEngine.php
--- a/src/applications/transactions/editengine/PhabricatorEditEngine.php
+++ b/src/applications/transactions/editengine/PhabricatorEditEngine.php
@@ -29,7 +29,6 @@
private $page;
private $pages;
private $navigation;
- private $hideHeader;
final public function setViewer(PhabricatorUser $viewer) {
$this->viewer = $viewer;
@@ -127,15 +126,6 @@
return $this->navigation;
}
- public function setHideHeader($hide_header) {
- $this->hideHeader = $hide_header;
- return $this;
- }
-
- public function getHideHeader() {
- return $this->hideHeader;
- }
-
/* -( Managing Fields )---------------------------------------------------- */
@@ -1194,15 +1184,10 @@
$crumbs = $this->buildCrumbs($object, $final = true);
- if ($this->getHideHeader()) {
- $header = null;
- $crumbs->setBorder(false);
- } else {
- $header = id(new PHUIHeaderView())
- ->setHeader($header_text)
- ->setHeaderIcon($header_icon);
- $crumbs->setBorder(true);
- }
+ $header = id(new PHUIHeaderView())
+ ->setHeader($header_text)
+ ->setHeaderIcon($header_icon);
+ $crumbs->setBorder(true);
if ($action_button) {
$header->addActionLink($action_button);
@@ -1231,19 +1216,19 @@
$view->setHeader($header);
}
- $navigation = $this->getNavigation();
- if ($navigation) {
- $view
- ->setNavigation($navigation)
- ->setMainColumn($content);
- } else {
- $view->setFooter($content);
- }
+ $view->setFooter($content);
- return $controller->newPage()
+ $page = $controller->newPage()
->setTitle($header_text)
->setCrumbs($crumbs)
->appendChild($view);
+
+ $navigation = $this->getNavigation();
+ if ($navigation) {
+ $page->setNavigation($navigation);
+ }
+
+ return $page;
}
protected function newEditResponse(

File Metadata

Mime Type
text/plain
Expires
Mon, Oct 28, 2:46 PM (2 w, 5 d ago)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6713213
Default Alt Text
D18342.id44095.diff (10 KB)

Event Timeline

Phabricator · Built by Phacility