Merge pull request 'fix issue #24 #24' (#29) from fix/site-description-summary into develop

Reviewed-on: #29

asset/scss/components/_cards.scss

@@ -1,3 +1,33 @@
 .card {
   padding: $global-padding;
 }
+.collection-card {
+  ul {
+  &.arc-site-meta {
+      list-style: none;
+      margin: $global-margin 0;
+      li {
+        &:before{
+          content:'';
+          display: inline-block;
+          width: rem-calc(150);
+          min-height: rem-calc($global-lineheight);
+        }
+        &.artist:before {
+          content:'Artist';
+        }
+        &.date:before {
+          content: 'Year';
+        }
+        &.collection:before {
+          content: 'Collection';
+        }
+        &.tech-document-link:before {
+          //content: 'Keywords';
+          display:inline;
+          width: 0;
+        }
+      }
+    }
+  }
+}

asset/scss/default.scss

@@ -39,7 +39,7 @@
 //@include foundation-switch;
 @include foundation-table;
 // Basic components
-@include foundation-badge;
+//@include foundation-badge;
 @include foundation-breadcrumbs;
 @include foundation-callout;
 @include foundation-card;
@@ -82,6 +82,7 @@
 
 // global project styles
 
+@import "global/print-pdf";
 @import "global/wp-overrides"; //errors
 @import "global/wp-admin";  //errors
 @import "global/typography";

asset/scss/global/_omeka.scss

@@ -66,14 +66,17 @@ body:not(.browse) #content {
   // }
 }
 
+// line breaks generated by omekas
 .break {
-  // width: 100%;
+  width: 100%;
-  // margin: (2 * $global-margin) 0;
+  margin: (2 * $global-margin) 0;
-  // clear: both;
+  clear: both;
 }
-
 .break.opaque {
-  // border-top: 1px solid $light-gray;
+  border-top: 1px solid $body-background;
+}
+.break.transparent {
+  border-top: none;
 }
 
 /* Styles for vertical menu layout */

asset/scss/modules/_content.scss

@@ -68,32 +68,25 @@ main {
 }
 
 
+
 //
-// page category
+//
+// .contain selector for max-width
 //--------------
-.index{
+.contain-width {
-  main {
+    .entry-content,.omekas-entry-content {
-    article {
+      @include breakpoint(small){
-      header {
-        .entry-title {
-        }
       }
-      section {
+      @include breakpoint(medium){
+        max-width: 50rem;
       }
-      .entry-content,.omekas-entry-content {
+      @include breakpoint(xlarge){
-        @include breakpoint(small){
+        max-width: 50rem;
-        }
-        @include breakpoint(medium){
-          max-width: unset;
-        }
-        @include breakpoint(xlarge){
-          max-width: unset;
-        }
       }
     }
-  }
 }
 
+
 //
 // news category
 //--------------
@@ -398,12 +391,42 @@ main {
     aside {
       background-color: $white;
       flex-direction: column;
-      align-content: center;
+      align-items: center;
       h2 {
         margin: $global-margin;
       }
     }
   }
+  &.collections-all {
+
+  }
+  &.collection-single {
+    .slides{
+      background-color: unset;
+      .slide {
+      margin:0 auto;
+      height: unset;
+      width: 100vw;
+      max-height: 10rem;
+      @include breakpoint(large){
+        height: unset;
+      }
+      img,.arc-page-header-img {
+        background-repeat: no-repeat;
+        background-size: contain;
+        width: 100vw;
+      }
+    }
+    }
+    aside {
+      nav {
+        width: 100vw;
+        border-top: $global-border-archive;
+        border-bottom: $global-border-archive;
+        margin: 0;
+      }
+    }
+  }
 }
 //end hero
 

view/common/block-layout/list-of-sites.phtml

@@ -1,4 +1,8 @@
 <?php
+//
+// as for 2021 07 28 this template is not being used
+// consider deleting it
+//
 $archiveSiteHelper = $this->getHelperPluginManager()->get('archiveSiteMeta');
 ?>
 

view/common/cross-site-search/results.phtml

@@ -11,7 +11,8 @@ $hasResults = false;
 <?php
 $img_src = $this->getHelperPluginManager()->get('archiveSiteMeta')->getSiteImage($this->site);
 if (!$img_src) {
-  $img_src = '/themes/archive/asset/img/default-header-image.jpg';
+  //$img_src = '/themes/archive/asset/img/default-header-image.jpg';
+  $img_src = $this->assetUrl('img/ARC-HIVE-logo.svg');
 }
 if ($this->site->title() == "Collections") {
   $image_height = "300px";

view/common/header-collections.phtml

@@ -17,14 +17,6 @@
 </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()

view/common/header-default.phtml

@@ -11,23 +11,23 @@
            title="an arc-hive project"
            alt="arc-hive logo" />
     <?php endif; ?>
-    <h1 class="site-name"><?php echo $site->title(); ?></h1>
+    <h1 class="site-name">
-    <h2 class="site-description">an integrative digital bio-art platform</h2>
+      <?php echo $site->title(); ?>
+    </h1>
+    <h2 class="site-description">
+        an integrative digital bio-art platform
+  </h2>
   </a>
 </main>
 <nav>
   <menu class="">
-    <ul>
+    <?php //
-      <li>
+          // Segun el diseño, este menu no existe
-        Segun el diseño, este menu no existe
+          // ----------
-      </li>
+          // echo $site->publicNav()
-    </ul>
+          //           ->menu()
-    <?php /*
+          //           ->setPartial('common/foundation-navigation.phtml')
-          echo $site->publicNav()
+          //           ->renderPartialWithParams(['layout' => 'dropdown']);
-                    ->menu()
-                    ->setPartial('common/foundation-navigation.phtml')
-                    ->renderPartialWithParams(['layout' => 'dropdown']);
-          */
     ?>
   </menu>
 </nav>

view/common/hero-collections.phtml

@@ -1,34 +1,34 @@
-<section class="hero omeka">
+<section class="hero omeka collections-all">
   <main class="slides">
     <?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(); ?>"
+               alt="<?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" />
+               alt="arc-hive logo"
+               class="logo" />
         </figure>
     </section>
     <?php endif; ?>
 
   </main>
   <aside>
-    <h2>
+    <h2 class="site-title">
       <a href="<?= $this->site->url() ?>">
         <?= $this->site->title() ?>
       </a>
     </h2>
-    <?php echo $this->partial('common/search-form.phtml'); ?>
+    <nav class="">
-
+      <?php echo $this->partial('common/search-form.phtml'); ?>
+    </nav>
   </aside>
 </section>

view/common/hero-default.phtml

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

view/omeka/site/page/show.phtml

@@ -11,7 +11,7 @@ $showPagePagination = $this->siteSetting('show_page_pagination', true);
 $img_src = null;
   $img_src = $this->getHelperPluginManager()->get('headerImage')->getImage($page);
   if (!$img_src) {
-    $img_src = $this->assetUrl('img/ARC-HIVE-logo.svg');
+    $img_src = $this->assetUrl('img/default-ARC-HIVE-hero-image.jpg');
   }
   ?>
   <style>