diff --git a/src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php b/src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php index cedf46bd33..5834984a65 100644 --- a/src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php +++ b/src/applications/auth/controller/PhabricatorAuthConfirmLinkController.php @@ -70,13 +70,8 @@ final class PhabricatorAuthConfirmLinkController $dialog->appendChild($form); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Confirm Link')) - ->setHref($panel_uri)); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($provider->getProviderName())); + $crumbs->addTextCrumb(pht('Confirm Link'), $panel_uri); + $crumbs->addTextCrumb($provider->getProviderName()); return $this->buildApplicationPage( array( diff --git a/src/applications/auth/controller/PhabricatorAuthLinkController.php b/src/applications/auth/controller/PhabricatorAuthLinkController.php index 326474fe2b..3cb06928a2 100644 --- a/src/applications/auth/controller/PhabricatorAuthLinkController.php +++ b/src/applications/auth/controller/PhabricatorAuthLinkController.php @@ -115,13 +115,8 @@ final class PhabricatorAuthLinkController } $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Link Account')) - ->setHref($panel_uri)); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($provider->getProviderName($name))); + $crumbs->addTextCrumb(pht('Link Account'), $panel_uri); + $crumbs->addTextCrumb($provider->getProviderName($name)); return $this->buildApplicationPage( array( diff --git a/src/applications/auth/controller/PhabricatorAuthLoginController.php b/src/applications/auth/controller/PhabricatorAuthLoginController.php index deb71a75b1..e95babeeae 100644 --- a/src/applications/auth/controller/PhabricatorAuthLoginController.php +++ b/src/applications/auth/controller/PhabricatorAuthLoginController.php @@ -202,20 +202,12 @@ final class PhabricatorAuthLoginController $crumbs = $this->buildApplicationCrumbs(); if ($this->getRequest()->getUser()->isLoggedIn()) { - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Link Account')) - ->setHref($provider->getSettingsURI())); + $crumbs->addTextCrumb(pht('Link Account'), $provider->getSettingsURI()); } else { - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Login')) - ->setHref($this->getApplicationURI('start/'))); + $crumbs->addTextCrumb(pht('Login'), $this->getApplicationURI('start/')); } - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($provider->getProviderName())); + $crumbs->addTextCrumb($provider->getProviderName()); return $this->buildApplicationPage( array( diff --git a/src/applications/auth/controller/PhabricatorAuthRegisterController.php b/src/applications/auth/controller/PhabricatorAuthRegisterController.php index 868aa1e304..62e629079b 100644 --- a/src/applications/auth/controller/PhabricatorAuthRegisterController.php +++ b/src/applications/auth/controller/PhabricatorAuthRegisterController.php @@ -401,17 +401,11 @@ final class PhabricatorAuthRegisterController $crumbs = $this->buildApplicationCrumbs(); if ($is_setup) { - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Setup Admin Account'))); + $crumbs->addTextCrumb(pht('Setup Admin Account')); $title = pht('Welcome to Phabricator'); } else { - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Register'))); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($provider->getProviderName())); + $crumbs->addTextCrumb(pht('Register')); + $crumbs->addTextCrumb($provider->getProviderName()); $title = pht('Phabricator Registration'); } diff --git a/src/applications/auth/controller/PhabricatorAuthStartController.php b/src/applications/auth/controller/PhabricatorAuthStartController.php index 468e1f8617..81f10d7480 100644 --- a/src/applications/auth/controller/PhabricatorAuthStartController.php +++ b/src/applications/auth/controller/PhabricatorAuthStartController.php @@ -126,9 +126,7 @@ final class PhabricatorAuthStartController $login_message = phutil_safe_html($login_message); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Login'))); + $crumbs->addTextCrumb(pht('Login')); return $this->buildApplicationPage( array( diff --git a/src/applications/auth/controller/PhabricatorEmailLoginController.php b/src/applications/auth/controller/PhabricatorEmailLoginController.php index 71ba31657f..8dd7be7c25 100644 --- a/src/applications/auth/controller/PhabricatorEmailLoginController.php +++ b/src/applications/auth/controller/PhabricatorEmailLoginController.php @@ -133,9 +133,7 @@ EOBODY; ->setError($e_captcha)); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Reset Password'))); + $crumbs->addTextCrumb(pht('Reset Password')); $dialog = new AphrontDialogView(); $dialog->setUser($request->getUser()); diff --git a/src/applications/auth/controller/PhabricatorEmailVerificationController.php b/src/applications/auth/controller/PhabricatorEmailVerificationController.php index 4bbe9b2dc7..0dbb918851 100644 --- a/src/applications/auth/controller/PhabricatorEmailVerificationController.php +++ b/src/applications/auth/controller/PhabricatorEmailVerificationController.php @@ -82,9 +82,7 @@ final class PhabricatorEmailVerificationController ->appendChild($content); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Verify Email'))); + $crumbs->addTextCrumb(pht('Verify Email')); return $this->buildApplicationPage( array( diff --git a/src/applications/auth/controller/config/PhabricatorAuthEditController.php b/src/applications/auth/controller/config/PhabricatorAuthEditController.php index 0ea5b0e549..b7a79e2209 100644 --- a/src/applications/auth/controller/config/PhabricatorAuthEditController.php +++ b/src/applications/auth/controller/config/PhabricatorAuthEditController.php @@ -281,9 +281,7 @@ final class PhabricatorAuthEditController } $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($crumb)); + $crumbs->addTextCrumb($crumb); $xaction_view = null; if (!$is_new) { diff --git a/src/applications/auth/controller/config/PhabricatorAuthListController.php b/src/applications/auth/controller/config/PhabricatorAuthListController.php index 7c24bbb4a4..421e3197a2 100644 --- a/src/applications/auth/controller/config/PhabricatorAuthListController.php +++ b/src/applications/auth/controller/config/PhabricatorAuthListController.php @@ -86,9 +86,7 @@ final class PhabricatorAuthListController pht('Add Authentication Provider')))); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Auth Providers'))); + $crumbs->addTextCrumb(pht('Auth Providers')); $config_name = 'auth.email-domains'; $config_href = '/config/edit/'.$config_name.'/'; diff --git a/src/applications/auth/controller/config/PhabricatorAuthNewController.php b/src/applications/auth/controller/config/PhabricatorAuthNewController.php index 7583c8869a..3362f01357 100644 --- a/src/applications/auth/controller/config/PhabricatorAuthNewController.php +++ b/src/applications/auth/controller/config/PhabricatorAuthNewController.php @@ -87,9 +87,7 @@ final class PhabricatorAuthNewController ->setForm($form); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Add Provider'))); + $crumbs->addTextCrumb(pht('Add Provider')); return $this->buildApplicationPage( array( diff --git a/src/applications/chatlog/controller/PhabricatorChatLogChannelListController.php b/src/applications/chatlog/controller/PhabricatorChatLogChannelListController.php index 88ebc89e93..945909bbbb 100644 --- a/src/applications/chatlog/controller/PhabricatorChatLogChannelListController.php +++ b/src/applications/chatlog/controller/PhabricatorChatLogChannelListController.php @@ -23,10 +23,7 @@ final class PhabricatorChatLogChannelListController $crumbs = $this ->buildApplicationCrumbs() - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Channel List')) - ->setHref($this->getApplicationURI())); + ->addTextCrumb(pht('Channel List'), $this->getApplicationURI()); return $this->buildApplicationPage( array( diff --git a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php index 07d414264a..b457b6f001 100644 --- a/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php +++ b/src/applications/chatlog/controller/PhabricatorChatLogChannelLogController.php @@ -183,10 +183,7 @@ final class PhabricatorChatLogChannelLogController $crumbs = $this ->buildApplicationCrumbs() - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($channel->getChannelName()) - ->setHref($uri)); + ->addTextCrumb($channel->getChannelName(), $uri); $form = id(new AphrontFormView()) ->setUser($user) diff --git a/src/applications/conduit/controller/PhabricatorConduitAPIController.php b/src/applications/conduit/controller/PhabricatorConduitAPIController.php index b08873f51c..8cfe6815d4 100644 --- a/src/applications/conduit/controller/PhabricatorConduitAPIController.php +++ b/src/applications/conduit/controller/PhabricatorConduitAPIController.php @@ -380,15 +380,9 @@ final class PhabricatorConduitAPIController $method_uri = $this->getApplicationURI('method/'.$method.'/'); - $crumbs = $this->buildApplicationCrumbs(); - $crumbs - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($method) - ->setHref($method_uri)) - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Call'))); + $crumbs = $this->buildApplicationCrumbs() + ->addTextCrumb($method, $method_uri) + ->addTextCrumb(pht('Call')); return $this->buildApplicationPage( array( diff --git a/src/applications/conduit/controller/PhabricatorConduitConsoleController.php b/src/applications/conduit/controller/PhabricatorConduitConsoleController.php index 5efb0d7377..82a41de59b 100644 --- a/src/applications/conduit/controller/PhabricatorConduitConsoleController.php +++ b/src/applications/conduit/controller/PhabricatorConduitConsoleController.php @@ -116,9 +116,7 @@ final class PhabricatorConduitConsoleController ->setForm($form); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($method->getAPIMethodName())); + $crumbs->addTextCrumb($method->getAPIMethodName()); return $this->buildApplicationPage( array( diff --git a/src/applications/conduit/controller/PhabricatorConduitLogController.php b/src/applications/conduit/controller/PhabricatorConduitLogController.php index ee95ff0533..ba384c77f8 100644 --- a/src/applications/conduit/controller/PhabricatorConduitLogController.php +++ b/src/applications/conduit/controller/PhabricatorConduitLogController.php @@ -40,9 +40,7 @@ final class PhabricatorConduitLogController $table = $this->renderCallTable($calls, $conns); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Call Logs'))); + $crumbs->addTextCrumb(pht('Call Logs')); return $this->buildApplicationPage( array( diff --git a/src/applications/conduit/controller/PhabricatorConduitTokenController.php b/src/applications/conduit/controller/PhabricatorConduitTokenController.php index b750d60d4c..4a44c558c0 100644 --- a/src/applications/conduit/controller/PhabricatorConduitTokenController.php +++ b/src/applications/conduit/controller/PhabricatorConduitTokenController.php @@ -49,9 +49,7 @@ final class PhabricatorConduitTokenController ->appendRemarkupInstructions($post_instructions); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Install Certificate'))); + $crumbs->addTextCrumb(pht('Install Certificate')); $object_box = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Certificate Token')) diff --git a/src/applications/config/controller/PhabricatorConfigAllController.php b/src/applications/config/controller/PhabricatorConfigAllController.php index c6a8dba05a..d1222775ef 100644 --- a/src/applications/config/controller/PhabricatorConfigAllController.php +++ b/src/applications/config/controller/PhabricatorConfigAllController.php @@ -56,9 +56,7 @@ final class PhabricatorConfigAllController $crumbs = $this ->buildApplicationCrumbs() - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title)); + ->addTextCrumb($title); $panel = new AphrontPanelView(); $panel->appendChild($table); diff --git a/src/applications/config/controller/PhabricatorConfigEditController.php b/src/applications/config/controller/PhabricatorConfigEditController.php index f7bf9cbb1b..42bc8bfe59 100644 --- a/src/applications/config/controller/PhabricatorConfigEditController.php +++ b/src/applications/config/controller/PhabricatorConfigEditController.php @@ -199,22 +199,13 @@ final class PhabricatorConfigEditController ->setForm($form); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Config')) - ->setHref($this->getApplicationURI())); + $crumbs->addTextCrumb(pht('Config'), $this->getApplicationURI()); if ($group) { - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($group->getName()) - ->setHref($group_uri)); + $crumbs->addTextCrumb($group->getName(), $group_uri); } - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($this->key) - ->setHref('/config/edit/'.$this->key)); + $crumbs->addTextCrumb($this->key, '/config/edit/'.$this->key); $xactions = id(new PhabricatorConfigTransactionQuery()) ->withObjectPHIDs(array($config_entry->getPHID())) diff --git a/src/applications/config/controller/PhabricatorConfigGroupController.php b/src/applications/config/controller/PhabricatorConfigGroupController.php index bdd4c73cd9..0f18fb7813 100644 --- a/src/applications/config/controller/PhabricatorConfigGroupController.php +++ b/src/applications/config/controller/PhabricatorConfigGroupController.php @@ -28,14 +28,8 @@ final class PhabricatorConfigGroupController $crumbs = $this ->buildApplicationCrumbs() - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Config')) - ->setHref($this->getApplicationURI())) - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($options->getName()) - ->setHref($this->getApplicationURI())); + ->addTextCrumb(pht('Config'), $this->getApplicationURI()) + ->addTextCrumb($options->getName(), $this->getApplicationURI()); return $this->buildApplicationPage( array( diff --git a/src/applications/config/controller/PhabricatorConfigIssueListController.php b/src/applications/config/controller/PhabricatorConfigIssueListController.php index f9b1333ca3..7e002c92ea 100644 --- a/src/applications/config/controller/PhabricatorConfigIssueListController.php +++ b/src/applications/config/controller/PhabricatorConfigIssueListController.php @@ -30,10 +30,7 @@ final class PhabricatorConfigIssueListController $crumbs = $this ->buildApplicationCrumbs($nav) - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Setup')) - ->setHref($this->getApplicationURI('issue/'))); + ->addTextCrumb(pht('Setup'), $this->getApplicationURI('issue/')); $nav->setCrumbs($crumbs); diff --git a/src/applications/config/controller/PhabricatorConfigIssueViewController.php b/src/applications/config/controller/PhabricatorConfigIssueViewController.php index bfc294d7ca..d10d154c9a 100644 --- a/src/applications/config/controller/PhabricatorConfigIssueViewController.php +++ b/src/applications/config/controller/PhabricatorConfigIssueViewController.php @@ -38,14 +38,8 @@ final class PhabricatorConfigIssueViewController $crumbs = $this ->buildApplicationCrumbs() - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Setup Issues')) - ->setHref($this->getApplicationURI('issue/'))) - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title) - ->setHref($request->getRequestURI())); + ->addTextCrumb(pht('Setup Issues'), $this->getApplicationURI('issue/')) + ->addTextCrumb($title, $request->getRequestURI()); return $this->buildApplicationPage( array( diff --git a/src/applications/config/controller/PhabricatorConfigListController.php b/src/applications/config/controller/PhabricatorConfigListController.php index a583fbb491..101e163834 100644 --- a/src/applications/config/controller/PhabricatorConfigListController.php +++ b/src/applications/config/controller/PhabricatorConfigListController.php @@ -26,10 +26,7 @@ final class PhabricatorConfigListController $crumbs = $this ->buildApplicationCrumbs() - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Config')) - ->setHref($this->getApplicationURI())); + ->addTextCrumb(pht('Config'), $this->getApplicationURI()); $nav->setCrumbs($crumbs); diff --git a/src/applications/countdown/controller/PhabricatorCountdownEditController.php b/src/applications/countdown/controller/PhabricatorCountdownEditController.php index 18d7b0bdff..b993f490dd 100644 --- a/src/applications/countdown/controller/PhabricatorCountdownEditController.php +++ b/src/applications/countdown/controller/PhabricatorCountdownEditController.php @@ -90,18 +90,11 @@ final class PhabricatorCountdownEditController $cancel_uri = '/countdown/'; if ($countdown->getID()) { $cancel_uri = '/countdown/'.$countdown->getID().'/'; - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName('C'.$countdown->getID()) - ->setHref($cancel_uri)); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit'))); + $crumbs->addTextCrumb('C'.$countdown->getID(), $cancel_uri); + $crumbs->addTextCrumb(pht('Edit')); $submit_label = pht('Save Changes'); } else { - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Create Countdown'))); + $crumbs->addTextCrumb(pht('Create Countdown')); $submit_label = pht('Create Countdown'); } diff --git a/src/applications/countdown/controller/PhabricatorCountdownViewController.php b/src/applications/countdown/controller/PhabricatorCountdownViewController.php index 1522b42513..7d6ed8c2ce 100644 --- a/src/applications/countdown/controller/PhabricatorCountdownViewController.php +++ b/src/applications/countdown/controller/PhabricatorCountdownViewController.php @@ -36,9 +36,7 @@ final class PhabricatorCountdownViewController $crumbs = $this ->buildApplicationCrumbs() - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName("C{$id}")); + ->addTextCrumb("C{$id}"); $header = id(new PHUIHeaderView()) ->setHeader($title) diff --git a/src/applications/daemon/controller/PhabricatorDaemonConsoleController.php b/src/applications/daemon/controller/PhabricatorDaemonConsoleController.php index 8a130939d1..a7188c5f6b 100644 --- a/src/applications/daemon/controller/PhabricatorDaemonConsoleController.php +++ b/src/applications/daemon/controller/PhabricatorDaemonConsoleController.php @@ -211,9 +211,7 @@ final class PhabricatorDaemonConsoleController $queued_panel->setNoBackground(); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Console'))); + $crumbs->addTextCrumb(pht('Console')); $nav = $this->buildSideNavView(); $nav->selectFilter('/'); diff --git a/src/applications/daemon/controller/PhabricatorDaemonLogEventViewController.php b/src/applications/daemon/controller/PhabricatorDaemonLogEventViewController.php index a57b41c483..aaf5e00e8f 100644 --- a/src/applications/daemon/controller/PhabricatorDaemonLogEventViewController.php +++ b/src/applications/daemon/controller/PhabricatorDaemonLogEventViewController.php @@ -29,14 +29,11 @@ final class PhabricatorDaemonLogEventViewController $daemon_id = $event->getLogID(); - $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Daemon %s', $daemon_id)) - ->setHref($this->getApplicationURI("log/{$daemon_id}/"))); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Event %s', $event->getID()))); + $crumbs = $this->buildApplicationCrumbs() + ->addTextCrumb( + pht('Daemon %s', $daemon_id), + $this->getApplicationURI("log/{$daemon_id}/")) + ->addTextCrumb(pht('Event %s', $event->getID())); return $this->buildApplicationPage( diff --git a/src/applications/daemon/controller/PhabricatorDaemonLogListController.php b/src/applications/daemon/controller/PhabricatorDaemonLogListController.php index 32aa288f46..e97220a243 100644 --- a/src/applications/daemon/controller/PhabricatorDaemonLogListController.php +++ b/src/applications/daemon/controller/PhabricatorDaemonLogListController.php @@ -19,9 +19,7 @@ final class PhabricatorDaemonLogListController $daemon_table->setDaemonLogs($logs); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('All Daemons'))); + $crumbs->addTextCrumb(pht('All Daemons')); $nav = $this->buildSideNavView(); $nav->selectFilter('log'); diff --git a/src/applications/daemon/controller/PhabricatorDaemonLogViewController.php b/src/applications/daemon/controller/PhabricatorDaemonLogViewController.php index 12fd283680..acec799b53 100644 --- a/src/applications/daemon/controller/PhabricatorDaemonLogViewController.php +++ b/src/applications/daemon/controller/PhabricatorDaemonLogViewController.php @@ -26,9 +26,7 @@ final class PhabricatorDaemonLogViewController $log->getID()); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Daemon %s', $log->getID()))); + $crumbs->addTextCrumb(pht('Daemon %s', $log->getID())); $header = id(new PHUIHeaderView()) ->setHeader($log->getDaemon()); diff --git a/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php b/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php index f8f9b39f72..68b75ba06d 100644 --- a/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php +++ b/src/applications/daemon/controller/PhabricatorWorkerTaskDetailController.php @@ -58,9 +58,7 @@ final class PhabricatorWorkerTaskDetailController } $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title)); + $crumbs->addTextCrumb($title); return $this->buildApplicationPage( array( diff --git a/src/applications/differential/controller/DifferentialDiffCreateController.php b/src/applications/differential/controller/DifferentialDiffCreateController.php index dd2776b42e..cd30487112 100644 --- a/src/applications/differential/controller/DifferentialDiffCreateController.php +++ b/src/applications/differential/controller/DifferentialDiffCreateController.php @@ -88,9 +88,7 @@ final class DifferentialDiffCreateController extends DifferentialController { ->setForm($form); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Create Diff'))); + $crumbs->addTextCrumb(pht('Create Diff')); if ($errors) { $errors = id(new AphrontErrorView()) diff --git a/src/applications/differential/controller/DifferentialDiffViewController.php b/src/applications/differential/controller/DifferentialDiffViewController.php index f6543a93d5..1063b5338f 100644 --- a/src/applications/differential/controller/DifferentialDiffViewController.php +++ b/src/applications/differential/controller/DifferentialDiffViewController.php @@ -146,9 +146,7 @@ final class DifferentialDiffViewController extends DifferentialController { ->setUser($request->getUser()); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Diff %d', $diff->getID()))); + $crumbs->addTextCrumb(pht('Diff %d', $diff->getID())); return $this->buildApplicationPage( array( diff --git a/src/applications/differential/controller/DifferentialRevisionEditController.php b/src/applications/differential/controller/DifferentialRevisionEditController.php index a136274dea..e58c88038e 100644 --- a/src/applications/differential/controller/DifferentialRevisionEditController.php +++ b/src/applications/differential/controller/DifferentialRevisionEditController.php @@ -153,16 +153,14 @@ final class DifferentialRevisionEditController extends DifferentialController { if ($revision->getID()) { if ($diff) { $title = pht('Update Differential Revision'); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName('D'.$revision->getID()) - ->setHref('/differential/diff/'.$diff->getID().'/')); + $crumbs->addTextCrumb( + 'D'.$revision->getID(), + '/differential/diff/'.$diff->getID().'/'); } else { $title = pht('Edit Differential Revision'); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName('D'.$revision->getID()) - ->setHref('/D'.$revision->getID())); + $crumbs->addTextCrumb( + 'D'.$revision->getID(), + '/D'.$revision->getID()); } } else { $title = pht('Create New Differential Revision'); @@ -173,9 +171,7 @@ final class DifferentialRevisionEditController extends DifferentialController { ->setFormError($error_view) ->setForm($form); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title)); + $crumbs->addTextCrumb($title); return $this->buildApplicationPage( array( diff --git a/src/applications/differential/controller/DifferentialRevisionViewController.php b/src/applications/differential/controller/DifferentialRevisionViewController.php index e418669ada..60a0acf210 100644 --- a/src/applications/differential/controller/DifferentialRevisionViewController.php +++ b/src/applications/differential/controller/DifferentialRevisionViewController.php @@ -421,10 +421,7 @@ final class DifferentialRevisionViewController extends DifferentialController { ); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($object_id) - ->setHref('/'.$object_id)); + $crumbs->addTextCrumb($object_id, '/'.$object_id); $prefs = $user->loadPreferences(); diff --git a/src/applications/diffusion/controller/DiffusionLintController.php b/src/applications/diffusion/controller/DiffusionLintController.php index ce462e9ad6..f826f33aa8 100644 --- a/src/applications/diffusion/controller/DiffusionLintController.php +++ b/src/applications/diffusion/controller/DiffusionLintController.php @@ -139,9 +139,7 @@ final class DiffusionLintController extends DiffusionController { if ($this->diffusionRequest) { $title[] = $drequest->getCallsign(); } else { - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('All Lint'))); + $crumbs->addTextCrumb(pht('All Lint')); } if ($this->diffusionRequest) { diff --git a/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php b/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php index f38ddffc26..f6aa65e8fa 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryCreateController.php @@ -181,9 +181,7 @@ final class DiffusionRepositoryCreateController } $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title)); + $crumbs->addTextCrumb($title); return $this->buildApplicationPage( array( diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditActionsController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditActionsController.php index 67e3b7aa7e..fe2e2f818b 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryEditActionsController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditActionsController.php @@ -59,9 +59,7 @@ final class DiffusionRepositoryEditActionsController $content = array(); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit Actions'))); + $crumbs->addTextCrumb(pht('Edit Actions')); $title = pht('Edit Actions (%s)', $repository->getName()); diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php index 62b58da016..7729b5d164 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditBasicController.php @@ -67,9 +67,7 @@ final class DiffusionRepositoryEditBasicController } $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit Basics'))); + $crumbs->addTextCrumb(pht('Edit Basics')); $title = pht('Edit %s', $repository->getName()); diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditBranchesController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditBranchesController.php index b22cf68cfb..27ada2d132 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryEditBranchesController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditBranchesController.php @@ -88,9 +88,7 @@ final class DiffusionRepositoryEditBranchesController $content = array(); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit Branches'))); + $crumbs->addTextCrumb(pht('Edit Branches')); $title = pht('Edit Branches (%s)', $repository->getName()); diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditController.php index 292597cbf5..6b8deca4f4 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryEditController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditController.php @@ -11,20 +11,12 @@ abstract class DiffusionRepositoryEditController $repo_uri = $this->getRepositoryControllerURI($repository, ''); $edit_uri = $this->getRepositoryControllerURI($repository, 'edit/'); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName('r'.$repository->getCallsign()) - ->setHref($repo_uri)); + $crumbs->addTextCrumb('r'.$repository->getCallsign(), $repo_uri); if ($is_main) { - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit Repository'))); + $crumbs->addTextCrumb(pht('Edit Repository')); } else { - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit')) - ->setHref($edit_uri)); + $crumbs->addTextCrumb(pht('Edit'), $edit_uri); } } diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php index 24ad783e09..eebc6d193f 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditEncodingController.php @@ -57,9 +57,7 @@ final class DiffusionRepositoryEditEncodingController } $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit Encoding'))); + $crumbs->addTextCrumb(pht('Edit Encoding')); $title = pht('Edit %s', $repository->getName()); diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditHostingController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditHostingController.php index c09afc5fd3..4665aa8438 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryEditHostingController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditHostingController.php @@ -67,9 +67,7 @@ final class DiffusionRepositoryEditHostingController } $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit Hosting'))); + $crumbs->addTextCrumb(pht('Edit Hosting')); $title = pht('Edit Hosting (%s)', $repository->getName()); @@ -172,9 +170,7 @@ final class DiffusionRepositoryEditHostingController } $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit Protocols'))); + $crumbs->addTextCrumb(pht('Edit Protocols')); $title = pht('Edit Protocols (%s)', $repository->getName()); diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditLocalController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditLocalController.php index 225ca9bd36..34e66e21b0 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryEditLocalController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditLocalController.php @@ -29,9 +29,7 @@ final class DiffusionRepositoryEditLocalController $errors = array(); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit Local'))); + $crumbs->addTextCrumb(pht('Edit Local')); $title = pht('Edit %s', $repository->getName()); diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditPolicyController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditPolicyController.php index 1a6f7dff2e..47ca660c28 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryEditPolicyController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditPolicyController.php @@ -67,9 +67,7 @@ final class DiffusionRepositoryEditPolicyController $content = array(); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit Policies'))); + $crumbs->addTextCrumb(pht('Edit Policies')); $title = pht('Edit Policies (%s)', $repository->getName()); diff --git a/src/applications/diffusion/controller/DiffusionRepositoryEditSubversionController.php b/src/applications/diffusion/controller/DiffusionRepositoryEditSubversionController.php index 425d28d38b..a4985e7f33 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryEditSubversionController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryEditSubversionController.php @@ -70,9 +70,7 @@ final class DiffusionRepositoryEditSubversionController $content = array(); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit Subversion Info'))); + $crumbs->addTextCrumb(pht('Edit Subversion Info')); $title = pht('Edit Subversion Info (%s)', $repository->getName()); diff --git a/src/applications/diffusion/controller/DiffusionRepositoryNewController.php b/src/applications/diffusion/controller/DiffusionRepositoryNewController.php index 5700b8a577..ecc4b5d1e3 100644 --- a/src/applications/diffusion/controller/DiffusionRepositoryNewController.php +++ b/src/applications/diffusion/controller/DiffusionRepositoryNewController.php @@ -67,9 +67,7 @@ final class DiffusionRepositoryNewController ->addCancelButton($this->getApplicationURI())); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('New Repository'))); + $crumbs->addTextCrumb(pht('New Repository')); $form_box = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Create or Import Repository')) diff --git a/src/applications/diviner/controller/DivinerAtomController.php b/src/applications/diviner/controller/DivinerAtomController.php index d3895fc4ad..d968e85ee7 100644 --- a/src/applications/diviner/controller/DivinerAtomController.php +++ b/src/applications/diviner/controller/DivinerAtomController.php @@ -59,18 +59,15 @@ final class DivinerAtomController extends DivinerController { $atom = $symbol->getAtom(); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($book->getShortTitle()) - ->setHref('/book/'.$book->getName().'/')); + $crumbs->addTextCrumb( + $book->getShortTitle(), + '/book/'.$book->getName().'/'); $atom_short_title = $atom->getDocblockMetaValue( 'short', $symbol->getTitle()); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($atom_short_title)); + $crumbs->addTextCrumb($atom_short_title); $header = id(new PHUIHeaderView()) ->setHeader($this->renderFullSignature($symbol)) diff --git a/src/applications/diviner/controller/DivinerBookController.php b/src/applications/diviner/controller/DivinerBookController.php index a3aeaedfc5..0ab122e801 100644 --- a/src/applications/diviner/controller/DivinerBookController.php +++ b/src/applications/diviner/controller/DivinerBookController.php @@ -27,10 +27,9 @@ final class DivinerBookController extends DivinerController { $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($book->getShortTitle()) - ->setHref('/book/'.$book->getName().'/')); + $crumbs->addTextCrumb( + $book->getShortTitle(), + '/book/'.$book->getName().'/'); $header = id(new PHUIHeaderView()) ->setHeader($book->getTitle()) diff --git a/src/applications/diviner/controller/DivinerLegacyController.php b/src/applications/diviner/controller/DivinerLegacyController.php index b38926b631..1efdb8c5d0 100644 --- a/src/applications/diviner/controller/DivinerLegacyController.php +++ b/src/applications/diviner/controller/DivinerLegacyController.php @@ -43,9 +43,7 @@ final class DivinerLegacyController extends DivinerController { } $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Documentation'))); + $crumbs->addTextCrumb(pht('Documentation')); $header = id(new PHUIHeaderView()) ->setHeader(pht('Documentation')); diff --git a/src/applications/drydock/controller/DrydockBlueprintEditController.php b/src/applications/drydock/controller/DrydockBlueprintEditController.php index 9b2d2cb18a..976640875d 100644 --- a/src/applications/drydock/controller/DrydockBlueprintEditController.php +++ b/src/applications/drydock/controller/DrydockBlueprintEditController.php @@ -80,12 +80,8 @@ final class DrydockBlueprintEditController extends DrydockController { $title = pht('Edit Blueprint'); $header = pht('Edit Blueprint %d', $blueprint->getID()); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Blueprint %d', $blueprint->getID()))); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit'))); + $crumbs->addTextCrumb(pht('Blueprint %d', $blueprint->getID())); + $crumbs->addTextCrumb(pht('Edit')); if ($request->isAjax()) { $dialog = id(new AphrontDialogView()) diff --git a/src/applications/drydock/controller/DrydockBlueprintListController.php b/src/applications/drydock/controller/DrydockBlueprintListController.php index 3c18e98d13..af0594768a 100644 --- a/src/applications/drydock/controller/DrydockBlueprintListController.php +++ b/src/applications/drydock/controller/DrydockBlueprintListController.php @@ -18,10 +18,7 @@ final class DrydockBlueprintListController extends DrydockController { $blueprint_list = $this->buildBlueprintListView($blueprints); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title) - ->setHref($request->getRequestURI())); + $crumbs->addTextCrumb($title, $request->getRequestURI()); $crumbs->addAction( id(new PHUIListItemView()) diff --git a/src/applications/drydock/controller/DrydockBlueprintViewController.php b/src/applications/drydock/controller/DrydockBlueprintViewController.php index 44e21a116a..bed26299fb 100644 --- a/src/applications/drydock/controller/DrydockBlueprintViewController.php +++ b/src/applications/drydock/controller/DrydockBlueprintViewController.php @@ -42,9 +42,7 @@ final class DrydockBlueprintViewController extends DrydockController { $crumbs = $this->buildApplicationCrumbs(); $crumbs->setActionList($actions); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Blueprint %d', $blueprint->getID()))); + $crumbs->addTextCrumb(pht('Blueprint %d', $blueprint->getID())); $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) diff --git a/src/applications/drydock/controller/DrydockLeaseListController.php b/src/applications/drydock/controller/DrydockLeaseListController.php index 8ae5e4add5..791299ff4f 100644 --- a/src/applications/drydock/controller/DrydockLeaseListController.php +++ b/src/applications/drydock/controller/DrydockLeaseListController.php @@ -31,10 +31,7 @@ final class DrydockLeaseListController extends DrydockController { )); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title) - ->setHref($request->getRequestURI())); + $crumbs->addTextCrumb($title, $request->getRequestURI()); $nav->setCrumbs($crumbs); return $this->buildApplicationPage( diff --git a/src/applications/drydock/controller/DrydockLeaseViewController.php b/src/applications/drydock/controller/DrydockLeaseViewController.php index 78f5447c3a..4739dfdbcf 100644 --- a/src/applications/drydock/controller/DrydockLeaseViewController.php +++ b/src/applications/drydock/controller/DrydockLeaseViewController.php @@ -40,10 +40,7 @@ final class DrydockLeaseViewController extends DrydockController { $crumbs = $this->buildApplicationCrumbs(); $crumbs->setActionList($actions); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title) - ->setHref($lease_uri)); + $crumbs->addTextCrumb($title, $lease_uri); $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) diff --git a/src/applications/drydock/controller/DrydockLogController.php b/src/applications/drydock/controller/DrydockLogController.php index 1a378df3cc..73907468b9 100644 --- a/src/applications/drydock/controller/DrydockLogController.php +++ b/src/applications/drydock/controller/DrydockLogController.php @@ -43,10 +43,7 @@ final class DrydockLogController extends DrydockController { )); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title) - ->setHref($this->getApplicationURI('/logs/'))); + $crumbs->addTextCrumb($title, $this->getApplicationURI('/logs/')); $nav->setCrumbs($crumbs); return $this->buildApplicationPage( diff --git a/src/applications/drydock/controller/DrydockResourceListController.php b/src/applications/drydock/controller/DrydockResourceListController.php index f93e343aa3..a868eefc29 100644 --- a/src/applications/drydock/controller/DrydockResourceListController.php +++ b/src/applications/drydock/controller/DrydockResourceListController.php @@ -20,10 +20,7 @@ final class DrydockResourceListController extends DrydockController { $resource_list = $this->buildResourceListView($resources); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title) - ->setHref($request->getRequestURI())); + $crumbs->addTextCrumb($title, $request->getRequestURI()); $nav = $this->buildSideNav('resource'); $nav->setCrumbs($crumbs); diff --git a/src/applications/drydock/controller/DrydockResourceViewController.php b/src/applications/drydock/controller/DrydockResourceViewController.php index 2421296322..46ecc1a4c4 100644 --- a/src/applications/drydock/controller/DrydockResourceViewController.php +++ b/src/applications/drydock/controller/DrydockResourceViewController.php @@ -49,9 +49,7 @@ final class DrydockResourceViewController extends DrydockController { $crumbs = $this->buildApplicationCrumbs(); $crumbs->setActionList($actions); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Resource %d', $resource->getID()))); + $crumbs->addTextCrumb(pht('Resource %d', $resource->getID())); $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) diff --git a/src/applications/feed/controller/PhabricatorFeedDetailController.php b/src/applications/feed/controller/PhabricatorFeedDetailController.php index 9b43f150bc..98ee7e2f66 100644 --- a/src/applications/feed/controller/PhabricatorFeedDetailController.php +++ b/src/applications/feed/controller/PhabricatorFeedDetailController.php @@ -30,9 +30,7 @@ final class PhabricatorFeedDetailController extends PhabricatorFeedController { $feed_view = phutil_tag_div('phabricator-feed-frame', $feed_view); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title)); + $crumbs->addTextCrumb($title); return $this->buildApplicationPage( diff --git a/src/applications/files/controller/PhabricatorFileInfoController.php b/src/applications/files/controller/PhabricatorFileInfoController.php index 0f7fe42d56..b224c9b55d 100644 --- a/src/applications/files/controller/PhabricatorFileInfoController.php +++ b/src/applications/files/controller/PhabricatorFileInfoController.php @@ -47,10 +47,9 @@ final class PhabricatorFileInfoController extends PhabricatorFileController { $timeline = $this->buildTransactionView($file, $xactions); $crumbs = $this->buildApplicationCrumbs(); $crumbs->setActionList($actions); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName('F'.$file->getID()) - ->setHref($this->getApplicationURI("/info/{$phid}/"))); + $crumbs->addTextCrumb( + 'F'.$file->getID(), + $this->getApplicationURI("/info/{$phid}/")); $object_box = id(new PHUIObjectBoxView()) ->setHeader($header); diff --git a/src/applications/files/controller/PhabricatorFileUploadController.php b/src/applications/files/controller/PhabricatorFileUploadController.php index b92bd9ac09..22d5846e4c 100644 --- a/src/applications/files/controller/PhabricatorFileUploadController.php +++ b/src/applications/files/controller/PhabricatorFileUploadController.php @@ -60,10 +60,7 @@ final class PhabricatorFileUploadController extends PhabricatorFileController { ->appendChild($instructions); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Upload')) - ->setHref($request->getRequestURI())); + $crumbs->addTextCrumb(pht('Upload'), $request->getRequestURI()); $title = pht('Upload File'); diff --git a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php index 8029b6fc3a..09d5f7ec2b 100644 --- a/src/applications/harbormaster/controller/HarbormasterBuildViewController.php +++ b/src/applications/harbormaster/controller/HarbormasterBuildViewController.php @@ -37,9 +37,7 @@ final class HarbormasterBuildViewController $this->buildPropertyLists($box, $build, $actions); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title)); + $crumbs->addTextCrumb($title); $build_targets = id(new HarbormasterBuildTargetQuery()) ->setViewer($viewer) diff --git a/src/applications/harbormaster/controller/HarbormasterBuildableEditController.php b/src/applications/harbormaster/controller/HarbormasterBuildableEditController.php index 1bfdf59934..3c27fb8ace 100644 --- a/src/applications/harbormaster/controller/HarbormasterBuildableEditController.php +++ b/src/applications/harbormaster/controller/HarbormasterBuildableEditController.php @@ -119,18 +119,11 @@ final class HarbormasterBuildableEditController $crumbs = $this->buildApplicationCrumbs(); if ($is_new) { - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('New Buildable'))); + $crumbs->addTextCrumb(pht('New Buildable')); } else { $id = $buildable->getID(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName("B{$id}") - ->setHref("/B{$id}")); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit'))); + $crumbs->addTextCrumb("B{$id}", "/B{$id}"); + $crumbs->addTextCrumb(pht('Edit')); } return $this->buildApplicationPage( diff --git a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php index 758d8b28da..41e5ad747c 100644 --- a/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php +++ b/src/applications/harbormaster/controller/HarbormasterBuildableViewController.php @@ -94,9 +94,7 @@ final class HarbormasterBuildableViewController $this->buildPropertyLists($box, $buildable, $actions); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName("B{$id}")); + $crumbs->addTextCrumb("B{$id}"); return $this->buildApplicationPage( array( diff --git a/src/applications/harbormaster/controller/HarbormasterPlanController.php b/src/applications/harbormaster/controller/HarbormasterPlanController.php index 6ba3d8c0bd..bc42e7fed0 100644 --- a/src/applications/harbormaster/controller/HarbormasterPlanController.php +++ b/src/applications/harbormaster/controller/HarbormasterPlanController.php @@ -5,10 +5,9 @@ abstract class HarbormasterPlanController extends PhabricatorController { public function buildApplicationCrumbs() { $crumbs = parent::buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Build Plans')) - ->setHref($this->getApplicationURI('plan/'))); + $crumbs->addTextCrumb( + pht('Build Plans'), + $this->getApplicationURI('plan/')); return $crumbs; } diff --git a/src/applications/harbormaster/controller/HarbormasterPlanEditController.php b/src/applications/harbormaster/controller/HarbormasterPlanEditController.php index bc58d4eefe..95495e3420 100644 --- a/src/applications/harbormaster/controller/HarbormasterPlanEditController.php +++ b/src/applications/harbormaster/controller/HarbormasterPlanEditController.php @@ -93,18 +93,13 @@ final class HarbormasterPlanEditController $crumbs = $this->buildApplicationCrumbs(); if ($is_new) { - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('New Build Plan'))); + $crumbs->addTextCrumb(pht('New Build Plan')); } else { $id = $plan->getID(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht("Plan %d", $id)) - ->setHref($this->getApplicationURI("plan/{$id}/"))); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit'))); + $crumbs->addTextCrumb( + pht("Plan %d", $id), + $this->getApplicationURI("plan/{$id}/")); + $crumbs->addTextCrumb(pht('Edit')); } return $this->buildApplicationPage( diff --git a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php index 36c896a062..920f3148fb 100644 --- a/src/applications/harbormaster/controller/HarbormasterPlanViewController.php +++ b/src/applications/harbormaster/controller/HarbormasterPlanViewController.php @@ -51,9 +51,7 @@ final class HarbormasterPlanViewController $this->buildPropertyLists($box, $plan, $actions); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht("Plan %d", $id))); + $crumbs->addTextCrumb(pht("Plan %d", $id)); $step_list = $this->buildStepList($plan); diff --git a/src/applications/harbormaster/controller/HarbormasterStepEditController.php b/src/applications/harbormaster/controller/HarbormasterStepEditController.php index 6b445c0bfb..b141eabafc 100644 --- a/src/applications/harbormaster/controller/HarbormasterStepEditController.php +++ b/src/applications/harbormaster/controller/HarbormasterStepEditController.php @@ -132,13 +132,10 @@ final class HarbormasterStepEditController $crumbs = $this->buildApplicationCrumbs(); $id = $plan->getID(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht("Plan %d", $id)) - ->setHref($this->getApplicationURI("plan/{$id}/"))); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit Step'))); + $crumbs->addTextCrumb( + pht("Plan %d", $id), + $this->getApplicationURI("plan/{$id}/")); + $crumbs->addTextCrumb(pht('Edit Step')); return $this->buildApplicationPage( array( diff --git a/src/applications/herald/controller/HeraldNewController.php b/src/applications/herald/controller/HeraldNewController.php index bb866d66ec..7fac8d08ad 100644 --- a/src/applications/herald/controller/HeraldNewController.php +++ b/src/applications/herald/controller/HeraldNewController.php @@ -89,9 +89,7 @@ final class HeraldNewController extends HeraldController { $crumbs = $this ->buildApplicationCrumbs() - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Create Rule'))); + ->addTextCrumb(pht('Create Rule')); return $this->buildApplicationPage( array( diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php index 81810f7b96..85b8a61640 100644 --- a/src/applications/herald/controller/HeraldRuleController.php +++ b/src/applications/herald/controller/HeraldRuleController.php @@ -194,9 +194,7 @@ final class HeraldRuleController extends HeraldController { $crumbs = $this ->buildApplicationCrumbs() - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title)); + ->addTextCrumb($title); return $this->buildApplicationPage( array( diff --git a/src/applications/herald/controller/HeraldRuleEditHistoryController.php b/src/applications/herald/controller/HeraldRuleEditHistoryController.php index 03ad026c01..7419272286 100644 --- a/src/applications/herald/controller/HeraldRuleEditHistoryController.php +++ b/src/applications/herald/controller/HeraldRuleEditHistoryController.php @@ -37,10 +37,9 @@ final class HeraldRuleEditHistoryController extends HeraldController { $crumbs = $this ->buildApplicationCrumbs($can_create = false) - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit History')) - ->setHref($this->getApplicationURI('herald/history'))); + ->addTextCrumb( + pht('Edit History'), + $this->getApplicationURI('herald/history')); $nav = $this->buildSideNavView(); $nav->selectFilter('history'); diff --git a/src/applications/herald/controller/HeraldRuleViewController.php b/src/applications/herald/controller/HeraldRuleViewController.php index 7e9105bdf1..115f85b718 100644 --- a/src/applications/herald/controller/HeraldRuleViewController.php +++ b/src/applications/herald/controller/HeraldRuleViewController.php @@ -44,9 +44,7 @@ final class HeraldRuleViewController extends HeraldController { $id = $rule->getID(); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName("H{$id}")); + $crumbs->addTextCrumb("H{$id}"); $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) diff --git a/src/applications/herald/controller/HeraldTestConsoleController.php b/src/applications/herald/controller/HeraldTestConsoleController.php index 22595d3ada..3cbfa47dc6 100644 --- a/src/applications/herald/controller/HeraldTestConsoleController.php +++ b/src/applications/herald/controller/HeraldTestConsoleController.php @@ -112,13 +112,10 @@ final class HeraldTestConsoleController extends HeraldController { ->setForm($form); $crumbs = id($this->buildApplicationCrumbs()) - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Transcripts')) - ->setHref($this->getApplicationURI('/transcript/'))) - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Test Console'))); + ->addTextCrumb( + pht('Transcripts'), + $this->getApplicationURI('/transcript/')) + ->addTextCrumb(pht('Test Console')); return $this->buildApplicationPage( $box, diff --git a/src/applications/herald/controller/HeraldTranscriptController.php b/src/applications/herald/controller/HeraldTranscriptController.php index 82413b41e2..7e320b235d 100644 --- a/src/applications/herald/controller/HeraldTranscriptController.php +++ b/src/applications/herald/controller/HeraldTranscriptController.php @@ -97,13 +97,10 @@ final class HeraldTranscriptController extends HeraldController { } $crumbs = id($this->buildApplicationCrumbs()) - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Transcripts')) - ->setHref($this->getApplicationURI('/transcript/'))) - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($xscript->getID())); + ->addTextCrumb( + pht('Transcripts'), + $this->getApplicationURI('/transcript/')) + ->addTextCrumb($xscript->getID()); $nav->setCrumbs($crumbs); return $this->buildApplicationPage( diff --git a/src/applications/herald/controller/HeraldTranscriptListController.php b/src/applications/herald/controller/HeraldTranscriptListController.php index 64335b5350..29004e0379 100644 --- a/src/applications/herald/controller/HeraldTranscriptListController.php +++ b/src/applications/herald/controller/HeraldTranscriptListController.php @@ -72,9 +72,7 @@ final class HeraldTranscriptListController extends HeraldController { $nav->appendChild($panel); $crumbs = id($this->buildApplicationCrumbs()) - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Transcripts'))); + ->addTextCrumb(pht('Transcripts')); $nav->setCrumbs($crumbs); return $this->buildApplicationPage( diff --git a/src/applications/legalpad/controller/LegalpadDocumentEditController.php b/src/applications/legalpad/controller/LegalpadDocumentEditController.php index 1acb6fe4b7..ec27cb1965 100644 --- a/src/applications/legalpad/controller/LegalpadDocumentEditController.php +++ b/src/applications/legalpad/controller/LegalpadDocumentEditController.php @@ -173,8 +173,7 @@ final class LegalpadDocumentEditController extends LegalpadController { ->setForm($form); $crumbs = $this->buildApplicationCrumbs($this->buildSideNav()); - $crumbs->addCrumb( - id(new PhabricatorCrumbView())->setName($short)); + $crumbs->addTextCrumb($short); $preview = id(new PHUIRemarkupPreviewPanel()) diff --git a/src/applications/legalpad/controller/LegalpadDocumentViewController.php b/src/applications/legalpad/controller/LegalpadDocumentViewController.php index 6ac974e703..379a5f500e 100644 --- a/src/applications/legalpad/controller/LegalpadDocumentViewController.php +++ b/src/applications/legalpad/controller/LegalpadDocumentViewController.php @@ -81,10 +81,9 @@ final class LegalpadDocumentViewController extends LegalpadController { $crumbs = $this->buildApplicationCrumbs($this->buildSideNav()); $crumbs->setActionList($actions); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName('L'.$document->getID()) - ->setHref($this->getApplicationURI('view/'.$document->getID()))); + $crumbs->addTextCrumb( + 'L'.$document->getID(), + $this->getApplicationURI('view/'.$document->getID())); $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) diff --git a/src/applications/macro/controller/PhabricatorMacroAudioController.php b/src/applications/macro/controller/PhabricatorMacroAudioController.php index 8b4b9cfdb6..1332163c55 100644 --- a/src/applications/macro/controller/PhabricatorMacroAudioController.php +++ b/src/applications/macro/controller/PhabricatorMacroAudioController.php @@ -132,15 +132,8 @@ final class PhabricatorMacroAudioController $title = pht('Edit Audio Behavior'); $crumb = pht('Edit Audio'); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setHref($view_uri) - ->setName(pht('Macro "%s"', $macro->getName()))); - - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setHref($request->getRequestURI()) - ->setName($crumb)); + $crumbs->addTextCrumb(pht('Macro "%s"', $macro->getName()), $view_uri); + $crumbs->addTextCrumb($crumb, $request->getRequestURI()); $upload_form = id(new AphrontFormView()) ->setEncType('multipart/form-data') diff --git a/src/applications/macro/controller/PhabricatorMacroEditController.php b/src/applications/macro/controller/PhabricatorMacroEditController.php index decd173560..b4a2e5ebbc 100644 --- a/src/applications/macro/controller/PhabricatorMacroEditController.php +++ b/src/applications/macro/controller/PhabricatorMacroEditController.php @@ -219,19 +219,13 @@ final class PhabricatorMacroEditController $title = pht('Edit Image Macro'); $crumb = pht('Edit Macro'); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setHref($view_uri) - ->setName(pht('Macro "%s"', $macro->getName()))); + $crumbs->addTextCrumb(pht('Macro "%s"', $macro->getName()), $view_uri); } else { $title = pht('Create Image Macro'); $crumb = pht('Create Macro'); } - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setHref($request->getRequestURI()) - ->setName($crumb)); + $crumbs->addCrumb($crumb, $request->getRequestURI()); $upload = null; if ($macro->getID()) { diff --git a/src/applications/macro/controller/PhabricatorMacroViewController.php b/src/applications/macro/controller/PhabricatorMacroViewController.php index 4724631751..89247cd2ba 100644 --- a/src/applications/macro/controller/PhabricatorMacroViewController.php +++ b/src/applications/macro/controller/PhabricatorMacroViewController.php @@ -30,10 +30,9 @@ final class PhabricatorMacroViewController $crumbs = $this->buildApplicationCrumbs(); $crumbs->setActionList($actions); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setHref($this->getApplicationURI('/view/'.$macro->getID().'/')) - ->setName($title_short)); + $crumbs->addTextCrumb( + $title_short, + $this->getApplicationURI('/view/'.$macro->getID().'/')); $properties = $this->buildPropertyView($macro, $actions); if ($file) { diff --git a/src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php b/src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php index 09b24383cf..aeca4bfeac 100644 --- a/src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php +++ b/src/applications/mailinglists/controller/PhabricatorMailingListsEditController.php @@ -117,13 +117,9 @@ final class PhabricatorMailingListsEditController ->addCancelButton($this->getApplicationURI())); if ($list->getID()) { - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit Mailing List'))); + $crumbs->addTextCrumb(pht('Edit Mailing List')); } else { - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Create Mailing List'))); + $crumbs->addTextCrumb(pht('Create Mailing List')); } $form_box = id(new PHUIObjectBoxView()) diff --git a/src/applications/maniphest/controller/ManiphestBatchEditController.php b/src/applications/maniphest/controller/ManiphestBatchEditController.php index 50e2c87a71..d05870371e 100644 --- a/src/applications/maniphest/controller/ManiphestBatchEditController.php +++ b/src/applications/maniphest/controller/ManiphestBatchEditController.php @@ -144,9 +144,7 @@ final class ManiphestBatchEditController extends ManiphestController { $title = pht('Batch Editor'); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title)); + $crumbs->addTextCrumb($title); $form_box = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Batch Edit Tasks')) diff --git a/src/applications/maniphest/controller/ManiphestReportController.php b/src/applications/maniphest/controller/ManiphestReportController.php index 67e4b673c0..d402b368f7 100644 --- a/src/applications/maniphest/controller/ManiphestReportController.php +++ b/src/applications/maniphest/controller/ManiphestReportController.php @@ -55,9 +55,7 @@ final class ManiphestReportController extends ManiphestController { $nav->appendChild($core); $nav->setCrumbs( $this->buildApplicationCrumbs() - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Reports')))); + ->addTextCrumb(pht('Reports'))); return $this->buildApplicationPage( $nav, diff --git a/src/applications/maniphest/controller/ManiphestTaskDetailController.php b/src/applications/maniphest/controller/ManiphestTaskDetailController.php index b86d90ce42..4d8d512b0f 100644 --- a/src/applications/maniphest/controller/ManiphestTaskDetailController.php +++ b/src/applications/maniphest/controller/ManiphestTaskDetailController.php @@ -367,11 +367,8 @@ final class ManiphestTaskDetailController extends ManiphestController { $object_name = 'T'.$task->getID(); $actions = $this->buildActionView($task); - $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($object_name) - ->setHref('/'.$object_name)) + $crumbs = $this->buildApplicationCrumbs() + ->addTextCrumb($object_name, '/'.$object_name) ->setActionList($actions); $header = $this->buildHeaderView($task); diff --git a/src/applications/maniphest/controller/ManiphestTaskEditController.php b/src/applications/maniphest/controller/ManiphestTaskEditController.php index 4038c96a3d..0d6e84d72d 100644 --- a/src/applications/maniphest/controller/ManiphestTaskEditController.php +++ b/src/applications/maniphest/controller/ManiphestTaskEditController.php @@ -667,15 +667,10 @@ final class ManiphestTaskEditController extends ManiphestController { $crumbs = $this->buildApplicationCrumbs(); if ($task->getID()) { - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName('T'.$task->getID()) - ->setHref('/T'.$task->getID())); + $crumbs->addTextCrumb('T'.$task->getID(), '/T'.$task->getID()); } - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($header_name)); + $crumbs->addTextCrumb($header_name); return $this->buildApplicationPage( array( diff --git a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php index 0b756f8532..ba85f5e9de 100644 --- a/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php +++ b/src/applications/meta/controller/PhabricatorApplicationDetailViewController.php @@ -24,9 +24,7 @@ final class PhabricatorApplicationDetailViewController $title = $selected->getName(); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($selected->getName())); + $crumbs->addTextCrumb($selected->getName()); $header = id(new PHUIHeaderView()) ->setHeader($title) diff --git a/src/applications/meta/controller/PhabricatorApplicationEditController.php b/src/applications/meta/controller/PhabricatorApplicationEditController.php index f18663ce27..aa4952205b 100644 --- a/src/applications/meta/controller/PhabricatorApplicationEditController.php +++ b/src/applications/meta/controller/PhabricatorApplicationEditController.php @@ -146,13 +146,8 @@ final class PhabricatorApplicationEditController ->addCancelButton($view_uri)); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($application->getName()) - ->setHref($view_uri)); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit Policies'))); + $crumbs->addTextCrumb($application->getName(), $view_uri); + $crumbs->addTextCrumb(pht('Edit Policies')); $header = id(new PHUIHeaderView()) ->setHeader(pht('Edit Policies: %s', $application->getName())); diff --git a/src/applications/nuance/controller/NuanceSourceViewController.php b/src/applications/nuance/controller/NuanceSourceViewController.php index 2f2c4037d7..e0031d1d80 100644 --- a/src/applications/nuance/controller/NuanceSourceViewController.php +++ b/src/applications/nuance/controller/NuanceSourceViewController.php @@ -47,9 +47,7 @@ final class NuanceSourceViewController extends NuanceController { $title = pht('%s', $source->getName()); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title)); + $crumbs->addTextCrumb($title); $header = $this->buildHeaderView($source); $actions = $this->buildActionView($source); diff --git a/src/applications/owners/controller/PhabricatorOwnersController.php b/src/applications/owners/controller/PhabricatorOwnersController.php index a68060c9fb..ff74fb14fc 100644 --- a/src/applications/owners/controller/PhabricatorOwnersController.php +++ b/src/applications/owners/controller/PhabricatorOwnersController.php @@ -45,9 +45,7 @@ abstract class PhabricatorOwnersController extends PhabricatorController { } $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title)); + $crumbs->addTextCrumb($title); $crumbs->addAction( id(new PHUIListItemView()) diff --git a/src/applications/passphrase/controller/PassphraseCredentialCreateController.php b/src/applications/passphrase/controller/PassphraseCredentialCreateController.php index 0ae3da1e73..d311dc9d0b 100644 --- a/src/applications/passphrase/controller/PassphraseCredentialCreateController.php +++ b/src/applications/passphrase/controller/PassphraseCredentialCreateController.php @@ -55,9 +55,7 @@ final class PassphraseCredentialCreateController extends PassphraseController { $title = pht('New Credential'); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Create'))); + $crumbs->addTextCrumb(pht('Create')); $box = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Create New Credential')) diff --git a/src/applications/passphrase/controller/PassphraseCredentialEditController.php b/src/applications/passphrase/controller/PassphraseCredentialEditController.php index f48b45e652..8846db5a26 100644 --- a/src/applications/passphrase/controller/PassphraseCredentialEditController.php +++ b/src/applications/passphrase/controller/PassphraseCredentialEditController.php @@ -219,19 +219,14 @@ final class PassphraseCredentialEditController extends PassphraseController { if ($is_new) { $title = pht('Create Credential'); $header = pht('Create New Credential'); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Create'))); + $crumbs->addTextCrumb(pht('Create')); } else { $title = pht('Edit Credential'); $header = pht('Edit Credential %s', 'K'.$credential->getID()); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName('K'.$credential->getID()) - ->setHref('/K'.$credential->getID())); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit'))); + $crumbs->addTextCrumb( + 'K'.$credential->getID(), + '/K'.$credential->getID()); + $crumbs->addTextCrumb(pht('Edit')); } if ($request->isAjax()) { diff --git a/src/applications/passphrase/controller/PassphraseCredentialViewController.php b/src/applications/passphrase/controller/PassphraseCredentialViewController.php index 9499bbc553..5ff0181bde 100644 --- a/src/applications/passphrase/controller/PassphraseCredentialViewController.php +++ b/src/applications/passphrase/controller/PassphraseCredentialViewController.php @@ -41,9 +41,7 @@ final class PassphraseCredentialViewController extends PassphraseController { $title = pht('%s %s', 'K'.$credential->getID(), $credential->getName()); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName('K'.$credential->getID())); + $crumbs->addTextCrumb('K'.$credential->getID()); $header = $this->buildHeaderView($credential); $actions = $this->buildActionView($credential); diff --git a/src/applications/paste/controller/PhabricatorPasteEditController.php b/src/applications/paste/controller/PhabricatorPasteEditController.php index 185b4b0337..e83cf66560 100644 --- a/src/applications/paste/controller/PhabricatorPasteEditController.php +++ b/src/applications/paste/controller/PhabricatorPasteEditController.php @@ -212,13 +212,9 @@ final class PhabricatorPasteEditController extends PhabricatorPasteController { $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView()); if (!$is_create) { - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName('P'.$paste->getID()) - ->setHref('/P'.$paste->getID())); + $crumbs->addTextCrumb('P'.$paste->getID(), '/P'.$paste->getID()); } - $crumbs->addCrumb( - id(new PhabricatorCrumbView())->setName($short)); + $crumbs->addTextCrumb($short); return $this->buildApplicationPage( array( diff --git a/src/applications/paste/controller/PhabricatorPasteViewController.php b/src/applications/paste/controller/PhabricatorPasteViewController.php index 1e10825f80..be756de590 100644 --- a/src/applications/paste/controller/PhabricatorPasteViewController.php +++ b/src/applications/paste/controller/PhabricatorPasteViewController.php @@ -88,10 +88,7 @@ final class PhabricatorPasteViewController extends PhabricatorPasteController { $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView()) ->setActionList($actions) - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName('P'.$paste->getID()) - ->setHref('/P'.$paste->getID())); + ->addTextCrumb('P'.$paste->getID(), '/P'.$paste->getID()); $xactions = id(new PhabricatorPasteTransactionQuery()) ->setViewer($request->getUser()) diff --git a/src/applications/people/controller/PhabricatorPeopleEditController.php b/src/applications/people/controller/PhabricatorPeopleEditController.php index f0203edcdf..1638f023f5 100644 --- a/src/applications/people/controller/PhabricatorPeopleEditController.php +++ b/src/applications/people/controller/PhabricatorPeopleEditController.php @@ -23,21 +23,12 @@ final class PhabricatorPeopleEditController return new Aphront404Response(); } $base_uri = '/people/edit/'.$user->getID().'/'; - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit User')) - ->setHref('/people/edit/')); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($user->getFullName()) - ->setHref($base_uri)); + $crumbs->addTextCrumb(pht('Edit User'), '/people/edit/'); + $crumbs->addTextCrumb($user->getFullName(), $base_uri); } else { $user = new PhabricatorUser(); $base_uri = '/people/edit/'; - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Create New User')) - ->setHref($base_uri)); + $crumbs->addTextCrumb(pht('Create New User'), $base_uri); } $nav = new AphrontSideNavFilterView(); diff --git a/src/applications/people/controller/PhabricatorPeopleLdapController.php b/src/applications/people/controller/PhabricatorPeopleLdapController.php index ee6e2cd8d1..280971bf06 100644 --- a/src/applications/people/controller/PhabricatorPeopleLdapController.php +++ b/src/applications/people/controller/PhabricatorPeopleLdapController.php @@ -38,10 +38,9 @@ final class PhabricatorPeopleLdapController ->appendChild($form); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Import Ldap Users')) - ->setHref($this->getApplicationURI('/ldap/'))); + $crumbs->addTextCrumb( + pht('Import Ldap Users'), + $this->getApplicationURI('/ldap/')); $nav = $this->buildSideNavView(); $nav->setCrumbs($crumbs); diff --git a/src/applications/people/controller/PhabricatorPeopleLogsController.php b/src/applications/people/controller/PhabricatorPeopleLogsController.php index f43be11c23..8cd7ad57a0 100644 --- a/src/applications/people/controller/PhabricatorPeopleLogsController.php +++ b/src/applications/people/controller/PhabricatorPeopleLogsController.php @@ -207,10 +207,7 @@ final class PhabricatorPeopleLogsController $filter = new AphrontListFilterView(); $filter->appendChild($form); $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView()); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Activity Logs')) - ->setHref('/people/logs/')); + $crumbs->addTextCrumb(pht('Activity Logs'), '/people/logs/'); $nav = $this->buildSideNavView(); $nav->selectFilter('logs'); diff --git a/src/applications/people/controller/PhabricatorPeopleProfileController.php b/src/applications/people/controller/PhabricatorPeopleProfileController.php index 261d2f27a6..cc17cf4bb0 100644 --- a/src/applications/people/controller/PhabricatorPeopleProfileController.php +++ b/src/applications/people/controller/PhabricatorPeopleProfileController.php @@ -71,9 +71,7 @@ final class PhabricatorPeopleProfileController $properties = $this->buildPropertyView($user, $actions); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($user->getUsername())); + $crumbs->addTextCrumb($user->getUsername()); $feed = $this->renderUserFeed($user); $object_box = id(new PHUIObjectBoxView()) diff --git a/src/applications/people/controller/PhabricatorPeopleProfileEditController.php b/src/applications/people/controller/PhabricatorPeopleProfileEditController.php index f341f1db78..5c5ff58912 100644 --- a/src/applications/people/controller/PhabricatorPeopleProfileEditController.php +++ b/src/applications/people/controller/PhabricatorPeopleProfileEditController.php @@ -61,13 +61,8 @@ final class PhabricatorPeopleProfileEditController $title = pht('Edit Profile'); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($user->getUsername()) - ->setHref($profile_uri)); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title)); + $crumbs->addTextCrumb($user->getUsername(), $profile_uri); + $crumbs->addTextCrumb($title); $form = id(new AphrontFormView()) ->setUser($viewer); diff --git a/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php b/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php index 169b90911a..91405ea4a7 100644 --- a/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php +++ b/src/applications/people/controller/PhabricatorPeopleProfilePictureController.php @@ -91,13 +91,8 @@ final class PhabricatorPeopleProfilePictureController $title = pht('Edit Profile Picture'); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($user->getUsername()) - ->setHref($profile_uri)); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title)); + $crumbs->addTextCrumb($user->getUsername(), $profile_uri); + $crumbs->addTextCrumb($title); $form = id(new PHUIFormLayoutView()) ->setUser($viewer); diff --git a/src/applications/phame/controller/blog/PhameBlogEditController.php b/src/applications/phame/controller/blog/PhameBlogEditController.php index 1b9aac97d6..be2ae64a85 100644 --- a/src/applications/phame/controller/blog/PhameBlogEditController.php +++ b/src/applications/phame/controller/blog/PhameBlogEditController.php @@ -176,10 +176,7 @@ final class PhameBlogEditController ->setForm($form); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($page_title) - ->setHref($this->getApplicationURI('blog/new'))); + $crumbs->addTextCrumb($page_title, $this->getApplicationURI('blog/new')); $nav = $this->renderSideNavFilterView(); $nav->selectFilter($this->id ? null : 'blog/new'); diff --git a/src/applications/phame/controller/blog/PhameBlogListController.php b/src/applications/phame/controller/blog/PhameBlogListController.php index bd11cf2947..ccba6c8609 100644 --- a/src/applications/phame/controller/blog/PhameBlogListController.php +++ b/src/applications/phame/controller/blog/PhameBlogListController.php @@ -48,10 +48,7 @@ final class PhameBlogListController extends PhameController { $blog_list->setPager($pager); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title) - ->setHref($this->getApplicationURI())); + $crumbs->addTextCrumb($title, $this->getApplicationURI()); $nav->appendChild( array( diff --git a/src/applications/phame/controller/blog/PhameBlogViewController.php b/src/applications/phame/controller/blog/PhameBlogViewController.php index 7efb21b3bc..5bd9fabbbd 100644 --- a/src/applications/phame/controller/blog/PhameBlogViewController.php +++ b/src/applications/phame/controller/blog/PhameBlogViewController.php @@ -58,10 +58,7 @@ final class PhameBlogViewController extends PhameController { $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($blog->getName()) - ->setHref($this->getApplicationURI())); + $crumbs->addTextCrumb($blog->getName(), $this->getApplicationURI()); $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) diff --git a/src/applications/phame/controller/post/PhamePostEditController.php b/src/applications/phame/controller/post/PhamePostEditController.php index 06e80891e8..2dfc479bcd 100644 --- a/src/applications/phame/controller/post/PhamePostEditController.php +++ b/src/applications/phame/controller/post/PhamePostEditController.php @@ -177,10 +177,9 @@ final class PhamePostEditController ->setForm($form); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($page_title) - ->setHref($this->getApplicationURI('/post/view/'.$this->id.'/'))); + $crumbs->addTextCrumb( + $page_title, + $this->getApplicationURI('/post/view/'.$this->id.'/')); $nav = $this->renderSideNavFilterView(null); $nav->appendChild( diff --git a/src/applications/phame/controller/post/PhamePostListController.php b/src/applications/phame/controller/post/PhamePostListController.php index 5153c1dd33..de2418c301 100644 --- a/src/applications/phame/controller/post/PhamePostListController.php +++ b/src/applications/phame/controller/post/PhamePostListController.php @@ -78,10 +78,7 @@ final class PhamePostListController extends PhameController { ->appendChild($post_list); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title) - ->setHref($this->getApplicationURI())); + $crumbs->addTextCrumb($title, $this->getApplicationURI()); $nav->appendChild( array( diff --git a/src/applications/phame/controller/post/PhamePostNewController.php b/src/applications/phame/controller/post/PhamePostNewController.php index 7667aa5fc4..b2839c880b 100644 --- a/src/applications/phame/controller/post/PhamePostNewController.php +++ b/src/applications/phame/controller/post/PhamePostNewController.php @@ -69,10 +69,7 @@ final class PhamePostNewController extends PhameController { $nav->selectFilter('post/new'); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title) - ->setHref($view_uri)); + $crumbs->addTextCrumb($title, $view_uri); $nav->appendChild($crumbs); if (!$blogs) { diff --git a/src/applications/phame/controller/post/PhamePostPublishController.php b/src/applications/phame/controller/post/PhamePostPublishController.php index ce336b263a..6986c4e288 100644 --- a/src/applications/phame/controller/post/PhamePostPublishController.php +++ b/src/applications/phame/controller/post/PhamePostPublishController.php @@ -51,10 +51,7 @@ final class PhamePostPublishController extends PhameController { ->setForm($form); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Preview')) - ->setHref($view_uri)); + $crumbs->addTextCrumb(pht('Preview'), $view_uri); $nav = $this->renderSideNavFilterView(null); $nav->appendChild( diff --git a/src/applications/phame/controller/post/PhamePostViewController.php b/src/applications/phame/controller/post/PhamePostViewController.php index 1fb600544d..bac0a370d3 100644 --- a/src/applications/phame/controller/post/PhamePostViewController.php +++ b/src/applications/phame/controller/post/PhamePostViewController.php @@ -36,10 +36,9 @@ final class PhamePostViewController extends PhameController { $crumbs = $this->buildApplicationCrumbs(); $crumbs->setActionList($actions); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($post->getTitle()) - ->setHref($this->getApplicationURI('post/view/'.$post->getID().'/'))); + $crumbs->addTextCrumb( + $post->getTitle(), + $this->getApplicationURI('post/view/'.$post->getID().'/')); $nav->appendChild($crumbs); diff --git a/src/applications/phlux/controller/PhluxEditController.php b/src/applications/phlux/controller/PhluxEditController.php index 1e847490b3..bf162169ba 100644 --- a/src/applications/phlux/controller/PhluxEditController.php +++ b/src/applications/phlux/controller/PhluxEditController.php @@ -164,16 +164,10 @@ final class PhluxEditController extends PhluxController { if ($is_new) { $title = pht('Create Variable'); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title) - ->setHref($request->getRequestURI())); + $crumbs->addTextCrumb($title, $request->getRequestURI()); } else { $title = pht('Edit %s', $this->key); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title) - ->setHref($request->getRequestURI())); + $crumbs->addTextCrumb($title, $request->getRequestURI()); } $form_box = id(new PHUIObjectBoxView()) diff --git a/src/applications/phlux/controller/PhluxListController.php b/src/applications/phlux/controller/PhluxListController.php index badc28f9c0..6c4480bf50 100644 --- a/src/applications/phlux/controller/PhluxListController.php +++ b/src/applications/phlux/controller/PhluxListController.php @@ -31,10 +31,7 @@ final class PhluxListController extends PhluxController { $title = pht('Variable List'); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title) - ->setHref($this->getApplicationURI())); + $crumbs->addTextCrumb($title, $this->getApplicationURI()); return $this->buildApplicationPage( array( diff --git a/src/applications/phlux/controller/PhluxViewController.php b/src/applications/phlux/controller/PhluxViewController.php index c492ba3660..1525ef1e1a 100644 --- a/src/applications/phlux/controller/PhluxViewController.php +++ b/src/applications/phlux/controller/PhluxViewController.php @@ -25,10 +25,7 @@ final class PhluxViewController extends PhluxController { $title = $var->getVariableKey(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title) - ->setHref($request->getRequestURI())); + $crumbs->addTextCrumb($title, $request->getRequestURI()); $header = id(new PHUIHeaderView()) ->setHeader($title) diff --git a/src/applications/pholio/controller/PholioImageHistoryController.php b/src/applications/pholio/controller/PholioImageHistoryController.php index 1581385c6a..131c323304 100644 --- a/src/applications/pholio/controller/PholioImageHistoryController.php +++ b/src/applications/pholio/controller/PholioImageHistoryController.php @@ -69,14 +69,8 @@ final class PholioImageHistoryController extends PholioController { $crumbs = $this->buildApplicationCrumbs(); $crumbs - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName('M'.$mock->getID()) - ->setHref('/M'.$mock->getID())) - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName('Image History') - ->setHref($request->getRequestURI())); + ->addTextCrumb('M'.$mock->getID(), '/M'.$mock->getID()) + ->addTextCrumb('Image History', $request->getRequestURI()); $content = array( $crumbs, diff --git a/src/applications/pholio/controller/PholioMockEditController.php b/src/applications/pholio/controller/PholioMockEditController.php index a3dde9a4b8..0980a7493d 100644 --- a/src/applications/pholio/controller/PholioMockEditController.php +++ b/src/applications/pholio/controller/PholioMockEditController.php @@ -326,10 +326,7 @@ final class PholioMockEditController extends PholioController { ->setForm($form); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title) - ->setHref($this->getApplicationURI())); + $crumbs->addTextCrumb($title, $this->getApplicationURI()); $content = array( $crumbs, diff --git a/src/applications/pholio/controller/PholioMockViewController.php b/src/applications/pholio/controller/PholioMockViewController.php index c4f786c122..e91376830c 100644 --- a/src/applications/pholio/controller/PholioMockViewController.php +++ b/src/applications/pholio/controller/PholioMockViewController.php @@ -98,10 +98,7 @@ final class PholioMockViewController extends PholioController { $crumbs = $this->buildApplicationCrumbs(); $crumbs->setActionList($actions); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName('M'.$mock->getID()) - ->setHref('/M'.$mock->getID())); + $crumbs->addTextCrumb('M'.$mock->getID(), '/M'.$mock->getID()); $object_box = id(new PHUIObjectBoxView()) ->setHeader($header) diff --git a/src/applications/phortune/controller/PhortuneAccountViewController.php b/src/applications/phortune/controller/PhortuneAccountViewController.php index a98a01317b..d8875b937e 100644 --- a/src/applications/phortune/controller/PhortuneAccountViewController.php +++ b/src/applications/phortune/controller/PhortuneAccountViewController.php @@ -24,10 +24,7 @@ final class PhortuneAccountViewController extends PhortuneController { $title = $account->getName(); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Account')) - ->setHref($request->getRequestURI())); + $crumbs->addTextCrumb(pht('Account'), $request->getRequestURI()); $header = id(new PHUIHeaderView()) ->setHeader($title); diff --git a/src/applications/phortune/controller/PhortunePaymentMethodEditController.php b/src/applications/phortune/controller/PhortunePaymentMethodEditController.php index 28059f72f0..4a82a219c5 100644 --- a/src/applications/phortune/controller/PhortunePaymentMethodEditController.php +++ b/src/applications/phortune/controller/PhortunePaymentMethodEditController.php @@ -159,14 +159,8 @@ final class PhortunePaymentMethodEditController ->setHeader($title); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Account')) - ->setHref($account_uri)); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Payment Methods')) - ->setHref($request->getRequestURI())); + $crumbs->addTextCrumb(pht('Account'), $account_uri); + $crumbs->addTextCrumb(pht('Payment Methods'), $request->getRequestURI()); return $this->buildApplicationPage( array( diff --git a/src/applications/phortune/controller/PhortuneProductEditController.php b/src/applications/phortune/controller/PhortuneProductEditController.php index 0e93ce29e2..f62817eca0 100644 --- a/src/applications/phortune/controller/PhortuneProductEditController.php +++ b/src/applications/phortune/controller/PhortuneProductEditController.php @@ -135,14 +135,12 @@ final class PhortuneProductEditController extends PhabricatorController { $title = pht('Edit Product'); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Products')) - ->setHref($this->getApplicationURI('product/'))); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($is_create ? pht('Create') : pht('Edit')) - ->setHref($request->getRequestURI())); + $crumbs->addTextCrumb( + pht('Products'), + $this->getApplicationURI('product/')); + $crumbs->addTextCrumb( + $is_create ? pht('Create') : pht('Edit'), + $request->getRequestURI()); $header = id(new PHUIHeaderView()) ->setHeader(pht('Edit Product')); diff --git a/src/applications/phortune/controller/PhortuneProductListController.php b/src/applications/phortune/controller/PhortuneProductListController.php index fab506ff34..9a7c22bd1e 100644 --- a/src/applications/phortune/controller/PhortuneProductListController.php +++ b/src/applications/phortune/controller/PhortuneProductListController.php @@ -17,10 +17,7 @@ final class PhortuneProductListController extends PhabricatorController { $title = pht('Product List'); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName('Products') - ->setHref($this->getApplicationURI('product/'))); + $crumbs->addTextCrumb('Products', $this->getApplicationURI('product/')); $crumbs->addAction( id(new PHUIListItemView()) ->setName(pht('Create Product')) diff --git a/src/applications/phortune/controller/PhortuneProductViewController.php b/src/applications/phortune/controller/PhortuneProductViewController.php index 29f8ccae98..f3c8fcf627 100644 --- a/src/applications/phortune/controller/PhortuneProductViewController.php +++ b/src/applications/phortune/controller/PhortuneProductViewController.php @@ -50,14 +50,12 @@ final class PhortuneProductViewController extends PhortuneController { $crumbs = $this->buildApplicationCrumbs(); $crumbs->setActionList($actions); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Products')) - ->setHref($this->getApplicationURI('product/'))); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('#%d', $product->getID())) - ->setHref($request->getRequestURI())); + $crumbs->addTextCrumb( + pht('Products'), + $this->getApplicationURI('product/')); + $crumbs->addTextCrumb( + pht('#%d', $product->getID()), + $request->getRequestURI()); $properties = id(new PHUIPropertyListView()) ->setUser($user) diff --git a/src/applications/phragment/controller/PhragmentController.php b/src/applications/phragment/controller/PhragmentController.php index 200772377d..912b729f71 100644 --- a/src/applications/phragment/controller/PhragmentController.php +++ b/src/applications/phragment/controller/PhragmentController.php @@ -41,15 +41,11 @@ abstract class PhragmentController extends PhabricatorController { protected function buildApplicationCrumbsWithPath(array $fragments) { $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName('/') - ->setHref('/phragment/')); + $crumbs->addTextCrumb('/', '/phragment/'); foreach ($fragments as $parent) { - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($parent->getName()) - ->setHref('/phragment/browse/'.$parent->getPath())); + $crumbs->addTextCrumb( + $parent->getName(), + '/phragment/browse/'.$parent->getPath()); } return $crumbs; } diff --git a/src/applications/phragment/controller/PhragmentCreateController.php b/src/applications/phragment/controller/PhragmentCreateController.php index 3927fb203e..5640913374 100644 --- a/src/applications/phragment/controller/PhragmentCreateController.php +++ b/src/applications/phragment/controller/PhragmentCreateController.php @@ -111,9 +111,7 @@ final class PhragmentCreateController extends PhragmentController { $this->getApplicationURI('browse/'.$parent_path))); $crumbs = $this->buildApplicationCrumbsWithPath($parents); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Create Fragment'))); + $crumbs->addTextCrumb(pht('Create Fragment')); $box = id(new PHUIObjectBoxView()) ->setHeaderText('Create Fragment') diff --git a/src/applications/phragment/controller/PhragmentPolicyController.php b/src/applications/phragment/controller/PhragmentPolicyController.php index e4ef33c212..b135e23f5d 100644 --- a/src/applications/phragment/controller/PhragmentPolicyController.php +++ b/src/applications/phragment/controller/PhragmentPolicyController.php @@ -88,9 +88,7 @@ final class PhragmentPolicyController extends PhragmentController { $this->getApplicationURI('browse/'.$fragment->getPath()))); $crumbs = $this->buildApplicationCrumbsWithPath($parents); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit Fragment Policies'))); + $crumbs->addTextCrumb(pht('Edit Fragment Policies')); $box = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Edit Fragment Policies: %s', $fragment->getPath())) diff --git a/src/applications/phragment/controller/PhragmentSnapshotCreateController.php b/src/applications/phragment/controller/PhragmentSnapshotCreateController.php index 923045ce5f..48018cc573 100644 --- a/src/applications/phragment/controller/PhragmentSnapshotCreateController.php +++ b/src/applications/phragment/controller/PhragmentSnapshotCreateController.php @@ -154,9 +154,7 @@ final class PhragmentSnapshotCreateController extends PhragmentController { ->appendInstructions($container); $crumbs = $this->buildApplicationCrumbsWithPath($parents); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Create Snapshot'))); + $crumbs->addTextCrumb(pht('Create Snapshot')); $box = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Create Snapshot of %s', $fragment->getName())) diff --git a/src/applications/phragment/controller/PhragmentSnapshotViewController.php b/src/applications/phragment/controller/PhragmentSnapshotViewController.php index 4cf0b577ec..47663e6331 100644 --- a/src/applications/phragment/controller/PhragmentSnapshotViewController.php +++ b/src/applications/phragment/controller/PhragmentSnapshotViewController.php @@ -40,9 +40,7 @@ final class PhragmentSnapshotViewController extends PhragmentController { } $crumbs = $this->buildApplicationCrumbsWithPath($parents); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('"%s" Snapshot', $snapshot->getName()))); + $crumbs->addTextCrumb(pht('"%s" Snapshot', $snapshot->getName())); $children = id(new PhragmentSnapshotChildQuery()) ->setViewer($viewer) diff --git a/src/applications/phragment/controller/PhragmentUpdateController.php b/src/applications/phragment/controller/PhragmentUpdateController.php index 1c233bb74e..f14d16e2fa 100644 --- a/src/applications/phragment/controller/PhragmentUpdateController.php +++ b/src/applications/phragment/controller/PhragmentUpdateController.php @@ -62,9 +62,7 @@ final class PhragmentUpdateController extends PhragmentController { $this->getApplicationURI('browse/'.$fragment->getPath()))); $crumbs = $this->buildApplicationCrumbsWithPath($parents); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Update Fragment'))); + $crumbs->addTextCrumb(pht('Update Fragment')); $box = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Update Fragment: %s', $fragment->getPath())) diff --git a/src/applications/phragment/controller/PhragmentVersionController.php b/src/applications/phragment/controller/PhragmentVersionController.php index b5f144cc32..803d0afb56 100644 --- a/src/applications/phragment/controller/PhragmentVersionController.php +++ b/src/applications/phragment/controller/PhragmentVersionController.php @@ -31,9 +31,7 @@ final class PhragmentVersionController extends PhragmentController { $current = idx($parents, count($parents) - 1, null); $crumbs = $this->buildApplicationCrumbsWithPath($parents); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('View Version %d', $version->getSequence()))); + $crumbs->addTextCrumb(pht('View Version %d', $version->getSequence())); $phids = array(); $phids[] = $version->getFilePHID(); diff --git a/src/applications/phriction/controller/PhrictionDiffController.php b/src/applications/phriction/controller/PhrictionDiffController.php index 3e926db60a..70e49a229f 100644 --- a/src/applications/phriction/controller/PhrictionDiffController.php +++ b/src/applications/phriction/controller/PhrictionDiffController.php @@ -107,21 +107,16 @@ final class PhrictionDiffController $crumbs->addCrumb($view); } - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('History')) - ->setHref(PhrictionDocument::getSlugURI($slug, 'history'))); - + $crumbs->addTextCrumb( + pht('History'), + PhrictionDocument::getSlugURI($slug, 'history')); $title = pht("Version %s vs %s", $l, $r); $header = id(new PHUIHeaderView()) ->setHeader($title); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title) - ->setHref($request->getRequestURI())); + $crumbs->addTextCrumb($title, $request->getRequestURI()); $comparison_table = $this->renderComparisonTable( diff --git a/src/applications/phriction/controller/PhrictionEditController.php b/src/applications/phriction/controller/PhrictionEditController.php index fabaaea055..63f184dde9 100644 --- a/src/applications/phriction/controller/PhrictionEditController.php +++ b/src/applications/phriction/controller/PhrictionEditController.php @@ -241,17 +241,12 @@ final class PhrictionEditController $crumbs = $this->buildApplicationCrumbs(); if ($document->getID()) { - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($content->getTitle()) - ->setHref(PhrictionDocument::getSlugURI($document->getSlug()))); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit'))); + $crumbs->addTextCrumb( + $content->getTitle(), + PhrictionDocument::getSlugURI($document->getSlug())); + $crumbs->addTextCrumb(pht('Edit')); } else { - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Create'))); + $crumbs->addTextCrumb(pht('Create')); } return $this->buildApplicationPage( diff --git a/src/applications/phriction/controller/PhrictionHistoryController.php b/src/applications/phriction/controller/PhrictionHistoryController.php index 53add915d2..d44d8f8f4b 100644 --- a/src/applications/phriction/controller/PhrictionHistoryController.php +++ b/src/applications/phriction/controller/PhrictionHistoryController.php @@ -138,11 +138,9 @@ final class PhrictionHistoryController foreach ($crumb_views as $view) { $crumbs->addCrumb($view); } - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('History')) - ->setHref( - PhrictionDocument::getSlugURI($document->getSlug(), 'history'))); + $crumbs->addTextCrumb( + pht('History'), + PhrictionDocument::getSlugURI($document->getSlug(), 'history')); $header = new PHUIHeaderView(); $header->setHeader(pht('Document History for %s', diff --git a/src/applications/ponder/controller/PonderAnswerEditController.php b/src/applications/ponder/controller/PonderAnswerEditController.php index 75db3a1c23..4ef6f6fb56 100644 --- a/src/applications/ponder/controller/PonderAnswerEditController.php +++ b/src/applications/ponder/controller/PonderAnswerEditController.php @@ -86,13 +86,8 @@ final class PonderAnswerEditController extends PonderController { ->addCancelButton($answer_uri)); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName("Q{$qid}") - ->setHref($answer_uri)); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit Answer'))); + $crumbs->addTextCrumb("Q{$qid}", $answer_uri); + $crumbs->addTextCrumb(pht('Edit Answer')); $form_box = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Edit Answer')) diff --git a/src/applications/ponder/controller/PonderAnswerHistoryController.php b/src/applications/ponder/controller/PonderAnswerHistoryController.php index 324809ec27..b15e228889 100644 --- a/src/applications/ponder/controller/PonderAnswerHistoryController.php +++ b/src/applications/ponder/controller/PonderAnswerHistoryController.php @@ -46,17 +46,9 @@ final class PonderAnswerHistoryController extends PonderController { $aid = $answer->getID(); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName("Q{$qid}") - ->setHref("/Q{$qid}")); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName("A{$aid}") - ->setHref("/Q{$qid}#{$aid}")); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('History'))); + $crumbs->addTextCrumb("Q{$qid}", "/Q{$qid}"); + $crumbs->addTextCrumb("A{$aid}", "/Q{$qid}#{$aid}"); + $crumbs->addTextCrumb(pht('History')); return $this->buildApplicationPage( array( diff --git a/src/applications/ponder/controller/PonderQuestionEditController.php b/src/applications/ponder/controller/PonderQuestionEditController.php index bcfc722ee0..cfaa9a0a09 100644 --- a/src/applications/ponder/controller/PonderQuestionEditController.php +++ b/src/applications/ponder/controller/PonderQuestionEditController.php @@ -117,17 +117,10 @@ final class PonderQuestionEditController extends PonderController { $id = $question->getID(); if ($id) { - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName("Q{$id}") - ->setHref("/Q{$id}")); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit'))); + $crumbs->addTextCrumb("Q{$id}", "/Q{$id}"); + $crumbs->addTextCrumb(pht('Edit')); } else { - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Ask Question'))); + $crumbs->addTextCrumb(pht('Ask Question')); } return $this->buildApplicationPage( diff --git a/src/applications/ponder/controller/PonderQuestionHistoryController.php b/src/applications/ponder/controller/PonderQuestionHistoryController.php index 4c8c382f8e..09658c14ed 100644 --- a/src/applications/ponder/controller/PonderQuestionHistoryController.php +++ b/src/applications/ponder/controller/PonderQuestionHistoryController.php @@ -45,13 +45,8 @@ final class PonderQuestionHistoryController extends PonderController { $qid = $question->getID(); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName("Q{$qid}") - ->setHref("/Q{$qid}")); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('History'))); + $crumbs->addTextCrumb("Q{$qid}", "/Q{$qid}"); + $crumbs->addTextCrumb(pht('History')); return $this->buildApplicationPage( array( diff --git a/src/applications/ponder/controller/PonderQuestionViewController.php b/src/applications/ponder/controller/PonderQuestionViewController.php index 3789d7a698..21f6d405ab 100644 --- a/src/applications/ponder/controller/PonderQuestionViewController.php +++ b/src/applications/ponder/controller/PonderQuestionViewController.php @@ -56,10 +56,7 @@ final class PonderQuestionViewController extends PonderController { $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView()); $crumbs->setActionList($actions); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName('Q'.$this->questionID) - ->setHref('/Q'.$this->questionID)); + $crumbs->addTextCrumb('Q'.$this->questionID, '/Q'.$this->questionID); return $this->buildApplicationPage( array( diff --git a/src/applications/project/controller/PhabricatorProjectCreateController.php b/src/applications/project/controller/PhabricatorProjectCreateController.php index 76de5b83d6..cdcfdb283b 100644 --- a/src/applications/project/controller/PhabricatorProjectCreateController.php +++ b/src/applications/project/controller/PhabricatorProjectCreateController.php @@ -112,10 +112,9 @@ final class PhabricatorProjectCreateController ->addCancelButton('/project/')); $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView()); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Create Project')) - ->setHref($this->getApplicationURI().'create/')); + $crumbs->addTextCrumb( + pht('Create Project'), + $this->getApplicationURI().'create/'); $form_box = id(new PHUIObjectBoxView()) ->setHeaderText(pht('Create New Project')) diff --git a/src/applications/project/controller/PhabricatorProjectHistoryController.php b/src/applications/project/controller/PhabricatorProjectHistoryController.php index d42c05afe4..cd92ed338d 100644 --- a/src/applications/project/controller/PhabricatorProjectHistoryController.php +++ b/src/applications/project/controller/PhabricatorProjectHistoryController.php @@ -37,14 +37,11 @@ final class PhabricatorProjectHistoryController ->setObjectPHID($project->getPHID()) ->setTransactions($xactions); - $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($project->getName()) - ->setHref($this->getApplicationURI("view/{$id}/"))); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('History'))); + $crumbs = $this->buildApplicationCrumbs() + ->addTextCrumb( + $project->getName(), + $this->getApplicationURI("view/{$id}/")) + ->addTextCrumb(pht('History')); return $this->buildApplicationPage( array( diff --git a/src/applications/project/controller/PhabricatorProjectMembersEditController.php b/src/applications/project/controller/PhabricatorProjectMembersEditController.php index fa81c442e1..129f53ded3 100644 --- a/src/applications/project/controller/PhabricatorProjectMembersEditController.php +++ b/src/applications/project/controller/PhabricatorProjectMembersEditController.php @@ -111,15 +111,11 @@ final class PhabricatorProjectMembersEditController ->setHeaderText($title) ->setForm($form); - $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView()); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($project->getName()) - ->setHref('/project/view/'.$project->getID().'/')); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit Members')) - ->setHref($this->getApplicationURI())); + $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView()) + ->addTextCrumb( + $project->getName(), + '/project/view/'.$project->getID().'/') + ->addTextCrumb(pht('Edit Members'), $this->getApplicationURI()); return $this->buildApplicationPage( array( diff --git a/src/applications/project/controller/PhabricatorProjectProfileController.php b/src/applications/project/controller/PhabricatorProjectProfileController.php index 9175614199..5f7dddf37b 100644 --- a/src/applications/project/controller/PhabricatorProjectProfileController.php +++ b/src/applications/project/controller/PhabricatorProjectProfileController.php @@ -73,9 +73,7 @@ final class PhabricatorProjectProfileController $properties = $this->buildPropertyListView($project, $profile, $actions); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($project->getName())) + $crumbs->addTextCrumb($project->getName()) ->setActionList($actions); $object_box = id(new PHUIObjectBoxView()) diff --git a/src/applications/project/controller/PhabricatorProjectProfileEditController.php b/src/applications/project/controller/PhabricatorProjectProfileEditController.php index 0d86c927af..db39cc1598 100644 --- a/src/applications/project/controller/PhabricatorProjectProfileEditController.php +++ b/src/applications/project/controller/PhabricatorProjectProfileEditController.php @@ -165,15 +165,11 @@ final class PhabricatorProjectProfileEditController ->setFormError($error_view) ->setForm($form); - $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView()); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($project->getName()) - ->setHref('/project/view/'.$project->getID().'/')); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit Project')) - ->setHref($this->getApplicationURI())); + $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView()) + ->addTextCrumb( + $project->getName(), + '/project/view/'.$project->getID().'/') + ->addTextCrumb(pht('Edit Project'), $this->getApplicationURI()); return $this->buildApplicationPage( array( diff --git a/src/applications/project/controller/PhabricatorProjectProfilePictureController.php b/src/applications/project/controller/PhabricatorProjectProfilePictureController.php index 6188f58014..41f02eebbd 100644 --- a/src/applications/project/controller/PhabricatorProjectProfilePictureController.php +++ b/src/applications/project/controller/PhabricatorProjectProfilePictureController.php @@ -89,13 +89,8 @@ final class PhabricatorProjectProfilePictureController $title = pht('Edit Project Picture'); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($project->getName()) - ->setHref($project_uri)); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title)); + $crumbs->addTextCrumb($project->getName(), $project_uri); + $crumbs->addTextCrumb($title); $form = id(new PHUIFormLayoutView()) ->setUser($viewer); diff --git a/src/applications/releeph/controller/ReleephProjectController.php b/src/applications/releeph/controller/ReleephProjectController.php index 2a0d774979..e8516e93ff 100644 --- a/src/applications/releeph/controller/ReleephProjectController.php +++ b/src/applications/releeph/controller/ReleephProjectController.php @@ -135,10 +135,7 @@ abstract class ReleephProjectController extends ReleephController { $project_id = $project->getID(); $project_uri = $this->getApplicationURI("project/{$project_id}/"); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setHref($project_uri) - ->setName($project->getName())); + $crumbs->addCrumb($project->getName(), $project_uri); } catch (Exception $ex) { // TODO: This is derps. } @@ -146,10 +143,7 @@ abstract class ReleephProjectController extends ReleephController { try { $branch = $this->getReleephBranch(); $branch_uri = $branch->getURI(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setHref($branch_uri) - ->setName($branch->getDisplayNameWithDetail())); + $crumbs->addCrumb($branch->getDisplayNameWithDetail(), $branch_uri); } catch (Exception $ex) { // TODO: This is also derps. } diff --git a/src/applications/releeph/controller/branch/ReleephBranchCreateController.php b/src/applications/releeph/controller/branch/ReleephBranchCreateController.php index 1309a3d55d..3978571c47 100644 --- a/src/applications/releeph/controller/branch/ReleephBranchCreateController.php +++ b/src/applications/releeph/controller/branch/ReleephBranchCreateController.php @@ -99,9 +99,7 @@ final class ReleephBranchCreateController extends ReleephProjectController { ->addCancelButton($project_uri)); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('New Branch'))); + $crumbs->addTextCrumb(pht('New Branch')); return $this->buildApplicationPage( array( diff --git a/src/applications/releeph/controller/branch/ReleephBranchEditController.php b/src/applications/releeph/controller/branch/ReleephBranchEditController.php index 1f1c0c6c47..3fcbf0b854 100644 --- a/src/applications/releeph/controller/branch/ReleephBranchEditController.php +++ b/src/applications/releeph/controller/branch/ReleephBranchEditController.php @@ -86,9 +86,7 @@ final class ReleephBranchEditController extends ReleephProjectController { $releeph_branch->getDisplayNameWithDetail()); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit'))); + $crumbs->addTextCrumb(pht('Edit')); return $this->buildApplicationPage( array( diff --git a/src/applications/releeph/controller/branch/ReleephBranchHistoryController.php b/src/applications/releeph/controller/branch/ReleephBranchHistoryController.php index 7e1314a03e..e0475d1f3c 100644 --- a/src/applications/releeph/controller/branch/ReleephBranchHistoryController.php +++ b/src/applications/releeph/controller/branch/ReleephBranchHistoryController.php @@ -32,9 +32,7 @@ final class ReleephBranchHistoryController extends ReleephProjectController { ->setTransactions($xactions); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('History'))); + $crumbs->addTextCrumb(pht('History')); return $this->buildApplicationPage( array( diff --git a/src/applications/releeph/controller/project/ReleephProjectCreateController.php b/src/applications/releeph/controller/project/ReleephProjectCreateController.php index f29f52f2c9..2195a4d51e 100644 --- a/src/applications/releeph/controller/project/ReleephProjectCreateController.php +++ b/src/applications/releeph/controller/project/ReleephProjectCreateController.php @@ -114,9 +114,7 @@ final class ReleephProjectCreateController extends ReleephProjectController { ->setForm($form); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('New Project'))); + $crumbs->addTextCrumb(pht('New Project')); return $this->buildApplicationPage( array( diff --git a/src/applications/releeph/controller/project/ReleephProjectHistoryController.php b/src/applications/releeph/controller/project/ReleephProjectHistoryController.php index e9df27f01c..85125d4cf2 100644 --- a/src/applications/releeph/controller/project/ReleephProjectHistoryController.php +++ b/src/applications/releeph/controller/project/ReleephProjectHistoryController.php @@ -32,9 +32,7 @@ final class ReleephProjectHistoryController extends ReleephProjectController { ->setTransactions($xactions); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('History'))); + $crumbs->addTextCrumb(pht('History')); return $this->buildApplicationPage( array( diff --git a/src/applications/releeph/controller/request/ReleephRequestEditController.php b/src/applications/releeph/controller/request/ReleephRequestEditController.php index 65532155b8..dc9d8abab9 100644 --- a/src/applications/releeph/controller/request/ReleephRequestEditController.php +++ b/src/applications/releeph/controller/request/ReleephRequestEditController.php @@ -272,20 +272,13 @@ final class ReleephRequestEditController extends ReleephProjectController { $title = pht('Edit Releeph Request'); $submit_name = pht('Save'); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName('RQ'.$rq->getID()) - ->setHref('/RQ'.$rq->getID())); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Edit'))); + $crumbs->addTextCrumb('RQ'.$rq->getID(), '/RQ'.$rq->getID()); + $crumbs->addTextCrumb(pht('Edit')); } else { $title = pht('Create Releeph Request'); $submit_name = pht('Create'); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('New Request'))); + $crumbs->addTextCrumb(pht('New Request')); } $form->appendChild( diff --git a/src/applications/releeph/controller/request/ReleephRequestViewController.php b/src/applications/releeph/controller/request/ReleephRequestViewController.php index fcbb6de7b2..345e3acb20 100644 --- a/src/applications/releeph/controller/request/ReleephRequestViewController.php +++ b/src/applications/releeph/controller/request/ReleephRequestViewController.php @@ -74,18 +74,13 @@ final class ReleephRequestViewController extends ReleephProjectController { ->setSubmitButtonName('Comment'); $crumbs = $this->buildApplicationCrumbs() - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($releeph_project->getName()) - ->setHref($releeph_project->getURI())) - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($releeph_branch->getDisplayNameWithDetail()) - ->setHref($releeph_branch->getURI())) - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName('RQ'.$releeph_request->getID()) - ->setHref('/RQ'.$releeph_request->getID())); + ->addTextCrumb($releeph_project->getName(), $releeph_project->getURI()) + ->addTextCrumb( + $releeph_branch->getDisplayNameWithDetail(), + $releeph_branch->getURI()) + ->addTextCrumb( + 'RQ'.$releeph_request->getID(), + '/RQ'.$releeph_request->getID()); return $this->buildStandardPageResponse( array( diff --git a/src/applications/search/controller/PhabricatorApplicationSearchController.php b/src/applications/search/controller/PhabricatorApplicationSearchController.php index c96c8c9401..b667834c94 100644 --- a/src/applications/search/controller/PhabricatorApplicationSearchController.php +++ b/src/applications/search/controller/PhabricatorApplicationSearchController.php @@ -260,9 +260,7 @@ final class PhabricatorApplicationSearchController $crumbs = $parent ->buildApplicationCrumbs() - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht("Search"))); + ->addTextCrumb(pht("Search")); $nav->setCrumbs($crumbs); @@ -344,10 +342,7 @@ final class PhabricatorApplicationSearchController $crumbs = $parent ->buildApplicationCrumbs() - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht("Saved Queries")) - ->setHref($engine->getQueryManagementURI())); + ->addTextCrumb(pht("Saved Queries"), $engine->getQueryManagementURI()); $nav->selectFilter('query/edit'); $nav->setCrumbs($crumbs); diff --git a/src/applications/search/controller/PhabricatorSearchController.php b/src/applications/search/controller/PhabricatorSearchController.php index 78ef4be93d..02f615c380 100644 --- a/src/applications/search/controller/PhabricatorSearchController.php +++ b/src/applications/search/controller/PhabricatorSearchController.php @@ -275,9 +275,7 @@ final class PhabricatorSearchController } $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName(pht('Search'))); + $crumbs->addTextCrumb(pht('Search')); return $this->buildApplicationPage( array( diff --git a/src/applications/search/controller/PhabricatorSearchEditController.php b/src/applications/search/controller/PhabricatorSearchEditController.php index 4d84af847e..f85f94f76d 100644 --- a/src/applications/search/controller/PhabricatorSearchEditController.php +++ b/src/applications/search/controller/PhabricatorSearchEditController.php @@ -98,9 +98,7 @@ final class PhabricatorSearchEditController ->setForm($form); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title)); + $crumbs->addTextCrumb($title); return $this->buildApplicationPage( array( diff --git a/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php b/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php index f4409e756f..a94a15872f 100644 --- a/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php +++ b/src/applications/slowvote/controller/PhabricatorSlowvoteEditController.php @@ -244,9 +244,7 @@ final class PhabricatorSlowvoteEditController ->addCancelButton($cancel_uri)); $crumbs = $this->buildApplicationCrumbs($this->buildSideNavView()); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title)); + $crumbs->addTextCrumb($title); $form_box = id(new PHUIObjectBoxView()) ->setHeaderText($title) diff --git a/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php index 274a85b6ab..1ceeda6cbd 100644 --- a/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php +++ b/src/applications/slowvote/controller/PhabricatorSlowvotePollController.php @@ -50,9 +50,7 @@ final class PhabricatorSlowvotePollController $properties = $this->buildPropertyView($poll, $actions); $crumbs = $this->buildApplicationCrumbs(); - $crumbs->addCrumb( - id(new PhabricatorCrumbView()) - ->setName('V'.$poll->getID())); + $crumbs->addTextCrumb('V'.$poll->getID()); $xactions = $this->buildTransactions($poll); $add_comment = $this->buildCommentForm($poll); diff --git a/src/applications/tokens/controller/PhabricatorTokenGivenController.php b/src/applications/tokens/controller/PhabricatorTokenGivenController.php index 471bb47fc1..1928c89fee 100644 --- a/src/applications/tokens/controller/PhabricatorTokenGivenController.php +++ b/src/applications/tokens/controller/PhabricatorTokenGivenController.php @@ -60,9 +60,7 @@ final class PhabricatorTokenGivenController extends PhabricatorTokenController { $nav = $this->buildSideNav(); $nav->setCrumbs( $this->buildApplicationCrumbs() - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title))); + ->addTextCrumb($title)); $nav->selectFilter('given/'); $nav->appendChild($list); diff --git a/src/applications/tokens/controller/PhabricatorTokenLeaderController.php b/src/applications/tokens/controller/PhabricatorTokenLeaderController.php index 271a5f1ab7..50527488b6 100644 --- a/src/applications/tokens/controller/PhabricatorTokenLeaderController.php +++ b/src/applications/tokens/controller/PhabricatorTokenLeaderController.php @@ -42,9 +42,7 @@ final class PhabricatorTokenLeaderController $nav = $this->buildSideNav(); $nav->setCrumbs( $this->buildApplicationCrumbs() - ->addCrumb( - id(new PhabricatorCrumbView()) - ->setName($title))); + ->addTextCrumb($title)); $nav->selectFilter('leaders/'); $nav->appendChild($list); diff --git a/src/view/layout/PhabricatorCrumbsView.php b/src/view/layout/PhabricatorCrumbsView.php index f9c378655e..ec411ca6e6 100644 --- a/src/view/layout/PhabricatorCrumbsView.php +++ b/src/view/layout/PhabricatorCrumbsView.php @@ -10,6 +10,22 @@ final class PhabricatorCrumbsView extends AphrontView { return false; } + + /** + * Convenience method for adding a simple crumb with just text, or text and + * a link. + * + * @param string Text of the crumb. + * @param string? Optional href for the crumb. + * @return this + */ + public function addTextCrumb($text, $href = null) { + return $this->addCrumb( + id(new PhabricatorCrumbView()) + ->setName($text) + ->setHref($href)); + } + public function addCrumb(PhabricatorCrumbView $crumb) { $this->crumbs[] = $crumb; return $this;