Compare commits

...

18 Commits

Author SHA1 Message Date
jorge 8796ae11a8 removed class .hero for search button fields 2021-11-18 14:09:26 +01:00
buttle d284002ae4 adds page_size attribute to collection list component 2021-11-10 14:18:27 +01:00
chris a735970d9b Merge pull request 'List collections with vue component' (#40) from collection-list into develop
Reviewed-on: #40
2021-11-10 13:59:26 +01:00
buttle 8b052f95ee updates vue component 2021-11-10 13:55:14 +01:00
buttle d6d9260c0e adds site->id to search text results 2021-11-03 23:07:21 +01:00
buttle dafe41912d loads component with sites via prop 2021-10-29 11:21:26 +02:00
buttle c56464e086 replaces php site list with vue component 2021-10-26 12:22:55 +02:00
jorge 8e1c27de2d changed EU logo back to blue as requested by mail on 18th 10 2021 2021-10-19 09:11:49 +02:00
buttle d7aa820113 adds header image by default
Closes #1
2021-10-13 14:50:01 +02:00
buttle 931e674e11 comments HTML block exclusion 2021-10-13 12:04:53 +02:00
jorge ac591b0476 Merge pull request 'fix menu header small screens' (#39) from fix/header into develop
Reviewed-on: #39
2021-10-13 10:49:00 +02:00
jorge 8d0b6cceb1 fixin header menu vew in small screens 2021-10-13 10:39:23 +02:00
jorge 852f119de0 fixin header menu vew in small screens 2021-10-13 10:34:51 +02:00
jorge c504a78e2c Merge pull request 'fix/header image issue #37' (#38) from fix/header into develop
Reviewed-on: #38
2021-10-13 09:58:52 +02:00
jorge 6e055dd4bb removed padding in header slide img 2021-10-13 09:56:28 +02:00
jorge 3223051b69 removed padding in header img 2021-10-13 09:54:10 +02:00
jorge 54e3ee7771 mods to fix presetantion of article image inside header when small-screen view 2021-10-13 09:44:15 +02:00
chris a9ea9cfce2 Merge pull request 'fix/index-sites-items-issue-35' (#36) from fix/index-sites-items-issue-35 into develop
Reviewed-on: #36
2021-10-08 12:17:36 +02:00
10 changed files with 82 additions and 77 deletions

File diff suppressed because one or more lines are too long

2
asset/js/archive-list.js Normal file

File diff suppressed because one or more lines are too long

View File

@ -1,4 +1,4 @@
.hero{ // .hero{
.search{ .search{
.input-group * { .input-group * {
margin: 0; margin: 0;
@ -64,4 +64,4 @@
} }
} }
} }
} // } //end .hero

View File

@ -30,8 +30,8 @@
} }
&.eu{ &.eu{
&::before { &::before {
// background-image: url('../img/eu_flag_creative_europe_co_funded_left.svg'); background-image: url('../img/eu_flag_creative_europe_co_funded_left.svg');
background-image: url('../img/rechts_co-funded-by-the-creative-europe-media-programme-of-the-european-union-flag.png'); //background-image: url('../img/rechts_co-funded-by-the-creative-europe-media-programme-of-the-european-union-flag.png');
} }
} }
} }

View File

@ -100,7 +100,7 @@ main {
max-width: 50rem; max-width: 50rem;
} }
@include breakpoint(xlarge){ @include breakpoint(xlarge){
max-width: 50rem; // max-width: 50rem;
} }
} }
} }
@ -207,12 +207,12 @@ main {
padding: 0; padding: 0;
margin: 0; margin: 0;
article { article {
@include breakpoint(small){
@include card-container(); @include card-container();
@include xy-cell(); @include xy-cell();
width: 100%; width: 100%;
padding: 0; padding: 0;
margin: 0; margin: 0;
@include breakpoint(small){
font-size: $global-font-size*0.7; font-size: $global-font-size*0.7;
} }
@include breakpoint(medium){ @include breakpoint(medium){
@ -220,7 +220,6 @@ main {
} }
@include breakpoint(large){ @include breakpoint(large){
} }
margin-bottom:0;
} }
} }
.accordion-content { .accordion-content {
@ -306,11 +305,13 @@ main {
@include xy-grid(); @include xy-grid();
.slide { .slide {
@include xy-grid; @include xy-grid;
justify-content: center;
@include breakpoint(small){ @include breakpoint(small){
width: 100vw; width: 100vw;
overflow: hidden;
padding: 0;
margin: 0; margin: 0;
padding: $global-padding * 3; justify-content: center;
color: $white;
.textwidget { .textwidget {
} }
} }
@ -325,9 +326,9 @@ main {
@include breakpoint(large){ @include breakpoint(large){
width: 50%; width: 50%;
height: calc((50vw*9)/16); height: calc((50vw*9)/16);
padding: 0; //padding: 0;
margin: 0; //margin: 0;
overflow:hidden; //overflow:hidden;
a { a {
@include flex; @include flex;
@include flex-align (center,middle); @include flex-align (center,middle);
@ -357,7 +358,6 @@ main {
background-color: $primary-color; background-color: $primary-color;
font-variant:all-small-caps; font-variant:all-small-caps;
} }
color: $white;
.logo { .logo {
@include breakpoint(medium){ @include breakpoint(medium){
@ -373,8 +373,22 @@ main {
@include xy-cell(auto); @include xy-cell(auto);
@include flex; @include flex;
@include flex-align(spaced,middle); @include flex-align(spaced,middle);
min-height: 6rem; @include breakpoint(small) {
flex-direction: column;
min-height: unset;
padding: $global-padding;
.menu, .menu.horizontal {
justify-content: center;
}
}
@include breakpoint(large) {
flex-direction: row;
min-height: $global-padding * 6;
padding: $global-padding 0 ; padding: $global-padding 0 ;
.menu, .menu.horizontal {
justify-content: unset;
}
}
a { a {
color: $body-font-color; color: $body-font-color;
} }

View File

@ -1,60 +1,31 @@
<?php <?php
//
// as for 2021 07 28 this template is not being used
// consider deleting it
//
$archiveSiteHelper = $this->getHelperPluginManager()->get('archiveSiteMeta'); $archiveSiteHelper = $this->getHelperPluginManager()->get('archiveSiteMeta');
?> ?>
<section class="collections-list">
<header> <?php
<h2> Latest in collections</h2> $collections = [];
</header> foreach($sites as $site){
<main class=""> $site_data = $archiveSiteHelper->getSiteMetaValues($site);
<article class=""> $site_data['id'] = $site->id();
<ul class="accordion" data-responsive-accordion-tabs="accordion small-accordion" data-multi-expand="true" data-allow-all-closed="true" data-deep-link="true"> $site_data['url'] = $site->siteUrl();
<li class="accordion-item title" data-accordion-item disabled> $site_data['title'] = $site->title();
<a href="#" class="accordion-title"> $site_data['summary'] = nl2br($this->escapeHtml($site->summary()));
<ul class=""> array_push($collections, $site_data);
<li class="title">Title</li> }
<li class="curator">Artist</li> //$collections = json_encode($collections, JSON_UNESCAPED_SLASHES);
<li class="collection-name">Collection</li> //$collections = json_encode($collections, JSON_HEX_APOS);
<li class="date">Date</li> //$collections = htmlspecialchars(json_encode($collections), ENT_QUOTES, 'UTF-8');
</ul> //$collections = str_replace("'", "\'", $collections);
</a> $collections = htmlentities(json_encode($collections, JSON_HEX_QUOT), ENT_QUOTES, 'UTF-8');
<div class="accordion-content" data-tab-content> //$collections = json_encode($collections);
<figure> ?>
</figure>
<p> <div data-vue-component="archive-list"
</p> data-collections='<?= $collections ?>'
data-page_size=3>
</div> </div>
</li>
<?php
// read each omeka site to publish
foreach($sites as $site): <script src="/themes/archive/asset/js/archive-list.js"></script>
$site_meta_values = $archiveSiteHelper->getSiteMetaValues($site);
// table body build file
echo $this->partial('common/site-list-entry', [
'site' => $site,
'showSummary' => $summaries,
'site_meta_values' => $site_meta_values,
'archive_collections' => $archiveSiteHelper->getCollections(),
]);
endforeach;
?>
</ul>
</article>
</main>
<aside>
<nav>
<?php
if (1 == 0):
//if ($pagination):
echo $this->pagination();
endif;
?>
</nav>
</aside>
</section>

View File

@ -1,3 +1,22 @@
<!-- arc-hive header-image insert begins -->
<?php
$img_src = null;
$img_src = $this->getHelperPluginManager()->get('headerImage')->getImage();
if (!$img_src) {
$img_src = $this->assetUrl('img/default-ARC-HIVE-hero-image.jpg');
}
?>
<style>
.arc-page-header-img {
content: url("<?= $img_src ?>");
}
</style>
<?php
?>
<!-- arc-hive header-image insert ends -->
<main class=""> <main class="">
<a href="<?php echo $site->url(); ?>" class="site-brand arc-hive-off"> <a href="<?php echo $site->url(); ?>" class="site-brand arc-hive-off">
<?php if ($this->themeSetting('logo')): ?> <?php if ($this->themeSetting('logo')): ?>

View File

@ -27,8 +27,5 @@
<?= $this->site->title() ?> <?= $this->site->title() ?>
</a> </a>
</h2> </h2>
<nav class="">
<?php echo $this->partial('common/search-form.phtml'); ?>
</nav>
</aside> </aside>
</section> </section>

View File

@ -40,7 +40,7 @@ $form->prepare();
<div id="new-block" class="active sidebar" data-url="<?php echo $this->url('admin/site/slug/page/default', ['action' => 'block'], true); ?>"> <div id="new-block" class="active sidebar" data-url="<?php echo $this->url('admin/site/slug/page/default', ['action' => 'block'], true); ?>">
<h3><?php echo $translate('Add new block'); ?></h3> <h3><?php echo $translate('Add new block'); ?></h3>
<?php foreach ($this->blockLayout()->getLayouts() as $layout): ?> <?php foreach ($this->blockLayout()->getLayouts() as $layout): ?>
<?php if ($layout == "html") { continue; } ?> <?php /* if ($layout == "html") { continue; } */ ?>
<?php /* if ($layout == "tableOfContents") { continue; } */ ?> <?php /* if ($layout == "tableOfContents") { continue; } */ ?>
<?php if ($layout == "searchingForm") { continue; } ?> <?php if ($layout == "searchingForm") { continue; } ?>
<button type="button" value="<?php echo $escape($layout); ?>" class="option"> <button type="button" value="<?php echo $escape($layout); ?>" class="option">

View File

@ -5,9 +5,12 @@ $showPagePagination = $this->siteSetting('show_page_pagination', true);
?> ?>
<!-- arc-hive page header-image insert begins --> <!-- arc-hive page header-image insert begins -->
<?php <?php
/*
$img_src has already been set at view/common/header-default.phtml
We override it here because a page may have it's own header image
*/
$img_src = null; $img_src = null;
$img_src = $this->getHelperPluginManager()->get('headerImage')->getImage($page); $img_src = $this->getHelperPluginManager()->get('headerImage')->getImage($page);
if (!$img_src) { if (!$img_src) {
@ -21,7 +24,6 @@ $img_src = null;
</style> </style>
<?php <?php
?> ?>
<!-- arc-hive page header-image insert ends --> <!-- arc-hive page header-image insert ends -->
<?php <?php