diff --git a/module/VuDL/src/VuDL/Controller/VudlController.php b/module/VuDL/src/VuDL/Controller/VudlController.php
index 6b3a59587d1ab338c5eed43db8c141dc06dde9a2..6809c1bd82e8b042c24f1aef180c4f0bfb135c4e 100644
--- a/module/VuDL/src/VuDL/Controller/VudlController.php
+++ b/module/VuDL/src/VuDL/Controller/VudlController.php
@@ -85,7 +85,7 @@ class VudlController extends AbstractVuDL
protected function getPage($parent, $child)
{
// GET LISTS
- $lists = array_reverse($this->getConnector()->getOrderedMembers($parent));
+ $lists = $this->getConnector()->getOrderedMembers($parent);
// GET LIST ITEMS
foreach ($lists as $list=>$list_data) {
$items = $this->getConnector()->getOrderedMembers($list_data);
@@ -181,7 +181,7 @@ class VudlController extends AbstractVuDL
'outline' => $this->getOutline($id, $start, $end-$start),
'start' => (int)$start
);
- $data['outline'] = $data['outline']['lists'][0];
+ $data['outline'] = current($data['outline']['lists']);
if (isset($data['outline'])) {
$data['length'] = count($data['outline']);
} else {
@@ -283,7 +283,7 @@ class VudlController extends AbstractVuDL
$view->parents = $parents;
if ($id != $root) {
$view->parentID = $root;
- $view->breadcrumbEnd = $outline['lists'][0][$view->page]['label'];
+ $view->breadcrumbEnd = $outline['lists'][0][$view->initPage]['label'];
}
$view->pagelength = $this->getConnector()->getPageLength();
return $view;
diff --git a/themes/bootstrap3/js/zoomy/canvas-zoomy.js b/themes/bootstrap3/js/zoomy/canvas-zoomy.js
index 158b96f885f3353b64d660283069e76c5b3ff38b..0284f02558dc85b4d317aecac25e97dfaf3ff570 100644
--- a/themes/bootstrap3/js/zoomy/canvas-zoomy.js
+++ b/themes/bootstrap3/js/zoomy/canvas-zoomy.js
@@ -6,13 +6,21 @@ var Zoomy = {
this.canvas.width = Math.floor(this.canvas.clientWidth);
this.canvas.height = Math.floor(this.canvas.clientHeight);
addEventListener('mousemove', Zoomy.mouseHandle, false);
+ addEventListener('touchmove', Zoomy.mouseHandle, false);
addEventListener('mouseup', function(e) {
Zoomy.mouseDown = false;
Zoomy.mouse = undefined;
}, false);
+ addEventListener('touchend', function(e) {
+ Zoomy.mouseDown = false;
+ Zoomy.mouse = undefined;
+ }, false);
this.canvas.addEventListener('mousedown', function(e) {
Zoomy.mouseDown = true;
}, false);
+ this.canvas.addEventListener('touchstart', function(e) {
+ Zoomy.mouseDown = true;
+ }, false);
this.canvas.addEventListener('mousewheel', function(e) {
e.preventDefault();
Zoomy.zoom(e);
@@ -28,8 +36,15 @@ var Zoomy = {
},
mouseHandle: function(e) {
if(!Zoomy.mouseDown) return;
- var mx = e.pageX-Zoomy.canvas.offsetLeft;
- var my = e.pageY-Zoomy.canvas.offsetTop;
+ e.preventDefault();
+ var mx = e.type.match("touch")
+ ? e.targetTouches[0].pageX
+ : e.pageX;
+ mx -= Zoomy.canvas.offsetLeft;
+ var my = e.type.match("touch")
+ ? e.targetTouches[0].pageY
+ : e.pageY;
+ my -= Zoomy.canvas.offsetTop;
if(typeof Zoomy.mouse !== "undefined") {
Zoomy.image.x = Math.floor(Zoomy.image.x + mx - Zoomy.mouse.x);
Zoomy.image.y = Math.floor(Zoomy.image.y + my - Zoomy.mouse.y);
diff --git a/themes/bootstrap3/templates/footer.phtml b/themes/bootstrap3/templates/footer.phtml
index ed7fe778e6e9ec65588046d8f1816c6e23f0732c..59e1cb35c4d3bad1038627a92a5788a80e858e13 100644
--- a/themes/bootstrap3/templates/footer.phtml
+++ b/themes/bootstrap3/templates/footer.phtml
@@ -1,7 +1,4 @@
-<? if ($mobileViewLink = $this->mobileUrl()): // display 'return to mobile' link when applicable ?>
- <hr/>
- <div class="mobileViewLink"><a href="<?=$this->escapeHtmlAttr($mobileViewLink)?>" class="btn btn-primary btn-lg"><?=$this->transEsc("mobile_link")?></a></div>
-<? endif; ?>
+
<hr/>
<div class="col-sm-4"><p><strong><?=$this->transEsc('Search Options')?></strong></p>
<ul>
diff --git a/themes/bootstrap3/templates/vudl/details.phtml b/themes/bootstrap3/templates/vudl/details.phtml
index 38449159d44dc3ba203ad832a2c5cfeb20cfbf31..7cf72d3ba42fd234a86c7d6cd2c557ee5eebb7c4 100644
--- a/themes/bootstrap3/templates/vudl/details.phtml
+++ b/themes/bootstrap3/templates/vudl/details.phtml
@@ -7,12 +7,12 @@
<div class="panel">
<div class="panel-heading">
<h4 class="panel-title">
- <a data-toggle="collapse" data-parent="#side-nav" href="#collapse0">
+ <a data-toggle="collapse" data-parent="#side-nav" href="#collapse_details">
<?=$this->transEsc('Summary & Rights') ?>
</a>
</h4>
</div>
- <div id="collapse0" class="panel-collapse collapse">
+ <div id="collapse_details" class="panel-collapse collapse">
<div class="panel-body details">
<table class="table">
<tr><td><?=$this->transEsc('Full Title') ?></td><td><?=$this->details['title']['value'] ?></td></tr>
diff --git a/themes/bootstrap3/templates/vudl/record.phtml b/themes/bootstrap3/templates/vudl/record.phtml
index 268efd5fc4bda417d489e03c00537f6a13fb0af1..d4f34cc775fe7bb999ace896ab4b3a83fe55b7da 100644
--- a/themes/bootstrap3/templates/vudl/record.phtml
+++ b/themes/bootstrap3/templates/vudl/record.phtml
@@ -14,10 +14,6 @@
break;
}
- // Facebook image meta
- $this->layout()->facebookImage = $this->outline['lists'][0][$this->initPage]['medium'];
- $this->layout()->facebookTitle = $this->details['title']['value'];
-
// HEADER FILES
$this->headLink()->appendStylesheet('vudl.css');
$this->headScript()->appendFile('vudl/config.js');
@@ -44,7 +40,7 @@
var initPage = $.parseJSON('<?=str_replace('\"', "\'", json_encode($this->outline['lists'][$this->initList][$this->initPage], JSON_HEX_APOS | JSON_HEX_AMP)) ?>');
counts = $.parseJSON('<?=json_encode($this->outline['counts'], JSON_HEX_APOS | JSON_HEX_AMP) ?>');
- <? if(count($this->outline['lists'][0]) >= $this->outline['counts'][0]): ?>
+ <? if(count($this->outline['lists'][$this->initList]) >= $this->outline['counts'][$this->initList]): ?>
loading_pages = false;
<? endif; ?>
</script>
@@ -94,12 +90,12 @@
<div class="panel">
<div class="panel-heading">
<h4 class="panel-title">
- <a data-toggle="collapse" data-parent="#side-nav" href="#collapse<?=$key+1 ?>">
+ <a data-toggle="collapse" data-parent="#side-nav" href="#collapse<?=$key ?>">
<?=$this->outline['names'][$key] ?>
</a>
</h4>
</div>
- <div id="collapse<?=$key+1 ?>" class="panel-collapse collapse<? if($key==$this->initList): ?> in<? endif; ?>">
+ <div id="collapse<?=$key ?>" class="panel-collapse collapse<? if($key==$this->initList): ?> in<? endif; ?>">
<div class="panel-body item-list" id="list<?=$key ?>">
<!-- PRE LOADING PLACEHOLDERS -->
<? for($i=0;$i<current(array_keys($list))-1;$i++): ?>
diff --git a/themes/bootstrap3/templates/vudl/views/page.phtml b/themes/bootstrap3/templates/vudl/views/page.phtml
index 1aec9a54db0a47e25aa65a9c3c9242ec899327b8..255236b5baf0b964e1c003dc1b1418fc4fe805e7 100644
--- a/themes/bootstrap3/templates/vudl/views/page.phtml
+++ b/themes/bootstrap3/templates/vudl/views/page.phtml
@@ -99,9 +99,11 @@
<img id="preview" src="<?=isset($this->medium) ? $this->medium : '' ?>">
</div>
<div class="tab-pane text-center" id="zoom">
- <a class="btn btn-default" onClick="Zoomy.turnLeft()">Turn Left</a>
+ <a class="btn btn-default" onClick="Zoomy.turnLeft()"><i class="fa fa-rotate-left"></i></a>
+ <a class="btn btn-default" onClick="Zoomy.zoom({deltaY:1})"><i class="fa fa-search-minus"></i></a>
<a class="btn btn-default" onClick="Zoomy.zoom(0,1)">[1:1]</a>
- <a class="btn btn-default" onClick="Zoomy.turnRight()">Turn Right</a>
+ <a class="btn btn-default" onClick="Zoomy.zoom({deltaY:-1})"><i class="fa fa-search-plus"></i></a>
+ <a class="btn btn-default" onClick="Zoomy.turnRight()"><i class="fa fa-rotate-right"></i></a>
<canvas id="zoomy"></canvas>
</div>
<div class="tab-pane text-center" id="master">