Revert the commit that un-implemented the combined stack features in...

Revert the commit that un-implemented the combined stack features in release-2.3. Necessary to let happy merging continue.

module/VuFind/src/VuFind/Controller/CombinedController.php

@@ -184,13 +184,21 @@ class CombinedController extends AbstractSearch
         && intval($config['Layout']['columns']) <= count($combinedResults)
             ? intval($config['Layout']['columns'])
             : count($combinedResults);
+        $placement = isset($config['Layout']['stack_placement'])
+            ? $config['Layout']['stack_placement']
+            : 'distributed';
+        if (!in_array($placement, array('distributed', 'left', 'right'))) {
+            $placement = 'distributed';
+        }
 
         // Build view model:
         return $this->createViewModel(
             array(
                 'columns' => $columns,
                 'combinedResults' => $combinedResults,
+                'config' => $config,
                 'params' => $params,
+                'placement' => $placement,
                 'results' => $results,
                 'supportsCart' => $supportsCart,
                 'supportsCartOptions' => $supportsCartOptions

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

@@ -11,7 +11,7 @@
   $moreUrl = $this->url($params->getOptions()->getSearchAction()) . $results->getUrlQuery()->setPage(1);
   $params->setLimit($limit);
 ?>
-<? if (isset($currentSearch['more_link'])): ?>
+<? if ($currentSearch['more_link']): ?>
   <div class="pull-right">
     <a href="<?=$moreUrl?>" class="btn btn-link"><i class="fa fa-gears"></i> <?=$this->transEsc('More options')?></a>
   </div>
@@ -75,7 +75,7 @@
     }
   ?>
   <?=$this->render('search/list-' . $viewType . '.phtml', $viewParams)?>
-  <? if (isset($currentSearch['more_link'])): ?>
+  <? if ($currentSearch['more_link']): ?>
     <p><a href="<?=$moreUrl?>"><?=$this->transEsc($currentSearch['more_link'])?> <i class="fa fa-long-arrow-right"></i></a></p>
   <? endif; ?>
 <? endif; ?>

themes/bootstrap3/templates/combined/results.phtml

@@ -34,6 +34,9 @@
       $this->escapeHtml($lookfor) . '</li>';
   }
 
+  // Enable cart if appropriate:
+  $this->showCartControls = $this->supportsCart && $this->cart()->isActive();
+
   // Load Javascript dependencies into header:
   $this->headScript()->appendFile("check_item_statuses.js");
   $this->headScript()->appendFile("check_save_statuses.js");
@@ -52,27 +55,15 @@
   <? if ($this->supportsCart && $this->cart()->isActive()): ?>
     <?=$this->context($this)->renderInContext('search/bulk-action-buttons.phtml', array('idPrefix' => ''))?>
   <? endif; ?>
-  <div class="row">
-    <? $columns = count($this->combinedResults); ?>
-    <? $columnIndex = 0; ?>
-    <? foreach ($this->combinedResults as $searchClassId => $currentSearch): ?>
-      <? if ((!isset($currentSearch['ajax']) || !$currentSearch['ajax']) && isset($currentSearch['hide_if_empty']) && $currentSearch['hide_if_empty'] && $currentSearch['view']->results->getResultTotal() == 0) { continue; } ?>
-      <div class="col-sm-<?=floor(12/$columns)?> combined-list" id="combined_<?=$this->escapeHtml($searchClassId)?>">
-        <?
-          $viewParams = array(
-            'searchClassId' => $searchClassId,
-            'currentSearch' => $currentSearch,
-            'showCartControls' => $this->supportsCartOptions[$columnIndex++] && $this->cart()->isActive()
-          );
-        ?>
-        <? if (isset($currentSearch['ajax']) && $currentSearch['ajax']): ?>
-          <?=$this->render('combined/results-ajax.phtml', $viewParams)?>
-        <? else: ?>
-          <?=$this->render('combined/results-list.phtml', $viewParams)?>
-        <? endif; ?>
-      </div>
-    <? endforeach; ?>
-  </div>
+  <?
+    $viewParams = array(
+      'searchClassId' => $searchClassId,
+      'combinedResults' => $this->combinedResults,
+      'supportsCartOptions' => $this->supportsCartOptions,
+      'showCartControls' => $this->showCartControls
+    );
+  ?>
+  <?=$this->context($this)->renderInContext('combined/stack-'.$placement.'.phtml', $viewParams)?>
   <? $recs = $combinedResults->getRecommendations('bottom'); if (!empty($recs)): ?>
     <div>
       <? foreach ($recs as $current): ?>

themes/bootstrap3/templates/combined/stack-distributed.phtml

+<div class="row">
+  <? $span = floor(12/$columns); ?>
+  <? $sectionCount = count($this->combinedResults); ?>
+  <? $keys = array(); ?>
+  <? $searches = array(); ?>
+  <? foreach ($this->combinedResults as $searchClassId => $currentSearch): ?>
+    <? $keys[] = $searchClassId; ?>
+    <? $searches[] = $currentSearch; ?>
+  <? endforeach; ?>
+  <? for ($column=0;$column<$columns;$column++): ?>
+    <? $columnIndex = $column; ?>
+    <div class="col-sm-<?=$span ?> combined-list">
+      <? while ($columnIndex < $sectionCount): ?>
+        <? $searchClassId = $keys[$columnIndex]; ?>
+        <? $currentSearch = $searches[$columnIndex]; ?>
+        <? if ((!isset($currentSearch['ajax']) || !$currentSearch['ajax']) && isset($currentSearch['hide_if_empty']) && $currentSearch['hide_if_empty'] && $currentSearch['view']->results->getResultTotal() == 0) { $columnIndex += $columns; continue; } ?>
+          <?
+            $viewParams = array('searchClassId' => $searchClassId, 'currentSearch' => $currentSearch);
+            // Enable cart if appropriate:
+            $viewParams['showCartControls'] = $this->supportsCartOptions[$columnIndex] && $this->showCartControls;
+          ?>
+          <div id="combined_<?=$this->escapeHtmlAttr($searchClassId)?>">
+            <? $templateSuffix = (isset($currentSearch['ajax']) && $currentSearch['ajax']) ? 'ajax' : 'list'; ?>
+            <?=$this->render('combined/results-' . $templateSuffix . '.phtml', $viewParams)?>
+          </div>
+        <? $columnIndex += $columns ?>
+      <? endwhile; ?>
+    </div>
+  <? endfor; ?>
+</div>
\ No newline at end of file

themes/bootstrap3/templates/combined/stack-left.phtml

+<div class="row">
+  <? $columnIndex = 0; ?>
+  <? $span = floor(12/$columns); ?>
+  <? $sectionCount = count($this->combinedResults); ?>
+  <? foreach ($this->combinedResults as $searchClassId => $currentSearch): ?>
+    <? if ((!isset($currentSearch['ajax']) || !$currentSearch['ajax']) && isset($currentSearch['hide_if_empty']) && $currentSearch['hide_if_empty'] && $currentSearch['view']->results->getResultTotal() == 0) { continue; } ?>
+    <? if ($columnIndex < $columns): ?>
+      <div class="col-sm-<?=$span ?><? if($columnIndex == $columns-1): ?> col-sm-pull-<?=$span*($columns-1) ?><? else: ?> col-sm-push-<?=$span ?><? endif; ?> combined-list">
+    <? endif; ?>
+    <?
+      $viewParams = array('searchClassId' => $searchClassId, 'currentSearch' => $currentSearch);
+      // Enable cart if appropriate:
+      $viewParams['showCartControls'] = $this->supportsCartOptions[$columnIndex] && $this->showCartControls;
+    ?>
+    <div id="combined_<?=$this->escapeHtmlAttr($searchClassId)?>">
+      <? $templateSuffix = (isset($currentSearch['ajax']) && $currentSearch['ajax']) ? 'ajax' : 'list'; ?>
+      <?=$this->render('combined/results-' . $templateSuffix . '.phtml', $viewParams)?>
+    </div>
+    <? ++$columnIndex ?>
+    <? if($columnIndex < $columns || $columnIndex == $sectionCount): ?>
+      </div>
+    <? endif; ?>
+  <? endforeach; ?>
+</div>
\ No newline at end of file

themes/bootstrap3/templates/combined/stack-right.phtml

+<div class="row">
+  <? $columnIndex = 0; ?>
+  <? $span = floor(12/$columns); ?>
+  <? $sectionCount = count($this->combinedResults); ?>
+  <? foreach ($this->combinedResults as $searchClassId => $currentSearch): ?>
+    <? if ((!isset($currentSearch['ajax']) || !$currentSearch['ajax']) && isset($currentSearch['hide_if_empty']) && $currentSearch['hide_if_empty'] && $currentSearch['view']->results->getResultTotal() == 0) { continue; } ?>
+    <? if ($columnIndex < $columns): ?>
+      <div class="col-sm-<?=$span ?> combined-list">
+    <? endif; ?>
+    <?
+      $viewParams = array('searchClassId' => $searchClassId, 'currentSearch' => $currentSearch);
+      // Enable cart if appropriate:
+      $viewParams['showCartControls'] = $this->supportsCartOptions[$columnIndex] && $this->showCartControls;
+    ?>
+    <div id="combined_<?=$this->escapeHtmlAttr($searchClassId)?>">
+      <? $templateSuffix = (isset($currentSearch['ajax']) && $currentSearch['ajax']) ? 'ajax' : 'list'; ?>
+      <?=$this->render('combined/results-' . $templateSuffix . '.phtml', $viewParams)?>
+    </div>
+    <? ++$columnIndex ?>
+    <? if($columnIndex < $columns || $columnIndex == $sectionCount): ?>
+      </div>
+    <? endif; ?>
+  <? endforeach; ?>
+</div>
\ No newline at end of file