From 06e4bc3eccb68b7528f695dcfe2a42b00c4ff986 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Thu, 28 Jun 2012 12:08:14 -0400
Subject: [PATCH] Added view helper to retrieve system contact email; added
missing "unavailable" template to jquerymobile theme.
---
.../VuFind/Theme/Root/Helper/SystemEmail.php | 51 +++++++++++++++++++
.../SolrDefault/tab-holdings.phtml | 2 +-
.../templates/error/unavailable.phtml | 2 +-
.../templates/myresearch/cataloglogin.phtml | 2 +-
.../templates/myresearch/login.phtml | 2 +-
themes/blueprint/templates/search/home.phtml | 2 +-
.../SolrDefault/tab-holdings.phtml | 2 +-
.../templates/error/unavailable.phtml | 21 ++++++++
.../templates/myresearch/cataloglogin.phtml | 2 +-
.../templates/myresearch/login.phtml | 2 +-
.../templates/search/advanced.phtml | 2 +-
.../jquerymobile/templates/search/home.phtml | 2 +-
themes/root/theme.ini | 1 +
13 files changed, 83 insertions(+), 10 deletions(-)
create mode 100644 module/VuFind/src/VuFind/Theme/Root/Helper/SystemEmail.php
create mode 100644 themes/jquerymobile/templates/error/unavailable.phtml
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/SystemEmail.php b/module/VuFind/src/VuFind/Theme/Root/Helper/SystemEmail.php
new file mode 100644
index 00000000000..cfe0c81911d
--- /dev/null
+++ b/module/VuFind/src/VuFind/Theme/Root/Helper/SystemEmail.php
@@ -0,0 +1,51 @@
+<?php
+/**
+ * System contact email helper.
+ *
+ * PHP version 5
+ *
+ * Copyright (C) Villanova University 2010.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2,
+ * as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * @category VuFind2
+ * @package View_Helpers
+ * @author Demian Katz <demian.katz@villanova.edu>
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @link http://vufind.org/wiki/building_a_recommendations_module Wiki
+ */
+namespace VuFind\Theme\Root\Helper;
+use VuFind\Config\Reader as ConfigReader, Zend\View\Helper\AbstractHelper;
+
+/**
+ * System contact email helper.
+ *
+ * @category VuFind2
+ * @package View_Helpers
+ * @author Demian Katz <demian.katz@villanova.edu>
+ * @license http://opensource.org/licenses/gpl-2.0.php GNU General Public License
+ * @link http://vufind.org/wiki/building_a_recommendations_module Wiki
+ */
+class SystemEmail extends AbstractHelper
+{
+ /**
+ * System contact email helper.
+ *
+ * @return string
+ */
+ public function __invoke()
+ {
+ return ConfigReader::getConfig()->Site->email;
+ }
+}
\ No newline at end of file
diff --git a/themes/blueprint/templates/RecordDriver/SolrDefault/tab-holdings.phtml b/themes/blueprint/templates/RecordDriver/SolrDefault/tab-holdings.phtml
index 53cd96e39f7..a39e9ac3a22 100644
--- a/themes/blueprint/templates/RecordDriver/SolrDefault/tab-holdings.phtml
+++ b/themes/blueprint/templates/RecordDriver/SolrDefault/tab-holdings.phtml
@@ -15,7 +15,7 @@
<h2><?=$this->transEsc('ils_offline_title')?></h2>
<p><strong><?=$this->transEsc('ils_offline_status')?></strong></p>
<p><?=$this->transEsc('ils_offline_holdings_message')?></p>
- <? $supportEmail = $this->escape(VF_Config_Reader::getConfig()->Site->email); ?>
+ <? $supportEmail = $this->escape($this->systemEmail()); ?>
<p><a href="mailto:<?=$supportEmail?>"><?=$supportEmail?></a></p>
</div>
<? endif; ?>
diff --git a/themes/blueprint/templates/error/unavailable.phtml b/themes/blueprint/templates/error/unavailable.phtml
index 1a306795138..3e226e96b8f 100644
--- a/themes/blueprint/templates/error/unavailable.phtml
+++ b/themes/blueprint/templates/error/unavailable.phtml
@@ -14,7 +14,7 @@
<p>
<?=$this->transEsc('Please contact the Library Reference Department for assistance')?>
<br/>
- <? $supportEmail = $this->escape(VF_Config_Reader::getConfig()->Site->email); ?>
+ <? $supportEmail = $this->escape($this->systemEmail()); ?>
<a href="mailto:<?=$supportEmail?>"><?=$supportEmail?></a>
</p>
</div>
diff --git a/themes/blueprint/templates/myresearch/cataloglogin.phtml b/themes/blueprint/templates/myresearch/cataloglogin.phtml
index 72574b04a12..fee5a5c6e6e 100644
--- a/themes/blueprint/templates/myresearch/cataloglogin.phtml
+++ b/themes/blueprint/templates/myresearch/cataloglogin.phtml
@@ -15,7 +15,7 @@
<h2><?=$this->transEsc('ils_offline_title')?></h2>
<p><strong><?=$this->transEsc('ils_offline_status')?></strong></p>
<p><?=$this->transEsc('ils_offline_login_message')?></p>
- <? $supportEmail = $this->escape(VF_Config_Reader::getConfig()->Site->email); ?>
+ <? $supportEmail = $this->escape($this->systemEmail()); ?>
<p><a href="mailto:<?=$supportEmail?>"><?=$supportEmail?></a></p>
</div>
<? else: ?>
diff --git a/themes/blueprint/templates/myresearch/login.phtml b/themes/blueprint/templates/myresearch/login.phtml
index 0efadba9063..092b9c44da2 100644
--- a/themes/blueprint/templates/myresearch/login.phtml
+++ b/themes/blueprint/templates/myresearch/login.phtml
@@ -23,7 +23,7 @@
<h2><?=$this->transEsc('ils_offline_title')?></h2>
<p><strong><?=$this->transEsc('ils_offline_status')?></strong></p>
<p><?=$this->transEsc('ils_offline_login_message')?></p>
- <? $supportEmail = $this->escape(VF_Config_Reader::getConfig()->Site->email); ?>
+ <? $supportEmail = $this->escape($this->systemEmail()); ?>
<p><a href="mailto:<?=$supportEmail?>"><?=$supportEmail?></a></p>
</div>
<? endif; ?>
diff --git a/themes/blueprint/templates/search/home.phtml b/themes/blueprint/templates/search/home.phtml
index 37345646355..22f57f76ef3 100644
--- a/themes/blueprint/templates/search/home.phtml
+++ b/themes/blueprint/templates/search/home.phtml
@@ -21,7 +21,7 @@
<h2><?=$this->transEsc('ils_offline_title')?></h2>
<p><strong><?=$this->transEsc('ils_offline_status')?></strong></p>
<p><?=$this->transEsc('ils_offline_home_message')?></p>
- <? $supportEmail = $this->escape(VF_Config_Reader::getConfig()->Site->email); ?>
+ <? $supportEmail = $this->escape($this->systemEmail()); ?>
<p><a href="mailto:<?=$supportEmail?>"><?=$supportEmail?></a></p>
</div>
<? endif; ?>
diff --git a/themes/jquerymobile/templates/RecordDriver/SolrDefault/tab-holdings.phtml b/themes/jquerymobile/templates/RecordDriver/SolrDefault/tab-holdings.phtml
index f243908d4ae..30403f246d2 100644
--- a/themes/jquerymobile/templates/RecordDriver/SolrDefault/tab-holdings.phtml
+++ b/themes/jquerymobile/templates/RecordDriver/SolrDefault/tab-holdings.phtml
@@ -15,7 +15,7 @@
<h2><?=$this->transEsc('ils_offline_title')?></h2>
<p><strong><?=$this->transEsc('ils_offline_status')?></strong></p>
<p><?=$this->transEsc('ils_offline_holdings_message')?></p>
- <? $supportEmail = $this->escape(VF_Config_Reader::getConfig()->Site->email); ?>
+ <? $supportEmail = $this->escape($this->systemEmail()); ?>
<p><a href="mailto:<?=$supportEmail?>"><?=$supportEmail?></a></p>
</div>
<? endif; ?>
diff --git a/themes/jquerymobile/templates/error/unavailable.phtml b/themes/jquerymobile/templates/error/unavailable.phtml
new file mode 100644
index 00000000000..ccae83f0bb2
--- /dev/null
+++ b/themes/jquerymobile/templates/error/unavailable.phtml
@@ -0,0 +1,21 @@
+<?
+ // Set page title.
+ $this->headTitle($this->translate('System Unavailable'));
+?>
+<div data-role="page" id="Search-home">
+ <?=$this->mobileMenu()->header(array('searchLink' => false))?>
+ <div data-role="content">
+ <div class="error unavailable">
+ <p>
+ <?=$this->transEsc('The system is currently unavailable due to system maintenance')?>.
+ <?=$this->transEsc('Please check back soon')?>.
+ </p>
+ <p>
+ <?=$this->transEsc('Please contact the Library Reference Department for assistance')?>
+ <br/>
+ <? $supportEmail = $this->escape($this->systemEmail()); ?>
+ <a href="mailto:<?=$supportEmail?>"><?=$supportEmail?></a>
+ </p>
+ </div>
+ </div>
+</div>
\ No newline at end of file
diff --git a/themes/jquerymobile/templates/myresearch/cataloglogin.phtml b/themes/jquerymobile/templates/myresearch/cataloglogin.phtml
index de391b93d71..4b2a04f8f3e 100644
--- a/themes/jquerymobile/templates/myresearch/cataloglogin.phtml
+++ b/themes/jquerymobile/templates/myresearch/cataloglogin.phtml
@@ -13,7 +13,7 @@
<h2><?=$this->transEsc('ils_offline_title')?></h2>
<p><strong><?=$this->transEsc('ils_offline_status')?></strong></p>
<p><?=$this->transEsc('ils_offline_login_message')?></p>
- <? $supportEmail = $this->escape(VF_Config_Reader::getConfig()->Site->email); ?>
+ <? $supportEmail = $this->escape($this->systemEmail()); ?>
<p><a href="mailto:<?=$supportEmail?>"><?=$supportEmail?></a></p>
</div>
<? else: ?>
diff --git a/themes/jquerymobile/templates/myresearch/login.phtml b/themes/jquerymobile/templates/myresearch/login.phtml
index 2be28f8952e..72ca8b48f09 100644
--- a/themes/jquerymobile/templates/myresearch/login.phtml
+++ b/themes/jquerymobile/templates/myresearch/login.phtml
@@ -15,7 +15,7 @@
<h2><?=$this->transEsc('ils_offline_title')?></h2>
<p><strong><?=$this->transEsc('ils_offline_status')?></strong></p>
<p><?=$this->transEsc('ils_offline_login_message')?></p>
- <? $supportEmail = $this->escape(VF_Config_Reader::getConfig()->Site->email); ?>
+ <? $supportEmail = $this->escape($this->systemEmail()); ?>
<p><a href="mailto:<?=$supportEmail?>"><?=$supportEmail?></a></p>
</div>
<? elseif ($hideLogin): ?>
diff --git a/themes/jquerymobile/templates/search/advanced.phtml b/themes/jquerymobile/templates/search/advanced.phtml
index 12064905068..00e29fbec28 100644
--- a/themes/jquerymobile/templates/search/advanced.phtml
+++ b/themes/jquerymobile/templates/search/advanced.phtml
@@ -22,7 +22,7 @@
<h2><?=$this->transEsc('ils_offline_title')?></h2>
<p><strong><?=$this->transEsc('ils_offline_status')?></strong></p>
<p><?=$this->transEsc('ils_offline_home_message')?></p>
- <? $supportEmail = $this->escape(VF_Config_Reader::getConfig()->Site->email); ?>
+ <? $supportEmail = $this->escape($this->systemEmail()); ?>
<p><a href="mailto:<?=$supportEmail?>"><?=$supportEmail?></a></p>
</div>
<? endif; ?>
diff --git a/themes/jquerymobile/templates/search/home.phtml b/themes/jquerymobile/templates/search/home.phtml
index d09ddac60aa..b8b537a1231 100644
--- a/themes/jquerymobile/templates/search/home.phtml
+++ b/themes/jquerymobile/templates/search/home.phtml
@@ -10,7 +10,7 @@
<h2><?=$this->transEsc('ils_offline_title')?></h2>
<p><strong><?=$this->transEsc('ils_offline_status')?></strong></p>
<p><?=$this->transEsc('ils_offline_home_message')?></p>
- <? $supportEmail = $this->escape(VF_Config_Reader::getConfig()->Site->email); ?>
+ <? $supportEmail = $this->escape($this->systemEmail()); ?>
<p><a href="mailto:<?=$supportEmail?>"><?=$supportEmail?></a></p>
</div>
<? endif; ?>
diff --git a/themes/root/theme.ini b/themes/root/theme.ini
index ce161257c14..0670dd593b3 100644
--- a/themes/root/theme.ini
+++ b/themes/root/theme.ini
@@ -9,5 +9,6 @@ helpers_to_register[] = "ImageLink"
helpers_to_register[] = "MobileUrl"
helpers_to_register[] = "OfflineMode"
helpers_to_register[] = "SearchOptions"
+helpers_to_register[] = "SystemEmail"
helpers_to_register[] = "TransEsc"
helpers_to_register[] = "Translate"
--
GitLab