1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-11-10 00:42:41 +01:00

Redesign Legalpad

Summary: Rolls out PHUIDocumentViewPro to Legalpad. Minor tweaks to provide space around Preamble and Signature blocks. Otherwise, straight forward.

Test Plan:
Build a new document with and without Preamble, sign document.

{F933386}

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D14377
This commit is contained in:
Chad Little 2015-11-01 15:57:48 -08:00
parent c45ba30416
commit b7a4d3b9a5
5 changed files with 29 additions and 32 deletions

View file

@ -7,7 +7,7 @@
*/
return array(
'names' => array(
'core.pkg.css' => 'a56d7104',
'core.pkg.css' => 'fae3b050',
'core.pkg.js' => '47dc9ebb',
'darkconsole.pkg.js' => 'e7393ebb',
'differential.pkg.css' => '2de124c9',
@ -126,8 +126,8 @@ return array(
'rsrc/css/phui/phui-box.css' => 'a5bb366d',
'rsrc/css/phui/phui-button.css' => '16020a60',
'rsrc/css/phui/phui-crumbs-view.css' => 'd842f867',
'rsrc/css/phui/phui-document-pro.css' => '3657eb4b',
'rsrc/css/phui/phui-document.css' => '78521ba3',
'rsrc/css/phui/phui-document-pro.css' => '5f86a934',
'rsrc/css/phui/phui-document.css' => '9fa715d2',
'rsrc/css/phui/phui-feed-story.css' => 'b7b26d23',
'rsrc/css/phui/phui-fontkit.css' => '7837a28c',
'rsrc/css/phui/phui-form-view.css' => '621b21c5',
@ -136,7 +136,7 @@ return array(
'rsrc/css/phui/phui-icon.css' => 'b0a6b1b6',
'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8',
'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
'rsrc/css/phui/phui-info-view.css' => '5b16bac6',
'rsrc/css/phui/phui-info-view.css' => 'fdabaa73',
'rsrc/css/phui/phui-list.css' => '125599df',
'rsrc/css/phui/phui-object-box.css' => '407eaf5a',
'rsrc/css/phui/phui-object-item-list-view.css' => '26c30d3f',
@ -776,8 +776,8 @@ return array(
'phui-calendar-list-css' => 'c1c7f338',
'phui-calendar-month-css' => '476be7e0',
'phui-crumbs-view-css' => 'd842f867',
'phui-document-view-css' => '78521ba3',
'phui-document-view-pro-css' => '3657eb4b',
'phui-document-view-css' => '9fa715d2',
'phui-document-view-pro-css' => '5f86a934',
'phui-feed-story-css' => 'b7b26d23',
'phui-font-icon-base-css' => 'ecbbb4c2',
'phui-fontkit-css' => '7837a28c',
@ -787,7 +787,7 @@ return array(
'phui-icon-view-css' => 'b0a6b1b6',
'phui-image-mask-css' => '5a8b09c8',
'phui-info-panel-css' => '27ea50a1',
'phui-info-view-css' => '5b16bac6',
'phui-info-view-css' => 'fdabaa73',
'phui-inline-comment-view-css' => '0fdb3667',
'phui-list-view-css' => '125599df',
'phui-object-box-css' => '407eaf5a',

View file

@ -253,7 +253,7 @@ final class LegalpadDocumentSignController extends LegalpadController {
->setIcon(
id(new PHUIIconView())
->setIconFont('fa-pencil'))
->setText(pht('Manage Document'))
->setText(pht('Manage'))
->setHref($manage_uri)
->setDisabled(!$can_edit)
->setWorkflow(!$can_edit));
@ -278,7 +278,7 @@ final class LegalpadDocumentSignController extends LegalpadController {
$preamble_box->addPropertyList($preamble);
}
$content = id(new PHUIDocumentView())
$content = id(new PHUIDocumentViewPro())
->addClass('legalpad')
->setHeader($header)
->appendChild(
@ -288,6 +288,7 @@ final class LegalpadDocumentSignController extends LegalpadController {
$document_markup,
));
$signature_box = null;
if (!$has_signed) {
$error_view = null;
if ($errors) {
@ -301,23 +302,21 @@ final class LegalpadDocumentSignController extends LegalpadController {
$field_errors);
switch ($document->getSignatureType()) {
case LegalpadDocument::SIGNATURE_TYPE_NONE:
$subheader = null;
default:
break;
case LegalpadDocument::SIGNATURE_TYPE_INDIVIDUAL:
case LegalpadDocument::SIGNATURE_TYPE_CORPORATION:
$subheader = id(new PHUIHeaderView())
->setHeader(pht('Agree and Sign Document'))
->setBleedHeader(true);
$box = id(new PHUIObjectBoxView())
->setHeaderText(pht('Agree and Sign Document'))
->setForm($signature_form);
if ($error_view) {
$box->setInfoView($error_view);
}
$signature_box = phutil_tag_div('phui-document-view-pro-box', $box);
break;
}
$content->appendChild(
array(
$subheader,
$error_view,
$signature_form,
));
}
$crumbs = $this->buildApplicationCrumbs();
@ -328,9 +327,11 @@ final class LegalpadDocumentSignController extends LegalpadController {
array(
$crumbs,
$content,
$signature_box,
),
array(
'title' => $title,
'class' => 'pro-white-background',
'pageObjects' => array($document->getPHID()),
));
}

View file

@ -2,7 +2,8 @@
* @provides phui-document-view-pro-css
*/
.phui-document-view.phui-document-view-pro {
.phui-document-view.phui-document-view-pro,
.phui-document-view-pro-box {
max-width: 800px;
padding: 0 16px;
position: relative;

View file

@ -92,11 +92,11 @@
border-color: {$thinblueborder};
}
.phui-document-content .phui-property-list-view {
.legalpad .phui-document-content .phui-property-list-view {
border: none;
box-shadow: none;
margin: 0;
background-color: {$lightgreybackground};
margin: 16px 0 0 0;
background-color: {$lightbluebackground};
}
.phui-document-content {
@ -134,10 +134,6 @@
padding-right: 120px;
}
.phui-document-view .phui-property-list-view {
border-bottom: 1px solid {$thinblueborder};
}
.phui-document-view .phui-info-severity-nodata {
background-color: {$lightgreybackground};
}
@ -172,10 +168,11 @@ body .phui-document-view .phui-header-shell.phui-bleed-header {
.phui-document-view .phui-property-list-section-header {
padding: 12px 16px 0px;
border-top: none;
}
.phui-document-view .phui-property-list-text-content {
padding: 0;
padding: 0 16px;
}
.phui-document-view .PhabricatorMonospaced,

View file

@ -109,9 +109,7 @@ h1.phui-info-view-head {
}
.legalpad .phui-info-view {
margin: 0;
border-radius: 0;
border-width: 0;
margin: 16px 0 0 0;
}
.aphront-dialog-body .phui-info-view {