Compare commits

..

No commits in common. "3b526e98a707edbfd1d87a26ab2bd7c0b5a2cd4a" and "59ac584be3f6ed5c81270f99c5cafae023dc7510" have entirely different histories.

10 changed files with 30 additions and 29 deletions

File diff suppressed because one or more lines are too long

Binary file not shown.

Before

Width:  |  Height:  |  Size: 897 KiB

View File

@ -252,7 +252,7 @@ main {
display:flex; display:flex;
flex-direction: column; flex-direction: column;
align-items: center; align-items: center;
margin-top: $global-margin * 1.5; margin-top: $global-margin * 1.5;
} }
// accordion for colletions list // accordion for colletions list
@ -550,11 +550,10 @@ main {
.slides { .slides {
background-color: $secondary-color; background-color: $secondary-color;
.slide { .slide {
height: 10rem;
flex-direction: column; flex-direction: column;
align-content: center; align-content: center;
align-self: center; align-self: center;
margin: 0 auto; margin: $global-margin auto;
&:first-child { &:first-child {
color: unset; color: unset;
background-color: unset; background-color: unset;
@ -566,16 +565,6 @@ main {
justify-content: center; justify-content: center;
} }
} }
.image-background {
width: 100%;
background-color: rgb(250,250,220);
background-image: url("../img/header_collections.jpg");
background-repeat: no-repeat;
background-size: cover;
background-position: center 75%;
}
&.collections-all{
}
} }
} }
aside { aside {

View File

@ -59,7 +59,10 @@
<section class="hero omeka collections-all"> <section class="hero omeka collections-all">
<main class="slides"> <main class="slides">
<section class="slide image-backgroud"> <section class="slide">
<figure>
<img src="asset/img/ARC-HIVE-logo.svg?v=2.0.0" title="an arc-hive project" alt="arc-hive logo" class="logo">
</figure>
</section> </section>
</main> </main>

View File

@ -19,9 +19,6 @@ foreach($sites as $site){
if (!isset($site_data['currator'])) { if (!isset($site_data['currator'])) {
$site_data['currator'] = ""; $site_data['currator'] = "";
} }
if (isset($site_data['project_date'])) {
$site_data['project_date'] = substr($site_data['project_date'], 0, 4);
}
array_push($projects, $site_data); array_push($projects, $site_data);
} }
//$collections = json_encode($collections, JSON_UNESCAPED_SLASHES); //$collections = json_encode($collections, JSON_UNESCAPED_SLASHES);

View File

@ -51,7 +51,7 @@
Hosted, maintained and coded by <a href="https://hangar.org">Hangar</a> Hosted, maintained and coded by <a href="https://hangar.org">Hangar</a>
</aside> </aside>
<aside class="double copyright"> <aside class="double copyright">
Powered by <a href="https://omeka.org/">Omeka</a> <?php echo $this->translate('Powered by Omeka S'); ?>
</aside> </aside>
<aside class="legal-credits"> <aside class="legal-credits">
Visual identity by <a href="http://oficinadedisseny.net/">Oficina de disseny</a> Visual identity by <a href="http://oficinadedisseny.net/">Oficina de disseny</a>

View File

@ -1,6 +1,6 @@
<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"> -->
<a href="https://arc-hive.zone/" class="site-brand arc-hive-off"> <a href="/" class="site-brand arc-hive-off">
<?php if ($this->themeSetting('logo')): ?> <?php if ($this->themeSetting('logo')): ?>
<img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>" <img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>"
alt="<?php echo $site->title(); ?>" alt="<?php echo $site->title(); ?>"

View File

@ -19,7 +19,7 @@ $img_src = null;
<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"> -->
<a href="https://arc-hive.zone/" class="site-brand arc-hive-off"> <a href="/" class="site-brand arc-hive-off">
<?php if ($this->themeSetting('logo')): ?> <?php if ($this->themeSetting('logo')): ?>
<img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>" <img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>"
alt="<?php echo $site->title(); ?>" alt="<?php echo $site->title(); ?>"

View File

@ -1,13 +1,25 @@
<section class="hero omeka collections-all"> <section class="hero omeka collections-all">
<main class="slides"> <main class="slides">
<section class="slide image-background"> <?php if ($this->themeSetting('logo')): ?>
<!-- <figure> --> <section class="slide">
<!-- <img src="" <figure>
<img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>"
title="<?php echo $site->title(); ?>"
alt="<?php echo $site->title(); ?>"
class="logo" />
</figure>
</section>
<?php else: ?>
<section class="slide">
<figure>
<img src="<?php echo $this->assetUrl('img/ARC-HIVE-logo.svg');?>"
title="an arc-hive project" title="an arc-hive project"
alt="arc-hive logo" alt="arc-hive logo"
class="logo" /--> class="logo" />
<!-- </figure> --> </figure>
</section> </section>
<?php endif; ?>
</main> </main>
<aside> <aside>
<h2 class="site-title"> <h2 class="site-title">

View File

@ -12,7 +12,7 @@ $items[0] = new ArrayObject(); // top level menu items go here
if ($wordpress_endpoint) { if ($wordpress_endpoint) {
try { try {
$client = new Client($wordpress_endpoint); $client = new Client($wordpress_endpoint);
$client->setOptions(array("timeout"=>2)); $client->setOptions(array("timeout"=>1));
$response = $client->send(); $response = $client->send();
} }
catch (exception $e) { catch (exception $e) {
@ -29,7 +29,6 @@ if ($wordpress_endpoint) {
$item_url = "/login"; $item_url = "/login";
} }
$item_title = $menu_item->title; $item_title = $menu_item->title;
/*
if ($lowered_title == 'collections') { if ($lowered_title == 'collections') {
if ($wordpress_site) { if ($wordpress_site) {
// change Collections item // change Collections item
@ -39,13 +38,13 @@ if ($wordpress_endpoint) {
continue; // do not render the Collections item continue; // do not render the Collections item
} }
} }
*/
$item = [ $item = [
"id" => $menu_item->ID, "id" => $menu_item->ID,
"title" => $item_title, "title" => $item_title,
"url" => $item_url "url" => $item_url
]; ];
if (!isset($items[$menu_item->menu_item_parent])) { if (!isset($items[$menu_item->menu_item_parent])) {
//if (!array_key_exists($menu_item->menu_item_parent, $items)) {
$items[$menu_item->menu_item_parent] = new ArrayObject(); $items[$menu_item->menu_item_parent] = new ArrayObject();
} }
$items[$menu_item->menu_item_parent][$menu_item->ID] =$item; $items[$menu_item->menu_item_parent][$menu_item->ID] =$item;
@ -91,6 +90,7 @@ if (!function_exists('render_menu')) {
} }
echo '<a role="" href="'.$menu_item['url'].'">'.$menu_item['title'].'</a>'.PHP_EOL; echo '<a role="" href="'.$menu_item['url'].'">'.$menu_item['title'].'</a>'.PHP_EOL;
if (isset($items[$menu_item['id']])) { if (isset($items[$menu_item['id']])) {
//if (array_key_exists($menu_item['id'], $items)) {
render_menu($items, $menu_item['id']); // render sub menu render_menu($items, $menu_item['id']); // render sub menu
} }
echo '</li>' . PHP_EOL; echo '</li>' . PHP_EOL;