Page MenuHomePhabricator
Files F76834

D7463.diff
All Users
Actions

D7463.diff
View Options

diff --git a/src/__celerity_resource_map__.php b/src/__celerity_resource_map__.php
--- a/src/__celerity_resource_map__.php
+++ b/src/__celerity_resource_map__.php
@@ -2981,15 +2981,6 @@
),
'disk' => '/rsrc/externals/javelin/lib/Workflow.js',
),
- 'legalpad-documentbody-css' =>
- array(
- 'uri' => '/res/034c3494/rsrc/css/application/legalpad/legalpad-documentbody.css',
- 'type' => 'css',
- 'requires' =>
- array(
- ),
- 'disk' => '/rsrc/css/application/legalpad/legalpad-documentbody.css',
- ),
'lightbox-attachment-css' =>
array(
'uri' => '/res/4657e15d/rsrc/css/aphront/lightbox-attachment.css',
diff --git a/src/applications/legalpad/controller/LegalpadDocumentSignController.php b/src/applications/legalpad/controller/LegalpadDocumentSignController.php
--- a/src/applications/legalpad/controller/LegalpadDocumentSignController.php
+++ b/src/applications/legalpad/controller/LegalpadDocumentSignController.php
@@ -47,7 +47,8 @@
$has_signed = true;
$error_view = id(new AphrontErrorView())
->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
- ->setTitle(pht('You have already agreed to these terms.'));
+ ->setTitle(pht('Already Signed'))
+ ->appendChild(pht('Thank you for signing and agreeing'));
$data = $signature->getSignatureData();
}
@@ -101,7 +102,8 @@
$has_signed = true;
$error_view = id(new AphrontErrorView())
->setSeverity(AphrontErrorView::SEVERITY_NOTICE)
- ->setTitle(pht('Signature successful. Thank you.'));
+ ->setTitle(pht('Signature successful'))
+ ->appendChild(pht('Thank you for signing and agreeing'));
} else {
$error_view = id(new AphrontErrorView())
->setTitle(pht('Error in submission.'))
@@ -126,14 +128,14 @@
id(new PHUIDocumentView())
->setHeader($header)
->appendChild($this->buildDocument($engine, $document_body)),
- $error_view,
$this->buildSignatureForm(
$document_body,
$signature,
$has_signed,
$e_name,
$e_email,
- $e_address_1));
+ $e_address_1,
+ $error_view));
return $this->buildApplicationPage(
$content,
@@ -148,24 +150,17 @@
PhabricatorMarkupEngine
$engine, LegalpadDocumentBody $body) {
- require_celerity_resource('legalpad-documentbody-css');
-
- return phutil_tag(
- 'div',
- array(
- 'class' => 'legalpad-documentbody'
- ),
- $engine->getOutput($body, LegalpadDocumentBody::MARKUP_FIELD_TEXT));
-
+ return $engine->getOutput($body, LegalpadDocumentBody::MARKUP_FIELD_TEXT);
}
private function buildSignatureForm(
LegalpadDocumentBody $body,
LegalpadDocumentSignature $signature,
$has_signed = false,
$e_name = true,
$e_email = true,
- $e_address_1 = true) {
+ $e_address_1 = true,
+ $error_view = null) {
$user = $this->getRequest()->getUser();
if ($has_signed) {
@@ -178,57 +173,55 @@
$form = id(new AphrontFormView())
->setUser($user)
->appendChild(
- id(new AphrontFormInsetView())
- ->setTitle(pht('Sign and Agree'))
- ->setDescription($instructions)
- ->setContent(phutil_tag('br', array()))
- ->appendChild(
- id(new AphrontFormTextControl())
- ->setLabel(pht('Name'))
- ->setValue(idx($data, 'name', ''))
- ->setName('name')
- ->setError($e_name)
- ->setDisabled($has_signed))
- ->appendChild(
- id(new AphrontFormTextControl())
- ->setLabel(pht('Email'))
- ->setValue(idx($data, 'email', ''))
- ->setName('email')
- ->setError($e_email)
- ->setDisabled($has_signed))
- ->appendChild(
- id(new AphrontFormTextControl())
- ->setLabel(pht('Address line 1'))
- ->setValue(idx($data, 'address_1', ''))
- ->setName('address_1')
- ->setError($e_address_1)
- ->setDisabled($has_signed))
- ->appendChild(
- id(new AphrontFormTextControl())
- ->setLabel(pht('Address line 2'))
- ->setValue(idx($data, 'address_2', ''))
- ->setName('address_2')
- ->setDisabled($has_signed))
- ->appendChild(
- id(new AphrontFormTextControl())
- ->setLabel(pht('Phone'))
- ->setValue(idx($data, 'phone', ''))
- ->setName('phone')
- ->setDisabled($has_signed))
- ->appendChild(
- id(new AphrontFormCheckboxControl())
- ->addCheckbox(
- 'agree',
- 'agree',
- pht('I agree to the terms laid forth above.'),
- $has_signed)
- ->setDisabled($has_signed))
- ->appendChild(
- id(new AphrontFormSubmitControl())
- ->setValue(pht('Sign and Agree'))
- ->setDisabled($has_signed)));
-
- return $form;
+ id(new AphrontFormTextControl())
+ ->setLabel(pht('Name'))
+ ->setValue(idx($data, 'name', ''))
+ ->setName('name')
+ ->setError($e_name)
+ ->setDisabled($has_signed))
+ ->appendChild(
+ id(new AphrontFormTextControl())
+ ->setLabel(pht('Email'))
+ ->setValue(idx($data, 'email', ''))
+ ->setName('email')
+ ->setError($e_email)
+ ->setDisabled($has_signed))
+ ->appendChild(
+ id(new AphrontFormTextControl())
+ ->setLabel(pht('Address line 1'))
+ ->setValue(idx($data, 'address_1', ''))
+ ->setName('address_1')
+ ->setError($e_address_1)
+ ->setDisabled($has_signed))
+ ->appendChild(
+ id(new AphrontFormTextControl())
+ ->setLabel(pht('Address line 2'))
+ ->setValue(idx($data, 'address_2', ''))
+ ->setName('address_2')
+ ->setDisabled($has_signed))
+ ->appendChild(
+ id(new AphrontFormTextControl())
+ ->setLabel(pht('Phone'))
+ ->setValue(idx($data, 'phone', ''))
+ ->setName('phone')
+ ->setDisabled($has_signed))
+ ->appendChild(
+ id(new AphrontFormCheckboxControl())
+ ->addCheckbox(
+ 'agree',
+ 'agree',
+ pht('I agree to the terms laid forth above.'),
+ $has_signed)
+ ->setDisabled($has_signed))
+ ->appendChild(
+ id(new AphrontFormSubmitControl())
+ ->setValue(pht('Sign and Agree'))
+ ->setDisabled($has_signed));
+
+ return id(new PHUIObjectBoxView())
+ ->setHeaderText(pht('Sign and Agree'))
+ ->setFormError($error_view)
+ ->setForm($form);
}
}
diff --git a/webroot/rsrc/css/application/legalpad/legalpad-documentbody.css b/webroot/rsrc/css/application/legalpad/legalpad-documentbody.css
deleted file mode 100644
--- a/webroot/rsrc/css/application/legalpad/legalpad-documentbody.css
+++ /dev/null
@@ -1,9 +0,0 @@
-/**
- * @provides legalpad-documentbody-css
- */
-
-.legalpad-documentbody {
- position: relative;
- padding: 1.25em 2%
-}
-

File Metadata

Mime Type
text/x-diff
Storage Engine
amazon-s3
Storage Format
Raw Data
Storage Handle
phabricator/je/p2/7rbtyqxbjtpkye3f
Default Alt Text
D7463.diff (6 KB)

Event Timeline

Phabricator · Built by Phacility