@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
Update Phortune for two column, spruce up UI
Summary: Moves everything I could find in Phortune to new UI layouts.
Test Plan: Tested every page I could get two, unclear how to test subscriptions.
Reviewers: epriestley
Reviewed By: epriestley
Subscribers: Korvin
Differential Revision: https://secure.phabricator.com/D15513
+472
-243
+5
-5
resources/celerity/map.php
+5
-5
resources/celerity/map.php
···
7
7
*/
8
8
return array(
9
9
'names' => array(
10
-
'core.pkg.css' => 'a93de192',
10
+
'core.pkg.css' => 'befbf333',
11
11
'core.pkg.js' => '7d8faf57',
12
12
'darkconsole.pkg.js' => 'e7393ebb',
13
13
'differential.pkg.css' => '7ba78475',
···
145
145
'rsrc/css/phui/phui-info-view.css' => '28efab79',
146
146
'rsrc/css/phui/phui-list.css' => '9da2aa00',
147
147
'rsrc/css/phui/phui-object-box.css' => '6b487c57',
148
-
'rsrc/css/phui/phui-object-item-list-view.css' => '18b2ce8e',
148
+
'rsrc/css/phui/phui-object-item-list-view.css' => '8d99e42b',
149
149
'rsrc/css/phui/phui-pager.css' => 'bea33d23',
150
150
'rsrc/css/phui/phui-pinboard-view.css' => '2495140e',
151
151
'rsrc/css/phui/phui-profile-menu.css' => '7e92a89a',
···
156
156
'rsrc/css/phui/phui-status.css' => '37309046',
157
157
'rsrc/css/phui/phui-tag-view.css' => '6bbd83e2',
158
158
'rsrc/css/phui/phui-timeline-view.css' => 'a0173eba',
159
-
'rsrc/css/phui/phui-two-column-view.css' => '37d704f3',
159
+
'rsrc/css/phui/phui-two-column-view.css' => '9c43b599',
160
160
'rsrc/css/phui/workboards/phui-workboard-color.css' => 'ac6fe6a7',
161
161
'rsrc/css/phui/workboards/phui-workboard.css' => 'e6d89647',
162
162
'rsrc/css/phui/workboards/phui-workcard.css' => '3646fb96',
···
834
834
'phui-inline-comment-view-css' => '5953c28e',
835
835
'phui-list-view-css' => '9da2aa00',
836
836
'phui-object-box-css' => '6b487c57',
837
-
'phui-object-item-list-view-css' => '18b2ce8e',
837
+
'phui-object-item-list-view-css' => '8d99e42b',
838
838
'phui-pager-css' => 'bea33d23',
839
839
'phui-pinboard-view-css' => '2495140e',
840
840
'phui-profile-menu-css' => '7e92a89a',
···
846
846
'phui-tag-view-css' => '6bbd83e2',
847
847
'phui-theme-css' => '027ba77e',
848
848
'phui-timeline-view-css' => 'a0173eba',
849
-
'phui-two-column-view-css' => '37d704f3',
849
+
'phui-two-column-view-css' => '9c43b599',
850
850
'phui-workboard-color-css' => 'ac6fe6a7',
851
851
'phui-workboard-view-css' => 'e6d89647',
852
852
'phui-workcard-view-css' => '3646fb96',
+15
-7
src/applications/phortune/controller/PhortuneAccountEditController.php
+15
-7
src/applications/phortune/controller/PhortuneAccountEditController.php
···
74
74
}
75
75
76
76
$crumbs = $this->buildApplicationCrumbs();
77
+
$crumbs->setBorder(true);
77
78
78
79
if ($is_new) {
79
80
$cancel_uri = $this->getApplicationURI('account/');
···
112
113
->addCancelButton($cancel_uri));
113
114
114
115
$box = id(new PHUIObjectBoxView())
115
-
->setHeaderText($title)
116
+
->setHeaderText(pht('Account'))
117
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
116
118
->setValidationException($validation_exception)
117
119
->setForm($form);
118
120
119
-
return $this->buildApplicationPage(
120
-
array(
121
-
$crumbs,
121
+
$header = id(new PHUIHeaderView())
122
+
->setHeader($title)
123
+
->setHeaderIcon('fa-pencil');
124
+
125
+
$view = id(new PHUITwoColumnView())
126
+
->setHeader($header)
127
+
->setFooter(array(
122
128
$box,
123
-
),
124
-
array(
125
-
'title' => $title,
126
129
));
130
+
131
+
return $this->newPage()
132
+
->setTitle($title)
133
+
->setCrumbs($crumbs)
134
+
->appendChild($view);
127
135
}
128
136
129
137
}
+21
-10
src/applications/phortune/controller/PhortuneAccountListController.php
+21
-10
src/applications/phortune/controller/PhortuneAccountListController.php
···
24
24
25
25
$crumbs = $this->buildApplicationCrumbs();
26
26
$crumbs->addTextCrumb(pht('Accounts'));
27
+
$crumbs->setBorder(true);
27
28
28
29
$payment_list = id(new PHUIObjectItemListView())
29
30
->setUser($viewer)
···
34
35
35
36
foreach ($accounts as $account) {
36
37
$item = id(new PHUIObjectItemView())
37
-
->setObjectName(pht('Account %d', $account->getID()))
38
+
->setSubhead(pht('Account %d', $account->getID()))
38
39
->setHeader($account->getName())
39
40
->setHref($this->getApplicationURI($account->getID().'/'))
40
-
->setObject($account);
41
+
->setObject($account)
42
+
->setIcon('fa-credit-card');
41
43
42
44
$payment_list->addItem($item);
43
45
}
···
53
55
54
56
$payment_box = id(new PHUIObjectBoxView())
55
57
->setHeader($payment_header)
58
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
56
59
->setObjectList($payment_list);
57
60
58
61
$merchant_list = id(new PHUIObjectItemListView())
···
64
67
65
68
foreach ($merchants as $merchant) {
66
69
$item = id(new PHUIObjectItemView())
67
-
->setObjectName(pht('Merchant %d', $merchant->getID()))
70
+
->setSubhead(pht('Merchant %d', $merchant->getID()))
68
71
->setHeader($merchant->getName())
69
72
->setHref($this->getApplicationURI('/merchant/'.$merchant->getID().'/'))
70
-
->setObject($merchant);
73
+
->setObject($merchant)
74
+
->setIcon('fa-bank');
71
75
72
76
$merchant_list->addItem($item);
73
77
}
···
83
87
84
88
$merchant_box = id(new PHUIObjectBoxView())
85
89
->setHeader($merchant_header)
90
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
86
91
->setObjectList($merchant_list);
87
92
88
-
return $this->buildApplicationPage(
89
-
array(
90
-
$crumbs,
93
+
$header = id(new PHUIHeaderView())
94
+
->setHeader(pht('Accounts'));
95
+
96
+
$view = id(new PHUITwoColumnView())
97
+
->setHeader($header)
98
+
->setFooter(array(
91
99
$payment_box,
92
100
$merchant_box,
93
-
),
94
-
array(
95
-
'title' => $title,
96
101
));
102
+
103
+
return $this->newPage()
104
+
->setTitle($title)
105
+
->setCrumbs($crumbs)
106
+
->appendChild($view);
107
+
97
108
}
98
109
99
110
}
+83
-57
src/applications/phortune/controller/PhortuneAccountViewController.php
+83
-57
src/applications/phortune/controller/PhortuneAccountViewController.php
···
36
36
37
37
$crumbs = $this->buildApplicationCrumbs();
38
38
$this->addAccountCrumb($crumbs, $account, $link = false);
39
+
$crumbs->setBorder(true);
39
40
40
41
$header = id(new PHUIHeaderView())
41
-
->setHeader($title);
42
+
->setHeader($title)
43
+
->setHeaderIcon('fa-credit-card');
42
44
43
-
$edit_uri = $this->getApplicationURI('account/edit/'.$account->getID().'/');
45
+
$curtain = $this->buildCurtainView($account, $invoices);
46
+
$invoices = $this->buildInvoicesSection($account, $invoices);
47
+
$purchase_history = $this->buildPurchaseHistorySection($account);
48
+
$charge_history = $this->buildChargeHistorySection($account);
49
+
$subscriptions = $this->buildSubscriptionsSection($account);
50
+
$payment_methods = $this->buildPaymentMethodsSection($account);
44
51
45
-
$actions = id(new PhabricatorActionListView())
46
-
->setUser($viewer)
47
-
->addAction(
48
-
id(new PhabricatorActionView())
49
-
->setName(pht('Edit Account'))
50
-
->setIcon('fa-pencil')
51
-
->setHref($edit_uri)
52
-
->setDisabled(!$can_edit)
53
-
->setWorkflow(!$can_edit));
52
+
$timeline = $this->buildTransactionTimeline(
53
+
$account,
54
+
new PhortuneAccountTransactionQuery());
55
+
$timeline->setShouldTerminate(true);
54
56
55
-
$properties = id(new PHUIPropertyListView())
56
-
->setObject($account)
57
-
->setUser($viewer);
57
+
$view = id(new PHUITwoColumnView())
58
+
->setHeader($header)
59
+
->setCurtain($curtain)
60
+
->setMainColumn(array(
61
+
$invoices,
62
+
$purchase_history,
63
+
$charge_history,
64
+
$subscriptions,
65
+
$payment_methods,
66
+
$timeline,
67
+
));
68
+
69
+
return $this->newPage()
70
+
->setTitle($title)
71
+
->setCrumbs($crumbs)
72
+
->appendChild($view);
73
+
74
+
}
75
+
76
+
private function buildCurtainView(PhortuneAccount $account, $invoices) {
77
+
$viewer = $this->getViewer();
78
+
79
+
$can_edit = PhabricatorPolicyFilter::hasCapability(
80
+
$viewer,
81
+
$account,
82
+
PhabricatorPolicyCapability::CAN_EDIT);
58
83
59
-
$properties->addProperty(
60
-
pht('Members'),
61
-
$viewer->renderHandleList($account->getMemberPHIDs()));
84
+
$edit_uri = $this->getApplicationURI('account/edit/'.$account->getID().'/');
85
+
86
+
$curtain = $this->newCurtainView($account);
87
+
$curtain->addAction(
88
+
id(new PhabricatorActionView())
89
+
->setName(pht('Edit Account'))
90
+
->setIcon('fa-pencil')
91
+
->setHref($edit_uri)
92
+
->setDisabled(!$can_edit)
93
+
->setWorkflow(!$can_edit));
62
94
63
95
$status_items = $this->getStatusItemsForAccount($account, $invoices);
64
96
$status_view = new PHUIStatusListView();
···
72
104
->setTarget(idx($item, 'target'))
73
105
->setNote(idx($item, 'note')));
74
106
}
75
-
$properties->addProperty(
76
-
pht('Status'),
77
-
$status_view);
78
107
79
-
$properties->setActionList($actions);
108
+
$member_phids = $account->getMemberPHIDs();
109
+
$handles = $viewer->loadHandles($member_phids);
80
110
81
-
$invoices = $this->buildInvoicesSection($account, $invoices);
82
-
$purchase_history = $this->buildPurchaseHistorySection($account);
83
-
$charge_history = $this->buildChargeHistorySection($account);
84
-
$subscriptions = $this->buildSubscriptionsSection($account);
85
-
$payment_methods = $this->buildPaymentMethodsSection($account);
111
+
$member_list = id(new PHUIObjectItemListView())
112
+
->setSimple(true);
86
113
87
-
$timeline = $this->buildTransactionTimeline(
88
-
$account,
89
-
new PhortuneAccountTransactionQuery());
90
-
$timeline->setShouldTerminate(true);
114
+
foreach ($member_phids as $member_phid) {
115
+
$image_uri = $handles[$member_phid]->getImageURI();
116
+
$image_href = $handles[$member_phid]->getURI();
117
+
$person = $handles[$member_phid];
91
118
92
-
$object_box = id(new PHUIObjectBoxView())
93
-
->setHeader($header)
94
-
->addPropertyList($properties);
119
+
$member = id(new PHUIObjectItemView())
120
+
->setImageURI($image_uri)
121
+
->setHref($image_href)
122
+
->setHeader($person->getFullName());
95
123
96
-
return $this->buildApplicationPage(
97
-
array(
98
-
$crumbs,
99
-
$object_box,
100
-
$invoices,
101
-
$purchase_history,
102
-
$charge_history,
103
-
$subscriptions,
104
-
$payment_methods,
105
-
$timeline,
106
-
),
107
-
array(
108
-
'title' => $title,
109
-
));
124
+
$member_list->addItem($member);
125
+
}
126
+
127
+
$curtain->newPanel()
128
+
->setHeaderText(pht('Status'))
129
+
->appendChild($status_view);
130
+
131
+
$curtain->newPanel()
132
+
->setHeaderText(pht('Members'))
133
+
->appendChild($member_list);
134
+
135
+
return $curtain;
110
136
}
111
137
112
138
private function buildPaymentMethodsSection(PhortuneAccount $account) {
113
-
$request = $this->getRequest();
114
-
$viewer = $request->getUser();
139
+
$viewer = $this->getViewer();
115
140
116
141
$can_edit = PhabricatorPolicyFilter::hasCapability(
117
142
$viewer,
···
179
204
180
205
return id(new PHUIObjectBoxView())
181
206
->setHeader($header)
207
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
182
208
->setObjectList($list);
183
209
}
184
210
···
186
212
PhortuneAccount $account,
187
213
array $carts) {
188
214
189
-
$request = $this->getRequest();
190
-
$viewer = $request->getUser();
215
+
$viewer = $this->getViewer();
191
216
192
217
$phids = array();
193
218
foreach ($carts as $cart) {
···
211
236
212
237
return id(new PHUIObjectBoxView())
213
238
->setHeader($header)
239
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
214
240
->setTable($table);
215
241
}
216
242
217
243
private function buildPurchaseHistorySection(PhortuneAccount $account) {
218
-
$request = $this->getRequest();
219
-
$viewer = $request->getUser();
244
+
$viewer = $this->getViewer();
220
245
221
246
$carts = id(new PhortuneCartQuery())
222
247
->setViewer($viewer)
···
260
285
261
286
return id(new PHUIObjectBoxView())
262
287
->setHeader($header)
288
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
263
289
->setTable($table);
264
290
}
265
291
266
292
private function buildChargeHistorySection(PhortuneAccount $account) {
267
-
$request = $this->getRequest();
268
-
$viewer = $request->getUser();
293
+
$viewer = $this->getViewer();
269
294
270
295
$charges = id(new PhortuneChargeQuery())
271
296
->setViewer($viewer)
···
302
327
303
328
return id(new PHUIObjectBoxView())
304
329
->setHeader($header)
330
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
305
331
->setTable($table);
306
332
}
307
333
308
334
private function buildSubscriptionsSection(PhortuneAccount $account) {
309
-
$request = $this->getRequest();
310
-
$viewer = $request->getUser();
335
+
$viewer = $this->getViewer();
311
336
312
337
$subscriptions = id(new PhortuneSubscriptionQuery())
313
338
->setViewer($viewer)
···
338
363
339
364
return id(new PHUIObjectBoxView())
340
365
->setHeader($header)
366
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
341
367
->setTable($table);
342
368
}
343
369
+15
-6
src/applications/phortune/controller/PhortuneCartCheckoutController.php
+15
-6
src/applications/phortune/controller/PhortuneCartCheckoutController.php
···
107
107
$cart_box = id(new PHUIObjectBoxView())
108
108
->setFormErrors($errors)
109
109
->setHeaderText(pht('Cart Contents'))
110
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
110
111
->setTable($cart_table);
111
112
112
113
$title = $cart->getName();
···
200
201
201
202
$payment_box = id(new PHUIObjectBoxView())
202
203
->setHeaderText(pht('Choose Payment Method'))
204
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
203
205
->appendChild($form)
204
206
->appendChild($provider_form);
205
207
···
208
210
$crumbs = $this->buildApplicationCrumbs();
209
211
$crumbs->addTextCrumb(pht('Checkout'));
210
212
$crumbs->addTextCrumb($title);
213
+
$crumbs->setBorder(true);
214
+
215
+
$header = id(new PHUIHeaderView())
216
+
->setHeader($title)
217
+
->setHeaderIcon('fa-shopping-cart');
211
218
212
-
return $this->buildApplicationPage(
213
-
array(
214
-
$crumbs,
219
+
$view = id(new PHUITwoColumnView())
220
+
->setHeader($header)
221
+
->setFooter(array(
215
222
$cart_box,
216
223
$description_box,
217
224
$payment_box,
218
-
),
219
-
array(
220
-
'title' => $title,
221
225
));
226
+
227
+
return $this->newPage()
228
+
->setTitle($title)
229
+
->setCrumbs($crumbs)
230
+
->appendChild($view);
222
231
223
232
}
224
233
}
+1
src/applications/phortune/controller/PhortuneCartController.php
+1
src/applications/phortune/controller/PhortuneCartController.php
+42
-35
src/applications/phortune/controller/PhortuneCartViewController.php
+42
-35
src/applications/phortune/controller/PhortuneCartViewController.php
···
108
108
break;
109
109
case PhortuneCart::STATUS_PURCHASED:
110
110
$error_view = id(new PHUIInfoView())
111
-
->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
111
+
->setSeverity(PHUIInfoView::SEVERITY_SUCCESS)
112
112
->appendChild(pht('This purchase has been completed.'));
113
113
break;
114
114
}
115
115
116
-
$properties = $this->buildPropertyListView($cart);
117
-
$actions = $this->buildActionListView(
116
+
if ($errors) {
117
+
$error_view = id(new PHUIInfoView())
118
+
->setSeverity(PHUIInfoView::SEVERITY_WARNING)
119
+
->appendChild($errors);
120
+
}
121
+
122
+
$details = $this->buildDetailsView($cart);
123
+
$curtain = $this->buildCurtainView(
118
124
$cart,
119
125
$can_edit,
120
126
$authority,
121
127
$resume_uri);
122
-
$properties->setActionList($actions);
123
128
124
129
$header = id(new PHUIHeaderView())
125
130
->setUser($viewer)
126
-
->setHeader(pht('Order Detail'));
131
+
->setHeader(pht('Order Detail'))
132
+
->setHeaderIcon('fa-shopping-cart');
127
133
128
134
if ($cart->getStatus() == PhortuneCart::STATUS_PURCHASED) {
129
135
$done_uri = $cart->getDoneURI();
···
138
144
}
139
145
140
146
$cart_box = id(new PHUIObjectBoxView())
141
-
->setHeader($header)
142
-
->addPropertyList($properties)
147
+
->setHeaderText(pht('Cart Items'))
148
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
143
149
->setTable($cart_table);
144
150
145
-
if ($errors) {
146
-
$cart_box->setFormErrors($errors);
147
-
} else if ($error_view) {
148
-
$cart_box->setInfoView($error_view);
149
-
}
150
-
151
151
$description = $this->renderCartDescription($cart);
152
152
153
153
$charges = id(new PhortuneChargeQuery())
···
173
173
174
174
$charges = id(new PHUIObjectBoxView())
175
175
->setHeaderText(pht('Charges'))
176
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
176
177
->setTable($charges_table);
177
178
178
179
$account = $cart->getAccount();
···
184
185
$this->addAccountCrumb($crumbs, $cart->getAccount());
185
186
}
186
187
$crumbs->addTextCrumb(pht('Cart %d', $cart->getID()));
188
+
$crumbs->setBorder(true);
187
189
188
190
$timeline = $this->buildTransactionTimeline(
189
191
$cart,
···
191
193
$timeline
192
194
->setShouldTerminate(true);
193
195
194
-
return $this->buildApplicationPage(
195
-
array(
196
-
$crumbs,
196
+
$view = id(new PHUITwoColumnView())
197
+
->setHeader($header)
198
+
->setCurtain($curtain)
199
+
->setMainColumn(array(
200
+
$error_view,
201
+
$details,
197
202
$cart_box,
198
203
$description,
199
204
$charges,
200
205
$timeline,
201
-
),
202
-
array(
203
-
'title' => pht('Cart'),
204
206
));
205
207
208
+
return $this->newPage()
209
+
->setTitle(pht('Cart %d', $cart->getID()))
210
+
->setCrumbs($crumbs)
211
+
->appendChild($view);
212
+
206
213
}
207
214
208
-
private function buildPropertyListView(PhortuneCart $cart) {
215
+
private function buildDetailsView(PhortuneCart $cart) {
209
216
210
-
$viewer = $this->getRequest()->getUser();
217
+
$viewer = $this->getViewer();
211
218
212
219
$view = id(new PHUIPropertyListView())
213
220
->setUser($viewer)
···
239
246
pht('Updated'),
240
247
phabricator_datetime($cart->getDateModified(), $viewer));
241
248
242
-
return $view;
249
+
return id(new PHUIObjectBoxView())
250
+
->setHeaderText(pht('Details'))
251
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
252
+
->appendChild($view);
243
253
}
244
254
245
-
private function buildActionListView(
255
+
private function buildCurtainView(
246
256
PhortuneCart $cart,
247
257
$can_edit,
248
258
$authority,
249
259
$resume_uri) {
250
260
251
-
$viewer = $this->getRequest()->getUser();
261
+
$viewer = $this->getViewer();
252
262
$id = $cart->getID();
253
-
254
-
$view = id(new PhabricatorActionListView())
255
-
->setUser($viewer)
256
-
->setObject($cart);
263
+
$curtain = $this->newCurtainView($cart);
257
264
258
265
$can_cancel = ($can_edit && $cart->canCancelOrder());
259
266
···
269
276
$accept_uri = $this->getApplicationURI("{$prefix}cart/{$id}/accept/");
270
277
$print_uri = $this->getApplicationURI("{$prefix}cart/{$id}/?__print__=1");
271
278
272
-
$view->addAction(
279
+
$curtain->addAction(
273
280
id(new PhabricatorActionView())
274
281
->setName(pht('Cancel Order'))
275
282
->setIcon('fa-times')
···
279
286
280
287
if ($authority) {
281
288
if ($cart->getStatus() == PhortuneCart::STATUS_REVIEW) {
282
-
$view->addAction(
289
+
$curtain->addAction(
283
290
id(new PhabricatorActionView())
284
291
->setName(pht('Accept Order'))
285
292
->setIcon('fa-check')
···
287
294
->setHref($accept_uri));
288
295
}
289
296
290
-
$view->addAction(
297
+
$curtain->addAction(
291
298
id(new PhabricatorActionView())
292
299
->setName(pht('Refund Order'))
293
300
->setIcon('fa-reply')
···
295
302
->setHref($refund_uri));
296
303
}
297
304
298
-
$view->addAction(
305
+
$curtain->addAction(
299
306
id(new PhabricatorActionView())
300
307
->setName(pht('Update Status'))
301
308
->setIcon('fa-refresh')
302
309
->setHref($update_uri));
303
310
304
311
if ($can_edit && $resume_uri) {
305
-
$view->addAction(
312
+
$curtain->addAction(
306
313
id(new PhabricatorActionView())
307
314
->setName(pht('Continue Checkout'))
308
315
->setIcon('fa-shopping-cart')
309
316
->setHref($resume_uri));
310
317
}
311
318
312
-
$view->addAction(
319
+
$curtain->addAction(
313
320
id(new PhabricatorActionView())
314
321
->setName(pht('Printable Version'))
315
322
->setHref($print_uri)
316
323
->setOpenInNewWindow(true)
317
324
->setIcon('fa-print'));
318
325
319
-
return $view;
326
+
return $curtain;
320
327
}
321
328
322
329
}
+18
-8
src/applications/phortune/controller/PhortuneMerchantEditController.php
+18
-8
src/applications/phortune/controller/PhortuneMerchantEditController.php
···
145
145
->setValue($button_text)
146
146
->addCancelButton($cancel_uri));
147
147
148
+
$header = id(new PHUIHeaderView())
149
+
->setHeader($title);
150
+
148
151
$crumbs = $this->buildApplicationCrumbs();
149
152
if ($is_new) {
150
153
$crumbs->addTextCrumb(pht('Create Merchant'));
154
+
$header->setHeaderIcon('fa-plus-square');
151
155
} else {
152
156
$crumbs->addTextCrumb(
153
157
pht('Merchant %d', $merchant->getID()),
154
158
$this->getApplicationURI('/merchant/'.$merchant->getID().'/'));
155
159
$crumbs->addTextCrumb(pht('Edit'));
160
+
$header->setHeaderIcon('fa-pencil');
156
161
}
162
+
$crumbs->setBorder(true);
157
163
158
164
$box = id(new PHUIObjectBoxView())
165
+
->setHeaderText(pht('Merchant'))
159
166
->setValidationException($validation_exception)
160
-
->setHeaderText($title)
167
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
161
168
->setForm($form);
162
169
163
-
return $this->buildApplicationPage(
164
-
array(
165
-
$crumbs,
170
+
$view = id(new PHUITwoColumnView())
171
+
->setHeader($header)
172
+
->setFooter(array(
166
173
$box,
167
-
),
168
-
array(
169
-
'title' => $title,
170
174
));
171
-
}
175
+
176
+
return $this->newPage()
177
+
->setTitle($title)
178
+
->setCrumbs($crumbs)
179
+
->appendChild($view);
180
+
181
+
}
172
182
173
183
}
+15
-7
src/applications/phortune/controller/PhortuneMerchantInvoiceCreateController.php
+15
-7
src/applications/phortune/controller/PhortuneMerchantInvoiceCreateController.php
···
89
89
90
90
$crumbs = $this->buildApplicationCrumbs();
91
91
$crumbs->addTextCrumb($merchant->getName());
92
+
$crumbs->setBorder(true);
92
93
93
94
$v_title = $request->getStr('title');
94
95
$e_title = true;
···
229
230
->setValue(pht('Send Invoice')));
230
231
231
232
$box = id(new PHUIObjectBoxView())
232
-
->setHeaderText(pht('New Invoice'))
233
+
->setHeaderText(pht('Details'))
234
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
233
235
->setFormErrors($errors)
234
236
->setForm($form);
235
237
236
-
return $this->buildApplicationPage(
237
-
array(
238
-
$crumbs,
238
+
$header = id(new PHUIHeaderView())
239
+
->setHeader($title)
240
+
->setHeaderIcon('fa-plus-square');
241
+
242
+
$view = id(new PHUITwoColumnView())
243
+
->setHeader($header)
244
+
->setFooter(array(
239
245
$box,
240
-
),
241
-
array(
242
-
'title' => $title,
243
246
));
247
+
248
+
return $this->newPage()
249
+
->setTitle($title)
250
+
->setCrumbs($crumbs)
251
+
->appendChild($view);
244
252
}
245
253
246
254
}
+63
-33
src/applications/phortune/controller/PhortuneMerchantViewController.php
+63
-33
src/applications/phortune/controller/PhortuneMerchantViewController.php
···
17
17
18
18
$crumbs = $this->buildApplicationCrumbs();
19
19
$crumbs->addTextCrumb($merchant->getName());
20
+
$crumbs->setBorder(true);
20
21
21
22
$title = pht(
22
23
'Merchant %d %s',
···
26
27
$header = id(new PHUIHeaderView())
27
28
->setHeader($merchant->getName())
28
29
->setUser($viewer)
29
-
->setPolicyObject($merchant);
30
+
->setPolicyObject($merchant)
31
+
->setHeaderIcon('fa-bank');
30
32
31
33
$providers = id(new PhortunePaymentProviderConfigQuery())
32
34
->setViewer($viewer)
33
35
->withMerchantPHIDs(array($merchant->getPHID()))
34
36
->execute();
35
37
36
-
$properties = $this->buildPropertyListView($merchant, $providers);
37
-
$actions = $this->buildActionListView($merchant);
38
-
$properties->setActionList($actions);
38
+
$details = $this->buildDetailsView($merchant, $providers);
39
+
$description = $this->buildDescriptionView($merchant);
40
+
$curtain = $this->buildCurtainView($merchant);
39
41
40
42
$provider_list = $this->buildProviderList(
41
43
$merchant,
42
44
$providers);
43
45
44
-
$box = id(new PHUIObjectBoxView())
45
-
->setHeader($header)
46
-
->addPropertyList($properties);
47
-
48
46
$timeline = $this->buildTransactionTimeline(
49
47
$merchant,
50
48
new PhortuneMerchantTransactionQuery());
51
49
$timeline->setShouldTerminate(true);
52
50
53
-
return $this->buildApplicationPage(
54
-
array(
55
-
$crumbs,
56
-
$box,
51
+
$view = id(new PHUITwoColumnView())
52
+
->setHeader($header)
53
+
->setCurtain($curtain)
54
+
->setMainColumn(array(
55
+
$details,
56
+
$description,
57
57
$provider_list,
58
58
$timeline,
59
-
),
60
-
array(
61
-
'title' => $title,
62
59
));
60
+
61
+
return $this->newPage()
62
+
->setTitle($title)
63
+
->setCrumbs($crumbs)
64
+
->appendChild($view);
63
65
}
64
66
65
-
private function buildPropertyListView(
67
+
private function buildDetailsView(
66
68
PhortuneMerchant $merchant,
67
69
array $providers) {
68
70
···
128
130
129
131
$view->addProperty(pht('Status'), $status_view);
130
132
131
-
$view->addProperty(
132
-
pht('Members'),
133
-
$viewer->renderHandleList($merchant->getMemberPHIDs()));
133
+
return id(new PHUIObjectBoxView())
134
+
->setHeaderText(pht('DETAILS'))
135
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
136
+
->appendChild($view);
137
+
}
134
138
135
-
$view->invokeWillRenderEvent();
139
+
private function buildDescriptionView(PhortuneMerchant $merchant) {
140
+
$viewer = $this->getViewer();
141
+
$view = id(new PHUIPropertyListView())
142
+
->setUser($viewer);
136
143
137
144
$description = $merchant->getDescription();
138
145
if (strlen($description)) {
139
146
$description = new PHUIRemarkupView($viewer, $description);
140
-
$view->addSectionHeader(
141
-
pht('Description'), PHUIPropertyListView::ICON_SUMMARY);
142
147
$view->addTextContent($description);
148
+
return id(new PHUIObjectBoxView())
149
+
->setHeaderText(pht('DESCRIPTION'))
150
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
151
+
->appendChild($view);
143
152
}
144
153
145
-
return $view;
154
+
return null;
146
155
}
147
156
148
-
private function buildActionListView(PhortuneMerchant $merchant) {
157
+
private function buildCurtainView(PhortuneMerchant $merchant) {
149
158
$viewer = $this->getRequest()->getUser();
150
159
$id = $merchant->getID();
151
160
···
154
163
$merchant,
155
164
PhabricatorPolicyCapability::CAN_EDIT);
156
165
157
-
$view = id(new PhabricatorActionListView())
158
-
->setUser($viewer)
159
-
->setObject($merchant);
166
+
$curtain = $this->newCurtainView($merchant);
160
167
161
-
$view->addAction(
168
+
$curtain->addAction(
162
169
id(new PhabricatorActionView())
163
170
->setName(pht('Edit Merchant'))
164
171
->setIcon('fa-pencil')
···
166
173
->setWorkflow(!$can_edit)
167
174
->setHref($this->getApplicationURI("merchant/edit/{$id}/")));
168
175
169
-
$view->addAction(
176
+
$curtain->addAction(
170
177
id(new PhabricatorActionView())
171
178
->setName(pht('View Orders'))
172
179
->setIcon('fa-shopping-cart')
···
174
181
->setDisabled(!$can_edit)
175
182
->setWorkflow(!$can_edit));
176
183
177
-
$view->addAction(
184
+
$curtain->addAction(
178
185
id(new PhabricatorActionView())
179
186
->setName(pht('View Subscriptions'))
180
187
->setIcon('fa-moon-o')
···
182
189
->setDisabled(!$can_edit)
183
190
->setWorkflow(!$can_edit));
184
191
185
-
186
-
$view->addAction(
192
+
$curtain->addAction(
187
193
id(new PhabricatorActionView())
188
194
->setName(pht('New Invoice'))
189
195
->setIcon('fa-fax')
···
191
197
->setDisabled(!$can_edit)
192
198
->setWorkflow(!$can_edit));
193
199
194
-
return $view;
200
+
$member_phids = $merchant->getMemberPHIDs();
201
+
$handles = $viewer->loadHandles($member_phids);
202
+
203
+
$member_list = id(new PHUIObjectItemListView())
204
+
->setSimple(true);
205
+
206
+
foreach ($member_phids as $member_phid) {
207
+
$image_uri = $handles[$member_phid]->getImageURI();
208
+
$image_href = $handles[$member_phid]->getURI();
209
+
$person = $handles[$member_phid];
210
+
211
+
$member = id(new PHUIObjectItemView())
212
+
->setImageURI($image_uri)
213
+
->setHref($image_href)
214
+
->setHeader($person->getFullName());
215
+
216
+
$member_list->addItem($member);
217
+
}
218
+
219
+
$curtain->newPanel()
220
+
->setHeaderText(pht('Members'))
221
+
->appendChild($member_list);
222
+
223
+
return $curtain;
195
224
}
196
225
197
226
private function buildProviderList(
···
283
312
284
313
return id(new PHUIObjectBoxView())
285
314
->setHeader($header)
315
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
286
316
->setObjectList($provider_list);
287
317
}
288
318
+16
-7
src/applications/phortune/controller/PhortunePaymentMethodCreateController.php
+16
-7
src/applications/phortune/controller/PhortunePaymentMethodCreateController.php
···
158
158
->addCancelButton($cancel_uri));
159
159
160
160
$box = id(new PHUIObjectBoxView())
161
-
->setHeaderText($provider->getPaymentMethodDescription())
161
+
->setHeaderText(pht('Method'))
162
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
162
163
->setForm($form);
163
164
164
165
$crumbs = $this->buildApplicationCrumbs();
165
166
$crumbs->addTextCrumb(pht('Add Payment Method'));
167
+
$crumbs->setBorder(true);
166
168
167
-
return $this->buildApplicationPage(
168
-
array(
169
-
$crumbs,
169
+
$header = id(new PHUIHeaderView())
170
+
->setHeader(pht('Add Payment Method'))
171
+
->setHeaderIcon('fa-plus-square');
172
+
173
+
$view = id(new PHUITwoColumnView())
174
+
->setHeader($header)
175
+
->setFooter(array(
170
176
$box,
171
-
),
172
-
array(
173
-
'title' => $provider->getPaymentMethodDescription(),
174
177
));
178
+
179
+
return $this->newPage()
180
+
->setTitle($provider->getPaymentMethodDescription())
181
+
->setCrumbs($crumbs)
182
+
->appendChild($view);
183
+
175
184
}
176
185
177
186
private function renderSelectProvider(
+16
-7
src/applications/phortune/controller/PhortunePaymentMethodEditController.php
+16
-7
src/applications/phortune/controller/PhortunePaymentMethodEditController.php
···
58
58
->setValue(pht('Save Changes')));
59
59
60
60
$box = id(new PHUIObjectBoxView())
61
-
->setHeaderText(pht('Edit Payment Method'))
61
+
->setHeaderText(pht('Payment Method'))
62
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
62
63
->setForm($form);
63
64
64
65
$crumbs = $this->buildApplicationCrumbs();
65
66
$crumbs->addTextCrumb($account->getName(), $account_uri);
66
67
$crumbs->addTextCrumb($method->getDisplayName());
67
68
$crumbs->addTextCrumb(pht('Edit'));
69
+
$crumbs->setBorder(true);
68
70
69
-
return $this->buildApplicationPage(
70
-
array(
71
-
$crumbs,
71
+
$header = id(new PHUIHeaderView())
72
+
->setHeader(pht('Edit Payment Method'))
73
+
->setHeaderIcon('fa-pencil');
74
+
75
+
$view = id(new PHUITwoColumnView())
76
+
->setHeader($header)
77
+
->setFooter(array(
72
78
$box,
73
-
),
74
-
array(
75
-
'title' => pht('Edit Payment Method'),
76
79
));
80
+
81
+
return $this->newPage()
82
+
->setTitle(pht('Edit Payment Method'))
83
+
->setCrumbs($crumbs)
84
+
->appendChild($view);
85
+
77
86
}
78
87
79
88
}
+22
-8
src/applications/phortune/controller/PhortuneProductListController.php
+22
-8
src/applications/phortune/controller/PhortuneProductListController.php
···
24
24
->setName(pht('Create Product'))
25
25
->setHref($this->getApplicationURI('product/edit/'))
26
26
->setIcon('fa-plus-square'));
27
+
$crumbs->setBorder(true);
27
28
28
29
$product_list = id(new PHUIObjectItemListView())
29
30
->setUser($viewer)
···
39
40
->setObjectName($product->getID())
40
41
->setHeader($product->getProductName())
41
42
->setHref($view_uri)
42
-
->addAttribute($price->formatForDisplay());
43
+
->addAttribute($price->formatForDisplay())
44
+
->setIcon('fa-gift');
43
45
44
46
$product_list->addItem($item);
45
47
}
46
48
47
-
return $this->buildApplicationPage(
48
-
array(
49
-
$crumbs,
50
-
$product_list,
49
+
$box = id(new PHUIObjectBoxView())
50
+
->setHeaderText(pht('Products'))
51
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
52
+
->setObjectList($product_list);
53
+
54
+
$header = id(new PHUIHeaderView())
55
+
->setHeader(pht('Products'))
56
+
->setHeaderIcon('fa-gift');
57
+
58
+
$view = id(new PHUITwoColumnView())
59
+
->setHeader($header)
60
+
->setFooter(array(
61
+
$box,
51
62
$pager,
52
-
),
53
-
array(
54
-
'title' => $title,
55
63
));
64
+
65
+
return $this->newPage()
66
+
->setTitle($title)
67
+
->setCrumbs($crumbs)
68
+
->appendChild($view);
69
+
56
70
}
57
71
58
72
}
+14
-12
src/applications/phortune/controller/PhortuneProductViewController.php
+14
-12
src/applications/phortune/controller/PhortuneProductViewController.php
···
17
17
$title = pht('Product: %s', $product->getProductName());
18
18
19
19
$header = id(new PHUIHeaderView())
20
-
->setHeader($product->getProductName());
20
+
->setHeader($product->getProductName())
21
+
->setHeaderIcon('fa-gift');
21
22
22
23
$edit_uri = $this->getApplicationURI('product/edit/'.$product->getID().'/');
23
-
24
-
$actions = id(new PhabricatorActionListView())
25
-
->setUser($viewer);
26
24
27
25
$crumbs = $this->buildApplicationCrumbs();
28
26
$crumbs->addTextCrumb(
···
31
29
$crumbs->addTextCrumb(
32
30
pht('#%d', $product->getID()),
33
31
$request->getRequestURI());
32
+
$crumbs->setBorder(true);
34
33
35
34
$properties = id(new PHUIPropertyListView())
36
35
->setUser($viewer)
37
-
->setActionList($actions)
38
36
->addProperty(
39
37
pht('Price'),
40
38
$product->getPriceAsCurrency()->formatForDisplay());
41
39
42
40
$object_box = id(new PHUIObjectBoxView())
43
-
->setHeader($header)
41
+
->setHeaderText(pht('DETAILS'))
42
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
44
43
->addPropertyList($properties);
45
44
46
-
return $this->buildApplicationPage(
47
-
array(
48
-
$crumbs,
45
+
$view = id(new PHUITwoColumnView())
46
+
->setHeader($header)
47
+
->setFooter(array(
49
48
$object_box,
50
-
),
51
-
array(
52
-
'title' => $title,
53
49
));
50
+
51
+
return $this->newPage()
52
+
->setTitle($title)
53
+
->setCrumbs($crumbs)
54
+
->appendChild($view);
55
+
54
56
}
55
57
56
58
}
+31
-14
src/applications/phortune/controller/PhortuneProviderEditController.php
+31
-14
src/applications/phortune/controller/PhortuneProviderEditController.php
···
177
177
178
178
$crumbs = $this->buildApplicationCrumbs();
179
179
$crumbs->addTextCrumb($merchant->getName(), $cancel_uri);
180
+
$crumbs->setBorder(true);
180
181
181
182
if ($is_new) {
182
183
$crumbs->addTextCrumb(pht('Add Provider'));
···
185
186
pht('Edit Provider %d', $provider_config->getID()));
186
187
}
187
188
189
+
$header = id(new PHUIHeaderView())
190
+
->setHeader($title)
191
+
->setHeaderIcon('fa-pencil');
192
+
188
193
$box = id(new PHUIObjectBoxView())
189
194
->setFormErrors($errors)
190
-
->setHeaderText($title)
195
+
->setHeaderText(pht('Properties'))
196
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
191
197
->appendChild($form);
192
198
193
-
return $this->buildApplicationPage(
194
-
array(
195
-
$crumbs,
199
+
$view = id(new PHUITwoColumnView())
200
+
->setHeader($header)
201
+
->setFooter(array(
196
202
$box,
197
-
),
198
-
array(
199
-
'title' => $title,
200
203
));
204
+
205
+
return $this->newPage()
206
+
->setTitle($title)
207
+
->setCrumbs($crumbs)
208
+
->appendChild($view);
209
+
201
210
}
202
211
203
212
private function processChooseClassRequest(
···
266
275
$crumbs = $this->buildApplicationCrumbs();
267
276
$crumbs->addTextCrumb($merchant->getName(), $cancel_uri);
268
277
$crumbs->addTextCrumb($title);
278
+
$crumbs->setBorder(true);
269
279
270
280
$box = id(new PHUIObjectBoxView())
271
-
->setHeaderText($title)
281
+
->setHeaderText(pht('Provider'))
272
282
->setFormErrors($errors)
283
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
273
284
->setForm($form);
274
285
275
-
return $this->buildApplicationPage(
276
-
array(
277
-
$crumbs,
286
+
$header = id(new PHUIHeaderView())
287
+
->setHeader($title)
288
+
->setHeaderIcon('fa-plus-square');
289
+
290
+
$view = id(new PHUITwoColumnView())
291
+
->setHeader($header)
292
+
->setFooter(array(
278
293
$box,
279
-
),
280
-
array(
281
-
'title' => $title,
282
294
));
295
+
296
+
return $this->newPage()
297
+
->setTitle($title)
298
+
->setCrumbs($crumbs)
299
+
->appendChild($view);
283
300
}
284
301
285
302
}
+15
-7
src/applications/phortune/controller/PhortuneSubscriptionEditController.php
+15
-7
src/applications/phortune/controller/PhortuneSubscriptionEditController.php
···
140
140
141
141
$box = id(new PHUIObjectBoxView())
142
142
->setUser($viewer)
143
-
->setHeaderText(pht('Edit %s', $subscription->getSubscriptionName()))
143
+
->setHeaderText(pht('Subscription'))
144
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
144
145
->setFormErrors($errors)
145
146
->appendChild($form);
146
147
147
-
return $this->buildApplicationPage(
148
-
array(
149
-
$crumbs,
148
+
$header = id(new PHUIHeaderView())
149
+
->setHeader(pht('Edit %s', $subscription->getSubscriptionName()))
150
+
->setHeaderIcon('fa-pencil');
151
+
152
+
$view = id(new PHUITwoColumnView())
153
+
->setHeader($header)
154
+
->setFooter(array(
150
155
$box,
151
-
),
152
-
array(
153
-
'title' => $title,
154
156
));
157
+
158
+
return $this->newPage()
159
+
->setTitle($title)
160
+
->setCrumbs($crumbs)
161
+
->appendChild($view);
162
+
155
163
}
156
164
157
165
+22
-18
src/applications/phortune/controller/PhortuneSubscriptionViewController.php
+22
-18
src/applications/phortune/controller/PhortuneSubscriptionViewController.php
···
35
35
$title = $subscription->getSubscriptionFullName();
36
36
37
37
$header = id(new PHUIHeaderView())
38
-
->setHeader($title);
39
-
40
-
$actions = id(new PhabricatorActionListView())
41
-
->setUser($viewer);
38
+
->setHeader($title)
39
+
->setHeaderIcon('fa-calendar-o');
42
40
41
+
$curtain = $this->newCurtainView($subscription);
43
42
$edit_uri = $subscription->getEditURI();
44
43
45
-
$actions->addAction(
44
+
$curtain->addAction(
46
45
id(new PhabricatorActionView())
47
46
->setIcon('fa-pencil')
48
47
->setName(pht('Edit Subscription'))
49
48
->setHref($edit_uri)
50
49
->setDisabled(!$can_edit)
51
50
->setWorkflow(!$can_edit));
52
-
53
51
54
52
$crumbs = $this->buildApplicationCrumbs();
55
53
if ($authority) {
···
58
56
$this->addAccountCrumb($crumbs, $account);
59
57
}
60
58
$crumbs->addTextCrumb($subscription->getSubscriptionCrumbName());
59
+
$crumbs->setBorder(true);
61
60
62
61
$properties = id(new PHUIPropertyListView())
63
-
->setUser($viewer)
64
-
->setActionList($actions);
62
+
->setUser($viewer);
65
63
66
64
$next_invoice = $subscription->getTrigger()->getNextEventPrediction();
67
65
$properties->addProperty(
···
83
81
pht('Autopay With'),
84
82
$autopay_method);
85
83
86
-
$object_box = id(new PHUIObjectBoxView())
87
-
->setHeader($header)
84
+
$details = id(new PHUIObjectBoxView())
85
+
->setHeaderText(pht('DETAILS'))
86
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
88
87
->addPropertyList($properties);
89
88
90
89
$due_box = $this->buildDueInvoices($subscription, $authority);
91
90
$invoice_box = $this->buildPastInvoices($subscription, $authority);
92
91
93
-
return $this->buildApplicationPage(
94
-
array(
95
-
$crumbs,
96
-
$object_box,
92
+
$view = id(new PHUITwoColumnView())
93
+
->setHeader($header)
94
+
->setCurtain($curtain)
95
+
->setMainColumn(array(
96
+
$details,
97
97
$due_box,
98
98
$invoice_box,
99
-
),
100
-
array(
101
-
'title' => $title,
102
-
));
99
+
));
100
+
101
+
return $this->newPage()
102
+
->setTitle($title)
103
+
->setCrumbs($crumbs)
104
+
->appendChild($view);
103
105
}
104
106
105
107
private function buildDueInvoices(
···
136
138
137
139
return id(new PHUIObjectBoxView())
138
140
->setHeader($invoice_header)
141
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
139
142
->appendChild($invoice_table);
140
143
}
141
144
···
199
202
200
203
return id(new PHUIObjectBoxView())
201
204
->setHeader($invoice_header)
205
+
->setBackground(PHUIObjectBoxView::BLUE_PROPERTY)
202
206
->appendChild($invoice_table);
203
207
}
204
208
+3
-2
src/applications/phortune/query/PhortuneMerchantSearchEngine.php
+3
-2
src/applications/phortune/query/PhortuneMerchantSearchEngine.php
···
70
70
$list->setUser($viewer);
71
71
foreach ($merchants as $merchant) {
72
72
$item = id(new PHUIObjectItemView())
73
-
->setObjectName(pht('Merchant %d', $merchant->getID()))
73
+
->setSubhead(pht('Merchant %d', $merchant->getID()))
74
74
->setHeader($merchant->getName())
75
75
->setHref('/phortune/merchant/'.$merchant->getID().'/')
76
-
->setObject($merchant);
76
+
->setObject($merchant)
77
+
->setIcon('fa-bank');
77
78
78
79
$list->addItem($item);
79
80
}
+9
src/view/phui/PHUIObjectItemListView.php
+9
src/view/phui/PHUIObjectItemListView.php
···
7
7
private $pager;
8
8
private $noDataString;
9
9
private $flush;
10
+
private $simple;
10
11
private $allowEmptyList;
11
12
private $states;
12
13
private $itemClass = 'phui-object-item-standard';
···
32
33
33
34
public function setPager($pager) {
34
35
$this->pager = $pager;
36
+
return $this;
37
+
}
38
+
39
+
public function setSimple($simple) {
40
+
$this->simple = $simple;
35
41
return $this;
36
42
}
37
43
···
68
74
}
69
75
if ($this->flush) {
70
76
$classes[] = 'phui-object-list-flush';
77
+
}
78
+
if ($this->simple) {
79
+
$classes[] = 'phui-object-list-simple';
71
80
}
72
81
73
82
return array(
+41
webroot/rsrc/css/phui/phui-object-item-list-view.css
+41
webroot/rsrc/css/phui/phui-object-item-list-view.css
···
782
782
padding: 0 8px 8px;
783
783
text-align: left;
784
784
}
785
+
786
+
/* - Simple List------------------------------------------------------------- */
787
+
788
+
.phui-object-list-simple .phui-object-item-with-image .phui-object-item-frame {
789
+
min-height: 26px;
790
+
}
791
+
792
+
.phui-object-list-simple .phui-object-item-image {
793
+
height: 26px;
794
+
width: 26px;
795
+
margin: 0;
796
+
}
797
+
798
+
.phui-object-list-simple .phui-object-item-with-image
799
+
.phui-object-item-content-box {
800
+
margin-left: 32px;
801
+
}
802
+
803
+
.phui-object-list-simple .phui-object-item-name {
804
+
padding: 2px 0;
805
+
}
806
+
807
+
.phui-object-list-simple .phui-object-item-name a {
808
+
color: {$darkbluetext};
809
+
}
810
+
811
+
.phui-object-item-list-view.phui-object-list-simple .phui-object-item-frame {
812
+
border: none;
813
+
margin-bottom: 4px;
814
+
}
815
+
816
+
.phui-object-item-list-view.phui-object-list-simple li:last-child
817
+
.phui-object-item-frame {
818
+
margin: 0;
819
+
}
820
+
821
+
.phui-object-list-simple .phui-object-item-actions {
822
+
top: 2px;
823
+
bottom: 2px;
824
+
right: 2px;
825
+
}