From 39039699f4f0464d33e54b8d5458875543b784bd Mon Sep 17 00:00:00 2001
From: Demian Katz <demian.katz@villanova.edu>
Date: Mon, 25 Jun 2012 14:37:34 -0400
Subject: [PATCH] Updated jquerymobile templates to match latest 2.0alpha code.
---
.../jquerymobile/templates/Recommend/SideFacets-dialog.phtml | 3 ++-
themes/vufind/jquerymobile/templates/record/addtag.phtml | 2 +-
themes/vufind/jquerymobile/templates/record/cite.phtml | 2 +-
themes/vufind/jquerymobile/templates/record/email.phtml | 2 +-
themes/vufind/jquerymobile/templates/record/hold.phtml | 2 +-
themes/vufind/jquerymobile/templates/record/save.phtml | 2 +-
themes/vufind/jquerymobile/templates/record/sms.phtml | 2 +-
themes/vufind/jquerymobile/templates/record/view.phtml | 2 +-
themes/vufind/jquerymobile/templates/search/results.phtml | 2 +-
.../vufind/jquerymobile/templates/summon/header-navbar.phtml | 1 +
10 files changed, 11 insertions(+), 9 deletions(-)
create mode 100644 themes/vufind/jquerymobile/templates/summon/header-navbar.phtml
diff --git a/themes/vufind/jquerymobile/templates/Recommend/SideFacets-dialog.phtml b/themes/vufind/jquerymobile/templates/Recommend/SideFacets-dialog.phtml
index 1edf36f9b69..2098395c79b 100644
--- a/themes/vufind/jquerymobile/templates/Recommend/SideFacets-dialog.phtml
+++ b/themes/vufind/jquerymobile/templates/Recommend/SideFacets-dialog.phtml
@@ -1,4 +1,4 @@
-<? $sideFacetSet = $this->recommend->getFacetSet(); $dateFacets = $this->recommend->getDateFacets(); ?>
+<? $sideFacetSet = $this->recommend->getFacetSet(); ?>
<? if (!empty($sideFacetSet) && $this->results->getResultTotal() > 0): ?>
<div data-role="dialog" id="Search-narrow">
<div data-role="header" data-theme="d" data-position="inline">
@@ -7,6 +7,7 @@
<div data-role="content">
<div data-role="collapsible-set" class="narrow-search">
<? $i = 0; foreach ($sideFacetSet as $title => $cluster): ?>
+ <? if (empty($cluster['list'])) { continue; } // skip empty facets ?>
<div data-role="collapsible" data-collapsed="<?=$i++ == 0 ? 'false' : 'true'?>">
<h4><?=$this->transEsc($cluster['label'])?></h4>
<ul class="narrow" data-role="listview" data-inset="true">
diff --git a/themes/vufind/jquerymobile/templates/record/addtag.phtml b/themes/vufind/jquerymobile/templates/record/addtag.phtml
index 849acba36ff..aff07d6bea6 100644
--- a/themes/vufind/jquerymobile/templates/record/addtag.phtml
+++ b/themes/vufind/jquerymobile/templates/record/addtag.phtml
@@ -3,7 +3,7 @@
$this->headTitle($this->translate('Add Tag'));
?>
<div data-role="page" id="Record-view">
- <?=$this->mobileMenu()->header(array('driver' => $this->driver))?>
+ <?=$this->mobileMenu()->header()?>
<div data-role="content">
<form method="post" name="tagRecord" data-ajax="false">
<input type="hidden" name="submit" value="1" />
diff --git a/themes/vufind/jquerymobile/templates/record/cite.phtml b/themes/vufind/jquerymobile/templates/record/cite.phtml
index 8aee2134501..4496f233b1c 100644
--- a/themes/vufind/jquerymobile/templates/record/cite.phtml
+++ b/themes/vufind/jquerymobile/templates/record/cite.phtml
@@ -10,7 +10,7 @@
}
?>
<div data-role="page" id="Record-view">
- <?=$this->mobileMenu()->header(array('driver' => $this->driver))?>
+ <?=$this->mobileMenu()->header()?>
<div class="record" data-role="content" data-record-id="<?=$this->escape($this->driver->getUniqueId())?>">
<? if (count($citations) == 0): ?>
<?=$this->transEsc('No citations are available for this record')?>
diff --git a/themes/vufind/jquerymobile/templates/record/email.phtml b/themes/vufind/jquerymobile/templates/record/email.phtml
index e58af0ddafa..535ec52699f 100644
--- a/themes/vufind/jquerymobile/templates/record/email.phtml
+++ b/themes/vufind/jquerymobile/templates/record/email.phtml
@@ -3,7 +3,7 @@
$this->headTitle($this->translate('Email Record'));
?>
<div data-role="page" id="Record-view">
- <?=$this->mobileMenu()->header(array('driver' => $this->driver))?>
+ <?=$this->mobileMenu()->header()?>
<div data-role="content">
<?=$this->flashmessages()?>
<form method="post" name="emailRecord" data-ajax="false">
diff --git a/themes/vufind/jquerymobile/templates/record/hold.phtml b/themes/vufind/jquerymobile/templates/record/hold.phtml
index fb2b1853187..ebf5fbaad00 100644
--- a/themes/vufind/jquerymobile/templates/record/hold.phtml
+++ b/themes/vufind/jquerymobile/templates/record/hold.phtml
@@ -3,7 +3,7 @@
$this->headTitle($this->translate('request_place_text') . ': ' . $this->driver->getBreadcrumb());
?>
<div data-role="page" id="Record-view">
- <?=$this->mobileMenu()->header(array('driver' => $this->driver))?>
+ <?=$this->mobileMenu()->header()?>
<div data-role="content">
<h2><?=$this->transEsc('request_place_text')?></h2>
<?=$this->flashmessages()?>
diff --git a/themes/vufind/jquerymobile/templates/record/save.phtml b/themes/vufind/jquerymobile/templates/record/save.phtml
index 5664ad37c43..f5d82a2bd0f 100644
--- a/themes/vufind/jquerymobile/templates/record/save.phtml
+++ b/themes/vufind/jquerymobile/templates/record/save.phtml
@@ -3,7 +3,7 @@
$this->headTitle($this->translate('Save'));
?>
<div data-role="page" id="Record-view">
- <?=$this->mobileMenu()->header(array('driver' => $this->driver))?>
+ <?=$this->mobileMenu()->header()?>
<div data-role="content">
<h3><?=$this->transEsc("add_favorite_prefix") ?> <?=$this->escape($this->driver->getBreadcrumb())?> <?=$this->transEsc("add_favorite_suffix") ?></h3>
<form method="get" name="saveRecord" data-ajax="false">
diff --git a/themes/vufind/jquerymobile/templates/record/sms.phtml b/themes/vufind/jquerymobile/templates/record/sms.phtml
index 1ab77065b48..73fa82b9f46 100644
--- a/themes/vufind/jquerymobile/templates/record/sms.phtml
+++ b/themes/vufind/jquerymobile/templates/record/sms.phtml
@@ -3,7 +3,7 @@
$this->headTitle($this->translate('Text this'));
?>
<div data-role="page" id="Record-view">
- <?=$this->mobileMenu()->header(array('driver' => $this->driver))?>
+ <?=$this->mobileMenu()->header()?>
<div data-role="content">
<?=$this->flashmessages()?>
<form method="post" action="" name="smsRecord" data-ajax="false">
diff --git a/themes/vufind/jquerymobile/templates/record/view.phtml b/themes/vufind/jquerymobile/templates/record/view.phtml
index 54223728cba..f08642153b7 100644
--- a/themes/vufind/jquerymobile/templates/record/view.phtml
+++ b/themes/vufind/jquerymobile/templates/record/view.phtml
@@ -4,7 +4,7 @@
$tab = $this->record($this->driver)->getTab($this->tab);
?>
<div data-role="page" id="Record-view">
- <?=$this->mobileMenu()->header(array('driver' => $this->driver, 'tab' => $this->tab, 'searchLink' => array('action' => 'Home') + $this->searchOptions($this->searchClassId)->getSearchAction()))?>
+ <?=$this->mobileMenu()->header(array('searchLink' => array('action' => 'Home') + $this->searchOptions($this->searchClassId)->getSearchAction()))?>
<div class="record" data-role="content" data-record-id="<?=$this->escape($this->driver->getUniqueId())?>">
<?=$this->flashmessages()?>
<? if ($this->tab == $this->defaultTab): ?>
diff --git a/themes/vufind/jquerymobile/templates/search/results.phtml b/themes/vufind/jquerymobile/templates/search/results.phtml
index bde12afcc46..d65b4f089c4 100644
--- a/themes/vufind/jquerymobile/templates/search/results.phtml
+++ b/themes/vufind/jquerymobile/templates/search/results.phtml
@@ -11,7 +11,7 @@
$this->headScript()->appendFile("check_item_statuses.js");
?>
<div data-role="page" id="Search-list" class="results-page">
- <?=$this->mobileMenu()->header(array('results' => $this->results, 'searchLink' => isset($this->searchLink) ? $this->searchLink : null))?>
+ <?=$this->mobileMenu()->header()?>
<div data-role="content">
<?=$this->flashmessages()?>
<? if (($recordTotal = $this->results->getResultTotal()) > 0): ?>
diff --git a/themes/vufind/jquerymobile/templates/summon/header-navbar.phtml b/themes/vufind/jquerymobile/templates/summon/header-navbar.phtml
new file mode 100644
index 00000000000..eb264af2bc4
--- /dev/null
+++ b/themes/vufind/jquerymobile/templates/summon/header-navbar.phtml
@@ -0,0 +1 @@
+<?=$this->render('search/header-navbar.phtml')?>
\ No newline at end of file
--
GitLab