Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F13818394
D12115.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
6 KB
Referenced Files
None
Subscribers
None
D12115.diff
View Options
diff --git a/resources/celerity/map.php b/resources/celerity/map.php
--- a/resources/celerity/map.php
+++ b/resources/celerity/map.php
@@ -7,7 +7,7 @@
*/
return array(
'names' => array(
- 'core.pkg.css' => 'eca3f2e7',
+ 'core.pkg.css' => 'f4d1cd07',
'core.pkg.js' => '75599122',
'darkconsole.pkg.js' => '8ab24e01',
'differential.pkg.css' => '5a0b221c',
@@ -26,7 +26,7 @@
'rsrc/css/aphront/pager-view.css' => '2e3539af',
'rsrc/css/aphront/panel-view.css' => '8427b78d',
'rsrc/css/aphront/phabricator-nav-view.css' => '7aeaf435',
- 'rsrc/css/aphront/table-view.css' => 'b22b7216',
+ 'rsrc/css/aphront/table-view.css' => '3e77fefe',
'rsrc/css/aphront/tokenizer.css' => '82ce2142',
'rsrc/css/aphront/tooltip.css' => '4099b97e',
'rsrc/css/aphront/transaction.css' => '042fc4bb',
@@ -504,7 +504,7 @@
'aphront-multi-column-view-css' => 'fd18389d',
'aphront-pager-view-css' => '2e3539af',
'aphront-panel-view-css' => '8427b78d',
- 'aphront-table-view-css' => 'b22b7216',
+ 'aphront-table-view-css' => '3e77fefe',
'aphront-tokenizer-control-css' => '82ce2142',
'aphront-tooltip-css' => '4099b97e',
'aphront-two-column-view-css' => '16ab3ad2',
diff --git a/src/applications/phortune/controller/PhortuneAccountListController.php b/src/applications/phortune/controller/PhortuneAccountListController.php
--- a/src/applications/phortune/controller/PhortuneAccountListController.php
+++ b/src/applications/phortune/controller/PhortuneAccountListController.php
@@ -27,6 +27,7 @@
$crumbs->addTextCrumb(pht('Accounts'));
$payment_list = id(new PHUIObjectItemListView())
+ ->setStackable(true)
->setUser($viewer)
->setNoDataString(
pht(
@@ -34,10 +35,13 @@
'accounts are used to make purchases.'));
foreach ($accounts as $account) {
+ $this->loadHandles($account->getMemberPHIDs());
+ $members = $this->renderHandlesForPHIDs($account->getMemberPHIDs(), ',');
$item = id(new PHUIObjectItemView())
->setObjectName(pht('Account %d', $account->getID()))
->setHeader($account->getName())
->setHref($this->getApplicationURI($account->getID().'/'))
+ ->addAttribute(pht('Members: %s', $members))
->setObject($account);
$payment_list->addItem($item);
@@ -59,6 +63,7 @@
->appendChild($payment_list);
$merchant_list = id(new PHUIObjectItemListView())
+ ->setStackable(true)
->setUser($viewer)
->setNoDataString(
pht(
diff --git a/src/applications/phortune/controller/PhortuneMerchantViewController.php b/src/applications/phortune/controller/PhortuneMerchantViewController.php
--- a/src/applications/phortune/controller/PhortuneMerchantViewController.php
+++ b/src/applications/phortune/controller/PhortuneMerchantViewController.php
@@ -210,6 +210,7 @@
PhabricatorPolicyCapability::CAN_EDIT);
$provider_list = id(new PHUIObjectItemListView())
+ ->setFlush(true)
->setNoDataString(pht('This merchant has no payment providers.'));
foreach ($providers as $provider_config) {
diff --git a/src/applications/phortune/view/PhortuneChargeTableView.php b/src/applications/phortune/view/PhortuneChargeTableView.php
--- a/src/applications/phortune/view/PhortuneChargeTableView.php
+++ b/src/applications/phortune/view/PhortuneChargeTableView.php
@@ -55,6 +55,7 @@
}
$table = id(new AphrontTableView($rows))
+ ->setTallTable(true)
->setHeaders(
array(
pht('ID'),
diff --git a/src/applications/phortune/view/PhortuneOrderTableView.php b/src/applications/phortune/view/PhortuneOrderTableView.php
--- a/src/applications/phortune/view/PhortuneOrderTableView.php
+++ b/src/applications/phortune/view/PhortuneOrderTableView.php
@@ -125,6 +125,7 @@
}
$table = id(new AphrontTableView($rows))
+ ->setTallTable(true)
->setNoDataString($this->getNoDataString())
->setRowClasses($rowc)
->setHeaders(
diff --git a/src/applications/phortune/view/PhortuneSubscriptionTableView.php b/src/applications/phortune/view/PhortuneSubscriptionTableView.php
--- a/src/applications/phortune/view/PhortuneSubscriptionTableView.php
+++ b/src/applications/phortune/view/PhortuneSubscriptionTableView.php
@@ -61,6 +61,7 @@
}
$table = id(new AphrontTableView($rows))
+ ->setTallTable(true)
->setHeaders(
array(
pht('ID'),
diff --git a/src/view/control/AphrontTableView.php b/src/view/control/AphrontTableView.php
--- a/src/view/control/AphrontTableView.php
+++ b/src/view/control/AphrontTableView.php
@@ -11,6 +11,7 @@
protected $zebraStripes = true;
protected $noDataString;
protected $className;
+ protected $tallTable;
protected $columnVisibility = array();
private $deviceVisibility = array();
@@ -75,6 +76,11 @@
return $this;
}
+ public function setTallTable($tall) {
+ $this->tallTable = $tall;
+ return $this;
+ }
+
public function setShortHeaders(array $short_headers) {
$this->shortHeaders = $short_headers;
return $this;
@@ -284,15 +290,23 @@
coalesce($this->noDataString, pht('No data available.'))));
}
- $table_class = 'aphront-table-view';
+ $classes = array();
+ $classes[] = 'aphront-table-view';
if ($this->className !== null) {
- $table_class .= ' '.$this->className;
+ $classes[] = $this->className;
+ }
+ if ($this->tallTable) {
+ $classes[] = 'aphront-tall-table-view';
}
if ($this->deviceReadyTable) {
- $table_class .= ' aphront-table-view-device-ready';
+ $classes[] = 'aphront-table-view-device-ready';
}
- $html = phutil_tag('table', array('class' => $table_class), $table);
+ $html = phutil_tag(
+ 'table',
+ array(
+ 'class' => implode(' ', $classes),),
+ $table);
return phutil_tag_div('aphront-table-wrap', $html);
}
diff --git a/webroot/rsrc/css/aphront/table-view.css b/webroot/rsrc/css/aphront/table-view.css
--- a/webroot/rsrc/css/aphront/table-view.css
+++ b/webroot/rsrc/css/aphront/table-view.css
@@ -99,11 +99,19 @@
font-size: 13px;
}
+.aphront-table-view.aphront-tall-table-view th {
+ padding: 10px 10px;
+}
+
.aphront-table-view td {
padding: 6px 10px;
font-size: 12px;
}
+.aphront-table-view.aphront-tall-table-view td {
+ padding: 8px 10px;
+}
+
.device-tablet .aphront-table-view td,
.device-phone .aphront-table-view td {
padding: 6px;
@@ -152,6 +160,7 @@
width: 100%;
}
+.aphront-table-view th.right,
.aphront-table-view td.right {
text-align: right;
}
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sat, Sep 21, 7:31 AM (21 h, 43 m)
Storage Engine
blob
Storage Format
Encrypted (AES-256-CBC)
Storage Handle
6625107
Default Alt Text
D12115.diff (6 KB)
Attached To
Mode
D12115: Basic touchups to Phortune UI
Attached
Detach File
Event Timeline
Log In to Comment