Combined view now enforces list view unless unavailable. Now responds to dynamic number of columns.

themes/blueprint/templates/combined/results-list.phtml

@@ -57,6 +57,7 @@
     <?=$this->recommend($current)?>
   <? endforeach; ?>
 <? else: ?>
-  <?=$this->render('search/list-' . $params->getView() . '.phtml', array('results' => $results, 'params' => $params))?>
+  <? $viewType = in_array('list', array_keys($params->getViewList())) ? 'list' : $params->getView(); ?>
+  <?=$this->render('search/list-' . $viewType . '.phtml', array('results' => $results, 'params' => $params))?>
   <p class="more_link"><a href="<?=$moreUrl?>"><?=$this->transEsc($currentSearch['more_link'])?></a></p>
 <? endif; ?>

themes/bootstrap/templates/combined/results-list.phtml

@@ -56,6 +56,7 @@
     <?=$this->recommend($current)?>
   <? endforeach; ?>
 <? else: ?>
-  <?=$this->render('search/list-' . $params->getView() . '.phtml', array('results' => $results, 'params' => $params))?>
+  <? $viewType = in_array('list', array_keys($params->getViewList())) ? 'list' : $params->getView(); ?>
+  <?=$this->render('search/list-' . $viewType . '.phtml', array('results' => $results, 'params' => $params))?>
   <p class="pad text-right"><a href="<?=$moreUrl?>"><?=$this->transEsc($currentSearch['more_link'])?> <i class="icon-long-arrow-right"></i></a></p>
 <? endif; ?>

themes/bootstrap/templates/combined/results.phtml

@@ -44,8 +44,9 @@
     </div>
   <? endif; ?>
   <div class="row-fluid">
+    <? $columns = count($this->combinedResults); ?>
     <? foreach ($this->combinedResults as $searchClassId => $currentSearch): ?>
-      <div class="span6 combined-list" id="combined_<?=$this->escapeHtml($searchClassId)?>">
+      <div class="span<?=floor(12/$columns)?> combined-list" id="combined_<?=$this->escapeHtml($searchClassId)?>">
         <? if (isset($currentSearch['ajax']) && $currentSearch['ajax']): ?>
           <?=$this->render('combined/results-ajax.phtml', array('searchClassId' => $searchClassId, 'currentSearch' => $currentSearch))?>
         <? else: ?>