Compare commits

..

3 Commits

9 changed files with 125 additions and 98 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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