@recaptime-dev's working patches + fork for Phorge, a community fork of Phabricator. (Upstream dev and stable branches are at upstream/main and upstream/stable respectively.)
hq.recaptime.dev/wiki/Phorge
phorge
phabricator
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
+29
-32
+7
-7
resources/celerity/map.php
+7
-7
resources/celerity/map.php
···
7
7
*/
8
8
return array(
9
9
'names' => array(
10
-
'core.pkg.css' => 'a56d7104',
10
+
'core.pkg.css' => 'fae3b050',
11
11
'core.pkg.js' => '47dc9ebb',
12
12
'darkconsole.pkg.js' => 'e7393ebb',
13
13
'differential.pkg.css' => '2de124c9',
···
126
126
'rsrc/css/phui/phui-box.css' => 'a5bb366d',
127
127
'rsrc/css/phui/phui-button.css' => '16020a60',
128
128
'rsrc/css/phui/phui-crumbs-view.css' => 'd842f867',
129
-
'rsrc/css/phui/phui-document-pro.css' => '3657eb4b',
130
-
'rsrc/css/phui/phui-document.css' => '78521ba3',
129
+
'rsrc/css/phui/phui-document-pro.css' => '5f86a934',
130
+
'rsrc/css/phui/phui-document.css' => '9fa715d2',
131
131
'rsrc/css/phui/phui-feed-story.css' => 'b7b26d23',
132
132
'rsrc/css/phui/phui-fontkit.css' => '7837a28c',
133
133
'rsrc/css/phui/phui-form-view.css' => '621b21c5',
···
136
136
'rsrc/css/phui/phui-icon.css' => 'b0a6b1b6',
137
137
'rsrc/css/phui/phui-image-mask.css' => '5a8b09c8',
138
138
'rsrc/css/phui/phui-info-panel.css' => '27ea50a1',
139
-
'rsrc/css/phui/phui-info-view.css' => '5b16bac6',
139
+
'rsrc/css/phui/phui-info-view.css' => 'fdabaa73',
140
140
'rsrc/css/phui/phui-list.css' => '125599df',
141
141
'rsrc/css/phui/phui-object-box.css' => '407eaf5a',
142
142
'rsrc/css/phui/phui-object-item-list-view.css' => '26c30d3f',
···
776
776
'phui-calendar-list-css' => 'c1c7f338',
777
777
'phui-calendar-month-css' => '476be7e0',
778
778
'phui-crumbs-view-css' => 'd842f867',
779
-
'phui-document-view-css' => '78521ba3',
780
-
'phui-document-view-pro-css' => '3657eb4b',
779
+
'phui-document-view-css' => '9fa715d2',
780
+
'phui-document-view-pro-css' => '5f86a934',
781
781
'phui-feed-story-css' => 'b7b26d23',
782
782
'phui-font-icon-base-css' => 'ecbbb4c2',
783
783
'phui-fontkit-css' => '7837a28c',
···
787
787
'phui-icon-view-css' => 'b0a6b1b6',
788
788
'phui-image-mask-css' => '5a8b09c8',
789
789
'phui-info-panel-css' => '27ea50a1',
790
-
'phui-info-view-css' => '5b16bac6',
790
+
'phui-info-view-css' => 'fdabaa73',
791
791
'phui-inline-comment-view-css' => '0fdb3667',
792
792
'phui-list-view-css' => '125599df',
793
793
'phui-object-box-css' => '407eaf5a',
+14
-13
src/applications/legalpad/controller/LegalpadDocumentSignController.php
+14
-13
src/applications/legalpad/controller/LegalpadDocumentSignController.php
···
253
253
->setIcon(
254
254
id(new PHUIIconView())
255
255
->setIconFont('fa-pencil'))
256
-
->setText(pht('Manage Document'))
256
+
->setText(pht('Manage'))
257
257
->setHref($manage_uri)
258
258
->setDisabled(!$can_edit)
259
259
->setWorkflow(!$can_edit));
···
278
278
$preamble_box->addPropertyList($preamble);
279
279
}
280
280
281
-
$content = id(new PHUIDocumentView())
281
+
$content = id(new PHUIDocumentViewPro())
282
282
->addClass('legalpad')
283
283
->setHeader($header)
284
284
->appendChild(
···
288
288
$document_markup,
289
289
));
290
290
291
+
$signature_box = null;
291
292
if (!$has_signed) {
292
293
$error_view = null;
293
294
if ($errors) {
···
301
302
$field_errors);
302
303
303
304
switch ($document->getSignatureType()) {
304
-
case LegalpadDocument::SIGNATURE_TYPE_NONE:
305
-
$subheader = null;
305
+
default:
306
306
break;
307
307
case LegalpadDocument::SIGNATURE_TYPE_INDIVIDUAL:
308
308
case LegalpadDocument::SIGNATURE_TYPE_CORPORATION:
309
-
$subheader = id(new PHUIHeaderView())
310
-
->setHeader(pht('Agree and Sign Document'))
311
-
->setBleedHeader(true);
309
+
$box = id(new PHUIObjectBoxView())
310
+
->setHeaderText(pht('Agree and Sign Document'))
311
+
->setForm($signature_form);
312
+
if ($error_view) {
313
+
$box->setInfoView($error_view);
314
+
}
315
+
$signature_box = phutil_tag_div('phui-document-view-pro-box', $box);
312
316
break;
313
317
}
314
318
315
-
$content->appendChild(
316
-
array(
317
-
$subheader,
318
-
$error_view,
319
-
$signature_form,
320
-
));
319
+
321
320
}
322
321
323
322
$crumbs = $this->buildApplicationCrumbs();
···
328
327
array(
329
328
$crumbs,
330
329
$content,
330
+
$signature_box,
331
331
),
332
332
array(
333
333
'title' => $title,
334
+
'class' => 'pro-white-background',
334
335
'pageObjects' => array($document->getPHID()),
335
336
));
336
337
}
+2
-1
webroot/rsrc/css/phui/phui-document-pro.css
+2
-1
webroot/rsrc/css/phui/phui-document-pro.css
+5
-8
webroot/rsrc/css/phui/phui-document.css
+5
-8
webroot/rsrc/css/phui/phui-document.css
···
92
92
border-color: {$thinblueborder};
93
93
}
94
94
95
-
.phui-document-content .phui-property-list-view {
95
+
.legalpad .phui-document-content .phui-property-list-view {
96
96
border: none;
97
97
box-shadow: none;
98
-
margin: 0;
99
-
background-color: {$lightgreybackground};
98
+
margin: 16px 0 0 0;
99
+
background-color: {$lightbluebackground};
100
100
}
101
101
102
102
.phui-document-content {
···
134
134
padding-right: 120px;
135
135
}
136
136
137
-
.phui-document-view .phui-property-list-view {
138
-
border-bottom: 1px solid {$thinblueborder};
139
-
}
140
-
141
137
.phui-document-view .phui-info-severity-nodata {
142
138
background-color: {$lightgreybackground};
143
139
}
···
172
168
173
169
.phui-document-view .phui-property-list-section-header {
174
170
padding: 12px 16px 0px;
171
+
border-top: none;
175
172
}
176
173
177
174
.phui-document-view .phui-property-list-text-content {
178
-
padding: 0;
175
+
padding: 0 16px;
179
176
}
180
177
181
178
.phui-document-view .PhabricatorMonospaced,