From f1193afa94bfeeebe8491b0e89a2b68d286c7f81 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@phacility.com>
Date: Thu, 7 Sep 2017 13:08:10 -0700
Subject: [PATCH] Update passphrase edit UI

Summary: Updates creating credentials

Test Plan: create some notes

Reviewers: epriestley

Reviewed By: epriestley

Spies: Korvin

Differential Revision: https://secure.phabricator.com/D18570
---
 .../herald/controller/HeraldRuleController.php  |  2 --
 .../PassphraseCredentialCreateController.php    |  9 ++-------
 .../PassphraseCredentialEditController.php      | 17 +++--------------
 3 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/applications/herald/controller/HeraldRuleController.php b/src/applications/herald/controller/HeraldRuleController.php
index d338f6a57e..eaf352a0a7 100644
--- a/src/applications/herald/controller/HeraldRuleController.php
+++ b/src/applications/herald/controller/HeraldRuleController.php
@@ -238,8 +238,6 @@ final class HeraldRuleController extends HeraldController {
         ? pht('Edit Herald Rule: %s', $rule->getName())
         : pht('Create Herald Rule: %s', idx($content_type_map, $content_type));
 
-    $icon = $rule->getID() ? 'fa-pencil' : 'fa-plus-square';
-
     $form_box = id(new PHUIObjectBoxView())
       ->setHeaderText($title)
       ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
diff --git a/src/applications/passphrase/controller/PassphraseCredentialCreateController.php b/src/applications/passphrase/controller/PassphraseCredentialCreateController.php
index 87afe22cc6..b237ef378b 100644
--- a/src/applications/passphrase/controller/PassphraseCredentialCreateController.php
+++ b/src/applications/passphrase/controller/PassphraseCredentialCreateController.php
@@ -52,17 +52,12 @@ final class PassphraseCredentialCreateController extends PassphraseController {
     $crumbs->setBorder(true);
 
     $box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('Credential'))
+      ->setHeaderText($title)
       ->setFormErrors($errors)
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
       ->setForm($form);
 
-    $header = id(new PHUIHeaderView())
-      ->setHeader($title)
-      ->setHeaderIcon('fa-plus-square');
-
     $view = id(new PHUITwoColumnView())
-      ->setHeader($header)
       ->setFooter($box);
 
     return $this->newPage()
diff --git a/src/applications/passphrase/controller/PassphraseCredentialEditController.php b/src/applications/passphrase/controller/PassphraseCredentialEditController.php
index a35bd3479e..91c8d93883 100644
--- a/src/applications/passphrase/controller/PassphraseCredentialEditController.php
+++ b/src/applications/passphrase/controller/PassphraseCredentialEditController.php
@@ -249,10 +249,6 @@ final class PassphraseCredentialEditController extends PassphraseController {
           ->setName('description')
           ->setLabel(pht('Description'))
           ->setValue($v_desc))
-      ->appendChild(
-        id(new AphrontFormMarkupControl())
-          ->setLabel(pht('Credential Type'))
-          ->setValue($type->getCredentialTypeName()))
       ->appendChild(
         id(new AphrontFormDividerControl()))
       ->appendControl(
@@ -322,10 +318,9 @@ final class PassphraseCredentialEditController extends PassphraseController {
     $crumbs->setBorder(true);
 
     if ($is_new) {
-      $title = pht('Create New Credential');
+      $title = pht('New Credential: %s', $type->getCredentialTypeName());
       $crumbs->addTextCrumb(pht('Create'));
       $cancel_uri = $this->getApplicationURI();
-      $header_icon = 'fa-plus-square';
     } else {
       $title = pht('Edit Credential: %s', $credential->getName());
       $crumbs->addTextCrumb(
@@ -333,7 +328,6 @@ final class PassphraseCredentialEditController extends PassphraseController {
         '/K'.$credential->getID());
       $crumbs->addTextCrumb(pht('Edit'));
       $cancel_uri = '/K'.$credential->getID();
-      $header_icon = 'fa-pencil';
     }
 
     if ($request->isAjax()) {
@@ -356,18 +350,13 @@ final class PassphraseCredentialEditController extends PassphraseController {
         ->addCancelButton($cancel_uri));
 
     $box = id(new PHUIObjectBoxView())
-      ->setHeaderText(pht('Credential'))
+      ->setHeaderText($title)
       ->setFormErrors($errors)
       ->setValidationException($validation_exception)
-      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
+      ->setBackground(PHUIObjectBoxView::WHITE_CONFIG)
       ->setForm($form);
 
-    $header = id(new PHUIHeaderView())
-      ->setHeader($title)
-      ->setHeaderIcon($header_icon);
-
     $view = id(new PHUITwoColumnView())
-      ->setHeader($header)
       ->setFooter(array(
         $box,
       ));