From a937b8f59f5dc1574e78357bfeca48b9e6547025 Mon Sep 17 00:00:00 2001 From: Alexander Blanchard Date: Tue, 25 Jun 2024 15:51:14 +0100 Subject: [PATCH 1/3] fix: Add toolbar to Summon Results Add serch tools to top of Summon Results --- .../themes/responsive/Summon/list.tpl | 67 ++++++++----------- 1 file changed, 28 insertions(+), 39 deletions(-) diff --git a/code/web/interface/themes/responsive/Summon/list.tpl b/code/web/interface/themes/responsive/Summon/list.tpl index f4dcb947bf..79e1ecfb88 100644 --- a/code/web/interface/themes/responsive/Summon/list.tpl +++ b/code/web/interface/themes/responsive/Summon/list.tpl @@ -1,4 +1,4 @@ -

{translate text='Events Search Results' isPublicFacing=true}

+

{translate text='Articles & Databases Search Results'}

{* Recommendations *} {if !empty($topRecommendations)} @@ -7,9 +7,13 @@ {/foreach} {/if} - {* Information about the search *}
- + {* User's viewing mode toggle switch *} + {if !empty($showSearchToolsAtTop)} + {include file="Search/search-toolbar.tpl"} + {else} + {include file="Search/results-displayMode-toggle.tpl"} + {/if} {if !empty($replacementTerm)}
{translate text="Showing Results for" isPublicFacing=true} {$replacementTerm}
@@ -38,12 +42,8 @@
{/if} - {* User's viewing mode toggle switch *} - {include file="Events/results-displayMode-toggle.tpl"} -
- {* End Listing Options *} {if !empty($subpage)} {include file=$subpage} @@ -51,39 +51,29 @@ {$pageContent} {/if} - {if $displayMode == 'covers'} - {if $recordEnd < $recordCount} - -
- -
- - {/if} - {else} - {if !empty($pageLinks.all)}
{$pageLinks.all}
{/if} - {/if} + {if !empty($pageLinks.all)}
{$pageLinks.all}
{/if} - {if $showSearchTools || ($loggedIn && count($userPermissions) > 0)} -
- {translate text='Search Tools' isPublicFacing=true} - {if !empty($showSearchTools) && (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 !empty($showSearchTools) && !$showSearchToolsAtTop} +
+ {translate text='Search Tools' isPublicFacing=true} + {translate text='Get RSS Feed' isPublicFacing=true} + {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}*} - {/if} - {if !empty($loggedIn) && (in_array('Administer All Collection Spotlights', $userPermissions) || in_array('Administer Library Collection Spotlights', $userPermissions))} - {translate text='Create Spotlight' isAdminFacing=true} - {/if} - {if !empty($loggedIn) && (in_array('Administer All Browse Categories', $userPermissions) || in_array('Administer Library Browse Categories', $userPermissions) || in_array('Administer Selected Browse Category Groups', $userPermissions))} - {translate text='Add To Browse' isPublicFacing=true} - {/if} -
+ {if !empty($loggedIn) && (in_array('Administer All Collection Spotlights', $userPermissions) || in_array('Administer Library Collection Spotlights', $userPermissions))} + {translate text='Create Spotlight' isAdminFacing=true} + {/if} + {if !empty($loggedIn) && (in_array('Administer All Browse Categories', $userPermissions) || in_array('Administer Library Browse Categories', $userPermissions) || in_array('Administer Selected Browse Category Groups', $userPermissions))} + {translate text='Add To Browse' isPublicFacing=true} + {/if} +
{/if}
@@ -105,6 +95,5 @@ Globals.opac = 1; {* set to true to keep opac browsers from storing browse mode *} {/if} $('#'+AspenDiscovery.Searches.displayMode).parent('label').addClass('active'); {* show user which one is selected *} - {rdelim}); - \ No newline at end of file + From b2c905b45277f3e29924be05598a60d98f5e4f00 Mon Sep 17 00:00:00 2001 From: Alexander Blanchard Date: Mon, 22 Jul 2024 10:03:12 +0100 Subject: [PATCH 2/3] chore: update change log --- code/web/release_notes/24.08.00.MD | 1 + 1 file changed, 1 insertion(+) diff --git a/code/web/release_notes/24.08.00.MD b/code/web/release_notes/24.08.00.MD index b52ce4f225..d394d01789 100644 --- a/code/web/release_notes/24.08.00.MD +++ b/code/web/release_notes/24.08.00.MD @@ -91,6 +91,7 @@ // alexander ### Summon Updates - Adjust code to ensure that the filter applies correctly no matter what page of results users are on when they apply it. (*AB*) +- Remove unimplemented option to change search results from List to Covers mode. (*AB*) ### WebBuilder Updates - Added grapes.js functionality. (*AB*) From 12d0bd4b1dc9af778fc36f376c787a8a63421a59 Mon Sep 17 00:00:00 2001 From: Alexander Blanchard Date: Tue, 30 Jul 2024 11:33:03 +0100 Subject: [PATCH 3/3] refactor: Remove unimplemented Summon Option Refactor code to correctly remove unimplemented list and cover toggle only from Summon search results. --- code/web/interface/themes/responsive/Summon/list.tpl | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/web/interface/themes/responsive/Summon/list.tpl b/code/web/interface/themes/responsive/Summon/list.tpl index 79e1ecfb88..d379c7e55b 100644 --- a/code/web/interface/themes/responsive/Summon/list.tpl +++ b/code/web/interface/themes/responsive/Summon/list.tpl @@ -10,9 +10,9 @@
{* User's viewing mode toggle switch *} {if !empty($showSearchToolsAtTop)} - {include file="Search/search-toolbar.tpl"} + {include file="Search/search-toolbar-no-display-mode.tpl"} {else} - {include file="Search/results-displayMode-toggle.tpl"} + {include file="Search/results-no-displayMode-toggle.tpl"} {/if} {if !empty($replacementTerm)}