recaptime.dev / phorge
@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
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

Expand "Settings" UI to full-width

Summary:
Depends on D19988. See D19826 for the last UI expansion. I don't have an especially strong product rationale for un-fixed-width'ing Settings since it doesn't suffer from the "mystery meat actions" issues that other fixed-width UIs do, but I like the full-width UI better and the other other fixed-width UIs all (?) have some actual rationale (e.g., large tables, multiple actions on subpanels), so "consistency" is an argument here.

Also rename "account" to "language" since both settings are language-related.

This moves away from the direction in D18436.

Test Plan:
Clicked each Settings panel, saw sensible rendering at full-width.

{F6145944}

Reviewers: amckinley

Reviewed By: amckinley

Differential Revision: https://secure.phabricator.com/D20005

epriestley f713fa1f f0c6ee48

+15 -19
+2 -2
src/__phutil_library_map__.php
··· 2076 2076 'PhabricatorAccessLog' => 'infrastructure/log/PhabricatorAccessLog.php', 2077 2077 'PhabricatorAccessLogConfigOptions' => 'applications/config/option/PhabricatorAccessLogConfigOptions.php', 2078 2078 'PhabricatorAccessibilitySetting' => 'applications/settings/setting/PhabricatorAccessibilitySetting.php', 2079 - 'PhabricatorAccountSettingsPanel' => 'applications/settings/panel/PhabricatorAccountSettingsPanel.php', 2080 2079 'PhabricatorActionListView' => 'view/layout/PhabricatorActionListView.php', 2081 2080 'PhabricatorActionView' => 'view/layout/PhabricatorActionView.php', 2082 2081 'PhabricatorActivitySettingsPanel' => 'applications/settings/panel/PhabricatorActivitySettingsPanel.php', ··· 3362 3361 'PhabricatorKeyringConfigOptionType' => 'applications/files/keyring/PhabricatorKeyringConfigOptionType.php', 3363 3362 'PhabricatorLDAPAuthProvider' => 'applications/auth/provider/PhabricatorLDAPAuthProvider.php', 3364 3363 'PhabricatorLabelProfileMenuItem' => 'applications/search/menuitem/PhabricatorLabelProfileMenuItem.php', 3364 + 'PhabricatorLanguageSettingsPanel' => 'applications/settings/panel/PhabricatorLanguageSettingsPanel.php', 3365 3365 'PhabricatorLegalpadApplication' => 'applications/legalpad/application/PhabricatorLegalpadApplication.php', 3366 3366 'PhabricatorLegalpadDocumentPHIDType' => 'applications/legalpad/phid/PhabricatorLegalpadDocumentPHIDType.php', 3367 3367 'PhabricatorLegalpadSignaturePolicyRule' => 'applications/legalpad/policyrule/PhabricatorLegalpadSignaturePolicyRule.php', ··· 7756 7756 'PhabricatorAccessLog' => 'Phobject', 7757 7757 'PhabricatorAccessLogConfigOptions' => 'PhabricatorApplicationConfigOptions', 7758 7758 'PhabricatorAccessibilitySetting' => 'PhabricatorSelectSetting', 7759 - 'PhabricatorAccountSettingsPanel' => 'PhabricatorEditEngineSettingsPanel', 7760 7759 'PhabricatorActionListView' => 'AphrontTagView', 7761 7760 'PhabricatorActionView' => 'AphrontView', 7762 7761 'PhabricatorActivitySettingsPanel' => 'PhabricatorSettingsPanel', ··· 9244 9243 'PhabricatorKeyringConfigOptionType' => 'PhabricatorConfigJSONOptionType', 9245 9244 'PhabricatorLDAPAuthProvider' => 'PhabricatorAuthProvider', 9246 9245 'PhabricatorLabelProfileMenuItem' => 'PhabricatorProfileMenuItem', 9246 + 'PhabricatorLanguageSettingsPanel' => 'PhabricatorEditEngineSettingsPanel', 9247 9247 'PhabricatorLegalpadApplication' => 'PhabricatorApplication', 9248 9248 'PhabricatorLegalpadDocumentPHIDType' => 'PhabricatorPHIDType', 9249 9249 'PhabricatorLegalpadSignaturePolicyRule' => 'PhabricatorPolicyRule',
+3 -5
src/applications/settings/controller/PhabricatorSettingsMainController.php
··· 115 115 $crumbs->setBorder(true); 116 116 117 117 if ($this->user) { 118 - $header_text = pht('Edit Settings (%s)', $user->getUserName()); 118 + $header_text = pht('Edit Settings: %s', $user->getUserName()); 119 119 } else { 120 120 $header_text = pht('Edit Global Settings'); 121 121 } ··· 127 127 128 128 $view = id(new PHUITwoColumnView()) 129 129 ->setHeader($header) 130 - ->setFixed(true) 131 - ->setNavigation($nav) 132 - ->setMainColumn($response); 130 + ->setFooter($response); 133 131 134 132 return $this->newPage() 135 133 ->setTitle($title) 136 134 ->setCrumbs($crumbs) 135 + ->setNavigation($nav) 137 136 ->appendChild($view); 138 - 139 137 } 140 138 141 139 private function buildPanels(PhabricatorUserPreferences $preferences) {
+1 -1
src/applications/settings/editor/PhabricatorSettingsEditEngine.php
··· 101 101 protected function getPageHeader($object) { 102 102 $user = $object->getUser(); 103 103 if ($user) { 104 - $text = pht('Edit Settings (%s)', $user->getUserName()); 104 + $text = pht('Edit Settings: %s', $user->getUserName()); 105 105 } else { 106 106 $text = pht('Edit Global Settings'); 107 107 }
+3 -3
src/applications/settings/panel/PhabricatorAccountSettingsPanel.php src/applications/settings/panel/PhabricatorLanguageSettingsPanel.php
··· 1 1 <?php 2 2 3 - final class PhabricatorAccountSettingsPanel 3 + final class PhabricatorLanguageSettingsPanel 4 4 extends PhabricatorEditEngineSettingsPanel { 5 5 6 - const PANELKEY = 'account'; 6 + const PANELKEY = 'language'; 7 7 8 8 public function getPanelName() { 9 - return pht('Account'); 9 + return pht('Language'); 10 10 } 11 11 12 12 public function getPanelGroupKey() {
+1 -1
src/applications/settings/panelgroup/PhabricatorSettingsAccountPanelGroup.php
··· 6 6 const PANELGROUPKEY = 'account'; 7 7 8 8 public function getPanelGroupName() { 9 - return null; 9 + return pht('Account'); 10 10 } 11 11 12 12 protected function getPanelGroupOrder() {
+1 -1
src/applications/settings/setting/PhabricatorPronounSetting.php
··· 10 10 } 11 11 12 12 public function getSettingPanelKey() { 13 - return PhabricatorAccountSettingsPanel::PANELKEY; 13 + return PhabricatorLanguageSettingsPanel::PANELKEY; 14 14 } 15 15 16 16 protected function getSettingOrder() {
+1 -1
src/applications/settings/setting/PhabricatorTranslationSetting.php
··· 10 10 } 11 11 12 12 public function getSettingPanelKey() { 13 - return PhabricatorAccountSettingsPanel::PANELKEY; 13 + return PhabricatorLanguageSettingsPanel::PANELKEY; 14 14 } 15 15 16 16 protected function getSettingOrder() {
+3 -5
src/applications/transactions/editengine/PhabricatorEditEngine.php
··· 1249 1249 $view->setHeader($page_header); 1250 1250 } 1251 1251 1252 + $view->setFooter($content); 1253 + 1252 1254 $page = $controller->newPage() 1253 1255 ->setTitle($header_text) 1254 1256 ->setCrumbs($crumbs) ··· 1256 1258 1257 1259 $navigation = $this->getNavigation(); 1258 1260 if ($navigation) { 1259 - $view->setFixed(true); 1260 - $view->setNavigation($navigation); 1261 - $view->setMainColumn($content); 1262 - } else { 1263 - $view->setFooter($content); 1261 + $page->setNavigation($navigation); 1264 1262 } 1265 1263 1266 1264 return $page;