From fa6151778fe84ee77b455e0c802fac7e84cfbf5b Mon Sep 17 00:00:00 2001 From: Chad Little Date: Sat, 2 Apr 2016 19:51:53 -0700 Subject: [PATCH] Fix Legalpad "Sign" box Summary: Missed converting this page, scenario. The box was poorly formatted. Test Plan: Create a new document that needs signed, verify box is correctly spaced and colored. Reviewers: epriestley Reviewed By: epriestley Subscribers: Korvin Differential Revision: https://secure.phabricator.com/D15591 --- resources/celerity/map.php | 4 ++-- .../LegalpadDocumentSignController.php | 17 +++++++++-------- webroot/rsrc/css/phui/phui-document-pro.css | 4 ---- 3 files changed, 11 insertions(+), 14 deletions(-) diff --git a/resources/celerity/map.php b/resources/celerity/map.php index 17293755c7..2b6873c89d 100644 --- a/resources/celerity/map.php +++ b/resources/celerity/map.php @@ -128,7 +128,7 @@ return array( 'rsrc/css/phui/phui-chart.css' => '6bf6f78e', 'rsrc/css/phui/phui-crumbs-view.css' => '79d536e5', 'rsrc/css/phui/phui-curtain-view.css' => '7148ae25', - 'rsrc/css/phui/phui-document-pro.css' => '92d5b648', + 'rsrc/css/phui/phui-document-pro.css' => '73e45fd2', 'rsrc/css/phui/phui-document-summary.css' => '9ca48bdf', 'rsrc/css/phui/phui-document.css' => '9c71d2bf', 'rsrc/css/phui/phui-feed-story.css' => '04aec08f', @@ -816,7 +816,7 @@ return array( 'phui-curtain-view-css' => '7148ae25', 'phui-document-summary-view-css' => '9ca48bdf', 'phui-document-view-css' => '9c71d2bf', - 'phui-document-view-pro-css' => '92d5b648', + 'phui-document-view-pro-css' => '73e45fd2', 'phui-feed-story-css' => '04aec08f', 'phui-font-icon-base-css' => '6449bce8', 'phui-fontkit-css' => '9cda225e', diff --git a/src/applications/legalpad/controller/LegalpadDocumentSignController.php b/src/applications/legalpad/controller/LegalpadDocumentSignController.php index 00549c1adc..70b750c38a 100644 --- a/src/applications/legalpad/controller/LegalpadDocumentSignController.php +++ b/src/applications/legalpad/controller/LegalpadDocumentSignController.php @@ -301,12 +301,15 @@ final class LegalpadDocumentSignController extends LegalpadController { case LegalpadDocument::SIGNATURE_TYPE_INDIVIDUAL: case LegalpadDocument::SIGNATURE_TYPE_CORPORATION: $box = id(new PHUIObjectBoxView()) + ->addClass('document-sign-box') ->setHeaderText(pht('Agree and Sign Document')) + ->setBackground(PHUIObjectBoxView::BLUE_PROPERTY) ->setForm($signature_form); if ($error_view) { $box->setInfoView($error_view); } - $signature_box = phutil_tag_div('phui-document-view-pro-box', $box); + $signature_box = phutil_tag_div( + 'phui-document-view-pro-box plt', $box); break; } @@ -317,15 +320,13 @@ final class LegalpadDocumentSignController extends LegalpadController { $crumbs->setBorder(true); $crumbs->addTextCrumb($document->getMonogram()); - return $this->buildApplicationPage( - array( - $crumbs, + return $this->newPage() + ->setTitle($title) + ->setCrumbs($crumbs) + ->setPageObjectPHIDs(array($document->getPHID())) + ->appendChild(array( $content, $signature_box, - ), - array( - 'title' => $title, - 'pageObjects' => array($document->getPHID()), )); } diff --git a/webroot/rsrc/css/phui/phui-document-pro.css b/webroot/rsrc/css/phui/phui-document-pro.css index c77ffa77e2..85f8150015 100644 --- a/webroot/rsrc/css/phui/phui-document-pro.css +++ b/webroot/rsrc/css/phui/phui-document-pro.css @@ -190,10 +190,6 @@ a.button.phui-document-toc { margin: 0; } -.phui-document-view-pro-box .phui-object-box .phui-form-view { - padding-bottom: 0; -} - .phui-document-view-pro-box .phui-object-box .remarkup-assist-textarea { height: 9em; }