diff --git a/view/common/block-layout/list-of-sites.phtml b/view/common/block-layout/list-of-sites.phtml index b63c81a..e4f6fce 100644 --- a/view/common/block-layout/list-of-sites.phtml +++ b/view/common/block-layout/list-of-sites.phtml @@ -1,6 +1,5 @@ getHelperPluginManager()->get('archiveSiteMeta'); -$collections = $archiveSiteHelper->getCollections(); ?>
@@ -17,11 +16,9 @@ $collections = $archiveSiteHelper->getCollections(); - 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();
pagination(); endif; ?> diff --git a/view/common/cross-site-search/results.phtml b/view/common/cross-site-search/results.phtml index d06298b..39330e8 100644 --- a/view/common/cross-site-search/results.phtml +++ b/view/common/cross-site-search/results.phtml @@ -2,7 +2,10 @@ $fulltextSearch = $this->params()->fromQuery('fulltext_search'); $hasResults = false; ?> - +getHelperPluginManager()->get('archiveSiteMeta'); +//$collections = $archiveSiteHelper->getCollections(); +?> site->url().'">'.$this->site->title().''; + /* if ($this->site->title() != "Collections") { $_html = ''.$this->site->title().''; } else { $_html = $this->site->title(); } + */ ?> $("#archive_page_title").html(''); @@ -37,35 +43,66 @@ $("#archive_page_title").html('');
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; -?> - getContent() as $sitePage) { - array_push($sitePages, $sitePage); - } - echo $this->partial('common/cross-site-search/site-page-results', [ - 'sitePages' => $sitePages, - ]); - ?> - -getTotalResults()): + foreach ($responseSitePages->getContent() as $sitePage) { + $site = $sitePage->site(); + array_push($result, $site); + } + } + if ($responseItems && $responseItems->getTotalResults()) { $hasResults = true; -?> - 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 */ +?> + + getTotalResults()): + $hasResults = true; ?> - + getContent() as $sitePage) { + array_push($sitePages, $sitePage); + } + echo $this->partial('common/cross-site-search/site-page-results', [ + 'sitePages' => $sitePages, + ]); + ?> + + + getTotalResults()): + $hasResults = true; + ?> + getContent() as $item) { + array_push($items, $item); + } + echo $this->partial('common/cross-site-search/item-results', [ + 'items' => $items, + ]); + ?> + +
+

translate('No result found'); ?> diff --git a/view/common/cross-site-search/site-page-results.phtml b/view/common/cross-site-search/site-page-results.phtml index 3d8d58d..56dd123 100644 --- a/view/common/cross-site-search/site-page-results.phtml +++ b/view/common/cross-site-search/site-page-results.phtml @@ -4,6 +4,8 @@ $archiveSiteHelper = $this->getHelperPluginManager()->get('archiveSiteMeta'); $archive_collections = $archiveSiteHelper->getCollections(); ?> + + diff --git a/view/omeka/site/page/show.phtml b/view/omeka/site/page/show.phtml index c200e69..e644e9f 100644 --- a/view/omeka/site/page/show.phtml +++ b/view/omeka/site/page/show.phtml @@ -22,11 +22,14 @@ if (!$img_src) {