From f1cd22716ad83f292739145c5e548237fd342769 Mon Sep 17 00:00:00 2001 From: epriestley Date: Mon, 1 Oct 2012 14:05:37 -0700 Subject: [PATCH] Link "More Stuff" to /applications/, not /apps/ Summary: D3575, D3576, D3577, D3578, D3579, D3580 put all the /apps/ links on /applications/, so we can get rid of /apps/ without loss of functionality. Test Plan: Clicked "More Stuff" on the homepage, got /applications/ instead of /apps/. Reviewers: vrana, btrahan Reviewed By: vrana CC: aran Differential Revision: https://secure.phabricator.com/D3581 --- ...AphrontDefaultApplicationConfiguration.php | 2 +- .../PhabricatorDirectoryController.php | 2 +- .../PhabricatorDirectoryMainController.php | 165 ------------------ 3 files changed, 2 insertions(+), 167 deletions(-) diff --git a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php index 7487a234d5..8d062e86c2 100644 --- a/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php +++ b/src/aphront/configuration/AphrontDefaultApplicationConfiguration.php @@ -32,7 +32,7 @@ class AphrontDefaultApplicationConfiguration public function getURIMap() { return $this->getResourceURIMapRules() + array( - '/(?:(?P(?:jump|apps))/)?' => + '/(?:(?P(?:jump))/)?' => 'PhabricatorDirectoryMainController', '/(?:(?Pfeed)/)' => array( 'public/' => 'PhabricatorFeedPublicStreamController', diff --git a/src/applications/directory/controller/PhabricatorDirectoryController.php b/src/applications/directory/controller/PhabricatorDirectoryController.php index 756e16c700..41524dc44a 100644 --- a/src/applications/directory/controller/PhabricatorDirectoryController.php +++ b/src/applications/directory/controller/PhabricatorDirectoryController.php @@ -42,7 +42,7 @@ abstract class PhabricatorDirectoryController extends PhabricatorController { $nav->addFilter('jump', 'Jump Nav'); $nav->addFilter('feed', 'Feed'); $nav->addSpacer(); - $nav->addFilter('apps', 'More Stuff'); + $nav->addFilter('applications', 'More Stuff'); return $nav; } diff --git a/src/applications/directory/controller/PhabricatorDirectoryMainController.php b/src/applications/directory/controller/PhabricatorDirectoryMainController.php index a1407d160d..ff9a8a5618 100644 --- a/src/applications/directory/controller/PhabricatorDirectoryMainController.php +++ b/src/applications/directory/controller/PhabricatorDirectoryMainController.php @@ -35,7 +35,6 @@ final class PhabricatorDirectoryMainController switch ($this->filter) { case 'jump': - case 'apps': break; case 'home': case 'feed': @@ -53,8 +52,6 @@ final class PhabricatorDirectoryMainController return $this->buildFeedResponse($nav, $projects); case 'jump': return $this->buildJumpResponse($nav); - case 'apps': - return $this->buildAppsResponse($nav); default: return $this->buildMainResponse($nav, $projects); } @@ -686,166 +683,4 @@ final class PhabricatorDirectoryMainController return $panel; } - public function buildAppsResponse(AphrontSideNavFilterView $nav) { - $user = $this->getRequest()->getUser(); - - $apps = array( - array( - '/repository/', - 'Repositories', - 'Configure tracked source code repositories.', - ), - array( - '/herald/', - 'Herald', - 'Create notification rules. Watch for danger!', - ), - array( - '/file/', - 'Files', - 'Upload and download files. Blob store for Pokemon pictures.', - ), - array( - '/project/', - 'Projects', - 'Group stuff into big piles.', - ), - array( - '/vote/', - 'Slowvote', - 'Create polls. Design by committee.', - ), - array( - '/countdown/', - 'Countdown', - 'Count down to events. Utilize the full capabilities of your ALU.', - ), - array( - '/people/', - 'People', - 'User directory. Sort of a social utility.', - ), - array( - '/owners/', - 'Owners', - 'Keep track of who owns code. Adopt today!', - ), - array( - '/conduit/', - 'Conduit API Console', - 'Web console for Conduit API.', - ), - array( - '/daemon/', - 'Daemon Console', - 'Offline process management.', - ), - array( - '/mail/', - 'MetaMTA', - 'Manage mail delivery. Yo dawg, we heard you like MTAs.', - array( - 'admin' => true, - ), - ), - array( - '/phid/', - 'PHID Manager', - 'Debugging tool for PHIDs.', - ), - array( - '/xhpast/', - 'XHPAST', - 'Web interface to PHP AST tool. Lex XHP AST & CTS FYI, LOL.', - ), - array( - 'http://www.phabricator.com/docs/phabricator/', - 'Phabricator Ducks', - 'Oops, that should say "Docs".', - array( - 'new' => true, - ), - ), - array( - 'http://www.phabricator.com/docs/arcanist/', - 'Arcanist Docs', - 'Words have never been so finely crafted.', - array( - 'new' => true, - ), - ), - array( - 'http://www.phabricator.com/docs/libphutil/', - 'libphutil Docs', - 'Soothing prose; seductive poetry.', - array( - 'new' => true, - ), - ), - array( - 'http://www.phabricator.com/docs/javelin/', - 'Javelin Docs', - 'O, what noble scribe hath penned these words?', - array( - 'new' => true, - ), - ), - array( - '/uiexample/', - 'UI Examples', - 'Phabricator UI elements. A gallery of modern art.', - array( - 'new' => true, - ), - ), - ); - - $out = array(); - foreach ($apps as $app) { - if (empty($app[3])) { - $app[3] = array(); - } - $app[3] += array( - 'admin' => false, - 'new' => false, - ); - list($href, $name, $desc, $options) = $app; - - if ($options['admin'] && !$user->getIsAdmin()) { - continue; - } - - $link = phutil_render_tag( - 'a', - array( - 'href' => $href, - 'target' => $options['new'] ? '_blank' : null, - ), - phutil_escape_html($name)); - - - - $out[] = - '
'. - '

'.$link.'

'. - '

'.phutil_escape_html($desc).'

'. - '
'; - } - - require_celerity_resource('phabricator-directory-css'); - - $out = - '
'. - implode("\n", $out). - '
'; - - $nav->appendChild($out); - - return $this->buildStandardPageResponse( - $nav, - array( - 'title' => 'More Stuff', - )); - } - }