From b9423e6fbd58f4d8ad75510892495ea540be0d79 Mon Sep 17 00:00:00 2001
From: Alexander Purr <purr@ub.uni-leipzig.de>
Date: Fri, 27 Sep 2019 17:20:28 +0200
Subject: [PATCH] refs #16101 [master-v5] offcanvas toggler * set right class
name .offcanvas-toggler * add offcanvas-toggler to search history template
---
.../templates/myresearch/checkedout.phtml | 2 +-
themes/finc/templates/myresearch/fines.phtml | 2 +-
.../templates/myresearch/historicloans.phtml | 2 +-
themes/finc/templates/myresearch/holds.phtml | 2 +-
.../templates/myresearch/illrequests.phtml | 2 +-
themes/finc/templates/myresearch/mylist.phtml | 2 +-
.../finc/templates/myresearch/profile.phtml | 2 +-
.../myresearch/storageretrievalrequests.phtml | 2 +-
themes/finc/templates/search/history.phtml | 42 +++++++++++++++++++
9 files changed, 50 insertions(+), 8 deletions(-)
create mode 100644 themes/finc/templates/search/history.phtml
diff --git a/themes/finc/templates/myresearch/checkedout.phtml b/themes/finc/templates/myresearch/checkedout.phtml
index 24bb3b11567..d7cb5d54aa0 100644
--- a/themes/finc/templates/myresearch/checkedout.phtml
+++ b/themes/finc/templates/myresearch/checkedout.phtml
@@ -11,7 +11,7 @@
?>
<div class="<?=$this->layoutClass('mainbody')?>">
- <span class="offcanvas-toogler">
+ <span class="offcanvas-toggler">
<button class="search-filter-toggle btn btn-primary visible-xs" href="#search-sidebar" data-toggle="offcanvas" title="<?=$this->transEsc('sidebar_expand')?>">
<?=$this->transEsc('offcanvas-toggler-myresearch')?>
</button>
diff --git a/themes/finc/templates/myresearch/fines.phtml b/themes/finc/templates/myresearch/fines.phtml
index b0a88a9d782..210a8cdf659 100644
--- a/themes/finc/templates/myresearch/fines.phtml
+++ b/themes/finc/templates/myresearch/fines.phtml
@@ -7,7 +7,7 @@
$this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Fines') . '</li>';
?>
<div class="<?=$this->layoutClass('mainbody')?>">
- <span class="offcanvas-toogler">
+ <span class="offcanvas-toggler">
<button class="search-filter-toggle btn btn-primary visible-xs" href="#search-sidebar" data-toggle="offcanvas" title="<?=$this->transEsc('sidebar_expand')?>">
<?=$this->transEsc('offcanvas-toggler-myresearch')?>
</button>
diff --git a/themes/finc/templates/myresearch/historicloans.phtml b/themes/finc/templates/myresearch/historicloans.phtml
index 837b29e67f7..7669f30c589 100644
--- a/themes/finc/templates/myresearch/historicloans.phtml
+++ b/themes/finc/templates/myresearch/historicloans.phtml
@@ -8,7 +8,7 @@
?>
<div class="<?=$this->layoutClass('mainbody')?>">
- <span class="offcanvas-toogler">
+ <span class="offcanvas-toggler">
<button class="search-filter-toggle btn btn-primary visible-xs" href="#search-sidebar" data-toggle="offcanvas" title="<?=$this->transEsc('sidebar_expand')?>">
<?=$this->transEsc('offcanvas-toggler-myresearch')?>
</button>
diff --git a/themes/finc/templates/myresearch/holds.phtml b/themes/finc/templates/myresearch/holds.phtml
index bc63f4f64ec..0e1f633f88b 100644
--- a/themes/finc/templates/myresearch/holds.phtml
+++ b/themes/finc/templates/myresearch/holds.phtml
@@ -8,7 +8,7 @@
?>
<div class="<?=$this->layoutClass('mainbody')?>">
- <span class="offcanvas-toogler">
+ <span class="offcanvas-toggler">
<button class="search-filter-toggle btn btn-primary visible-xs" href="#search-sidebar" data-toggle="offcanvas" title="<?=$this->transEsc('sidebar_expand')?>">
<?=$this->transEsc('offcanvas-toggler-myresearch')?>
</button>
diff --git a/themes/finc/templates/myresearch/illrequests.phtml b/themes/finc/templates/myresearch/illrequests.phtml
index 685858006df..2d119b26e75 100644
--- a/themes/finc/templates/myresearch/illrequests.phtml
+++ b/themes/finc/templates/myresearch/illrequests.phtml
@@ -8,7 +8,7 @@
. '<li class="active">' . $this->transEsc('Interlibrary Loan Requests') . '</li>';
?>
<div class="<?=$this->layoutClass('mainbody')?>">
- <span class="offcanvas-toogler">
+ <span class="offcanvas-toggler">
<button class="search-filter-toggle btn btn-primary visible-xs" href="#search-sidebar" data-toggle="offcanvas" title="<?=$this->transEsc('sidebar_expand')?>">
<?=$this->transEsc('offcanvas-toggler-myresearch')?>
</button>
diff --git a/themes/finc/templates/myresearch/mylist.phtml b/themes/finc/templates/myresearch/mylist.phtml
index 390ed6252c3..a932041d6e7 100644
--- a/themes/finc/templates/myresearch/mylist.phtml
+++ b/themes/finc/templates/myresearch/mylist.phtml
@@ -29,7 +29,7 @@ $user = $this->auth()->isLoggedIn();
<?=$this->flashmessages()?>
<div class="<?=$this->layoutClass('mainbody')?>">
- <span class="offcanvas-toogler">
+ <span class="offcanvas-toggler">
<button class="search-filter-toggle btn btn-primary visible-xs" href="#search-sidebar" data-toggle="offcanvas" title="<?=$this->transEsc('sidebar_expand')?>">
<?=$this->transEsc('offcanvas-toggler-myresearch')?>
</button>
diff --git a/themes/finc/templates/myresearch/profile.phtml b/themes/finc/templates/myresearch/profile.phtml
index c0d135e29dd..92cb2bb097e 100644
--- a/themes/finc/templates/myresearch/profile.phtml
+++ b/themes/finc/templates/myresearch/profile.phtml
@@ -11,7 +11,7 @@ $arrTemplate = '<tr><th>%%LABEL%%:</th><td> %%VALUE%%</td></tr>';
?>
<div class="<?=$this->layoutClass('mainbody')?>">
- <span class="offcanvas-toogler">
+ <span class="offcanvas-toggler">
<button class="search-filter-toggle btn btn-primary visible-xs" href="#search-sidebar" data-toggle="offcanvas" title="<?=$this->transEsc('sidebar_expand')?>">
<?=$this->transEsc('offcanvas-toggler-myresearch')?>
</button>
diff --git a/themes/finc/templates/myresearch/storageretrievalrequests.phtml b/themes/finc/templates/myresearch/storageretrievalrequests.phtml
index 9360e7f4522..903505ca8c6 100644
--- a/themes/finc/templates/myresearch/storageretrievalrequests.phtml
+++ b/themes/finc/templates/myresearch/storageretrievalrequests.phtml
@@ -8,7 +8,7 @@
?>
<div class="<?=$this->layoutClass('mainbody')?>">
- <span class="offcanvas-toogler">
+ <span class="offcanvas-toggler">
<button class="search-filter-toggle btn btn-primary visible-xs" href="#search-sidebar" data-toggle="offcanvas" title="<?=$this->transEsc('sidebar_expand')?>">
<?=$this->transEsc('offcanvas-toggler-myresearch')?>
</button>
diff --git a/themes/finc/templates/search/history.phtml b/themes/finc/templates/search/history.phtml
new file mode 100644
index 00000000000..816fda1b32f
--- /dev/null
+++ b/themes/finc/templates/search/history.phtml
@@ -0,0 +1,42 @@
+<?php
+ // Set page title.
+ $this->headTitle($this->translate('Search History'));
+
+ // Set up breadcrumbs:
+ $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li>'
+ . '<li class="active">' . $this->transEsc('History') . '</li>';
+
+ $saveSupported = $this->accountCapabilities()->getSavedSearchSetting() === 'enabled';
+?>
+
+<div class="<?=$this->layoutClass('mainbody')?>">
+ <span class="offcanvas-toggler">
+ <button class="search-filter-toggle btn btn-primary visible-xs" href="#search-sidebar" data-toggle="offcanvas" title="<?=$this->transEsc('sidebar_expand')?>">
+ <?=$this->transEsc('offcanvas-toggler-myresearch')?>
+ </button>
+ </span>
+ <?=$this->flashmessages()?>
+ <?php if ($saveSupported && !empty($this->saved)): ?>
+ <h2><?=$this->transEsc("history_saved_searches")?></h2>
+ <?=$this->context()->renderInContext('search/history-table.phtml', ['showSaved' => true]);?>
+ <?php endif; ?>
+
+ <h2><?=$this->transEsc("history_recent_searches")?></h2>
+ <?php if (!empty($this->unsaved)): ?>
+ <?=$this->context()->renderInContext('search/history-table.phtml', ['showSaved' => false]);?>
+ <a href="?purge=true"><i class="fa fa-remove" aria-hidden="true"></i> <?=$this->transEsc("history_purge")?></a>
+ <?php else: ?>
+ <?=$this->transEsc("history_no_searches")?>
+ <?php endif; ?>
+</div>
+
+<?php if ($saveSupported): ?>
+ <div class="<?=$this->layoutClass('sidebar')?>">
+ <?=$this->context($this)->renderInContext(
+ "myresearch/menu.phtml",
+ // Only activate search history in account menu if user is logged in.
+ $this->auth()->isLoggedIn() ? ['active' => 'history'] : []
+ );
+ ?>
+ </div>
+<?php endif; ?>
--
GitLab