From f2efda75b59b02edacf48c1233b83488b3f5a631 Mon Sep 17 00:00:00 2001
From: Chad Little <chad@chadsdomain.com>
Date: Fri, 17 May 2013 16:01:19 -0700
Subject: [PATCH] A few Macro bugs

Summary: Consistent look for panels, test for mobile, forms consistency

Test Plan: test Macro on web and iOS sim

Reviewers: epriestley, btrahan

Reviewed By: epriestley

CC: aran, Korvin

Differential Revision: https://secure.phabricator.com/D5959
---
 .../controller/PhabricatorMacroEditController.php   | 13 ++++---------
 .../controller/PhabricatorMacroListController.php   |  1 +
 .../controller/PhabricatorMacroViewController.php   |  1 +
 3 files changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/applications/macro/controller/PhabricatorMacroEditController.php b/src/applications/macro/controller/PhabricatorMacroEditController.php
index e81ec229f3..be3ebc6ab9 100644
--- a/src/applications/macro/controller/PhabricatorMacroEditController.php
+++ b/src/applications/macro/controller/PhabricatorMacroEditController.php
@@ -156,6 +156,7 @@ final class PhabricatorMacroEditController
 
     $form
       ->setEncType('multipart/form-data')
+      ->setFlexible(true)
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setLabel(pht('Name'))
@@ -219,7 +220,7 @@ final class PhabricatorMacroEditController
 
     if ($macro->getID()) {
       $title = pht('Edit Image Macro');
-      $crumb = pht('Edit');
+      $crumb = pht('Edit Macro');
 
       $crumbs->addCrumb(
         id(new PhabricatorCrumbView())
@@ -227,7 +228,7 @@ final class PhabricatorMacroEditController
           ->setName(pht('Macro "%s"', $macro->getName())));
     } else {
       $title = pht('Create Image Macro');
-      $crumb = pht('Create');
+      $crumb = pht('Create Macro');
     }
 
     $crumbs->addCrumb(
@@ -266,17 +267,11 @@ final class PhabricatorMacroEditController
       $upload = array($upload_header, $upload_form);
     }
 
-    $panel = new AphrontPanelView();
-    $panel->setHeader(pht('Create New Macro'));
-    $panel->setNoBackground();
-    $panel->appendChild($form);
-    $panel->setWidth(AphrontPanelView::WIDTH_FORM);
-
     return $this->buildApplicationPage(
       array(
         $crumbs,
         $error_view,
-        $panel,
+        $form,
         $upload,
       ),
       array(
diff --git a/src/applications/macro/controller/PhabricatorMacroListController.php b/src/applications/macro/controller/PhabricatorMacroListController.php
index c127c929d9..be6c82b439 100644
--- a/src/applications/macro/controller/PhabricatorMacroListController.php
+++ b/src/applications/macro/controller/PhabricatorMacroListController.php
@@ -67,6 +67,7 @@ final class PhabricatorMacroListController
     $filter_form = id(new AphrontFormView())
       ->setMethod('GET')
       ->setUser($request->getUser())
+      ->setNoShading(true)
       ->appendChild(
         id(new AphrontFormTextControl())
           ->setName('name')
diff --git a/src/applications/macro/controller/PhabricatorMacroViewController.php b/src/applications/macro/controller/PhabricatorMacroViewController.php
index 15c6d52163..efe77eeaea 100644
--- a/src/applications/macro/controller/PhabricatorMacroViewController.php
+++ b/src/applications/macro/controller/PhabricatorMacroViewController.php
@@ -105,6 +105,7 @@ final class PhabricatorMacroViewController
       ),
       array(
         'title' => $title_short,
+        'device' => true,
       ));
   }