Merge pull request 'recupera las header images de las páginas. separa los partials de Collections y default en ficheros distintos.' (#3) from fix/header-image into develop

Reviewed-on: #3
I can't see any inconvenients to proceed.

view/common/header-archive.phtml

@@ -1,16 +0,0 @@
-<main class="">
-  <a href="<?php echo $site->url(); ?>" class="site-brand arc-hive-off">
-    <?php if ($this->themeSetting('logo')): ?>
-      <img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>" alt="<?php echo $site->title(); ?>" title="<?php echo $site->title(); ?>" class="logo">
-    <?php else: ?>
-      <img src="<?php echo $this->assetUrl('img/ARC-HIVE-logo.svg');?>" class="logo" title="an arc-hive project" alt="arc-hive logo" />
-    <?php endif; ?>
-    <h1 class="site-name"><?php echo $site->title(); ?></h1>
-    <h2 class="site-description">an integrative digital bio-art platform</h2>
-  </a>
-</main>
-<nav>
-  <menu class="">
-    <?php echo $site->publicNav()->menu()->setPartial('common/foundation-navigation.phtml')->renderPartialWithParams(['layout' => 'dropdown']); ?>
-  </menu>
-</nav>

view/common/header-collections.phtml

@@ -0,0 +1,36 @@
+<main class="">
+  <a href="<?php echo $site->url(); ?>" class="site-brand arc-hive-off">
+    <?php if ($this->themeSetting('logo')): ?>
+      <img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>"
+           alt="<?php echo $site->title(); ?>"
+           title="<?php echo $site->title(); ?>"
+           class="logo">
+    <?php else: ?>
+      <img src="<?php echo $this->assetUrl('img/ARC-HIVE-logo.svg');?>"
+           class="logo"
+           title="an arc-hive project"
+           alt="arc-hive logo" />
+    <?php endif; ?>
+    <h1 class="site-name"><?php echo $site->title(); ?></h1>
+    <h2 class="site-description">an integrative digital bio-art platform</h2>
+  </a>
+</main>
+<nav>
+  <menu class="">
+    <ul>
+      <li>
+        Este menu no lo genera Omeka.
+      </li>
+      <li>
+        Creo que emula el menu del wordpress.
+      </li>
+    </ul>
+    <?php /*
+          echo $site->publicNav()
+                    ->menu()
+                    ->setPartial('common/foundation-navigation.phtml')
+                    ->renderPartialWithParams(['layout' => 'dropdown']);
+          */
+    ?>
+  </menu>
+</nav>

view/common/header-default.phtml

@@ -0,0 +1,33 @@
+<main class="">
+  <a href="<?php echo $site->url(); ?>" class="site-brand arc-hive-off">
+    <?php if ($this->themeSetting('logo')): ?>
+      <img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>"
+           alt="<?php echo $site->title(); ?>"
+           title="<?php echo $site->title(); ?>"
+           class="logo">
+    <?php else: ?>
+      <img src="<?php echo $this->assetUrl('img/ARC-HIVE-logo.svg');?>"
+           class="logo"
+           title="an arc-hive project"
+           alt="arc-hive logo" />
+    <?php endif; ?>
+    <h1 class="site-name"><?php echo $site->title(); ?></h1>
+    <h2 class="site-description">an integrative digital bio-art platform</h2>
+  </a>
+</main>
+<nav>
+  <menu class="">
+    <ul>
+      <li>
+        Segun el diseño, este menu no existe
+      </li>
+    </ul>
+    <?php /*
+          echo $site->publicNav()
+                    ->menu()
+                    ->setPartial('common/foundation-navigation.phtml')
+                    ->renderPartialWithParams(['layout' => 'dropdown']);
+          */
+    ?>
+  </menu>
+</nav>

view/common/hero-collections.phtml

@@ -3,21 +3,31 @@
     <?php if ($this->themeSetting('logo')): ?>
       <section class="slide">
         <figure>
-          <img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>" alt="<?php echo $site->title(); ?>" title="<?php echo $site->title(); ?>" class="logo" />
+          <img src="<?php echo $this->themeSettingAssetUrl('logo'); ?>"
+               alt="<?php echo $site->title(); ?>"
+               title="<?php echo $site->title(); ?>"
+               class="logo" />
         </figure>
       </section>
     <?php else: ?>
     <section class="slide">
         <!-- <p>ARC-HIVE is a curatorial space that gathers artworks that work in the continuum of biomateriality, from DNA, proteins, and cells to full organisms. They can be manipulation, modification or (re)creation of life and living processes.</p> -->
         <figure>
-          <img src="<?php echo $this->assetUrl('img/ARC-HIVE-logo.svg');?>" class="logo" title="an arc-hive project" alt="arc-hive logo" />
+          <img src="<?php echo $this->assetUrl('img/ARC-HIVE-logo.svg');?>"
+               class="logo"
+               title="an arc-hive project"
+               alt="arc-hive logo" />
         </figure>
     </section>
     <?php endif; ?>
+
   </main>
   <aside>
-    <h2>collections</h2>
+    <h2>
-
+      <a href="<?= $this->site->url() ?>">
+        <?= $this->site->title() ?>
+      </a>
+    </h2>
     <?php echo $this->partial('common/search-form.phtml'); ?>
 
   </aside>

view/common/hero-default.phtml

@@ -0,0 +1,27 @@
+<section class="hero omeka">
+  <main class="slides">
+    <section class="slide">
+        <figure>
+          <img class="arc-page-header-img"
+               title="an arc-hive project"
+               alt="collection logo" />
+        </figure>
+    </section>
+  </main>
+  <aside>
+    <h2>
+      <a href="<?= $this->site->url() ?>">
+        <?= $this->site->title() ?>
+      </a>
+    </h2>
+    <?php
+      echo $site->publicNav()
+                ->menu()
+                ->setPartial('common/foundation-navigation.phtml')
+                ->renderPartialWithParams(['layout' => 'dropdown']);
+
+    ?>
+    <?php echo $this->partial('common/search-form.phtml'); ?>
+
+  </aside>
+</section>

view/layout/layout.phtml

@@ -31,11 +31,12 @@ if ($userBar) {
   $this->htmlElement('body')->appendAttribute('class', 'user-bar');
 }
 
+/*
 $logo = $this->themeSettingAssetUrl('logo');
 if ($logo):
     $titlelogo = '<img class="site-logo" src="' . $this->escapeHtml($logo) . '"' . 'alt="' . $site->title() . '"' . '>';
 endif;
-
+*/
 ?>
 <?php echo $this->doctype(); ?>
 <?php echo $this->htmlElement('html'); ?>
@@ -52,10 +53,22 @@ endif;
 
             <header>
               <?php echo $userBar; ?>
-              <?php echo $this->partial('common/header-archive'); ?>
+              <?php
+                if ($site->title() == "Collections") {
+                  echo $this->partial('common/header-collections');
+                } else {
+                  echo $this->partial('common/header-default');
+                }
+              ?>
             </header>
 
-            <?php echo $this->partial('common/hero-archive.phtml'); ?>
+            <?php
+              if ($site->title() == "Collections") {
+                echo $this->partial('common/hero-collections');
+              } else {
+                echo $this->partial('common/hero-default');
+              }
+            ?>
 
             <main>
               <article>

view/omeka/site/page/show.phtml

@@ -5,40 +5,25 @@ $showPagePagination = $this->siteSetting('show_page_pagination', true);
 ?>
 
 
-<!-- arc-hive insert begins -->
-<?php
-//$site->pages();
-$img_src = $this->getHelperPluginManager()->get('headerImage')->getImage($page);
-if (!$img_src) {
-  $img_src = '/themes/archive/asset/img/default-header-image.jpg';
-}
-if ($this->site->title() == "Collections") {
-  $image_height = "300px";
-} else {
-  $image_height = "200px";
-}
-?>
-<style>
-#archive_header_img {
-   background: url("<?= $img_src ?>") no-repeat;
-   width: 100%;
-   height: <?= $image_height ?>;
-}
-</style>
-<script>
-<?php
-  $_html = '<a href="'.$this->site->url().'">'.$this->site->title().'</a>';
-?>
-$("#archive_page_title").html('<?php echo $_html ?>');
-</script>
-<!-- arc-hive insert ends -->
 
-<?php /*
+<!-- arc-hive page header-image insert begins -->
-      echo $page->id();
+<?php
-      $this->pageTitle($page->title());
+$img_src = null;
-      */
+  $img_src = $this->getHelperPluginManager()->get('headerImage')->getImage($page);
+  if (!$img_src) {
+    $img_src = $this->assetUrl('img/ARC-HIVE-logo.svg');
+  }
+  ?>
+  <style>
+  .arc-page-header-img {
+     content: url("<?= $img_src ?>");
+  }
+  </style>
+  <?php
 ?>
 
+<!-- arc-hive page header-image insert ends -->
+
 <?php
 $nav = $site->publicNav();
 $container = $nav->getContainer();