added support for foundation js

Merge pull request 'recovers header image on item and media pages' (#10 ) from fix/item-media-header into develop
Reviewed-on: #10
2021-07-21 16:13:36 +02:00 · 2021-07-21 10:37:56 +02:00 · 2021-07-20 11:49:59 +02:00 · 2021-07-18 14:47:23 +02:00 · 2021-07-15 17:36:47 +02:00 · 2021-07-15 17:33:43 +02:00
8 changed files with 23269 additions and 629 deletions
--- a/asset/css/default.css
+++ b/asset/css/default.css
--- a/asset/js/foundation.js
+++ b/asset/js/foundation.js
--- a/asset/scss/global/_omeka.scss
+++ b/asset/scss/global/_omeka.scss
--- a/asset/scss/modules/_content.scss
+++ b/asset/scss/modules/_content.scss
@ -41,6 +41,10 @@ main {
        text-align: center;
      }
    }
+    section {
+      padding: $global-padding $global-padding*2;
+      //margin: $global-margin;
+    }
    .entry-content {
      @include breakpoint(small){
        @include xy-cell(12);
--- a/gulpfile.js
+++ b/gulpfile.js
@ -28,6 +28,7 @@ function serve() {
  });

  gulp.watch("asset/scss/*.scss", sass);
+  gulp.watch("asset/scss/*/*.scss", sass);
  gulp.watch("*.html").on('change', browserSync.reload);
 }

--- a/view/layout/layout.phtml
+++ b/view/layout/layout.phtml
@ -15,6 +15,7 @@ $this->headLink()->prependStylesheet($this->assetUrl('css/iconfonts.css', 'Omeka
 //   'integrity' => 'sha256-/PFxCnsMh+nTuM0k3VJCRch1gwnCfKjaP8rJNq5SoBg= sha384-9ksAFjQjZnpqt6VtpjMjlp2S0qrGbcwF/rvrLUg2vciMhwc1UJJeAAOLuJ96w+Nj sha512-UMSn6RHqqJeJcIfV1eS2tPKCjzaHkU/KqgAnQ7Nzn0mLicFxaVhm9vq7zG5+0LALt15j1ljlg8Fp9PT1VGNmDw==',
 //   'crossorigin' => 'anonymous'
 // ]);
+$this->headScript()->prependFile($this->assetUrl('js/foundation.js'));
 $this->headScript()->prependFile($this->assetUrl('js/global.js', 'Omeka'));

 $this->headScript()->prependFile($this->assetUrl('js/expand-site-list-item.js'));
@ -93,7 +94,7 @@ endif;
            <!-- </div> -->
        </content>
        <script>
-          $(document).foundation();
+          //$(document).foundation();
        </script>

    </body>
--- a/view/omeka/site/item/show.phtml
+++ b/view/omeka/site/item/show.phtml
@ -7,34 +7,29 @@ $itemMedia = $item->media();
 $showLayout = $this->themeSetting('show_layout');
 ?>

-<!-- arc-hive insert begins -->
+<!-- arc-hive page header-image 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';
-}
-if ($this->site->title() == "Collections") {
-  $image_height = "300px";
-} else {
-  $image_height = "200px";
-}
+$img_src = null;
+  $img_src = $this->getHelperPluginManager()->get('archiveSiteMeta')->getSiteImage($site);
+  if (!$img_src) {
+    $img_src = $this->assetUrl('img/ARC-HIVE-logo.svg');
+  }
+  ?>
+  <style>
+  .arc-page-header-img {
+     content: url("<?= $img_src ?>");
+  }
+  </style>
+  <?php
 ?>
-<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 -->
+<!-- arc-hive page header-image insert ends -->
+


 <div class="resource-title">
--- a/view/omeka/site/media/show.phtml
+++ b/view/omeka/site/media/show.phtml
@ -3,33 +3,28 @@ $translate = $this->plugin('translate');
 ?>
 <?php $this->htmlElement('body')->appendAttribute('class', 'media resource show'); ?>

-<!-- arc-hive insert begins -->
+<!-- arc-hive page header-image insert begins -->
 <?php
-//$site->pages();
-$img_src = $this->getHelperPluginManager()->get('archiveSiteMeta')->getSiteImage($site);
-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";
-}
+$img_src = null;
+  $img_src = $this->getHelperPluginManager()->get('archiveSiteMeta')->getSiteImage($site);
+  if (!$img_src) {
+    $img_src = $this->assetUrl('img/ARC-HIVE-logo.svg');
+  }
+  ?>
+  <style>
+  .arc-page-header-img {
+     content: url("<?= $img_src ?>");
+  }
+  </style>
+  <?php
 ?>
-<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 -->
+<!-- arc-hive page header-image insert ends -->


 <div class="resource-title">
Author	SHA1	Message	Date
jorge	5196290f91	added support for foundation js	2021-07-21 16:13:36 +02:00
jorge	81dff27d00	Merge pull request 'recovers header image on item and media pages' (#10 ) from fix/item-media-header into develop Reviewed-on: #10	2021-07-21 10:37:56 +02:00
buttle	80d30b5369	recovers header image on item and media pages	2021-07-20 11:49:59 +02:00
chris	364d45d7fe	Merge pull request 'mods in gulpfile so `npm start` will track all .scss files inside `assets/scss`' (#9 ) from fix/gulpfile-scss into develop Reviewed-on: #9	2021-07-18 14:47:23 +02:00
jorge	4d6e898e74	mods in gulpfile so `npm start` will track all .scss files inside `assets/scss`	2021-07-15 17:36:47 +02:00
chris	b27ed67638	Merge pull request 'fix/content-section-width' (#8 ) from fix/content-section-width into develop Reviewed-on: #8	2021-07-15 17:33:43 +02:00
jorge	8ea4b85d9c	commented specificall _omeka styles interfearing with ach-hive.zone scss	2021-07-15 17:24:15 +02:00
jorge	0f90fb0c1e	main content width padding fix	2021-07-15 17:21:21 +02:00