From 34031b3970f0ecce9db29693ec0136fb7a02cd4f Mon Sep 17 00:00:00 2001
From: Chris Hallberg <crhallberg@gmail.com>
Date: Tue, 8 Apr 2014 12:00:52 -0400
Subject: [PATCH] Grid fixes: layout and cart checkboxes.
---
themes/bootprint/css/style.css | 1 +
.../templates/RecordDriver/SolrDefault/result-grid.phtml | 4 +++-
themes/bootstrap/templates/search/list-grid.phtml | 4 ++--
3 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/themes/bootprint/css/style.css b/themes/bootprint/css/style.css
index 32e112e1667..9968cbce24f 100644
--- a/themes/bootprint/css/style.css
+++ b/themes/bootprint/css/style.css
@@ -136,6 +136,7 @@ select, .btn:not(.btn-link){vertical-align:top}
.bulkActionButtons {border-bottom:1px solid #DDD;margin-top:6px;padding-bottom:6px}
.result {padding:6px 0}
.result:nth-child(odd) {background:#EEE}
+.grid .result {background:none}
.result>.checkbox {font-weight:bold;margin:2px 0 2px 1%;max-width:6%}
.result>.checkbox input[type="checkbox"] {margin:3px auto}
.result .middle {margin-left:1%;width:52%}
diff --git a/themes/bootstrap/templates/RecordDriver/SolrDefault/result-grid.phtml b/themes/bootstrap/templates/RecordDriver/SolrDefault/result-grid.phtml
index c4cf3f83320..bcd491f9867 100644
--- a/themes/bootstrap/templates/RecordDriver/SolrDefault/result-grid.phtml
+++ b/themes/bootstrap/templates/RecordDriver/SolrDefault/result-grid.phtml
@@ -10,7 +10,9 @@ $urls = $this->record($this->driver)->getLinkDetails();
<div class="result <?=$this->driver->supportsAjaxStatus()?' ajaxItem':''?>">
<input type="hidden" value="<?=$this->escapeHtml($this->driver->getUniqueID())?>" class="hiddenId" />
- <?=$this->record($this->driver)->getCheckbox() ?></br>
+ <? if (!isset($this->hideCartControls) && $this->cart()->isActive()): ?>
+ <?=$this->record($this->driver)->getCheckbox() ?></br>
+ <? endif; ?>
<div class="text-center" style="margin:auto;max-width:70px">
<a href="<?=$this->recordLink()->getUrl($this->driver)?>">
<? if ($summThumb = $this->record($this->driver)->getThumbnail('large')): ?>
diff --git a/themes/bootstrap/templates/search/list-grid.phtml b/themes/bootstrap/templates/search/list-grid.phtml
index ee26d3c30e2..550b82183f6 100644
--- a/themes/bootstrap/templates/search/list-grid.phtml
+++ b/themes/bootstrap/templates/search/list-grid.phtml
@@ -1,8 +1,8 @@
-<div class="row">
+<div class="row-fluid">
<? $i = 0; foreach ($this->results->getResults() as $current): ?>
<div id="result<?=$i++ ?>" class="span3 grid">
<?=$this->record($current)->getSearchResult('grid')?>
</div>
- <?=($i%4==0)?'</div><div class="row">':''?>
+ <?=($i%4==0)?'</div><div class="row-fluid">':''?>
<? endforeach; ?>
</div>
--
GitLab