From c8dd77e0ec6bee84d8e62d6f070cc0d75fbfafb4 Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Tue, 26 Jun 2012 12:10:29 -0400
Subject: [PATCH] Introduced serverUrl view helper where appropriate.
---
.../VuFind/src/VuFind/Theme/Root/Helper/ResultFeed.php | 4 ++--
.../blueprint/templates/Recommend/FavoriteFacets.phtml | 4 ++--
.../blueprint/templates/Recommend/SideFacets.phtml | 4 ++--
.../blueprint/templates/Recommend/TopFacets.phtml | 2 +-
.../RecordDriver/SolrDefault/tab-holdings.phtml | 4 ++--
.../blueprint/templates/search/controls/limit.phtml | 2 +-
.../blueprint/templates/search/controls/sort.phtml | 2 +-
.../vufind/blueprint/templates/search/pagination.phtml | 10 +++++-----
.../blueprint/templates/search/reservessearch.phtml | 2 +-
.../templates/Recommend/SideFacets-dialog.phtml | 2 +-
.../jquerymobile/templates/Recommend/SideFacets.phtml | 2 +-
.../RecordDriver/SolrDefault/tab-holdings.phtml | 4 ++--
.../jquerymobile/templates/search/pagination.phtml | 4 ++--
.../jquerymobile/templates/search/reservessearch.phtml | 2 +-
14 files changed, 24 insertions(+), 24 deletions(-)
diff --git a/module/VuFind/src/VuFind/Theme/Root/Helper/ResultFeed.php b/module/VuFind/src/VuFind/Theme/Root/Helper/ResultFeed.php
index 9a2c1214f5e..565ec40e2f5 100644
--- a/module/VuFind/src/VuFind/Theme/Root/Helper/ResultFeed.php
+++ b/module/VuFind/src/VuFind/Theme/Root/Helper/ResultFeed.php
@@ -60,11 +60,11 @@ class VuFind_Theme_Root_Helper_ResultFeed extends Zend_View_Helper_Abstract
. $results->getDisplayQuery()
);
$feed->setLink(
- $this->view->fullUrl($this->view->url())
+ $this->view->fullUrl($this->view->serverUrl())
. $results->getUrl()->setViewParam(null, false)
);
$feed->setFeedLink(
- $this->view->fullUrl($this->view->url())
+ $this->view->fullUrl($this->view->serverUrl())
. $results->getUrl()->getParams(false),
$results->getView()
);
diff --git a/themes/vufind/blueprint/templates/Recommend/FavoriteFacets.phtml b/themes/vufind/blueprint/templates/Recommend/FavoriteFacets.phtml
index c14debfbc31..9db6852e99f 100644
--- a/themes/vufind/blueprint/templates/Recommend/FavoriteFacets.phtml
+++ b/themes/vufind/blueprint/templates/Recommend/FavoriteFacets.phtml
@@ -29,7 +29,7 @@
<ul class="filters">
<? $field = $sideFacetSet['tags']['label'];
foreach ($tagFilterList as $filter): ?>
- <? $removeLink = $this->url().$this->results->getUrl()->removeFacet($filter['field'], $filter['value']); ?>
+ <? $removeLink = $this->serverUrl().$this->results->getUrl()->removeFacet($filter['field'], $filter['value']); ?>
<li>
<a href="<?=$removeLink?>"><img src="<?=$this->imageLink('silk/delete.png')?>" alt="<?=$this->transEsc('Delete') ?>"/></a>
<a href="<?=$removeLink?>"><?=$this->transEsc($field)?>: <?=$this->escape($filter['displayText'])?></a>
@@ -43,7 +43,7 @@
<? if ($thisFacet['isApplied']): ?>
<?=$this->escape($thisFacet['displayText'])?> <img src="<?=$this->imageLink('silk/tick.png')?>" alt="<?=$this->transEsc('Selected') ?>"/>
<? else: ?>
- <a href="<?=$this->url().$this->results->getUrl()->addFacet('tags', $thisFacet['value'])?>"><?=$this->escape($thisFacet['displayText'])?></a> (<?=$this->escape($thisFacet['count'])?>)
+ <a href="<?=$this->serverUrl().$this->results->getUrl()->addFacet('tags', $thisFacet['value'])?>"><?=$this->escape($thisFacet['displayText'])?></a> (<?=$this->escape($thisFacet['count'])?>)
<? endif; ?>
</li>
<? endforeach; ?>
diff --git a/themes/vufind/blueprint/templates/Recommend/SideFacets.phtml b/themes/vufind/blueprint/templates/Recommend/SideFacets.phtml
index f1db4020ef4..b29170a55dc 100644
--- a/themes/vufind/blueprint/templates/Recommend/SideFacets.phtml
+++ b/themes/vufind/blueprint/templates/Recommend/SideFacets.phtml
@@ -16,7 +16,7 @@
<? foreach ($filterList as $field => $filters): ?>
<? foreach ($filters as $filter): ?>
<?
- $removeLink = $this->url().$this->results->getUrl()->removeFacet($filter['field'], $filter['value']);
+ $removeLink = $this->serverUrl().$this->results->getUrl()->removeFacet($filter['field'], $filter['value']);
if ($filter['displayText'] == '[* TO *]') $filter['displayText'] = $this->translate('filter_wildcard');
?>
<li>
@@ -57,7 +57,7 @@
<? if ($thisFacet['isApplied']): ?>
<dd><?=$this->escape($thisFacet['displayText'])?> <img src="<?=$this->imageLink('silk/tick.png')?>" alt="Selected"/></dd>
<? else: ?>
- <dd><a href="<?=$this->url().$this->results->getUrl()->addFacet($title, $thisFacet['value'])?>"><?=$this->escape($thisFacet['displayText'])?></a> (<?=$this->escape($thisFacet['count'])?>)</dd>
+ <dd><a href="<?=$this->serverUrl().$this->results->getUrl()->addFacet($title, $thisFacet['value'])?>"><?=$this->escape($thisFacet['displayText'])?></a> (<?=$this->escape($thisFacet['count'])?>)</dd>
<? endif; ?>
<? endforeach; ?>
<? if ($i > 5): ?><dd><a href="#" onclick="lessFacets('<?=$this->escape($title)?>'); return false;"><?=$this->transEsc('less')?> ...</a></dd><? endif; ?>
diff --git a/themes/vufind/blueprint/templates/Recommend/TopFacets.phtml b/themes/vufind/blueprint/templates/Recommend/TopFacets.phtml
index 44b195b55ca..9a09b6be002 100644
--- a/themes/vufind/blueprint/templates/Recommend/TopFacets.phtml
+++ b/themes/vufind/blueprint/templates/Recommend/TopFacets.phtml
@@ -20,7 +20,7 @@
<? if ($thisFacet['isApplied']): ?>
<?=$this->escape($thisFacet['displayText'])?> <img src="<?=$this->imageLink('silk/tick.png')?>" alt="<?=$this->transEsc('Selected') ?>"/>
<? else: ?>
- <a href="<?=$this->url().$this->results->getUrl()->addFacet($title, $thisFacet['value'])?>"><?=$this->escape($thisFacet['displayText'])?></a> (<?=$thisFacet['count'] ?>)
+ <a href="<?=$this->serverUrl().$this->results->getUrl()->addFacet($title, $thisFacet['value'])?>"><?=$this->escape($thisFacet['displayText'])?></a> (<?=$thisFacet['count'] ?>)
<? endif; ?>
</span>
<? if (count($cluster['list']) > $corner && $iter == count($cluster['list'])): ?>
diff --git a/themes/vufind/blueprint/templates/RecordDriver/SolrDefault/tab-holdings.phtml b/themes/vufind/blueprint/templates/RecordDriver/SolrDefault/tab-holdings.phtml
index 020a957ae9b..f1e2c1796b9 100644
--- a/themes/vufind/blueprint/templates/RecordDriver/SolrDefault/tab-holdings.phtml
+++ b/themes/vufind/blueprint/templates/RecordDriver/SolrDefault/tab-holdings.phtml
@@ -23,11 +23,11 @@
<? if ($this->account->loginEnabled() && $offlineMode != 'ils-offline'): ?>
<? if (!$user): ?>
<div class="info">
- <a href="<?=$this->url()?>?login=true&catalogLogin=true"><?=$this->transEsc("Login")?></a> <?=$this->transEsc("hold_login")?>
+ <a href="<?=$this->serverUrl()?>?login=true&catalogLogin=true"><?=$this->transEsc("Login")?></a> <?=$this->transEsc("hold_login")?>
</div>
<? elseif (!$user->cat_username): ?>
<div class="info">
- <?=$this->translate("hold_profile_html", array('%%url%%' => $this->url() . '?catalogLogin=true'))?>
+ <?=$this->translate("hold_profile_html", array('%%url%%' => $this->serverUrl() . '?catalogLogin=true'))?>
</div>
<? endif; ?>
<? endif; ?>
diff --git a/themes/vufind/blueprint/templates/search/controls/limit.phtml b/themes/vufind/blueprint/templates/search/controls/limit.phtml
index ae58a578261..f1aa5e86266 100644
--- a/themes/vufind/blueprint/templates/search/controls/limit.phtml
+++ b/themes/vufind/blueprint/templates/search/controls/limit.phtml
@@ -1,6 +1,6 @@
<div class="limitSelect">
<? $limitList = $this->results->getLimitList(); if (count($limitList) > 1): ?>
- <form action="<?=$this->url() . $this->results->getUrl()->setLimit(null)?>" method="post">
+ <form action="<?=$this->serverUrl() . $this->results->getUrl()->setLimit(null)?>" method="post">
<label for="limit"><?=$this->transEsc('Results per page')?></label>
<select id="limit" name="limit" class="jumpMenu">
<? foreach ($limitList as $limitVal => $limitData): ?>
diff --git a/themes/vufind/blueprint/templates/search/controls/sort.phtml b/themes/vufind/blueprint/templates/search/controls/sort.phtml
index c755112f6da..4a847e4e31a 100644
--- a/themes/vufind/blueprint/templates/search/controls/sort.phtml
+++ b/themes/vufind/blueprint/templates/search/controls/sort.phtml
@@ -1,5 +1,5 @@
<? $list = $this->results->getSortList(); if (!empty($list)): ?>
- <form action="<?=$this->url() . $this->results->getUrl()->setSort(null)?>" method="post">
+ <form action="<?=$this->serverUrl() . $this->results->getUrl()->setSort(null)?>" method="post">
<label for="sort_options_1"><?=$this->transEsc('Sort')?></label>
<select id="sort_options_1" name="sort" class="jumpMenu">
<? foreach ($this->results->getSortList() as $sortType => $sortData): ?>
diff --git a/themes/vufind/blueprint/templates/search/pagination.phtml b/themes/vufind/blueprint/templates/search/pagination.phtml
index fdf19975702..84a0a0da288 100644
--- a/themes/vufind/blueprint/templates/search/pagination.phtml
+++ b/themes/vufind/blueprint/templates/search/pagination.phtml
@@ -1,14 +1,14 @@
<? if ($this->pageCount): ?>
<div class="pagination">
<? if (isset($this->previous)): ?>
- <a href="<?=$this->url() . $this->results->getUrl()->setPage(1)?>">[1]</a>
- <a href="<?=$this->url() . $this->results->getUrl()->setPage($this->previous)?>">« <?=$this->transEsc('Prev')?></a>
+ <a href="<?=$this->serverUrl() . $this->results->getUrl()->setPage(1)?>">[1]</a>
+ <a href="<?=$this->serverUrl() . $this->results->getUrl()->setPage($this->previous)?>">« <?=$this->transEsc('Prev')?></a>
<? endif; ?>
<? if (count($this->pagesInRange) > 1): ?>
<? foreach ($this->pagesInRange as $page): ?>
<? if ($page != $this->current): ?>
- <a href="<?=$this->url() . $this->results->getUrl()->setPage($page)?>"><?=$page?></a>
+ <a href="<?=$this->serverUrl() . $this->results->getUrl()->setPage($page)?>"><?=$page?></a>
<? else: ?>
<span><?=$page?></span>
<? endif; ?>
@@ -16,8 +16,8 @@
<? endif; ?>
<? if (isset($this->next)): ?>
- <a href="<?=$this->url() . $this->results->getUrl()->setPage($this->next)?>"><?=$this->transEsc('Next');?> »</a>
- <a href="<?=$this->url() . $this->results->getUrl()->setPage($this->pageCount)?>">[<?=$this->pageCount?>]</a>
+ <a href="<?=$this->serverUrl() . $this->results->getUrl()->setPage($this->next)?>"><?=$this->transEsc('Next');?> »</a>
+ <a href="<?=$this->serverUrl() . $this->results->getUrl()->setPage($this->pageCount)?>">[<?=$this->pageCount?>]</a>
<? endif; ?>
</div>
<? endif; ?>
\ No newline at end of file
diff --git a/themes/vufind/blueprint/templates/search/reservessearch.phtml b/themes/vufind/blueprint/templates/search/reservessearch.phtml
index 4c4bbb8e91f..fc09247cd57 100644
--- a/themes/vufind/blueprint/templates/search/reservessearch.phtml
+++ b/themes/vufind/blueprint/templates/search/reservessearch.phtml
@@ -52,7 +52,7 @@
</tr>
<? foreach ($this->results->getResults() as $record): ?>
<?
- $url = $this->url() . $this->escape(
+ $url = $this->serverUrl() . $this->escape(
'?inst=' . urlencode($record->getInstructorId())
. '&course=' . urlencode($record->getCourseId())
. '&dept=' . urlencode($record->getDepartmentId())
diff --git a/themes/vufind/jquerymobile/templates/Recommend/SideFacets-dialog.phtml b/themes/vufind/jquerymobile/templates/Recommend/SideFacets-dialog.phtml
index 2098395c79b..115da9f7b97 100644
--- a/themes/vufind/jquerymobile/templates/Recommend/SideFacets-dialog.phtml
+++ b/themes/vufind/jquerymobile/templates/Recommend/SideFacets-dialog.phtml
@@ -15,7 +15,7 @@
<? if ($thisFacet['isApplied']): ?>
<li data-icon="check" class="checked"><a href="" data-rel="back"><?=$this->escape($thisFacet['displayText'])?></a> <span class="ui-li-count"><?=$this->escape($thisFacet['count'])?></span></li>
<? else: ?>
- <li><a rel="external" href="<?=$this->url().$this->results->getUrl()->addFacet($title, $thisFacet['value'])?>"><?=$this->escape($thisFacet['displayText'])?></a> <span class="ui-li-count"><?=$this->escape($thisFacet['count'])?></span></li>
+ <li><a rel="external" href="<?=$this->serverUrl().$this->results->getUrl()->addFacet($title, $thisFacet['value'])?>"><?=$this->escape($thisFacet['displayText'])?></a> <span class="ui-li-count"><?=$this->escape($thisFacet['count'])?></span></li>
<? endif; ?>
<? endforeach; ?>
</ul>
diff --git a/themes/vufind/jquerymobile/templates/Recommend/SideFacets.phtml b/themes/vufind/jquerymobile/templates/Recommend/SideFacets.phtml
index 703a5ab1a5b..188067c35a3 100644
--- a/themes/vufind/jquerymobile/templates/Recommend/SideFacets.phtml
+++ b/themes/vufind/jquerymobile/templates/Recommend/SideFacets.phtml
@@ -4,7 +4,7 @@
<? $i = 0; foreach ($filterList as $field => $filters): ?>
<? foreach ($filters as $filter): ?>
<?
- $removeLink = $this->url().$this->results->getUrl()->removeFacet($filter['field'], $filter['value']);
+ $removeLink = $this->serverUrl().$this->results->getUrl()->removeFacet($filter['field'], $filter['value']);
if ($filter['displayText'] == '[* TO *]') $filter['displayText'] = $this->translate('filter_wildcard');
?>
<li data-icon="minus">
diff --git a/themes/vufind/jquerymobile/templates/RecordDriver/SolrDefault/tab-holdings.phtml b/themes/vufind/jquerymobile/templates/RecordDriver/SolrDefault/tab-holdings.phtml
index 7c38653a124..9af7b5eb999 100644
--- a/themes/vufind/jquerymobile/templates/RecordDriver/SolrDefault/tab-holdings.phtml
+++ b/themes/vufind/jquerymobile/templates/RecordDriver/SolrDefault/tab-holdings.phtml
@@ -23,11 +23,11 @@
<? if ($this->account->loginEnabled() && $offlineMode != 'ils-offline'): ?>
<? if (!$user): ?>
<div class="info">
- <a href="<?=$this->url()?>?login=true&catalogLogin=true"><?=$this->transEsc("Login")?></a> <?=$this->transEsc("hold_login")?>
+ <a href="<?=$this->serverUrl()?>?login=true&catalogLogin=true"><?=$this->transEsc("Login")?></a> <?=$this->transEsc("hold_login")?>
</div>
<? elseif (!$user->cat_username): ?>
<div class="info">
- <?=$this->translate("hold_profile_html", array('%%url%%' => $this->url() . '?catalogLogin=true'))?>
+ <?=$this->translate("hold_profile_html", array('%%url%%' => $this->serverUrl() . '?catalogLogin=true'))?>
</div>
<? endif; ?>
<? endif; ?>
diff --git a/themes/vufind/jquerymobile/templates/search/pagination.phtml b/themes/vufind/jquerymobile/templates/search/pagination.phtml
index 1244d04d22b..2c4d760f794 100644
--- a/themes/vufind/jquerymobile/templates/search/pagination.phtml
+++ b/themes/vufind/jquerymobile/templates/search/pagination.phtml
@@ -1,11 +1,11 @@
<div data-role="controlgroup" data-type="horizontal" align="center">
<? if ($this->pageCount): ?>
<? if (isset($this->previous)): ?>
- <a rel="external" data-role="button" data-rel="back" href="<?=$this->url() . $this->results->getUrl()->setPage($this->previous)?>">« <?=$this->transEsc('Prev')?></a>
+ <a rel="external" data-role="button" data-rel="back" href="<?=$this->serverUrl() . $this->results->getUrl()->setPage($this->previous)?>">« <?=$this->transEsc('Prev')?></a>
<? endif; ?>
<? if (isset($this->next)): ?>
- <a rel="external" data-role="button" href="<?=$this->url() . $this->results->getUrl()->setPage($this->next)?>"><?=$this->transEsc('Next');?> »</a>
+ <a rel="external" data-role="button" href="<?=$this->serverUrl() . $this->results->getUrl()->setPage($this->next)?>"><?=$this->transEsc('Next');?> »</a>
<? endif; ?>
<? endif; ?>
</div>
\ No newline at end of file
diff --git a/themes/vufind/jquerymobile/templates/search/reservessearch.phtml b/themes/vufind/jquerymobile/templates/search/reservessearch.phtml
index 457e82b74a5..679b69331ac 100644
--- a/themes/vufind/jquerymobile/templates/search/reservessearch.phtml
+++ b/themes/vufind/jquerymobile/templates/search/reservessearch.phtml
@@ -33,7 +33,7 @@
<ul class="results" data-role="listview" data-split-icon="plus" data-split-theme="c">
<? foreach ($this->results->getResults() as $record): ?>
<?
- $url = $this->url() . $this->escape(
+ $url = $this->serverUrl() . $this->escape(
'?inst=' . urlencode($record->getInstructorId())
. '&course=' . urlencode($record->getCourseId())
. '&dept=' . urlencode($record->getDepartmentId())
--
GitLab