1
0
Fork 0
mirror of https://we.phorge.it/source/phorge.git synced 2024-12-01 03:02:43 +01:00

(stable) Fix search results with tables, fatals in Phortune

Summary: Previously we collapsed all table search results, but the new UI doesn't need it. Remove unused methods and fix CSS.

Test Plan: Legalpad Signatures, Phortune Accounts.

Reviewers: epriestley

Reviewed By: epriestley

Subscribers: Korvin

Differential Revision: https://secure.phabricator.com/D16469
This commit is contained in:
Chad Little 2016-08-29 20:09:43 -07:00 committed by epriestley
parent be84c051e5
commit 3f7021e0d8
6 changed files with 9 additions and 17 deletions

View file

@ -39,7 +39,7 @@ final class PhortuneAccountListController extends PhortuneController {
->setHeader($account->getName()) ->setHeader($account->getName())
->setHref($this->getApplicationURI($account->getID().'/')) ->setHref($this->getApplicationURI($account->getID().'/'))
->setObject($account) ->setObject($account)
->setIcon('fa-credit-card'); ->setImageIcon('fa-credit-card');
$payment_list->addItem($item); $payment_list->addItem($item);
} }
@ -71,7 +71,7 @@ final class PhortuneAccountListController extends PhortuneController {
->setHeader($merchant->getName()) ->setHeader($merchant->getName())
->setHref($this->getApplicationURI('/merchant/'.$merchant->getID().'/')) ->setHref($this->getApplicationURI('/merchant/'.$merchant->getID().'/'))
->setObject($merchant) ->setObject($merchant)
->setIcon('fa-bank'); ->setImageIcon('fa-bank');
$merchant_list->addItem($item); $merchant_list->addItem($item);
} }

View file

@ -41,7 +41,7 @@ final class PhortuneProductListController extends PhabricatorController {
->setHeader($product->getProductName()) ->setHeader($product->getProductName())
->setHref($view_uri) ->setHref($view_uri)
->addAttribute($price->formatForDisplay()) ->addAttribute($price->formatForDisplay())
->setIcon('fa-gift'); ->setImageIcon('fa-gift');
$product_list->addItem($item); $product_list->addItem($item);
} }

View file

@ -74,7 +74,7 @@ final class PhortuneMerchantSearchEngine
->setHeader($merchant->getName()) ->setHeader($merchant->getName())
->setHref('/phortune/merchant/'.$merchant->getID().'/') ->setHref('/phortune/merchant/'.$merchant->getID().'/')
->setObject($merchant) ->setObject($merchant)
->setIcon('fa-bank'); ->setImageIcon('fa-bank');
$list->addItem($item); $list->addItem($item);
} }

View file

@ -270,9 +270,6 @@ final class PhabricatorApplicationSearchController
if ($list->getContent()) { if ($list->getContent()) {
$box->appendChild($list->getContent()); $box->appendChild($list->getContent());
} }
if ($list->getCollapsed()) {
$box->setCollapsed(true);
}
$result_header = $list->getHeader(); $result_header = $list->getHeader();
if ($result_header) { if ($result_header) {

View file

@ -12,7 +12,6 @@ final class PhabricatorApplicationSearchResultView extends Phobject {
private $content = null; private $content = null;
private $infoView = null; private $infoView = null;
private $actions = array(); private $actions = array();
private $collapsed = null;
private $noDataString; private $noDataString;
private $crumbs = array(); private $crumbs = array();
private $header; private $header;
@ -70,15 +69,6 @@ final class PhabricatorApplicationSearchResultView extends Phobject {
return $this->actions; return $this->actions;
} }
public function setCollapsed($collapsed) {
$this->collapsed = $collapsed;
return $this;
}
public function getCollapsed() {
return $this->collapsed;
}
public function setNoDataString($nodata) { public function setNoDataString($nodata) {
$this->noDataString = $nodata; $this->noDataString = $nodata;
return $this; return $this;

View file

@ -16,6 +16,11 @@
border-bottom: 1px solid {$thinblueborder}; border-bottom: 1px solid {$thinblueborder};
} }
.application-search-view .phui-object-box.phui-object-box-collapsed
.phui-header-shell {
padding: 20px 8px;
}
.application-search-results .application-search-results
.phui-profile-header.phui-header-shell .phui-header-header { .phui-profile-header.phui-header-shell .phui-header-header {
font-size: 20px; font-size: 20px;