From cf2f2d1dd8d2ecacbb03e129b5d98dce4c5131ed Mon Sep 17 00:00:00 2001 From: Demian Katz <demian.katz@villanova.edu> Date: Thu, 2 Nov 2017 14:39:14 -0400 Subject: [PATCH] More case adjustment. --- themes/bootstrap3/templates/Recommend/SwitchTab.phtml | 2 +- themes/bootstrap3/templates/search/advanced/layout.phtml | 2 +- themes/bootstrap3/templates/search/searchbox.phtml | 8 ++++---- themes/root/theme.config.php | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/themes/bootstrap3/templates/Recommend/SwitchTab.phtml b/themes/bootstrap3/templates/Recommend/SwitchTab.phtml index b85ef25d9c8..e04632f53f2 100644 --- a/themes/bootstrap3/templates/Recommend/SwitchTab.phtml +++ b/themes/bootstrap3/templates/Recommend/SwitchTab.phtml @@ -1,6 +1,6 @@ <? $tabConfig = is_object($this->params) - ? $this->searchtabs()->getTabConfigForParams($this->params) : []; + ? $this->searchTabs()->getTabConfigForParams($this->params) : []; ?> <? if (count($tabConfig) > 0): ?> <div class="alert alert-info"> diff --git a/themes/bootstrap3/templates/search/advanced/layout.phtml b/themes/bootstrap3/templates/search/advanced/layout.phtml index 86b1f239c0b..2ed1ec36a41 100644 --- a/themes/bootstrap3/templates/search/advanced/layout.phtml +++ b/themes/bootstrap3/templates/search/advanced/layout.phtml @@ -26,7 +26,7 @@ $hiddenFilters = $this->saved->getParams()->getHiddenFilters(); } else { $hasDefaultsApplied = $searchDetails = $searchFilters = $groups = false; - $hiddenFilters = $this->searchtabs()->getHiddenFilters($this->searchClassId, true); + $hiddenFilters = $this->searchTabs()->getHiddenFilters($this->searchClassId, true); } // Step 1: Load the javascript diff --git a/themes/bootstrap3/templates/search/searchbox.phtml b/themes/bootstrap3/templates/search/searchbox.phtml index cbc41492204..38d56d6f8dd 100644 --- a/themes/bootstrap3/templates/search/searchbox.phtml +++ b/themes/bootstrap3/templates/search/searchbox.phtml @@ -18,16 +18,16 @@ $lastLimit = $this->searchMemory()->getLastLimit($this->searchClassId); $ignoreHiddenFilterMemory = isset($this->ignoreHiddenFilterMemory) && $this->ignoreHiddenFilterMemory; $ignoreHiddenFiltersInRequest = isset($this->ignoreHiddenFiltersInRequest) && $this->ignoreHiddenFiltersInRequest; - $hiddenFilters = $this->searchtabs()->getHiddenFilters($this->searchClassId, $ignoreHiddenFilterMemory, $ignoreHiddenFiltersInRequest); + $hiddenFilters = $this->searchTabs()->getHiddenFilters($this->searchClassId, $ignoreHiddenFilterMemory, $ignoreHiddenFiltersInRequest); if (empty($hiddenFilters) && !$ignoreHiddenFilterMemory) { $hiddenFilters = $this->searchMemory()->getLastHiddenFilters($this->searchClassId); if (empty($hiddenFilters)) { - $hiddenFilters = $this->searchtabs()->getHiddenFilters($this->searchClassId); + $hiddenFilters = $this->searchTabs()->getHiddenFilters($this->searchClassId); } } - $hiddenFilterParams = $this->searchtabs()->getCurrentHiddenFilterParams($this->searchClassId, $ignoreHiddenFilterMemory, '?'); + $hiddenFilterParams = $this->searchTabs()->getCurrentHiddenFilterParams($this->searchClassId, $ignoreHiddenFilterMemory, '?'); ?> -<? $tabConfig = $this->searchtabs()->getTabConfig($this->searchClassId, $this->lookfor, $this->searchIndex, $this->searchType, $hiddenFilters); ?> +<? $tabConfig = $this->searchTabs()->getTabConfig($this->searchClassId, $this->lookfor, $this->searchIndex, $this->searchType, $hiddenFilters); ?> <? if ($this->searchType == 'advanced'): ?> <div class="navbar-form navbar-left flip"> <? $tabs = $this->context($this)->renderInContext('search/searchTabs', ['searchTabs' => $tabConfig['tabs']]); ?> diff --git a/themes/root/theme.config.php b/themes/root/theme.config.php index 22d3826962f..91242c71295 100644 --- a/themes/root/theme.config.php +++ b/themes/root/theme.config.php @@ -36,7 +36,7 @@ return [ 'searchMemory' => 'VuFind\View\Helper\Root\Factory::getSearchMemory', 'searchOptions' => 'VuFind\View\Helper\Root\Factory::getSearchOptions', 'searchParams' => 'VuFind\View\Helper\Root\Factory::getSearchParams', - 'searchtabs' => 'VuFind\View\Helper\Root\Factory::getSearchTabs', + 'searchTabs' => 'VuFind\View\Helper\Root\Factory::getSearchTabs', 'summaries' => 'VuFind\View\Helper\Root\Factory::getSummaries', 'syndeticsPlus' => 'VuFind\View\Helper\Root\Factory::getSyndeticsPlus', 'systemEmail' => 'VuFind\View\Helper\Root\Factory::getSystemEmail', -- GitLab