Skip to content
Snippets Groups Projects
Commit 5a33971b authored by Demian Katz's avatar Demian Katz
Browse files

Fixed some basic header/layout template issues (VF_Cart --> \VuFind\Cart, baseurl --> url('home')).

parent a5758034
No related merge requests found
<a id="logo" href="<?=$this->baseUrl()?>"></a> <a id="logo" href="<?=$this->url('home')?>"></a>
<div id="headerRight"> <div id="headerRight">
<? $cart = VF_Cart::getInstance(); if ($cart->isActive()): ?> <? $cart = \VuFind\Cart::getInstance(); if ($cart->isActive()): ?>
<div id="cartSummary" class="cartSummary"> <div id="cartSummary" class="cartSummary">
<a id="cartItems" title="<?=$this->transEsc('View Book Bag')?>" class="bookbag" href="<?=$this->url(array('controller' => 'Cart', 'action' => 'Home'), 'default', true)?>"><strong><span><?=count($cart->getItems())?></span></strong> <?=$this->transEsc('items')?> <?=$cart->isFull() ? '(' . $this->transEsc('bookbag_full') . ')' : ''?></a> <a id="cartItems" title="<?=$this->transEsc('View Book Bag')?>" class="bookbag" href="<?=$this->url(array('controller' => 'Cart', 'action' => 'Home'), 'default', true)?>"><strong><span><?=count($cart->getItems())?></span></strong> <?=$this->transEsc('items')?> <?=$cart->isFull() ? '(' . $this->transEsc('bookbag_full') . ')' : ''?></a>
<a id="viewCart" title="<?=$this->transEsc('View Book Bag')?>" class="viewCart bookbag offscreen" href="<?=$this->url(array('controller' => 'Cart', 'action' => 'Home'), 'default', true)?>"><strong><span id="cartSize"><?=count($cart->getItems())?></span></strong> <?=$this->transEsc('items')?><span id="cartStatus"><?=$cart->isFull() ? $this->transEsc('bookbag_full') : '&nbsp;'?></span></a> <a id="viewCart" title="<?=$this->transEsc('View Book Bag')?>" class="viewCart bookbag offscreen" href="<?=$this->url(array('controller' => 'Cart', 'action' => 'Home'), 'default', true)?>"><strong><span id="cartSize"><?=count($cart->getItems())?></span></strong> <?=$this->transEsc('items')?><span id="cartStatus"><?=$cart->isFull() ? $this->transEsc('bookbag_full') : '&nbsp;'?></span></a>
......
...@@ -9,8 +9,7 @@ ...@@ -9,8 +9,7 @@
$this->headLink( $this->headLink(
array( array(
'href' => $this->url( 'href' => $this->url(
array('controller' => 'Search', 'action' => 'OpenSearch'), 'default', array('controller' => 'Search', 'action' => 'OpenSearch')
'default', true
) . '?method=describe', ) . '?method=describe',
'type' => 'application/opensearchdescription+xml', 'type' => 'application/opensearchdescription+xml',
'title' => $this->transEsc('Library Catalog Search'), 'title' => $this->transEsc('Library Catalog Search'),
...@@ -21,10 +20,10 @@ ...@@ -21,10 +20,10 @@
<?=$this->headLink()?> <?=$this->headLink()?>
<? <?
// Set global path for Javascript code: // Set global path for Javascript code:
$this->headScript()->prependScript("path = '" . $this->baseUrl() . "';"); $this->headScript()->prependScript("path = '" . rtrim($this->url('home'), '/') . "';");
// Deal with cart stuff: // Deal with cart stuff:
$cart = VF_Cart::getInstance(); $cart = \VuFind\Cart::getInstance();
if ($cart->isActive()) { if ($cart->isActive()) {
$this->headScript()->appendFile("jquery.cookie.js"); $this->headScript()->appendFile("jquery.cookie.js");
$this->headScript()->appendFile("cart.js"); $this->headScript()->appendFile("cart.js");
...@@ -71,7 +70,7 @@ ...@@ -71,7 +70,7 @@
<? if ($this->layout()->breadcrumbs): ?> <? if ($this->layout()->breadcrumbs): ?>
<div class="breadcrumbs"> <div class="breadcrumbs">
<div class="breadcrumbinner"> <div class="breadcrumbinner">
<a href="<?=$this->baseUrl()?>"><?=$this->transEsc('Home')?></a> <span>&gt;</span> <a href="<?=$this->url('home')?>"><?=$this->transEsc('Home')?></a> <span>&gt;</span>
<?=$this->layout()->breadcrumbs?> <?=$this->layout()->breadcrumbs?>
</div> </div>
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment