[FINNA-1449] Upstream compatibility changes to system email display.

NatLibFi · Dec 4, 2024 · 5ba9179 · 5ba9179
1 parent 7683041
commit 5ba9179
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 52 deletions.
diff --git a/themes/finna2/templates/eds/home.phtml b/themes/finna2/templates/eds/home.phtml
@@ -21,21 +21,6 @@
 ?>
 <!--  Begin home.phtml and close page container for extra styling  -->
 </div>
-<div class="container-fluid">
-  <div class="container">
-    <div class="row">
-      <?php if ($this->ils()->getOfflineMode() == 'ils-offline'): ?>
-      <div class="alert alert-warning">
-        <h2><?=$this->transEsc('ils_offline_title')?></h2>
-        <p><strong><?=$this->transEsc('ils_offline_status')?></strong></p>
-        <p><?=$this->transEsc('ils_offline_home_message')?></p>
-        <?php $supportEmail = $this->escapeHtmlAttr($this->systemEmail()); ?>
-        <p><a href="mailto:<?=$supportEmail?>"><?=$supportEmail?></a></p>
-      </div>
-      <?php endif; ?>
-    </div>
-  </div>
-</div>
 <div class="container-fluid eds-home">
   <div class="container">
     <div>

diff --git a/themes/finna2/templates/error/index.phtml b/themes/finna2/templates/error/index.phtml
@@ -11,13 +11,7 @@
     <p><?=$this->transEsc('An error has occurred')?></p>
     <p><?=$this->transEsc($this->message)?></p>
   <?php endif; ?>
-  <p>
-    <?=$this->transEsc('Please contact the Library Reference Department for assistance')?>
-    <br>
-    <?php $supportEmail = $this->escapeHtmlAttr($this->systemEmail()); ?>
-    <a href="mailto:<?=$supportEmail?>"><?=$supportEmail?></a>
-  </p>
-  <br>
+  <?=$this->render('error/contact.phtml')?>
   <?php if (preg_match('/Record (\w+):.* does not exist/', $this->exception->getMessage(), $matches) && $this->authorizationNote($matches[1])): ?>
     <p><?=$this->translate('record_not_found_unauthorized')?></p>
   <?php endif; ?>

diff --git a/themes/finna2/templates/primo/home.phtml b/themes/finna2/templates/primo/home.phtml
@@ -21,21 +21,6 @@
 ?>
 <!--  Begin home.phtml and close page container for extra styling  -->
 </div>
-<div class="container-fluid">
-  <div class="container">
-    <div class="row">
-      <?php if ($this->ils()->getOfflineMode() == 'ils-offline'): ?>
-      <div class="alert alert-warning">
-        <h2><?=$this->transEsc('ils_offline_title')?></h2>
-        <p><strong><?=$this->transEsc('ils_offline_status')?></strong></p>
-        <p><?=$this->transEsc('ils_offline_home_message')?></p>
-        <?php $supportEmail = $this->escapeHtmlAttr($this->systemEmail()); ?>
-        <p><a href="mailto:<?=$supportEmail?>"><?=$supportEmail?></a></p>
-      </div>
-      <?php endif; ?>
-    </div>
-  </div>
-</div>
 <div class="container-fluid primo-home">
   <div class="container">
     <div>

diff --git a/themes/finna2/templates/summon/home.phtml b/themes/finna2/templates/summon/home.phtml
@@ -21,21 +21,6 @@
 ?>
 <!--  Begin home.phtml and close page container for extra styling  -->
 </div>
-<div class="container-fluid">
-  <div class="container">
-    <div>
-      <?php if ($this->ils()->getOfflineMode() == 'ils-offline'): ?>
-      <div class="alert alert-warning">
-        <h2><?=$this->transEsc('ils_offline_title')?></h2>
-        <p><strong><?=$this->transEsc('ils_offline_status')?></strong></p>
-        <p><?=$this->transEsc('ils_offline_home_message')?></p>
-        <?php $supportEmail = $this->escapeHtmlAttr($this->systemEmail()); ?>
-        <p><a href="mailto:<?=$supportEmail?>"><?=$supportEmail?></a></p>
-      </div>
-      <?php endif; ?>
-    </div>
-  </div>
-</div>
 <div class="container-fluid summon-home">
   <div class="container">
      <div>