makes a search from the Collections site render a collections list

asset/css/archive.css

@@ -6,3 +6,9 @@
 .archive-page-title {
   text-align: center;
 }
+._expand_site_item {
+  cursor: pointer;
+}
+._expand_site_item:hover {
+    background: #3374C2;
+}

asset/js/expand-site-list-item.js

@@ -1,7 +1,7 @@
 (function($) {
     $(document).ready(function() {
-        $('._expandable_site_item').click(function() {
-            alert('expand');
+        $('._expand_site_item').click(function() {
+            $(this).next('tr').toggle();
         });
     });
 })(jQuery)

view/common/block-layout/list-of-sites.phtml

@@ -1,6 +1,5 @@
 <?php
 $archiveSiteHelper = $this->getHelperPluginManager()->get('archiveSiteMeta');
-$collections = $archiveSiteHelper->getCollections();
 ?>
 
 <div class="list-of-sites">
@@ -17,11 +16,9 @@ $collections = $archiveSiteHelper->getCollections();
         </thead>
         <tbody>
 
-
         <?php
         foreach($sites as $site):
             $site_meta_values = $archiveSiteHelper->getSiteMetaValues($site);
-            //echo $this->partial('common/index/site-list-item', [
             echo $this->partial('common/site-list-entry', [
                             'site' => $site,
                             'showSummary' => $summaries,
@@ -36,7 +33,8 @@ $collections = $archiveSiteHelper->getCollections();
 
     </div>
     <?php
-    if ($pagination):
+    if (1 == 0):
+    //if ($pagination):
         echo $this->pagination();
     endif;
     ?>

view/common/cross-site-search/results.phtml

@@ -2,33 +2,37 @@
 $fulltextSearch = $this->params()->fromQuery('fulltext_search');
 $hasResults = false;
 ?>
-
+<?php
+//$archiveSiteHelper = $this->getHelperPluginManager()->get('archiveSiteMeta');
+//$collections = $archiveSiteHelper->getCollections();
+?>
 
 <!-- arc-hive insert begins -->
 <?php
-//$site->pages();
-// set header image
 $img_src = $this->getHelperPluginManager()->get('archiveSiteMeta')->getSiteImage($site);
 if (!$img_src) {
   $img_src = '/themes/archive/asset/img/default-header-image.jpg';
 }
 
 ?>
-  <style>
-  #archive_header_img {
-     background:url("<?= $img_src ?>") no-repeat;
-     width:100%;
-     height:100px;
-  }
-  </style>
+<style>
+#archive_header_img {
+   background:url("<?= $img_src ?>") no-repeat;
+   width:100%;
+   height:100px;
+}
+</style>
 
 <script>
 <?php
+  $_html = '<a href="'.$this->site->url().'">'.$this->site->title().'</a>';
+  /*
   if ($this->site->title() != "Collections") {
     $_html = '<a href="'.$this->site->url().'">'.$this->site->title().'</a>';
   } else {
     $_html = $this->site->title();
   }
+  */
 ?>
 $("#archive_page_title").html('<?php echo $_html ?>');
 </script>
@@ -39,35 +43,66 @@ $("#archive_page_title").html('<?php echo $_html ?>');
 
 <div class="results">
 <?php
-if ($responseSitePages && $responseSitePages->getTotalResults()):
+if ($this->site->title() == "Collections") {
+  /* convert all the results into sites and display the list of sites */
+  $result = array();
+  if ($responseSitePages && $responseSitePages->getTotalResults()) {
     $hasResults = true;
-?>
-    <?php
-      $sitePages = array();
-      foreach ($responseSitePages->getContent() as $sitePage) {
-        array_push($sitePages, $sitePage);
-      }
-      echo $this->partial('common/cross-site-search/site-page-results', [
-                      'sitePages' => $sitePages,
-                    ]);
-    ?>
-<?php endif; ?>
-<?php
-if ($responseItems && $responseItems->getTotalResults()):
+    foreach ($responseSitePages->getContent() as $sitePage) {
+      $site = $sitePage->site();
+      array_push($result, $site);
+    }
+  }
+  if ($responseItems && $responseItems->getTotalResults()) {
     $hasResults = true;
-?>
-    <?php
-      $items = array();
-      foreach ($responseItems->getContent() as $item) {
-        array_push($items, $item);
+    foreach ($responseSitePages->getContent() as $sitePage) {
+      $site = $sitePage->site();
+      if (!in_array ($site , $result)) {
+        array_push($result, $site);
       }
-      echo $this->partial('common/cross-site-search/item-results', [
-                      'items' => $items,
-                    ]);
+    }
+  }
+  echo $this->partial('common/block-layout/list-of-sites', [
+          'sites' => $result,
+          'summaries' => 1,
+        ]);
+} else {
+  /* display the results as normal */
+?>
+
+    <?php
+    if ($responseSitePages && $responseSitePages->getTotalResults()):
+        $hasResults = true;
     ?>
-<?php endif; ?>
+        <?php
+          $sitePages = array();
+          foreach ($responseSitePages->getContent() as $sitePage) {
+            array_push($sitePages, $sitePage);
+          }
+          echo $this->partial('common/cross-site-search/site-page-results', [
+                          'sitePages' => $sitePages,
+                        ]);
+        ?>
+    <?php endif; ?>
+
+    <?php
+    if ($responseItems && $responseItems->getTotalResults()):
+        $hasResults = true;
+    ?>
+        <?php
+          $items = array();
+          foreach ($responseItems->getContent() as $item) {
+            array_push($items, $item);
+          }
+          echo $this->partial('common/cross-site-search/item-results', [
+                          'items' => $items,
+                        ]);
+        ?>
+    <?php endif; ?>
+<?php } ?>
 </div>
 
+
 <?php if (!$hasResults): ?>
     <p><?php echo $this->translate('No result found'); ?>
 <?php endif; ?>

view/common/cross-site-search/site-page-results.phtml

@@ -4,6 +4,8 @@ $archiveSiteHelper = $this->getHelperPluginManager()->get('archiveSiteMeta');
 $archive_collections = $archiveSiteHelper->getCollections();
 ?>
 
+
+
 <!-- <h2><?php echo sprintf($this->translate('Site page results for "%s"'), $fulltextSearch); ?></h2> -->
 
 

view/common/site-list-entry.phtml

@@ -2,9 +2,9 @@
 $summary = $showSummary ? $site->summary() : null;
 ?>
 
-  <tr class="_expandable_site_item">
+  <tr class="_expand_site_item">
     <td>
-      <?php echo $this->hyperlink($site->title(), $site->siteUrl(), ['class' => 'site-link']); ?>
+      <?= $site->title() ?>
     </td>
     <td>
       <?php if ($site_meta_values != null): ?>
@@ -25,12 +25,14 @@ $summary = $showSummary ? $site->summary() : null;
   <tr style="display:none">
     <td>
       <?php if ($site_meta_values != null): ?>
-         <?= $site_meta_values['thumbnail']; ?>
+        <img src="<?= $site_meta_values['thumbnail']; ?>" />
       <?php endif; ?>
     </td>
     <td colspan="3">
       <?php if ($summary): ?>
       <?php echo nl2br($this->escapeHtml($summary)); ?>
+      <br />
       <?php endif; ?>
+      <?php echo $this->hyperlink($site->title(), $site->siteUrl(), ['class' => 'site-link']); ?>
     </td>
   </tr>

view/omeka/site/item/show.phtml

@@ -7,29 +7,23 @@ $itemMedia = $item->media();
 $showLayout = $this->themeSetting('show_layout');
 ?>
 
+<!-- arc-hive insert begins -->
 <?php
-$site->pages();
+//$site->pages();
 // set header image
 $img_src = $this->getHelperPluginManager()->get('archiveSiteMeta')->getSiteImage($site);
-if ($img_src) {
+if (!$img_src) {
+  $img_src = '/themes/archive/asset/img/default-header-image.jpg';
+}
 ?>
-  <style>
-  #archive_header_img {
-     background:url("<?= $img_src ?>") no-repeat;
-     width:100%;
-     height:100px;
-  }
-  </style>
-<?php } else { ?>
-  <style>
-  #archive_header_img {
-     display: none;
-  }
-  </style>
-<?php } ?>
-
+<style>
+#archive_header_img {
+   background:url("<?= $img_src ?>") no-repeat;
+   width:100%;
+   height:100px;
+}
+</style>
 <script>
-/*
 <?php
   if ($this->site->title() != "Collections") {
     $_html = '<a href="'.$this->site->url().'">'.$this->site->title().'</a>';
@@ -38,8 +32,8 @@ if ($img_src) {
   }
 ?>
 $("#archive_page_title").html('<?php echo $_html ?>');
-*/
 </script>
+<!-- arc-hive insert ends -->
 
 
 <div class="resource-title">

view/omeka/site/media/show.phtml

@@ -3,28 +3,21 @@ $translate = $this->plugin('translate');
 ?>
 <?php $this->htmlElement('body')->appendAttribute('class', 'media resource show'); ?>
 
+<!-- arc-hive insert begins -->
 <?php
-$site->pages();
-// set header image
+//$site->pages();
 $img_src = $this->getHelperPluginManager()->get('archiveSiteMeta')->getSiteImage($site);
-if ($img_src) {
+if (!$img_src) {
+  $img_src = '/themes/archive/asset/img/default-header-image.jpg';
+}
 ?>
-  <style>
-  #archive_header_img {
-     background:url("<?= $img_src ?>") no-repeat;
-     width:100%;
-     height:100px;
-  }
-  </style>
-<?php } else { ?>
-  <style>
-  #archive_header_img {
-     display: none;
-  }
-  </style>
-<?php } ?>
-
-
+<style>
+#archive_header_img {
+   background:url("<?= $img_src ?>") no-repeat;
+   width:100%;
+   height:100px;
+}
+</style>
 <script>
 <?php
   if ($this->site->title() != "Collections") {
@@ -35,7 +28,7 @@ if ($img_src) {
 ?>
 $("#archive_page_title").html('<?php echo $_html ?>');
 </script>
-
+<!-- arc-hive insert ends -->
 
 
 <div class="resource-title">

view/omeka/site/page/show.phtml

@@ -7,32 +7,29 @@ $showPagePagination = $this->siteSetting('show_page_pagination', true);
 
 <!-- arc-hive insert begins -->
 <?php
-$site->pages();
-// set header image
+//$site->pages();
 $img_src = $this->getHelperPluginManager()->get('headerImage')->getImage($page);
-if ($img_src) {
+if (!$img_src) {
+  $img_src = '/themes/archive/asset/img/default-header-image.jpg';
+}
 ?>
-  <style>
-  #archive_header_img {
-     background:url("<?= $img_src ?>") no-repeat;
-     width:100%;
-     height:100px;
-  }
-  </style>
-<?php } else { ?>
-  <style>
-  #archive_header_img {
-     display: none;
-  }
-  </style>
-<?php } ?>
+<style>
+#archive_header_img {
+   background:url("<?= $img_src ?>") no-repeat;
+   width:100%;
+   height:100px;
+}
+</style>
 <script>
 <?php
+  $_html = '<a href="'.$this->site->url().'">'.$this->site->title().'</a>';
+  /*
   if ($this->site->title() != "Collections") {
     $_html = '<a href="'.$this->site->url().'">'.$this->site->title().'</a>';
   } else {
     $_html = $this->site->title();
   }
+  */
 ?>
 $("#archive_page_title").html('<?php echo $_html ?>');
 </script>