Compare commits

..

No commits in common. "551ba6b214aa00a6efc5c15f2cddd80a8ee4d216" and "1da5e9f4ea74f478fa4c95973fecc7b0a67d3055" have entirely different histories.

9 changed files with 96 additions and 123 deletions

View File

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

View File

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

View File

@ -1,5 +1,6 @@
<?php
$archiveSiteHelper = $this->getHelperPluginManager()->get('archiveSiteMeta');
$collections = $archiveSiteHelper->getCollections();
?>
<div class="list-of-sites">
@ -16,9 +17,11 @@ $archiveSiteHelper = $this->getHelperPluginManager()->get('archiveSiteMeta');
</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,
@ -33,8 +36,7 @@ $archiveSiteHelper = $this->getHelperPluginManager()->get('archiveSiteMeta');
</div>
<?php
if (1 == 0):
//if ($pagination):
if ($pagination):
echo $this->pagination();
endif;
?>

View File

@ -2,37 +2,33 @@
$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>
@ -43,66 +39,35 @@ $("#archive_page_title").html('<?php echo $_html ?>');
<div class="results">
<?php
if ($this->site->title() == "Collections") {
/* convert all the results into sites and display the list of sites */
$result = array();
if ($responseSitePages && $responseSitePages->getTotalResults()) {
if ($responseSitePages && $responseSitePages->getTotalResults()):
$hasResults = true;
foreach ($responseSitePages->getContent() as $sitePage) {
$site = $sitePage->site();
array_push($result, $site);
}
}
if ($responseItems && $responseItems->getTotalResults()) {
$hasResults = true;
foreach ($responseSitePages->getContent() as $sitePage) {
$site = $sitePage->site();
if (!in_array ($site , $result)) {
array_push($result, $site);
}
}
}
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;
$sitePages = array();
foreach ($responseSitePages->getContent() as $sitePage) {
array_push($sitePages, $sitePage);
}
echo $this->partial('common/cross-site-search/site-page-results', [
'sitePages' => $sitePages,
]);
?>
<?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 endif; ?>
<?php
if ($responseItems && $responseItems->getTotalResults()):
$hasResults = true;
?>
<?php
if ($responseItems && $responseItems->getTotalResults()):
$hasResults = true;
$items = array();
foreach ($responseItems->getContent() as $item) {
array_push($items, $item);
}
echo $this->partial('common/cross-site-search/item-results', [
'items' => $items,
]);
?>
<?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 } ?>
<?php endif; ?>
</div>
<?php if (!$hasResults): ?>
<p><?php echo $this->translate('No result found'); ?>
<?php endif; ?>

View File

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

View File

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

@ -7,23 +7,29 @@ $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) {
$img_src = '/themes/archive/asset/img/default-header-image.jpg';
}
if ($img_src) {
?>
<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>
<?php } else { ?>
<style>
#archive_header_img {
display: none;
}
</style>
<?php } ?>
<script>
/*
<?php
if ($this->site->title() != "Collections") {
$_html = '<a href="'.$this->site->url().'">'.$this->site->title().'</a>';
@ -32,8 +38,8 @@ if (!$img_src) {
}
?>
$("#archive_page_title").html('<?php echo $_html ?>');
*/
</script>
<!-- arc-hive insert ends -->
<div class="resource-title">

View File

@ -3,21 +3,28 @@ $translate = $this->plugin('translate');
?>
<?php $this->htmlElement('body')->appendAttribute('class', 'media resource show'); ?>
<!-- arc-hive insert begins -->
<?php
//$site->pages();
$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';
}
if ($img_src) {
?>
<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>
<?php } else { ?>
<style>
#archive_header_img {
display: none;
}
</style>
<?php } ?>
<script>
<?php
if ($this->site->title() != "Collections") {
@ -28,7 +35,7 @@ if (!$img_src) {
?>
$("#archive_page_title").html('<?php echo $_html ?>');
</script>
<!-- arc-hive insert ends -->
<div class="resource-title">

View File

@ -7,29 +7,32 @@ $showPagePagination = $this->siteSetting('show_page_pagination', true);
<!-- arc-hive insert begins -->
<?php
//$site->pages();
$site->pages();
// set header image
$img_src = $this->getHelperPluginManager()->get('headerImage')->getImage($page);
if (!$img_src) {
$img_src = '/themes/archive/asset/img/default-header-image.jpg';
}
if ($img_src) {
?>
<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>
<?php } else { ?>
<style>
#archive_header_img {
display: none;
}
</style>
<?php } ?>
<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>