Merge branch 'master' into blender-tweaks

src/applications/differential/controller/DifferentialDiffCreateController.php

@@ -140,10 +140,12 @@ final class DifferentialDiffCreateController extends DifferentialController {
       $title = pht('Update Diff');
       $header = pht('Update Diff');
       $button = pht('Continue');
+      $header_icon = 'fa-upload';
     } else {
       $title = pht('Create Diff');
       $header = pht('Create New Diff');
       $button = pht('Create Diff');
+      $header_icon = 'fa-plus-square';
     }
 
     $form
@@ -197,15 +199,12 @@ final class DifferentialDiffCreateController extends DifferentialController {
           ->setValue($button));
 
     $form_box = id(new PHUIObjectBoxView())
-      ->setHeaderText($header)
+      ->setHeaderText(pht('Diff'))
       ->setValidationException($validation_exception)
       ->setForm($form)
+      ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
       ->setFormErrors($errors);
 
-    if ($info_view) {
-      $form_box->setInfoView($info_view);
-    }
-
     $crumbs = $this->buildApplicationCrumbs();
     if ($revision) {
       $crumbs->addTextCrumb(
@@ -213,15 +212,23 @@ final class DifferentialDiffCreateController extends DifferentialController {
         '/'.$revision->getMonogram());
     }
     $crumbs->addTextCrumb($title);
+    $crumbs->setBorder(true);
 
-    return $this->buildApplicationPage(
-      array(
-        $crumbs,
+    $header = id(new PHUIHeaderView())
+      ->setHeader($title)
+      ->setHeaderIcon($header_icon);
+
+    $view = id(new PHUITwoColumnView())
+      ->setHeader($header)
+      ->setFooter(array(
+        $info_view,
         $form_box,
-      ),
-      array(
-        'title' => $title,
       ));
+
+    return $this->newPage()
+      ->setTitle($title)
+      ->setCrumbs($crumbs)
+      ->appendChild($view);
   }
 
 }