From 0bbc39fa8b83a653ffc201cb34cca508721b4889 Mon Sep 17 00:00:00 2001 From: Katherine Perdue Date: Tue, 4 Jun 2024 11:45:14 -0400 Subject: [PATCH 1/8] When catalog offline, hide actions that prompt login --- .../themes/responsive/Assabet/event.tpl | 8 +++- .../themes/responsive/Communico/event.tpl | 6 ++- .../GroupedWork/result-tools-horizontal.tpl | 21 ++++++---- .../themes/responsive/LibraryMarket/event.tpl | 12 ++++-- .../RecordDrivers/Events/assabet_result.tpl | 6 ++- .../RecordDrivers/Events/communico_result.tpl | 6 ++- .../Events/library_calendar_result.tpl | 6 ++- .../RecordDrivers/Events/listEntry.tpl | 6 ++- .../Events/springshare_libcal_result.tpl | 6 ++- .../themes/responsive/Search/list-none.tpl | 2 +- .../themes/responsive/Search/list.tpl | 6 ++- .../themes/responsive/Springshare/event.tpl | 6 ++- .../interface/themes/responsive/js/aspen.js | 38 ++++++++----------- .../themes/responsive/js/aspen/account.js | 38 ++++++++----------- 14 files changed, 92 insertions(+), 75 deletions(-) diff --git a/code/web/interface/themes/responsive/Assabet/event.tpl b/code/web/interface/themes/responsive/Assabet/event.tpl index d958bc8e10..8651fa8b84 100644 --- a/code/web/interface/themes/responsive/Assabet/event.tpl +++ b/code/web/interface/themes/responsive/Assabet/event.tpl @@ -101,9 +101,13 @@ {else} {translate text="Registration Information" isPublicFacing=true} {/if} - {translate text="Add to Your Events" isPublicFacing=true} + {if empty($offline)} + {translate text="Add to Your Events" isPublicFacing=true} + {/if} - {else} + {elseif empty($offline)} {translate text="Add to Your Events" isPublicFacing=true} {/if} {/if} diff --git a/code/web/interface/themes/responsive/Communico/event.tpl b/code/web/interface/themes/responsive/Communico/event.tpl index f523337ba5..4b485b86da 100644 --- a/code/web/interface/themes/responsive/Communico/event.tpl +++ b/code/web/interface/themes/responsive/Communico/event.tpl @@ -101,9 +101,11 @@ {else} {translate text="Registration Information" isPublicFacing=true} {/if} - {translate text="Add to Your Events" isPublicFacing=true} + {if empty($offline)} + {translate text="Add to Your Events" isPublicFacing=true} + {/if} - {else} + {else empty($offline)} {translate text="Add to Your Events" isPublicFacing=true} {/if} {/if} diff --git a/code/web/interface/themes/responsive/GroupedWork/result-tools-horizontal.tpl b/code/web/interface/themes/responsive/GroupedWork/result-tools-horizontal.tpl index 296e730dc6..435edf260e 100644 --- a/code/web/interface/themes/responsive/GroupedWork/result-tools-horizontal.tpl +++ b/code/web/interface/themes/responsive/GroupedWork/result-tools-horizontal.tpl @@ -17,14 +17,16 @@ {if $showMoreInfo !== false} getPermanentId() isPublicFacing=true inAttribute=true}">{translate text="More Info" isPublicFacing=true} {/if} - {if $showComments == 1} - {* Hide Review Button for xs views in Search Results & User Lists *} - - {/if} - {if $showFavorites == 1} - + {if empty($offline)} + {if $showComments == 1} + {* Hide Review Button for xs views in Search Results & User Lists *} + + {/if} + {if $showFavorites == 1} + + {/if} {/if} {if !empty($loggedIn) && $module == 'Search' && in_array('Manually Group and Ungroup Works', $userPermissions)} @@ -34,6 +36,9 @@
{include file="GroupedWork/share-tools.tpl"}
+ {if !empty($offline) && $showMoreInfo == false && ($showComments || $showFavorites)} +
{translate text="Actions that require a login are currently unavailable" isPublicFacing=true}
+ {/if} {/if} {/strip} \ No newline at end of file diff --git a/code/web/interface/themes/responsive/LibraryMarket/event.tpl b/code/web/interface/themes/responsive/LibraryMarket/event.tpl index dd23e2bfda..f8387c9275 100644 --- a/code/web/interface/themes/responsive/LibraryMarket/event.tpl +++ b/code/web/interface/themes/responsive/LibraryMarket/event.tpl @@ -66,10 +66,12 @@ {else} {translate text="Registration Information" isPublicFacing=true} {/if} - {translate text="Go To Your Events" isPublicFacing=true} + {if empty($offline)} + {translate text="Go To Your Events" isPublicFacing=true} + {/if}
- {else} + {elseif empty($offline)} {translate text="In Your Events" isPublicFacing=true} {/if} {else} @@ -81,9 +83,11 @@ {else} {translate text="Registration Information" isPublicFacing=true} {/if} - {translate text="Add to Your Events" isPublicFacing=true} + {if empty($offline)} + {translate text="Add to Your Events" isPublicFacing=true} + {/if} - {else} + {elseif empty($offline)} {translate text="Add to Your Events" isPublicFacing=true} {/if} {/if} diff --git a/code/web/interface/themes/responsive/RecordDrivers/Events/assabet_result.tpl b/code/web/interface/themes/responsive/RecordDrivers/Events/assabet_result.tpl index 37861b773f..4330172ed3 100644 --- a/code/web/interface/themes/responsive/RecordDrivers/Events/assabet_result.tpl +++ b/code/web/interface/themes/responsive/RecordDrivers/Events/assabet_result.tpl @@ -85,11 +85,13 @@ {else} {translate text="Registration Information" isPublicFacing=true} {/if} - {translate text="Add to Your Events" isPublicFacing=true} + {if empty($offline)} + {translate text="Add to Your Events" isPublicFacing=true} + {/if}
- {else} + {elseif empty($offline)}
{translate text="Add to Your Events" isPublicFacing=true}
diff --git a/code/web/interface/themes/responsive/RecordDrivers/Events/communico_result.tpl b/code/web/interface/themes/responsive/RecordDrivers/Events/communico_result.tpl index 6ee31ca1d8..e869166e8b 100644 --- a/code/web/interface/themes/responsive/RecordDrivers/Events/communico_result.tpl +++ b/code/web/interface/themes/responsive/RecordDrivers/Events/communico_result.tpl @@ -85,11 +85,13 @@ {else} {translate text="Registration Information" isPublicFacing=true} {/if} - {translate text="Add to Your Events" isPublicFacing=true} + {if empty($offline)} + {translate text="Add to Your Events" isPublicFacing=true} + {/if}
- {else} + {elseif empty($offline)}
{translate text="Add to Your Events" isPublicFacing=true}
diff --git a/code/web/interface/themes/responsive/RecordDrivers/Events/library_calendar_result.tpl b/code/web/interface/themes/responsive/RecordDrivers/Events/library_calendar_result.tpl index 6a24a2292f..88e9718941 100644 --- a/code/web/interface/themes/responsive/RecordDrivers/Events/library_calendar_result.tpl +++ b/code/web/interface/themes/responsive/RecordDrivers/Events/library_calendar_result.tpl @@ -76,11 +76,13 @@ {else} {translate text="Registration Information" isPublicFacing=true} {/if} - {translate text="Add to Your Events" isPublicFacing=true} + {if empty($offline)} + {translate text="Add to Your Events" isPublicFacing=true} + {/if}
- {else} + {elseif empty($offline)}
{translate text="Add to Your Events" isPublicFacing=true}
diff --git a/code/web/interface/themes/responsive/RecordDrivers/Events/listEntry.tpl b/code/web/interface/themes/responsive/RecordDrivers/Events/listEntry.tpl index 1b9373a25b..4d03ad8a67 100644 --- a/code/web/interface/themes/responsive/RecordDrivers/Events/listEntry.tpl +++ b/code/web/interface/themes/responsive/RecordDrivers/Events/listEntry.tpl @@ -60,13 +60,15 @@ {if $recordDriver->isRegistrationRequired()}
{translate text="Registration Information" isPublicFacing=true} - {translate text="Add to Your Events" isPublicFacing=true} + {if empty($offline)} + {translate text="Add to Your Events" isPublicFacing=true} + {/if}
{* {translate text="Add to Your Events and Register" isPublicFacing=true} *} - {else} + {elseif empty($offline)} {translate text="Add to Your Events" isPublicFacing=true} {/if} {/if} diff --git a/code/web/interface/themes/responsive/RecordDrivers/Events/springshare_libcal_result.tpl b/code/web/interface/themes/responsive/RecordDrivers/Events/springshare_libcal_result.tpl index 06b26910e7..18b51fcfa4 100644 --- a/code/web/interface/themes/responsive/RecordDrivers/Events/springshare_libcal_result.tpl +++ b/code/web/interface/themes/responsive/RecordDrivers/Events/springshare_libcal_result.tpl @@ -95,11 +95,13 @@ {else} {translate text="Registration Information" isPublicFacing=true} {/if} - {translate text="Add to Your Events" isPublicFacing=true} + {if empty($offline)} + {translate text="Add to Your Events" isPublicFacing=true} + {/if}
- {else} + {elseif empty($offline)}
{translate text="Add to Your Events" isPublicFacing=true} diff --git a/code/web/interface/themes/responsive/Search/list-none.tpl b/code/web/interface/themes/responsive/Search/list-none.tpl index c30713abb2..c1dd55f9cd 100644 --- a/code/web/interface/themes/responsive/Search/list-none.tpl +++ b/code/web/interface/themes/responsive/Search/list-none.tpl @@ -110,7 +110,7 @@
{/if} - {if $displayMaterialsRequest} + {if $displayMaterialsRequest && empty($offline)} {if $materialRequestType == 1}

{translate text="Didn't find it?" isPublicFacing=true}

diff --git a/code/web/interface/themes/responsive/Search/list.tpl b/code/web/interface/themes/responsive/Search/list.tpl index 8735e5b513..52538a7e72 100644 --- a/code/web/interface/themes/responsive/Search/list.tpl +++ b/code/web/interface/themes/responsive/Search/list.tpl @@ -61,7 +61,9 @@
{* End Listing Options *} - + {if !empty($offline) && ($showComments || $showFavorites)} +
{translate text="Actions that require a login are currently unavailable" isPublicFacing=true}
+ {/if} {if !empty($placard)} {include file="Search/placard.tpl"} {/if} @@ -101,7 +103,7 @@
{/if} - {if $displayMaterialsRequest} + {if $displayMaterialsRequest && empty($offline)} {if $materialRequestType == 1}

{translate text="Didn't find it?" isPublicFacing=true}

diff --git a/code/web/interface/themes/responsive/Springshare/event.tpl b/code/web/interface/themes/responsive/Springshare/event.tpl index 1b6281e5cf..5dfbdee3f5 100644 --- a/code/web/interface/themes/responsive/Springshare/event.tpl +++ b/code/web/interface/themes/responsive/Springshare/event.tpl @@ -104,9 +104,11 @@ {else} {translate text="Registration Information" isPublicFacing=true} {/if} - {translate text="Add to Your Events" isPublicFacing=true} + {if empty($offline)} + {translate text="Add to Your Events" isPublicFacing=true} + {/if}
- {else} + {elseif empty($offline)} {translate text="Add to Your Events" isPublicFacing=true} {/if} {/if} diff --git a/code/web/interface/themes/responsive/js/aspen.js b/code/web/interface/themes/responsive/js/aspen.js index 33fca6390c..f6f1db7081 100644 --- a/code/web/interface/themes/responsive/js/aspen.js +++ b/code/web/interface/themes/responsive/js/aspen.js @@ -7538,28 +7538,22 @@ AspenDiscovery.Account = (function () { }, regInfoModal: function (trigger, source, id, vendor, regLink) { - if (Globals.loggedIn) { - var url = Globals.path + "/MyAccount/AJAX"; - var params = { - 'method': 'eventRegistrationModal', - sourceId: id, - source: source, - regLink: regLink, - vendor: vendor - }; - // noinspection JSUnresolvedFunction - $.getJSON(url, params, function (data) { - if (data.success) { - AspenDiscovery.showMessageWithButtons(data.title, data.body, data.buttons, false); - } else { - AspenDiscovery.showMessage("Error", data.message); - } - }).fail(AspenDiscovery.ajaxFail); - }else { - AspenDiscovery.Account.ajaxLogin(null, function () { - return AspenDiscovery.Account.regInfoModal(trigger, source, id, vendor, regLink); - }, false); - } + var url = Globals.path + "/MyAccount/AJAX"; + var params = { + 'method': 'eventRegistrationModal', + sourceId: id, + source: source, + regLink: regLink, + vendor: vendor + }; + // noinspection JSUnresolvedFunction + $.getJSON(url, params, function (data) { + if (data.success) { + AspenDiscovery.showMessageWithButtons(data.title, data.body, data.buttons, false); + } else { + AspenDiscovery.showMessage("Error", data.message); + } + }).fail(AspenDiscovery.ajaxFail); return false; }, diff --git a/code/web/interface/themes/responsive/js/aspen/account.js b/code/web/interface/themes/responsive/js/aspen/account.js index c51d76cec4..f4afe08f44 100644 --- a/code/web/interface/themes/responsive/js/aspen/account.js +++ b/code/web/interface/themes/responsive/js/aspen/account.js @@ -2041,28 +2041,22 @@ AspenDiscovery.Account = (function () { }, regInfoModal: function (trigger, source, id, vendor, regLink) { - if (Globals.loggedIn) { - var url = Globals.path + "/MyAccount/AJAX"; - var params = { - 'method': 'eventRegistrationModal', - sourceId: id, - source: source, - regLink: regLink, - vendor: vendor - }; - // noinspection JSUnresolvedFunction - $.getJSON(url, params, function (data) { - if (data.success) { - AspenDiscovery.showMessageWithButtons(data.title, data.body, data.buttons, false); - } else { - AspenDiscovery.showMessage("Error", data.message); - } - }).fail(AspenDiscovery.ajaxFail); - }else { - AspenDiscovery.Account.ajaxLogin(null, function () { - return AspenDiscovery.Account.regInfoModal(trigger, source, id, vendor, regLink); - }, false); - } + var url = Globals.path + "/MyAccount/AJAX"; + var params = { + 'method': 'eventRegistrationModal', + sourceId: id, + source: source, + regLink: regLink, + vendor: vendor + }; + // noinspection JSUnresolvedFunction + $.getJSON(url, params, function (data) { + if (data.success) { + AspenDiscovery.showMessageWithButtons(data.title, data.body, data.buttons, false); + } else { + AspenDiscovery.showMessage("Error", data.message); + } + }).fail(AspenDiscovery.ajaxFail); return false; }, From 1653565cc717e45f6fadaaf882b510d88c719cd2 Mon Sep 17 00:00:00 2001 From: Katherine Perdue Date: Wed, 5 Jun 2024 12:51:57 -0400 Subject: [PATCH 2/8] Conditionally show e-resource checkout/hold buttons when catalog offline --- .../web/RecordDrivers/Axis360RecordDriver.php | 5 +++- .../CloudLibraryRecordDriver.php | 5 +++- .../RecordDrivers/EbscohostRecordDriver.php | 23 +++++++++++-------- code/web/RecordDrivers/HooplaRecordDriver.php | 5 +++- .../RecordDrivers/OverDriveRecordDriver.php | 8 +++++-- .../PalaceProjectRecordDriver.php | 6 +++-- 6 files changed, 36 insertions(+), 16 deletions(-) diff --git a/code/web/RecordDrivers/Axis360RecordDriver.php b/code/web/RecordDrivers/Axis360RecordDriver.php index 84670083c2..7aed9a5e6e 100644 --- a/code/web/RecordDrivers/Axis360RecordDriver.php +++ b/code/web/RecordDrivers/Axis360RecordDriver.php @@ -201,7 +201,10 @@ public function getRecordActions($relatedRecord, $variationId, $isAvailable, $is $loadDefaultActions = count($this->_actions) == 0; } - if ($loadDefaultActions) { + //Check if catalog is offline and login for eResources should be allowed for offline + global $offlineMode; + global $loginAllowedWhileOffline; + if ($loadDefaultActions && (!$offlineMode || $loginAllowedWhileOffline)) { if ($isAvailable) { $this->_actions[] = [ 'title' => translate([ diff --git a/code/web/RecordDrivers/CloudLibraryRecordDriver.php b/code/web/RecordDrivers/CloudLibraryRecordDriver.php index abc96ca43d..7bd9be68ce 100644 --- a/code/web/RecordDrivers/CloudLibraryRecordDriver.php +++ b/code/web/RecordDrivers/CloudLibraryRecordDriver.php @@ -182,7 +182,10 @@ public function getRecordActions($relatedRecord, $variationId, $isAvailable, $is $loadDefaultActions = count($this->_actions) == 0; } - if ($loadDefaultActions) { + //Check if catalog is offline and login for eResources should be allowed for offline + global $offlineMode; + global $loginAllowedWhileOffline; + if ($loadDefaultActions && (!$offlineMode || $loginAllowedWhileOffline)) { if ($isAvailable) { $userId = UserAccount::getActiveUserId(); if ($userId == false) { diff --git a/code/web/RecordDrivers/EbscohostRecordDriver.php b/code/web/RecordDrivers/EbscohostRecordDriver.php index 91876e07b6..261e92c4b0 100644 --- a/code/web/RecordDrivers/EbscohostRecordDriver.php +++ b/code/web/RecordDrivers/EbscohostRecordDriver.php @@ -596,15 +596,20 @@ private function getPublicationDates() { public function getRecordActions() { if ($this->_actions === null) { $this->_actions = []; - $this->_actions[] = [ - 'title' => translate([ - 'text' => 'Access Online', - 'isPublicFacing' => true, - ]), - 'url' => '/EBSCOhost/AccessOnline?id=' . $this->getUniqueID(), - 'requireLogin' => true, - 'type' => 'ebscohost_access_online', - ]; + //Check if catalog is offline and login for eResources should be allowed for offline + global $offlineMode; + global $loginAllowedWhileOffline; + if (!$offlineMode || $loginAllowedWhileOffline) { + $this->_actions[] = [ + 'title' => translate([ + 'text' => 'Access Online', + 'isPublicFacing' => true, + ]), + 'url' => '/EBSCOhost/AccessOnline?id=' . $this->getUniqueID(), + 'requireLogin' => true, + 'type' => 'ebscohost_access_online', + ]; + } } return $this->_actions; } diff --git a/code/web/RecordDrivers/HooplaRecordDriver.php b/code/web/RecordDrivers/HooplaRecordDriver.php index 7c4ad5131e..e34d178b92 100644 --- a/code/web/RecordDrivers/HooplaRecordDriver.php +++ b/code/web/RecordDrivers/HooplaRecordDriver.php @@ -238,7 +238,10 @@ function getRecordActions($relatedRecord, $variationId, $recordAvailable, $recor $loadDefaultActions = count($this->_actions) == 0; } - if ($loadDefaultActions) { + //Check if catalog is offline and login for eResources should be allowed for offline + global $offlineMode; + global $loginAllowedWhileOffline; + if ($loadDefaultActions && (!$offlineMode || $loginAllowedWhileOffline)) { /** @var Library $searchLibrary */ $searchLibrary = Library::getSearchLibrary(); if ($searchLibrary->hooplaLibraryID > 0) { // Library is enabled for Hoopla patron action integration diff --git a/code/web/RecordDrivers/OverDriveRecordDriver.php b/code/web/RecordDrivers/OverDriveRecordDriver.php index 431db42c76..2ce819f9f4 100644 --- a/code/web/RecordDrivers/OverDriveRecordDriver.php +++ b/code/web/RecordDrivers/OverDriveRecordDriver.php @@ -844,7 +844,11 @@ public function getRecordActions($relatedRecord, $variationId, $isAvailable, $is require_once ROOT_DIR . '/Drivers/OverDriveDriver.php'; $overDriveDriver = OverDriveDriver::getOverDriveDriver(); $readerName = $overDriveDriver->getReaderName(); - if (!$overDriveDriver->isCirculationEnabled()) { + //Check if catalog is offline and login for eResources should be allowed for offline + global $offlineMode; + global $loginAllowedWhileOffline; + //Show link to OverDrive record when the catalog is offline and can't do logins + if (!$overDriveDriver->isCirculationEnabled() || ($offlineMode && !$loginAllowedWhileOffline)) { $overDriveMetadata = $this->getOverDriveMetaData(); $crossRefId = $overDriveMetadata->getDecodedRawData()->crossRefId; $productUrl = $overDriveDriver->getProductUrl($crossRefId); @@ -869,7 +873,7 @@ public function getRecordActions($relatedRecord, $variationId, $isAvailable, $is $loadDefaultActions = count($this->_actions) == 0; } - if ($loadDefaultActions) { + if ($loadDefaultActions && (!$offlineMode || $loginAllowedWhileOffline)) { if ($isAvailable) { $this->_actions[] = [ 'title' => translate([ diff --git a/code/web/RecordDrivers/PalaceProjectRecordDriver.php b/code/web/RecordDrivers/PalaceProjectRecordDriver.php index 238e5e6dc5..4e4e1e51e0 100644 --- a/code/web/RecordDrivers/PalaceProjectRecordDriver.php +++ b/code/web/RecordDrivers/PalaceProjectRecordDriver.php @@ -209,8 +209,10 @@ public function getRecordActions($relatedRecord, $variationId, $isAvailable, $is $this->_actions = array_merge($this->_actions, $user->getCirculatedRecordActions('palace_project', $this->id)); $loadDefaultActions = count($this->_actions) == 0; } - - if ($loadDefaultActions) { + //Check if catalog is offline and login for eResources should be allowed for offline + global $offlineMode; + global $loginAllowedWhileOffline; + if ($loadDefaultActions && (!$offlineMode || $loginAllowedWhileOffline)) { if (!empty($this->palaceProjectRawMetadata)) { foreach ($this->palaceProjectRawMetadata->links as $link) { if ($link->rel == 'http://opds-spec.org/acquisition/borrow') { From 3cc7095db694748cc9e9377c73b43c7efc4ee0f4 Mon Sep 17 00:00:00 2001 From: Katherine Perdue Date: Thu, 6 Jun 2024 13:25:21 -0400 Subject: [PATCH 3/8] Don't show email/save search/save list buttons when catalog is offline --- .../RecordDrivers/EbscohostRecordDriver.php | 25 ++++++++----------- .../responsive/CourseReserves/list-none.tpl | 14 ++++++----- .../themes/responsive/CourseReserves/list.tpl | 14 ++++++----- .../themes/responsive/EBSCO/list.tpl | 14 ++++++----- .../EBSCO/result-tools-horizontal.tpl | 2 +- .../themes/responsive/EBSCOhost/list.tpl | 14 ++++++----- .../EBSCOhost/result-tools-horizontal.tpl | 2 +- .../themes/responsive/Events/list-none.tpl | 14 ++++++----- .../themes/responsive/Events/list.tpl | 14 ++++++----- .../themes/responsive/Genealogy/list.tpl | 14 ++++++----- .../Genealogy/result-tools-horizontal.tpl | 2 +- .../GroupedWork/result-tools-horizontal.tpl | 3 --- .../responsive/GroupedWork/result-tools.tpl | 2 +- .../themes/responsive/Lists/list-none.tpl | 14 ++++++----- .../themes/responsive/Lists/list.tpl | 14 ++++++----- .../responsive/OpenArchives/list-none.tpl | 14 ++++++----- .../themes/responsive/OpenArchives/list.tpl | 14 ++++++----- .../OpenArchives/result-tools-horizontal.tpl | 2 +- .../GroupedWork/browse_result.tpl | 2 +- .../themes/responsive/Search/list-none.tpl | 14 ++++++----- .../themes/responsive/Search/list.tpl | 17 ++++++------- .../Search/search-toolbar-no-display-mode.tpl | 2 +- .../Search/search-toolbar-popup.tpl | 18 +++++++------ .../responsive/Search/search-toolbar.tpl | 2 +- .../themes/responsive/Summon/list.tpl | 2 +- .../Summon/result-tools-horizontal.tpl | 2 +- .../themes/responsive/Websites/list-none.tpl | 14 ++++++----- code/web/services/GroupedWork/AJAX.php | 3 ++- 28 files changed, 144 insertions(+), 124 deletions(-) diff --git a/code/web/RecordDrivers/EbscohostRecordDriver.php b/code/web/RecordDrivers/EbscohostRecordDriver.php index 261e92c4b0..3c0a00b7c5 100644 --- a/code/web/RecordDrivers/EbscohostRecordDriver.php +++ b/code/web/RecordDrivers/EbscohostRecordDriver.php @@ -596,21 +596,16 @@ private function getPublicationDates() { public function getRecordActions() { if ($this->_actions === null) { $this->_actions = []; - //Check if catalog is offline and login for eResources should be allowed for offline - global $offlineMode; - global $loginAllowedWhileOffline; - if (!$offlineMode || $loginAllowedWhileOffline) { - $this->_actions[] = [ - 'title' => translate([ - 'text' => 'Access Online', - 'isPublicFacing' => true, - ]), - 'url' => '/EBSCOhost/AccessOnline?id=' . $this->getUniqueID(), - 'requireLogin' => true, - 'type' => 'ebscohost_access_online', - ]; - } - } + $this->_actions[] = [ + 'title' => translate([ + 'text' => 'Access Online', + 'isPublicFacing' => true, + ]), + 'url' => '/EBSCOhost/AccessOnline?id=' . $this->getUniqueID(), + 'requireLogin' => true, + 'type' => 'ebscohost_access_online', + ]; + } return $this->_actions; } } \ No newline at end of file diff --git a/code/web/interface/themes/responsive/CourseReserves/list-none.tpl b/code/web/interface/themes/responsive/CourseReserves/list-none.tpl index 506f402b0b..2d68a0d83d 100644 --- a/code/web/interface/themes/responsive/CourseReserves/list-none.tpl +++ b/code/web/interface/themes/responsive/CourseReserves/list-none.tpl @@ -51,12 +51,14 @@ {translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} {translate text='Get RSS Feed' isPublicFacing=true} - {translate text='Email this Search' isPublicFacing=true} - {if !empty($enableSavedSearches)} - {if !empty($savedSearch)} - {translate text="Remove Saved Search" isPublicFacing=true} - {else} - {translate text='Save Search' isPublicFacing=true} + {if empty($offline)} + {translate text='Email this Search' isPublicFacing=true} + {if !empty($enableSavedSearches)} + {if !empty($savedSearch)} + {translate text="Remove Saved Search" isPublicFacing=true} + {else} + {translate text='Save Search' isPublicFacing=true} + {/if} {/if} {/if} {*{translate text='Export To CSV' isPublicFacing=true}*} diff --git a/code/web/interface/themes/responsive/CourseReserves/list.tpl b/code/web/interface/themes/responsive/CourseReserves/list.tpl index 4b66f963e0..108634dee1 100644 --- a/code/web/interface/themes/responsive/CourseReserves/list.tpl +++ b/code/web/interface/themes/responsive/CourseReserves/list.tpl @@ -74,12 +74,14 @@ {translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} {translate text='Get RSS Feed' isPublicFacing=true} - {translate text='Email this Search' isPublicFacing=true} - {if !empty($enableSavedSearches)} - {if !empty($savedSearch)} - {translate text="Remove Saved Search" isPublicFacing=true} - {else} - {translate text='Save Search' isPublicFacing=true} + {if empty($offline)} + {translate text='Email this Search' isPublicFacing=true} + {if !empty($enableSavedSearches)} + {if !empty($savedSearch)} + {translate text="Remove Saved Search" isPublicFacing=true} + {else} + {translate text='Save Search' isPublicFacing=true} + {/if} {/if} {/if} {*{translate text='Export To CSV' isPublicFacing=true}*} diff --git a/code/web/interface/themes/responsive/EBSCO/list.tpl b/code/web/interface/themes/responsive/EBSCO/list.tpl index 7ac62ffd77..a6368c8d3a 100644 --- a/code/web/interface/themes/responsive/EBSCO/list.tpl +++ b/code/web/interface/themes/responsive/EBSCO/list.tpl @@ -30,12 +30,14 @@
{translate text='Search Tools' isPublicFacing=true} {translate text='Get RSS Feed' isPublicFacing=true} - {translate text='Email this Search' isPublicFacing=true} - {if !empty($enableSavedSearches)} - {if !empty($savedSearch)} - {translate text="Remove Saved Search" isPublicFacing=true} - {else} - {translate text='Save Search' isPublicFacing=true} + {if empty($offline)} + {translate text='Email this Search' isPublicFacing=true} + {if !empty($enableSavedSearches)} + {if !empty($savedSearch)} + {translate text="Remove Saved Search" isPublicFacing=true} + {else} + {translate text='Save Search' isPublicFacing=true} + {/if} {/if} {/if} {*{translate text='Export To CSV' isPublicFacing=true}*} diff --git a/code/web/interface/themes/responsive/EBSCO/result-tools-horizontal.tpl b/code/web/interface/themes/responsive/EBSCO/result-tools-horizontal.tpl index be7db97197..e06e1262c4 100644 --- a/code/web/interface/themes/responsive/EBSCO/result-tools-horizontal.tpl +++ b/code/web/interface/themes/responsive/EBSCO/result-tools-horizontal.tpl @@ -8,7 +8,7 @@ {translate text="More Info" isPublicFacing=true}
{/if} - {if $showFavorites == 1} + {if $showFavorites == 1 && empty($offline)}
diff --git a/code/web/interface/themes/responsive/EBSCOhost/list.tpl b/code/web/interface/themes/responsive/EBSCOhost/list.tpl index d0844e1e2b..78bf1df9b4 100644 --- a/code/web/interface/themes/responsive/EBSCOhost/list.tpl +++ b/code/web/interface/themes/responsive/EBSCOhost/list.tpl @@ -30,12 +30,14 @@
{translate text='Search Tools' isPublicFacing=true} {if !empty($rssLink)}{translate text='Get RSS Feed' isPublicFacing=true}{/if} - {translate text='Email this Search' isPublicFacing=true} - {if !empty($enableSavedSearches)} - {if !empty($savedSearch)} - {translate text="Remove Saved Search" isPublicFacing=true} - {else} - {translate text='Save Search' isPublicFacing=true} + {if empty($offline)} + {translate text='Email this Search' isPublicFacing=true} + {if !empty($enableSavedSearches)} + {if !empty($savedSearch)} + {translate text="Remove Saved Search" isPublicFacing=true} + {else} + {translate text='Save Search' isPublicFacing=true} + {/if} {/if} {/if} {*{translate text='Export To CSV' isPublicFacing=true}*} diff --git a/code/web/interface/themes/responsive/EBSCOhost/result-tools-horizontal.tpl b/code/web/interface/themes/responsive/EBSCOhost/result-tools-horizontal.tpl index a896943878..8302602e21 100644 --- a/code/web/interface/themes/responsive/EBSCOhost/result-tools-horizontal.tpl +++ b/code/web/interface/themes/responsive/EBSCOhost/result-tools-horizontal.tpl @@ -8,7 +8,7 @@ {translate text="More Info" isPublicFacing=true}
{/if} - {if $showFavorites == 1} + {if $showFavorites == 1 && empty($offline)}
diff --git a/code/web/interface/themes/responsive/Events/list-none.tpl b/code/web/interface/themes/responsive/Events/list-none.tpl index 89a3266947..0c94b0b479 100644 --- a/code/web/interface/themes/responsive/Events/list-none.tpl +++ b/code/web/interface/themes/responsive/Events/list-none.tpl @@ -62,12 +62,14 @@ {translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} {translate text='Get RSS Feed' isPublicFacing=true} - {translate text='Email this Search' isPublicFacing=true} - {if !empty($enableSavedSearches)} - {if !empty($savedSearch)} - {translate text="Remove Saved Search" isPublicFacing=true} - {else} - {translate text='Save Search' isPublicFacing=true} + {if empty($offline)} + {translate text='Email this Search' isPublicFacing=true} + {if !empty($enableSavedSearches)} + {if !empty($savedSearch)} + {translate text="Remove Saved Search" isPublicFacing=true} + {else} + {translate text='Save Search' isPublicFacing=true} + {/if} {/if} {/if} {*{translate text='Export To CSV' isPublicFacing=true}*} diff --git a/code/web/interface/themes/responsive/Events/list.tpl b/code/web/interface/themes/responsive/Events/list.tpl index 367ed9b3e0..08a0296b15 100644 --- a/code/web/interface/themes/responsive/Events/list.tpl +++ b/code/web/interface/themes/responsive/Events/list.tpl @@ -72,12 +72,14 @@ {translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} {translate text='Get RSS Feed' isPublicFacing=true} - {translate text='Email this Search' isPublicFacing=true} - {if !empty($enableSavedSearches)} - {if !empty($savedSearch)} - {translate text="Remove Saved Search" isPublicFacing=true} - {else} - {translate text='Save Search' isPublicFacing=true} + {if empty($offline)} + {translate text='Email this Search' isPublicFacing=true} + {if !empty($enableSavedSearches)} + {if !empty($savedSearch)} + {translate text="Remove Saved Search" isPublicFacing=true} + {else} + {translate text='Save Search' isPublicFacing=true} + {/if} {/if} {/if} {*{translate text='Export To CSV' isPublicFacing=true}*} diff --git a/code/web/interface/themes/responsive/Genealogy/list.tpl b/code/web/interface/themes/responsive/Genealogy/list.tpl index cc0cc20d21..12ce537d71 100644 --- a/code/web/interface/themes/responsive/Genealogy/list.tpl +++ b/code/web/interface/themes/responsive/Genealogy/list.tpl @@ -52,12 +52,14 @@
{translate text='Search Tools' isPublicFacing=true} {translate text='Get RSS Feed' isPublicFacing=true} - {translate text='Email this Search' isPublicFacing=true} - {if !empty($enableSavedSearches)} - {if !empty($savedSearch)} - {translate text="Remove Saved Search" isPublicFacing=true} - {else} - {translate text='Save Search' isPublicFacing=true} + {if empty($offline)} + {translate text='Email this Search' isPublicFacing=true} + {if !empty($enableSavedSearches)} + {if !empty($savedSearch)} + {translate text="Remove Saved Search" isPublicFacing=true} + {else} + {translate text='Save Search' isPublicFacing=true} + {/if} {/if} {/if} {if !empty($excelLink)}{translate text='Export To CSV' isPublicFacing=true}{/if} diff --git a/code/web/interface/themes/responsive/Genealogy/result-tools-horizontal.tpl b/code/web/interface/themes/responsive/Genealogy/result-tools-horizontal.tpl index 31e0f2537e..f83f4a0622 100644 --- a/code/web/interface/themes/responsive/Genealogy/result-tools-horizontal.tpl +++ b/code/web/interface/themes/responsive/Genealogy/result-tools-horizontal.tpl @@ -8,7 +8,7 @@ {translate text="More Info" isPublicFacing=true}
{/if} - {if $showFavorites == 1} + {if $showFavorites == 1 && empty($offline)}
diff --git a/code/web/interface/themes/responsive/GroupedWork/result-tools-horizontal.tpl b/code/web/interface/themes/responsive/GroupedWork/result-tools-horizontal.tpl index 435edf260e..1c86e973c4 100644 --- a/code/web/interface/themes/responsive/GroupedWork/result-tools-horizontal.tpl +++ b/code/web/interface/themes/responsive/GroupedWork/result-tools-horizontal.tpl @@ -36,9 +36,6 @@
{include file="GroupedWork/share-tools.tpl"}
- {if !empty($offline) && $showMoreInfo == false && ($showComments || $showFavorites)} -
{translate text="Actions that require a login are currently unavailable" isPublicFacing=true}
- {/if}
{/if} {/strip} \ No newline at end of file diff --git a/code/web/interface/themes/responsive/GroupedWork/result-tools.tpl b/code/web/interface/themes/responsive/GroupedWork/result-tools.tpl index a6ef4fae34..7fec02af01 100644 --- a/code/web/interface/themes/responsive/GroupedWork/result-tools.tpl +++ b/code/web/interface/themes/responsive/GroupedWork/result-tools.tpl @@ -1,5 +1,5 @@ {strip} - {if $showFavorites == 1} + {if $showFavorites == 1 && empty($offline)}
{translate text="Add to List" isPublicFacing=true} diff --git a/code/web/interface/themes/responsive/Lists/list-none.tpl b/code/web/interface/themes/responsive/Lists/list-none.tpl index 7aa4709451..1fa74afe66 100644 --- a/code/web/interface/themes/responsive/Lists/list-none.tpl +++ b/code/web/interface/themes/responsive/Lists/list-none.tpl @@ -51,12 +51,14 @@ {translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} {translate text='Get RSS Feed' isPublicFacing=true} - {translate text='Email this Search' isPublicFacing=true} - {if !empty($enableSavedSearches)} - {if !empty($savedSearch)} - {translate text="Remove Saved Search" isPublicFacing=true} - {else} - {translate text='Save Search' isPublicFacing=true} + {if empty($offline)} + {translate text='Email this Search' isPublicFacing=true} + {if !empty($enableSavedSearches)} + {if !empty($savedSearch)} + {translate text="Remove Saved Search" isPublicFacing=true} + {else} + {translate text='Save Search' isPublicFacing=true} + {/if} {/if} {/if} {if !empty($excelLink)}{translate text='Export To CSV' isPublicFacing=true}{/if} diff --git a/code/web/interface/themes/responsive/Lists/list.tpl b/code/web/interface/themes/responsive/Lists/list.tpl index a9ccc4fcf2..754289b342 100644 --- a/code/web/interface/themes/responsive/Lists/list.tpl +++ b/code/web/interface/themes/responsive/Lists/list.tpl @@ -74,12 +74,14 @@ {translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} {translate text='Get RSS Feed' isPublicFacing=true} - {translate text='Email this Search' isPublicFacing=true} - {if !empty($enableSavedSearches)} - {if !empty($savedSearch)} - {translate text="Remove Saved Search" isPublicFacing=true} - {else} - {translate text='Save Search' isPublicFacing=true} + {if empty($offline)} + {translate text='Email this Search' isPublicFacing=true} + {if !empty($enableSavedSearches)} + {if !empty($savedSearch)} + {translate text="Remove Saved Search" isPublicFacing=true} + {else} + {translate text='Save Search' isPublicFacing=true} + {/if} {/if} {/if} {if !empty($excelLink)}{translate text='Export To CSV' isPublicFacing=true}{/if} diff --git a/code/web/interface/themes/responsive/OpenArchives/list-none.tpl b/code/web/interface/themes/responsive/OpenArchives/list-none.tpl index 01d726fa6c..8ac46fad99 100644 --- a/code/web/interface/themes/responsive/OpenArchives/list-none.tpl +++ b/code/web/interface/themes/responsive/OpenArchives/list-none.tpl @@ -62,12 +62,14 @@ {translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} {translate text='Get RSS Feed' isPublicFacing=true} - {translate text='Email this Search' isPublicFacing=true} - {if !empty($enableSavedSearches)} - {if !empty($savedSearch)} - {translate text="Remove Saved Search" isPublicFacing=true} - {else} - {translate text='Save Search' isPublicFacing=true} + {if empty($offline)} + {translate text='Email this Search' isPublicFacing=true} + {if !empty($enableSavedSearches)} + {if !empty($savedSearch)} + {translate text="Remove Saved Search" isPublicFacing=true} + {else} + {translate text='Save Search' isPublicFacing=true} + {/if} {/if} {/if} {*{translate text='Export To CSV' isPublicFacing=true}*} diff --git a/code/web/interface/themes/responsive/OpenArchives/list.tpl b/code/web/interface/themes/responsive/OpenArchives/list.tpl index 1efb696418..2a35081f53 100644 --- a/code/web/interface/themes/responsive/OpenArchives/list.tpl +++ b/code/web/interface/themes/responsive/OpenArchives/list.tpl @@ -77,12 +77,14 @@ {translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} {translate text='Get RSS Feed' isPublicFacing=true} - {translate text='Email this Search' isPublicFacing=true} - {if !empty($enableSavedSearches)} - {if !empty($savedSearch)} - {translate text="Remove Saved Search" isPublicFacing=true} - {else} - {translate text='Save Search' isPublicFacing=true} + {if empty($offline)} + {translate text='Email this Search' isPublicFacing=true} + {if !empty($enableSavedSearches)} + {if !empty($savedSearch)} + {translate text="Remove Saved Search" isPublicFacing=true} + {else} + {translate text='Save Search' isPublicFacing=true} + {/if} {/if} {/if} {*{translate text='Export To CSV' isPublicFacing=true}*} diff --git a/code/web/interface/themes/responsive/OpenArchives/result-tools-horizontal.tpl b/code/web/interface/themes/responsive/OpenArchives/result-tools-horizontal.tpl index 2ba9426861..b3859b9882 100644 --- a/code/web/interface/themes/responsive/OpenArchives/result-tools-horizontal.tpl +++ b/code/web/interface/themes/responsive/OpenArchives/result-tools-horizontal.tpl @@ -8,7 +8,7 @@ {translate text="More Info" isPublicFacing=true}
{/if} - {if $showFavorites == 1} + {if $showFavorites == 1 && empty($offline)}
diff --git a/code/web/interface/themes/responsive/RecordDrivers/GroupedWork/browse_result.tpl b/code/web/interface/themes/responsive/RecordDrivers/GroupedWork/browse_result.tpl index a51b0ed301..1cf63ec3f7 100644 --- a/code/web/interface/themes/responsive/RecordDrivers/GroupedWork/browse_result.tpl +++ b/code/web/interface/themes/responsive/RecordDrivers/GroupedWork/browse_result.tpl @@ -30,7 +30,7 @@ {if !empty($showRatings) && $browseCategoryRatingsMode != 0}
{translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} {translate text='Get RSS Feed' isPublicFacing=true} - {translate text='Email this Search' isPublicFacing=true} - {if !empty($enableSavedSearches)} - {if !empty($savedSearch)} - {translate text="Remove Saved Search" isPublicFacing=true} - {else} - {translate text='Save Search' isPublicFacing=true} + {if empty($offline)} + {translate text='Email this Search' isPublicFacing=true} + {if !empty($enableSavedSearches)} + {if !empty($savedSearch)} + {translate text="Remove Saved Search" isPublicFacing=true} + {else} + {translate text='Save Search' isPublicFacing=true} + {/if} {/if} {/if} {if !empty($excelLink)}{translate text='Export To CSV' isPublicFacing=true}{/if} diff --git a/code/web/interface/themes/responsive/Search/list.tpl b/code/web/interface/themes/responsive/Search/list.tpl index 52538a7e72..b5bf1c05ee 100644 --- a/code/web/interface/themes/responsive/Search/list.tpl +++ b/code/web/interface/themes/responsive/Search/list.tpl @@ -61,9 +61,6 @@
{* End Listing Options *} - {if !empty($offline) && ($showComments || $showFavorites)} -
{translate text="Actions that require a login are currently unavailable" isPublicFacing=true}
- {/if} {if !empty($placard)} {include file="Search/placard.tpl"} {/if} @@ -133,12 +130,14 @@ {translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} {translate text='Get RSS Feed' isPublicFacing=true} - {translate text='Email this Search' isPublicFacing=true} - {if !empty($enableSavedSearches)} - {if !empty($savedSearch)} - {translate text="Remove Saved Search" isPublicFacing=true} - {else} - {translate text='Save Search' isPublicFacing=true} + {if empty($offline)} + {translate text='Email this Search' isPublicFacing=true} + {if !empty($enableSavedSearches)} + {if !empty($savedSearch)} + {translate text="Remove Saved Search" isPublicFacing=true} + {else} + {translate text='Save Search' isPublicFacing=true} + {/if} {/if} {/if} {if !empty($excelLink)}{translate text='Export To CSV' isPublicFacing=true}{/if} diff --git a/code/web/interface/themes/responsive/Search/search-toolbar-no-display-mode.tpl b/code/web/interface/themes/responsive/Search/search-toolbar-no-display-mode.tpl index f9dedf2bf4..e6cde2acea 100644 --- a/code/web/interface/themes/responsive/Search/search-toolbar-no-display-mode.tpl +++ b/code/web/interface/themes/responsive/Search/search-toolbar-no-display-mode.tpl @@ -25,7 +25,7 @@
diff --git a/code/web/interface/themes/responsive/RecordDrivers/Events/assabet_result.tpl b/code/web/interface/themes/responsive/RecordDrivers/Events/assabet_result.tpl index 4330172ed3..387fe8f174 100644 --- a/code/web/interface/themes/responsive/RecordDrivers/Events/assabet_result.tpl +++ b/code/web/interface/themes/responsive/RecordDrivers/Events/assabet_result.tpl @@ -85,13 +85,13 @@ {else} {translate text="Registration Information" isPublicFacing=true} {/if} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text="Add to Your Events" isPublicFacing=true} {/if}

- {elseif empty($offline)} + {elseif empty($offline) || $enableEContentWhileOffline}
{translate text="Add to Your Events" isPublicFacing=true}
diff --git a/code/web/interface/themes/responsive/RecordDrivers/Events/communico_result.tpl b/code/web/interface/themes/responsive/RecordDrivers/Events/communico_result.tpl index e869166e8b..e713083584 100644 --- a/code/web/interface/themes/responsive/RecordDrivers/Events/communico_result.tpl +++ b/code/web/interface/themes/responsive/RecordDrivers/Events/communico_result.tpl @@ -85,13 +85,13 @@ {else} {translate text="Registration Information" isPublicFacing=true} {/if} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text="Add to Your Events" isPublicFacing=true} {/if}
- {elseif empty($offline)} + {elseif empty($offline) || $enableEContentWhileOffline}
{translate text="Add to Your Events" isPublicFacing=true}
diff --git a/code/web/interface/themes/responsive/RecordDrivers/Events/library_calendar_result.tpl b/code/web/interface/themes/responsive/RecordDrivers/Events/library_calendar_result.tpl index 88e9718941..c0ba77e9e8 100644 --- a/code/web/interface/themes/responsive/RecordDrivers/Events/library_calendar_result.tpl +++ b/code/web/interface/themes/responsive/RecordDrivers/Events/library_calendar_result.tpl @@ -76,13 +76,13 @@ {else} {translate text="Registration Information" isPublicFacing=true} {/if} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text="Add to Your Events" isPublicFacing=true} {/if}
- {elseif empty($offline)} + {elseif empty($offline) || $enableEContentWhileOffline}
{translate text="Add to Your Events" isPublicFacing=true}
diff --git a/code/web/interface/themes/responsive/RecordDrivers/Events/listEntry.tpl b/code/web/interface/themes/responsive/RecordDrivers/Events/listEntry.tpl index 4d03ad8a67..d2450fe5db 100644 --- a/code/web/interface/themes/responsive/RecordDrivers/Events/listEntry.tpl +++ b/code/web/interface/themes/responsive/RecordDrivers/Events/listEntry.tpl @@ -60,7 +60,7 @@ {if $recordDriver->isRegistrationRequired()}
{translate text="Registration Information" isPublicFacing=true} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text="Add to Your Events" isPublicFacing=true} {/if}
@@ -68,7 +68,7 @@ {translate text="Add to Your Events and Register" isPublicFacing=true} *} - {elseif empty($offline)} + {elseif empty($offline) || $enableEContentWhileOffline} {translate text="Add to Your Events" isPublicFacing=true} {/if} {/if} diff --git a/code/web/interface/themes/responsive/RecordDrivers/Events/springshare_libcal_result.tpl b/code/web/interface/themes/responsive/RecordDrivers/Events/springshare_libcal_result.tpl index 18b51fcfa4..d1ff3f358f 100644 --- a/code/web/interface/themes/responsive/RecordDrivers/Events/springshare_libcal_result.tpl +++ b/code/web/interface/themes/responsive/RecordDrivers/Events/springshare_libcal_result.tpl @@ -95,13 +95,13 @@ {else} {translate text="Registration Information" isPublicFacing=true} {/if} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text="Add to Your Events" isPublicFacing=true} {/if}
- {elseif empty($offline)} + {elseif empty($offline) || $enableEContentWhileOffline}
{translate text="Add to Your Events" isPublicFacing=true} diff --git a/code/web/interface/themes/responsive/RecordDrivers/GroupedWork/browse_result.tpl b/code/web/interface/themes/responsive/RecordDrivers/GroupedWork/browse_result.tpl index 1cf63ec3f7..4c07409943 100644 --- a/code/web/interface/themes/responsive/RecordDrivers/GroupedWork/browse_result.tpl +++ b/code/web/interface/themes/responsive/RecordDrivers/GroupedWork/browse_result.tpl @@ -30,7 +30,7 @@ {if !empty($showRatings) && $browseCategoryRatingsMode != 0}
{translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} {translate text='Get RSS Feed' isPublicFacing=true} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text='Email this Search' isPublicFacing=true} {if !empty($enableSavedSearches)} {if !empty($savedSearch)} diff --git a/code/web/interface/themes/responsive/Search/list.tpl b/code/web/interface/themes/responsive/Search/list.tpl index b5bf1c05ee..227c160477 100644 --- a/code/web/interface/themes/responsive/Search/list.tpl +++ b/code/web/interface/themes/responsive/Search/list.tpl @@ -130,7 +130,7 @@ {translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} {translate text='Get RSS Feed' isPublicFacing=true} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text='Email this Search' isPublicFacing=true} {if !empty($enableSavedSearches)} {if !empty($savedSearch)} diff --git a/code/web/interface/themes/responsive/Search/search-toolbar-no-display-mode.tpl b/code/web/interface/themes/responsive/Search/search-toolbar-no-display-mode.tpl index e6cde2acea..95a02366b6 100644 --- a/code/web/interface/themes/responsive/Search/search-toolbar-no-display-mode.tpl +++ b/code/web/interface/themes/responsive/Search/search-toolbar-no-display-mode.tpl @@ -25,7 +25,7 @@
    {if !empty($showSearchTools)} - {if !empty($enableSavedSearches) && empty($offline)} + {if !empty($enableSavedSearches) && (empty($offline) || $enableEContentWhileOffline)} {if !empty($savedSearch)}
  • {translate text='Remove Saved Search' isPublicFacing=true}
    • {else} diff --git a/code/web/interface/themes/responsive/Search/search-toolbar-popup.tpl b/code/web/interface/themes/responsive/Search/search-toolbar-popup.tpl index c7a5c751ad..f46be78103 100644 --- a/code/web/interface/themes/responsive/Search/search-toolbar-popup.tpl +++ b/code/web/interface/themes/responsive/Search/search-toolbar-popup.tpl @@ -38,7 +38,7 @@
    {if !empty($showSearchTools)} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {if !empty($enableSavedSearches)} {if !empty($savedSearch)} {translate text='Remove Saved Search' isPublicFacing=true} diff --git a/code/web/interface/themes/responsive/Search/search-toolbar.tpl b/code/web/interface/themes/responsive/Search/search-toolbar.tpl index 5dee698f4b..28c24ea150 100644 --- a/code/web/interface/themes/responsive/Search/search-toolbar.tpl +++ b/code/web/interface/themes/responsive/Search/search-toolbar.tpl @@ -33,7 +33,7 @@
    - {elseif empty($offline)} + {elseif empty($offline) || $enableEContentWhileOffline} {translate text="Add to Your Events" isPublicFacing=true} {/if} {/if} diff --git a/code/web/interface/themes/responsive/Summon/list.tpl b/code/web/interface/themes/responsive/Summon/list.tpl index 126defc658..f4dcb947bf 100644 --- a/code/web/interface/themes/responsive/Summon/list.tpl +++ b/code/web/interface/themes/responsive/Summon/list.tpl @@ -66,7 +66,7 @@ {if $showSearchTools || ($loggedIn && count($userPermissions) > 0)}
    {translate text='Search Tools' isPublicFacing=true} - {if !empty($showSearchTools) && empty($offline)} + {if !empty($showSearchTools) && (empty($offline) || $enableEContentWhileOffline)} {translate text='Email this Search' isPublicFacing=true} {if !empty($enableSavedSearches)} {if !empty($savedSearch)} diff --git a/code/web/interface/themes/responsive/Summon/result-tools-horizontal.tpl b/code/web/interface/themes/responsive/Summon/result-tools-horizontal.tpl index 175b85f304..b3b5895fe8 100644 --- a/code/web/interface/themes/responsive/Summon/result-tools-horizontal.tpl +++ b/code/web/interface/themes/responsive/Summon/result-tools-horizontal.tpl @@ -8,7 +8,7 @@ {translate text="More Info" isPublicFacing=true}
    {/if} - {if $showFavorites == 1 && empty($offline)} + {if $showFavorites == 1 && empty($offline) || $enableEContentWhileOffline}
    diff --git a/code/web/interface/themes/responsive/Websites/list-none.tpl b/code/web/interface/themes/responsive/Websites/list-none.tpl index 980f145ed1..a5efa83eb3 100644 --- a/code/web/interface/themes/responsive/Websites/list-none.tpl +++ b/code/web/interface/themes/responsive/Websites/list-none.tpl @@ -62,7 +62,7 @@ {translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} {translate text='Get RSS Feed' isPublicFacing=true} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text='Email this Search' isPublicFacing=true} {if !empty($enableSavedSearches)} {if !empty($savedSearch)} From 1ed072200a0fa566d13a2432d722379c4e87173f Mon Sep 17 00:00:00 2001 From: Katherine Perdue Date: Fri, 7 Jun 2024 09:24:03 -0400 Subject: [PATCH 6/8] Don't hide buttons when eContent login allowed --- code/web/interface/themes/responsive/Assabet/event.tpl | 4 ++-- code/web/interface/themes/responsive/Communico/event.tpl | 4 ++-- .../themes/responsive/CourseReserves/list-none.tpl | 2 +- .../interface/themes/responsive/CourseReserves/list.tpl | 2 +- code/web/interface/themes/responsive/EBSCO/list.tpl | 2 +- .../themes/responsive/EBSCO/result-tools-horizontal.tpl | 2 +- code/web/interface/themes/responsive/EBSCOhost/list.tpl | 2 +- .../responsive/EBSCOhost/result-tools-horizontal.tpl | 2 +- code/web/interface/themes/responsive/Events/list-none.tpl | 2 +- code/web/interface/themes/responsive/Events/list.tpl | 2 +- code/web/interface/themes/responsive/Genealogy/list.tpl | 2 +- .../responsive/Genealogy/result-tools-horizontal.tpl | 2 +- .../responsive/GroupedWork/result-tools-horizontal.tpl | 2 +- .../themes/responsive/GroupedWork/result-tools.tpl | 2 +- .../interface/themes/responsive/LibraryMarket/event.tpl | 8 ++++---- code/web/interface/themes/responsive/Lists/list-none.tpl | 2 +- code/web/interface/themes/responsive/Lists/list.tpl | 2 +- .../themes/responsive/OpenArchives/list-none.tpl | 2 +- .../web/interface/themes/responsive/OpenArchives/list.tpl | 2 +- .../responsive/OpenArchives/result-tools-horizontal.tpl | 2 +- .../responsive/RecordDrivers/Events/assabet_result.tpl | 4 ++-- .../responsive/RecordDrivers/Events/communico_result.tpl | 4 ++-- .../RecordDrivers/Events/library_calendar_result.tpl | 4 ++-- .../themes/responsive/RecordDrivers/Events/listEntry.tpl | 4 ++-- .../RecordDrivers/Events/springshare_libcal_result.tpl | 4 ++-- .../RecordDrivers/GroupedWork/browse_result.tpl | 2 +- code/web/interface/themes/responsive/Search/list-none.tpl | 2 +- code/web/interface/themes/responsive/Search/list.tpl | 2 +- .../responsive/Search/search-toolbar-no-display-mode.tpl | 2 +- .../themes/responsive/Search/search-toolbar-popup.tpl | 2 +- .../interface/themes/responsive/Search/search-toolbar.tpl | 2 +- .../web/interface/themes/responsive/Springshare/event.tpl | 4 ++-- code/web/interface/themes/responsive/Summon/list.tpl | 2 +- .../themes/responsive/Summon/result-tools-horizontal.tpl | 2 +- .../interface/themes/responsive/Websites/list-none.tpl | 2 +- 35 files changed, 46 insertions(+), 46 deletions(-) diff --git a/code/web/interface/themes/responsive/Assabet/event.tpl b/code/web/interface/themes/responsive/Assabet/event.tpl index 8651fa8b84..9153a75093 100644 --- a/code/web/interface/themes/responsive/Assabet/event.tpl +++ b/code/web/interface/themes/responsive/Assabet/event.tpl @@ -101,13 +101,13 @@ {else} {translate text="Registration Information" isPublicFacing=true} {/if} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text="Add to Your Events" isPublicFacing=true} {/if}
    - {elseif empty($offline)} + {elseif empty($offline) || $enableEContentWhileOffline} {translate text="Add to Your Events" isPublicFacing=true} {/if} {/if} diff --git a/code/web/interface/themes/responsive/Communico/event.tpl b/code/web/interface/themes/responsive/Communico/event.tpl index 4b485b86da..0fe5a46890 100644 --- a/code/web/interface/themes/responsive/Communico/event.tpl +++ b/code/web/interface/themes/responsive/Communico/event.tpl @@ -101,11 +101,11 @@ {else} {translate text="Registration Information" isPublicFacing=true} {/if} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text="Add to Your Events" isPublicFacing=true} {/if}
- {else empty($offline)} + {else empty($offline) || $enableEContentWhileOffline} {translate text="Add to Your Events" isPublicFacing=true} {/if} {/if} diff --git a/code/web/interface/themes/responsive/CourseReserves/list-none.tpl b/code/web/interface/themes/responsive/CourseReserves/list-none.tpl index 2d68a0d83d..4833e8abda 100644 --- a/code/web/interface/themes/responsive/CourseReserves/list-none.tpl +++ b/code/web/interface/themes/responsive/CourseReserves/list-none.tpl @@ -51,7 +51,7 @@ {translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} {translate text='Get RSS Feed' isPublicFacing=true} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text='Email this Search' isPublicFacing=true} {if !empty($enableSavedSearches)} {if !empty($savedSearch)} diff --git a/code/web/interface/themes/responsive/CourseReserves/list.tpl b/code/web/interface/themes/responsive/CourseReserves/list.tpl index 108634dee1..0018c98872 100644 --- a/code/web/interface/themes/responsive/CourseReserves/list.tpl +++ b/code/web/interface/themes/responsive/CourseReserves/list.tpl @@ -74,7 +74,7 @@ {translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} {translate text='Get RSS Feed' isPublicFacing=true} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text='Email this Search' isPublicFacing=true} {if !empty($enableSavedSearches)} {if !empty($savedSearch)} diff --git a/code/web/interface/themes/responsive/EBSCO/list.tpl b/code/web/interface/themes/responsive/EBSCO/list.tpl index a6368c8d3a..85c19a5ac9 100644 --- a/code/web/interface/themes/responsive/EBSCO/list.tpl +++ b/code/web/interface/themes/responsive/EBSCO/list.tpl @@ -30,7 +30,7 @@
{translate text='Search Tools' isPublicFacing=true} {translate text='Get RSS Feed' isPublicFacing=true} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text='Email this Search' isPublicFacing=true} {if !empty($enableSavedSearches)} {if !empty($savedSearch)} diff --git a/code/web/interface/themes/responsive/EBSCO/result-tools-horizontal.tpl b/code/web/interface/themes/responsive/EBSCO/result-tools-horizontal.tpl index e06e1262c4..62013309b0 100644 --- a/code/web/interface/themes/responsive/EBSCO/result-tools-horizontal.tpl +++ b/code/web/interface/themes/responsive/EBSCO/result-tools-horizontal.tpl @@ -8,7 +8,7 @@ {translate text="More Info" isPublicFacing=true}
{/if} - {if $showFavorites == 1 && empty($offline)} + {if $showFavorites == 1 && (empty($offline) || $enableEContentWhileOffline)}
diff --git a/code/web/interface/themes/responsive/EBSCOhost/list.tpl b/code/web/interface/themes/responsive/EBSCOhost/list.tpl index 78bf1df9b4..83483eb2b1 100644 --- a/code/web/interface/themes/responsive/EBSCOhost/list.tpl +++ b/code/web/interface/themes/responsive/EBSCOhost/list.tpl @@ -30,7 +30,7 @@
{translate text='Search Tools' isPublicFacing=true} {if !empty($rssLink)}{translate text='Get RSS Feed' isPublicFacing=true}{/if} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text='Email this Search' isPublicFacing=true} {if !empty($enableSavedSearches)} {if !empty($savedSearch)} diff --git a/code/web/interface/themes/responsive/EBSCOhost/result-tools-horizontal.tpl b/code/web/interface/themes/responsive/EBSCOhost/result-tools-horizontal.tpl index 8302602e21..a74bbea439 100644 --- a/code/web/interface/themes/responsive/EBSCOhost/result-tools-horizontal.tpl +++ b/code/web/interface/themes/responsive/EBSCOhost/result-tools-horizontal.tpl @@ -8,7 +8,7 @@ {translate text="More Info" isPublicFacing=true}
{/if} - {if $showFavorites == 1 && empty($offline)} + {if $showFavorites == 1 && (empty($offline) || $enableEContentWhileOffline)}
diff --git a/code/web/interface/themes/responsive/Events/list-none.tpl b/code/web/interface/themes/responsive/Events/list-none.tpl index 0c94b0b479..0080299f00 100644 --- a/code/web/interface/themes/responsive/Events/list-none.tpl +++ b/code/web/interface/themes/responsive/Events/list-none.tpl @@ -62,7 +62,7 @@ {translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} {translate text='Get RSS Feed' isPublicFacing=true} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text='Email this Search' isPublicFacing=true} {if !empty($enableSavedSearches)} {if !empty($savedSearch)} diff --git a/code/web/interface/themes/responsive/Events/list.tpl b/code/web/interface/themes/responsive/Events/list.tpl index 08a0296b15..073a625677 100644 --- a/code/web/interface/themes/responsive/Events/list.tpl +++ b/code/web/interface/themes/responsive/Events/list.tpl @@ -72,7 +72,7 @@ {translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} {translate text='Get RSS Feed' isPublicFacing=true} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text='Email this Search' isPublicFacing=true} {if !empty($enableSavedSearches)} {if !empty($savedSearch)} diff --git a/code/web/interface/themes/responsive/Genealogy/list.tpl b/code/web/interface/themes/responsive/Genealogy/list.tpl index 12ce537d71..a0d7ee4cab 100644 --- a/code/web/interface/themes/responsive/Genealogy/list.tpl +++ b/code/web/interface/themes/responsive/Genealogy/list.tpl @@ -52,7 +52,7 @@
{translate text='Search Tools' isPublicFacing=true} {translate text='Get RSS Feed' isPublicFacing=true} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text='Email this Search' isPublicFacing=true} {if !empty($enableSavedSearches)} {if !empty($savedSearch)} diff --git a/code/web/interface/themes/responsive/Genealogy/result-tools-horizontal.tpl b/code/web/interface/themes/responsive/Genealogy/result-tools-horizontal.tpl index f83f4a0622..2a1000ed06 100644 --- a/code/web/interface/themes/responsive/Genealogy/result-tools-horizontal.tpl +++ b/code/web/interface/themes/responsive/Genealogy/result-tools-horizontal.tpl @@ -8,7 +8,7 @@ {translate text="More Info" isPublicFacing=true}
{/if} - {if $showFavorites == 1 && empty($offline)} + {if $showFavorites == 1 && (empty($offline) || $enableEContentWhileOffline)}
diff --git a/code/web/interface/themes/responsive/GroupedWork/result-tools-horizontal.tpl b/code/web/interface/themes/responsive/GroupedWork/result-tools-horizontal.tpl index 1c86e973c4..9b1886d654 100644 --- a/code/web/interface/themes/responsive/GroupedWork/result-tools-horizontal.tpl +++ b/code/web/interface/themes/responsive/GroupedWork/result-tools-horizontal.tpl @@ -17,7 +17,7 @@ {if $showMoreInfo !== false} getPermanentId() isPublicFacing=true inAttribute=true}">{translate text="More Info" isPublicFacing=true} {/if} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {if $showComments == 1} {* Hide Review Button for xs views in Search Results & User Lists *}
{/if} - {if $showFavorites == 1 && empty($offline)} + {if $showFavorites == 1 && (empty($offline) || $enableEContentWhileOffline)}
diff --git a/code/web/interface/themes/responsive/RecordDrivers/Events/assabet_result.tpl b/code/web/interface/themes/responsive/RecordDrivers/Events/assabet_result.tpl index 4330172ed3..387fe8f174 100644 --- a/code/web/interface/themes/responsive/RecordDrivers/Events/assabet_result.tpl +++ b/code/web/interface/themes/responsive/RecordDrivers/Events/assabet_result.tpl @@ -85,13 +85,13 @@ {else} {translate text="Registration Information" isPublicFacing=true} {/if} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text="Add to Your Events" isPublicFacing=true} {/if}

- {elseif empty($offline)} + {elseif empty($offline) || $enableEContentWhileOffline}
{translate text="Add to Your Events" isPublicFacing=true}
diff --git a/code/web/interface/themes/responsive/RecordDrivers/Events/communico_result.tpl b/code/web/interface/themes/responsive/RecordDrivers/Events/communico_result.tpl index e869166e8b..e713083584 100644 --- a/code/web/interface/themes/responsive/RecordDrivers/Events/communico_result.tpl +++ b/code/web/interface/themes/responsive/RecordDrivers/Events/communico_result.tpl @@ -85,13 +85,13 @@ {else} {translate text="Registration Information" isPublicFacing=true} {/if} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text="Add to Your Events" isPublicFacing=true} {/if}
- {elseif empty($offline)} + {elseif empty($offline) || $enableEContentWhileOffline}
{translate text="Add to Your Events" isPublicFacing=true}
diff --git a/code/web/interface/themes/responsive/RecordDrivers/Events/library_calendar_result.tpl b/code/web/interface/themes/responsive/RecordDrivers/Events/library_calendar_result.tpl index 88e9718941..c0ba77e9e8 100644 --- a/code/web/interface/themes/responsive/RecordDrivers/Events/library_calendar_result.tpl +++ b/code/web/interface/themes/responsive/RecordDrivers/Events/library_calendar_result.tpl @@ -76,13 +76,13 @@ {else} {translate text="Registration Information" isPublicFacing=true} {/if} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text="Add to Your Events" isPublicFacing=true} {/if}
- {elseif empty($offline)} + {elseif empty($offline) || $enableEContentWhileOffline}
{translate text="Add to Your Events" isPublicFacing=true}
diff --git a/code/web/interface/themes/responsive/RecordDrivers/Events/listEntry.tpl b/code/web/interface/themes/responsive/RecordDrivers/Events/listEntry.tpl index 4d03ad8a67..d2450fe5db 100644 --- a/code/web/interface/themes/responsive/RecordDrivers/Events/listEntry.tpl +++ b/code/web/interface/themes/responsive/RecordDrivers/Events/listEntry.tpl @@ -60,7 +60,7 @@ {if $recordDriver->isRegistrationRequired()}
{translate text="Registration Information" isPublicFacing=true} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text="Add to Your Events" isPublicFacing=true} {/if}
@@ -68,7 +68,7 @@ {translate text="Add to Your Events and Register" isPublicFacing=true} *} - {elseif empty($offline)} + {elseif empty($offline) || $enableEContentWhileOffline} {translate text="Add to Your Events" isPublicFacing=true} {/if} {/if} diff --git a/code/web/interface/themes/responsive/RecordDrivers/Events/springshare_libcal_result.tpl b/code/web/interface/themes/responsive/RecordDrivers/Events/springshare_libcal_result.tpl index 18b51fcfa4..d1ff3f358f 100644 --- a/code/web/interface/themes/responsive/RecordDrivers/Events/springshare_libcal_result.tpl +++ b/code/web/interface/themes/responsive/RecordDrivers/Events/springshare_libcal_result.tpl @@ -95,13 +95,13 @@ {else} {translate text="Registration Information" isPublicFacing=true} {/if} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text="Add to Your Events" isPublicFacing=true} {/if}
- {elseif empty($offline)} + {elseif empty($offline) || $enableEContentWhileOffline}
{translate text="Add to Your Events" isPublicFacing=true} diff --git a/code/web/interface/themes/responsive/RecordDrivers/GroupedWork/browse_result.tpl b/code/web/interface/themes/responsive/RecordDrivers/GroupedWork/browse_result.tpl index 1cf63ec3f7..4c07409943 100644 --- a/code/web/interface/themes/responsive/RecordDrivers/GroupedWork/browse_result.tpl +++ b/code/web/interface/themes/responsive/RecordDrivers/GroupedWork/browse_result.tpl @@ -30,7 +30,7 @@ {if !empty($showRatings) && $browseCategoryRatingsMode != 0}
{translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} {translate text='Get RSS Feed' isPublicFacing=true} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text='Email this Search' isPublicFacing=true} {if !empty($enableSavedSearches)} {if !empty($savedSearch)} diff --git a/code/web/interface/themes/responsive/Search/list.tpl b/code/web/interface/themes/responsive/Search/list.tpl index b5bf1c05ee..227c160477 100644 --- a/code/web/interface/themes/responsive/Search/list.tpl +++ b/code/web/interface/themes/responsive/Search/list.tpl @@ -130,7 +130,7 @@ {translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} {translate text='Get RSS Feed' isPublicFacing=true} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text='Email this Search' isPublicFacing=true} {if !empty($enableSavedSearches)} {if !empty($savedSearch)} diff --git a/code/web/interface/themes/responsive/Search/search-toolbar-no-display-mode.tpl b/code/web/interface/themes/responsive/Search/search-toolbar-no-display-mode.tpl index e6cde2acea..95a02366b6 100644 --- a/code/web/interface/themes/responsive/Search/search-toolbar-no-display-mode.tpl +++ b/code/web/interface/themes/responsive/Search/search-toolbar-no-display-mode.tpl @@ -25,7 +25,7 @@
    {if !empty($showSearchTools)} - {if !empty($enableSavedSearches) && empty($offline)} + {if !empty($enableSavedSearches) && (empty($offline) || $enableEContentWhileOffline)} {if !empty($savedSearch)}
  • {translate text='Remove Saved Search' isPublicFacing=true}
    • {else} diff --git a/code/web/interface/themes/responsive/Search/search-toolbar-popup.tpl b/code/web/interface/themes/responsive/Search/search-toolbar-popup.tpl index c7a5c751ad..f46be78103 100644 --- a/code/web/interface/themes/responsive/Search/search-toolbar-popup.tpl +++ b/code/web/interface/themes/responsive/Search/search-toolbar-popup.tpl @@ -38,7 +38,7 @@
    {if !empty($showSearchTools)} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {if !empty($enableSavedSearches)} {if !empty($savedSearch)} {translate text='Remove Saved Search' isPublicFacing=true} diff --git a/code/web/interface/themes/responsive/Search/search-toolbar.tpl b/code/web/interface/themes/responsive/Search/search-toolbar.tpl index 5dee698f4b..28c24ea150 100644 --- a/code/web/interface/themes/responsive/Search/search-toolbar.tpl +++ b/code/web/interface/themes/responsive/Search/search-toolbar.tpl @@ -33,7 +33,7 @@
    - {elseif empty($offline)} + {elseif empty($offline) || $enableEContentWhileOffline} {translate text="Add to Your Events" isPublicFacing=true} {/if} {/if} diff --git a/code/web/interface/themes/responsive/Summon/list.tpl b/code/web/interface/themes/responsive/Summon/list.tpl index 126defc658..f4dcb947bf 100644 --- a/code/web/interface/themes/responsive/Summon/list.tpl +++ b/code/web/interface/themes/responsive/Summon/list.tpl @@ -66,7 +66,7 @@ {if $showSearchTools || ($loggedIn && count($userPermissions) > 0)}
    {translate text='Search Tools' isPublicFacing=true} - {if !empty($showSearchTools) && empty($offline)} + {if !empty($showSearchTools) && (empty($offline) || $enableEContentWhileOffline)} {translate text='Email this Search' isPublicFacing=true} {if !empty($enableSavedSearches)} {if !empty($savedSearch)} diff --git a/code/web/interface/themes/responsive/Summon/result-tools-horizontal.tpl b/code/web/interface/themes/responsive/Summon/result-tools-horizontal.tpl index 175b85f304..b3b5895fe8 100644 --- a/code/web/interface/themes/responsive/Summon/result-tools-horizontal.tpl +++ b/code/web/interface/themes/responsive/Summon/result-tools-horizontal.tpl @@ -8,7 +8,7 @@ {translate text="More Info" isPublicFacing=true}
    {/if} - {if $showFavorites == 1 && empty($offline)} + {if $showFavorites == 1 && empty($offline) || $enableEContentWhileOffline}
    diff --git a/code/web/interface/themes/responsive/Websites/list-none.tpl b/code/web/interface/themes/responsive/Websites/list-none.tpl index 980f145ed1..a5efa83eb3 100644 --- a/code/web/interface/themes/responsive/Websites/list-none.tpl +++ b/code/web/interface/themes/responsive/Websites/list-none.tpl @@ -62,7 +62,7 @@ {translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} {translate text='Get RSS Feed' isPublicFacing=true} - {if empty($offline)} + {if empty($offline) || $enableEContentWhileOffline} {translate text='Email this Search' isPublicFacing=true} {if !empty($enableSavedSearches)} {if !empty($savedSearch)} From d6f316f4e057b29f96c105f23104d237c2168094 Mon Sep 17 00:00:00 2001 From: Katherine Perdue Date: Fri, 7 Jun 2024 16:30:44 -0400 Subject: [PATCH 7/8] Fix tabs --- .../web/RecordDrivers/Axis360RecordDriver.php | 8 ++++---- .../CloudLibraryRecordDriver.php | 8 ++++---- .../RecordDrivers/EbscohostRecordDriver.php | 20 +++++++++---------- code/web/RecordDrivers/HooplaRecordDriver.php | 8 ++++---- .../RecordDrivers/OverDriveRecordDriver.php | 10 +++++----- .../PalaceProjectRecordDriver.php | 6 +++--- 6 files changed, 30 insertions(+), 30 deletions(-) diff --git a/code/web/RecordDrivers/Axis360RecordDriver.php b/code/web/RecordDrivers/Axis360RecordDriver.php index 7aed9a5e6e..77ab63a1b5 100644 --- a/code/web/RecordDrivers/Axis360RecordDriver.php +++ b/code/web/RecordDrivers/Axis360RecordDriver.php @@ -201,10 +201,10 @@ public function getRecordActions($relatedRecord, $variationId, $isAvailable, $is $loadDefaultActions = count($this->_actions) == 0; } - //Check if catalog is offline and login for eResources should be allowed for offline - global $offlineMode; - global $loginAllowedWhileOffline; - if ($loadDefaultActions && (!$offlineMode || $loginAllowedWhileOffline)) { + //Check if catalog is offline and login for eResources should be allowed for offline + global $offlineMode; + global $loginAllowedWhileOffline; + if ($loadDefaultActions && (!$offlineMode || $loginAllowedWhileOffline)) { if ($isAvailable) { $this->_actions[] = [ 'title' => translate([ diff --git a/code/web/RecordDrivers/CloudLibraryRecordDriver.php b/code/web/RecordDrivers/CloudLibraryRecordDriver.php index 7bd9be68ce..80e71124c8 100644 --- a/code/web/RecordDrivers/CloudLibraryRecordDriver.php +++ b/code/web/RecordDrivers/CloudLibraryRecordDriver.php @@ -182,10 +182,10 @@ public function getRecordActions($relatedRecord, $variationId, $isAvailable, $is $loadDefaultActions = count($this->_actions) == 0; } - //Check if catalog is offline and login for eResources should be allowed for offline - global $offlineMode; - global $loginAllowedWhileOffline; - if ($loadDefaultActions && (!$offlineMode || $loginAllowedWhileOffline)) { + //Check if catalog is offline and login for eResources should be allowed for offline + global $offlineMode; + global $loginAllowedWhileOffline; + if ($loadDefaultActions && (!$offlineMode || $loginAllowedWhileOffline)) { if ($isAvailable) { $userId = UserAccount::getActiveUserId(); if ($userId == false) { diff --git a/code/web/RecordDrivers/EbscohostRecordDriver.php b/code/web/RecordDrivers/EbscohostRecordDriver.php index 3c0a00b7c5..91876e07b6 100644 --- a/code/web/RecordDrivers/EbscohostRecordDriver.php +++ b/code/web/RecordDrivers/EbscohostRecordDriver.php @@ -596,16 +596,16 @@ private function getPublicationDates() { public function getRecordActions() { if ($this->_actions === null) { $this->_actions = []; - $this->_actions[] = [ - 'title' => translate([ - 'text' => 'Access Online', - 'isPublicFacing' => true, - ]), - 'url' => '/EBSCOhost/AccessOnline?id=' . $this->getUniqueID(), - 'requireLogin' => true, - 'type' => 'ebscohost_access_online', - ]; - } + $this->_actions[] = [ + 'title' => translate([ + 'text' => 'Access Online', + 'isPublicFacing' => true, + ]), + 'url' => '/EBSCOhost/AccessOnline?id=' . $this->getUniqueID(), + 'requireLogin' => true, + 'type' => 'ebscohost_access_online', + ]; + } return $this->_actions; } } \ No newline at end of file diff --git a/code/web/RecordDrivers/HooplaRecordDriver.php b/code/web/RecordDrivers/HooplaRecordDriver.php index e34d178b92..cfe69da410 100644 --- a/code/web/RecordDrivers/HooplaRecordDriver.php +++ b/code/web/RecordDrivers/HooplaRecordDriver.php @@ -238,10 +238,10 @@ function getRecordActions($relatedRecord, $variationId, $recordAvailable, $recor $loadDefaultActions = count($this->_actions) == 0; } - //Check if catalog is offline and login for eResources should be allowed for offline - global $offlineMode; - global $loginAllowedWhileOffline; - if ($loadDefaultActions && (!$offlineMode || $loginAllowedWhileOffline)) { + //Check if catalog is offline and login for eResources should be allowed for offline + global $offlineMode; + global $loginAllowedWhileOffline; + if ($loadDefaultActions && (!$offlineMode || $loginAllowedWhileOffline)) { /** @var Library $searchLibrary */ $searchLibrary = Library::getSearchLibrary(); if ($searchLibrary->hooplaLibraryID > 0) { // Library is enabled for Hoopla patron action integration diff --git a/code/web/RecordDrivers/OverDriveRecordDriver.php b/code/web/RecordDrivers/OverDriveRecordDriver.php index 2ce819f9f4..94b8db4a3d 100644 --- a/code/web/RecordDrivers/OverDriveRecordDriver.php +++ b/code/web/RecordDrivers/OverDriveRecordDriver.php @@ -844,10 +844,10 @@ public function getRecordActions($relatedRecord, $variationId, $isAvailable, $is require_once ROOT_DIR . '/Drivers/OverDriveDriver.php'; $overDriveDriver = OverDriveDriver::getOverDriveDriver(); $readerName = $overDriveDriver->getReaderName(); - //Check if catalog is offline and login for eResources should be allowed for offline - global $offlineMode; - global $loginAllowedWhileOffline; - //Show link to OverDrive record when the catalog is offline and can't do logins + //Check if catalog is offline and login for eResources should be allowed for offline + global $offlineMode; + global $loginAllowedWhileOffline; + //Show link to OverDrive record when the catalog is offline and can't do logins if (!$overDriveDriver->isCirculationEnabled() || ($offlineMode && !$loginAllowedWhileOffline)) { $overDriveMetadata = $this->getOverDriveMetaData(); $crossRefId = $overDriveMetadata->getDecodedRawData()->crossRefId; @@ -873,7 +873,7 @@ public function getRecordActions($relatedRecord, $variationId, $isAvailable, $is $loadDefaultActions = count($this->_actions) == 0; } - if ($loadDefaultActions && (!$offlineMode || $loginAllowedWhileOffline)) { + if ($loadDefaultActions && (!$offlineMode || $loginAllowedWhileOffline)) { if ($isAvailable) { $this->_actions[] = [ 'title' => translate([ diff --git a/code/web/RecordDrivers/PalaceProjectRecordDriver.php b/code/web/RecordDrivers/PalaceProjectRecordDriver.php index 4e4e1e51e0..f218040103 100644 --- a/code/web/RecordDrivers/PalaceProjectRecordDriver.php +++ b/code/web/RecordDrivers/PalaceProjectRecordDriver.php @@ -209,9 +209,9 @@ public function getRecordActions($relatedRecord, $variationId, $isAvailable, $is $this->_actions = array_merge($this->_actions, $user->getCirculatedRecordActions('palace_project', $this->id)); $loadDefaultActions = count($this->_actions) == 0; } - //Check if catalog is offline and login for eResources should be allowed for offline - global $offlineMode; - global $loginAllowedWhileOffline; + //Check if catalog is offline and login for eResources should be allowed for offline + global $offlineMode; + global $loginAllowedWhileOffline; if ($loadDefaultActions && (!$offlineMode || $loginAllowedWhileOffline)) { if (!empty($this->palaceProjectRawMetadata)) { foreach ($this->palaceProjectRawMetadata->links as $link) { From 8279defacf7806fcd7e54211ba56fb88cab5a43e Mon Sep 17 00:00:00 2001 From: Katherine Perdue Date: Mon, 10 Jun 2024 11:51:49 -0400 Subject: [PATCH 8/8] Hide email search in offline mode --- .../themes/responsive/Author/home.tpl | 4 ++-- .../Search/search-toolbar-no-display-mode.tpl | 24 +++++++++++-------- .../responsive/Search/search-toolbar.tpl | 24 +++++++++++-------- .../themes/responsive/Websites/list.tpl | 18 ++++++++------ 4 files changed, 41 insertions(+), 29 deletions(-) diff --git a/code/web/interface/themes/responsive/Author/home.tpl b/code/web/interface/themes/responsive/Author/home.tpl index 9235db055b..aba2d4b8cd 100644 --- a/code/web/interface/themes/responsive/Author/home.tpl +++ b/code/web/interface/themes/responsive/Author/home.tpl @@ -39,10 +39,10 @@ {if !empty($pageLinks.all)}
    {$pageLinks.all}
    {/if} {/if} - {if !empty($showSearchTools) && !$showSearchToolsAtTop} + {if !empty($showSearchTools) && !$showSearchToolsAtTop && (empty($offline) || $enableEContentWhileOffline)}
    {translate text='Search Tools' isPublicFacing=true}   - {translate text='Get RSS Feed' isPublicFacing=true}   + {if !empty($rssLink)}{translate text='Get RSS Feed' isPublicFacing=true}  {/if} {translate text='Email this Search' isPublicFacing=true}
    {/if} diff --git a/code/web/interface/themes/responsive/Search/search-toolbar-no-display-mode.tpl b/code/web/interface/themes/responsive/Search/search-toolbar-no-display-mode.tpl index 95a02366b6..fcc98114fb 100644 --- a/code/web/interface/themes/responsive/Search/search-toolbar-no-display-mode.tpl +++ b/code/web/interface/themes/responsive/Search/search-toolbar-no-display-mode.tpl @@ -25,15 +25,19 @@
    -
    diff --git a/code/web/interface/themes/responsive/Search/search-toolbar.tpl b/code/web/interface/themes/responsive/Search/search-toolbar.tpl index 28c24ea150..b0a7509d09 100644 --- a/code/web/interface/themes/responsive/Search/search-toolbar.tpl +++ b/code/web/interface/themes/responsive/Search/search-toolbar.tpl @@ -33,15 +33,19 @@
    -
    diff --git a/code/web/interface/themes/responsive/Websites/list.tpl b/code/web/interface/themes/responsive/Websites/list.tpl index 44db39f52e..714284ffba 100644 --- a/code/web/interface/themes/responsive/Websites/list.tpl +++ b/code/web/interface/themes/responsive/Websites/list.tpl @@ -71,13 +71,17 @@
    {translate text='Search Tools' isPublicFacing=true} {if !empty($showSearchTools)} - {translate text='Get RSS Feed' isPublicFacing=true} - {translate text='Email this Search' isPublicFacing=true} - {if !empty($enableSavedSearches)} - {if !empty($savedSearch)} - {translate text="Remove Saved Search" isPublicFacing=true} - {else} - {translate text='Save Search' isPublicFacing=true} + {if !empty($rssLink)} + {translate text='Get RSS Feed' isPublicFacing=true} + {/if} + {if empty($offline) || $enableEContentWhileOffline} + {translate text='Email this Search' isPublicFacing=true} + {if !empty($enableSavedSearches)} + {if !empty($savedSearch)} + {translate text="Remove Saved Search" isPublicFacing=true} + {else} + {translate text='Save Search' isPublicFacing=true} + {/if} {/if} {/if} {*{translate text='Export To CSV' isPublicFacing=true}*}