Skip to content
Snippets Groups Projects
Commit 9ebaaa10 authored by Chris Hallberg's avatar Chris Hallberg
Browse files

Next page/items button rearrange in VuDL. Implemented per list button display.... 

Next page/items button rearrange in VuDL. Implemented per list button display. Redesigned next/prev item interface.
parent ec5bfaa1
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 121 additions and 76 deletions
module/VuDL/src/VuDL/Controller/VudlController.php
+ 1
− 1
View file @ 9ebaaa10
......@@ -429,7 +429,7 @@ class VudlController extends AbstractVuDL
if ($index == -1) {
return $this->redirect()
->toRoute('collection', array('id'=>$params['trail']));
} elseif (isset($params['prev_x'])) {
} elseif (isset($params['prev'])) {
return $this->redirect()->toRoute(
'vudl-record', array('id'=>$members[($index-1)%count($members)])
);
......
themes/bootprint3/css/compiled.css
+ 1
− 1
View file @ 9ebaaa10
This source diff could not be displayed because it is too large. You can view the blob instead.
themes/bootprint3/less/bootprint.less
+ 5
− 0
View file @ 9ebaaa10
......@@ -57,6 +57,11 @@ input[type=checkbox] {
padding:5px 10px;
}
.nav-pills {display:table;margin:0 auto}
.navbar {min-height:1px;}
.navbar-form {
margin-top:5px;
margin-bottom:5px;
}
.pagination {
display:table;
margin:18px auto;
......
themes/bootstrap3/css/compiled.css
+ 1
− 1
View file @ 9ebaaa10
This source diff could not be displayed because it is too large. You can view the blob instead.
themes/bootstrap3/css/vudl.css
+ 19
− 6
View file @ 9ebaaa10
.grid-btn {font-size:14px}
.sibling-form .navbar-nav {display:table;float:none;margin:auto}
.sibling-form .navbar-nav li {margin:0 4px}
.sibling-form .navbar {min-height:1px}
.sibling-form .navbar-nav > li > a {
padding-top:6px;
padding-bottom:6px;
}
/* Navbar buttons */
.sibling-form .navbar-nav li a.btn.btn-default:active,
.sibling-form .navbar-nav li a.btn.btn-default:focus,
.sibling-form .navbar-nav li a.btn.btn-default:hover {
color:#FFF;
background-color:#333;
border-color:#ADADAD;
}
.panel {border:1px solid #DDD}
.panel .panel-heading {background:#EEE}
......@@ -37,9 +55,4 @@ div.xml.collapsed > div { display:none;margin-left:2px }
.fa.file-audio:before {content: "\f1c7";}
.fa.file-msexcel:before {content: "\f1c3";}
.fa.file-msword:before {content: "\f1c2";}
.fa.file-pdf:before {content: "\f1c1";}
.siblings-form .trail {
display:inline-block;
vertical-align:bottom;
}
\ No newline at end of file
.fa.file-pdf:before {content: "\f1c1";}
\ No newline at end of file
themes/bootstrap3/js/vudl/record.js
+ 10
− 0
View file @ 9ebaaa10
......@@ -143,6 +143,10 @@ function resizeAccordions(offset) {
'max-height':vudlAccordionHeight,
'overflow-y':'auto'
});
$('#zoom').css({
'height':vudlAccordionHeight,
'overflow-y':'auto'
});
}
// Toggle side menu
function toggleSideNav() {
......@@ -156,6 +160,12 @@ $(document).ready(function() {
$('.page-link').click(function() {
$('.page-link.selected').removeClass('selected');
$(this).addClass('selected');
var list = parseInt($(this).parents('.item-list').attr('list-index'));
if(counts[list] > 1) {
$('.siblings-form .turn-button').removeClass('hidden');
} else {
$('.siblings-form .turn-button').addClass('hidden');
}
});
// Load clicked items
$('.unloaded').click(function() {
......
themes/bootstrap3/less/a11y.less
+ 2
− 2
View file @ 9ebaaa10
......@@ -43,7 +43,7 @@
.open .dropdown-toggle& {
color: @background;
background-color: @color;
border-color: darken(@border, 12%);
border-color: darken(@border, 12%);
}
}
......@@ -67,7 +67,7 @@
@navbar-default-brand-color: @navbar-default-link-color;
@navbar-default-brand-hover-color: #068139; //contrast 3.15, so min 19px;
.navbar-brand {
font-size: 20px;
font-size: 20px;
}
@navbar-default-brand-hover-bg: transparent;
......
themes/bootstrap3/less/bootstrap.less
+ 1
− 0
View file @ 9ebaaa10
@import "bootstrap/bootstrap";
@import "a11y";
[data-toggle~=dropdown] {cursor:pointer}
.fa {cursor:default}
.form-control {
@media(min-width:768px) {
......
themes/bootstrap3/templates/breadcrumbs/default.phtml
+ 1
− 1
View file @ 9ebaaa10
<li><a href="<?=$this->url('home')?>"><?=$this->transEsc('Home')?></a></li>
<li><a href="<?=$this->url('vudl-default-collection')?>"><?=$this->transEsc('Collections') ?></a></li>
<? $current = $this->layout()->breadcrumbs; $current = current($current); ?>
<? foreach(array_reverse($current) as $id=>$parent): ?>
<? foreach($current as $id=>$parent): ?>
<li><a href="<?=$this->url('collection', array('id'=>$id)) ?>"><?=$parent ?></a></li>
<? endforeach; ?>
<? if(isset($this->layout()->end)): ?>
......
themes/bootstrap3/templates/vudl/navigation.phtml 0 → 100644
+ 78
− 0
View file @ 9ebaaa10
<?
// Parent collections for Prev/Next Item
$parents = array();
$parentKeys = array();
foreach($this->parents as $trail) {
if(is_array($trail)) {
end($trail);
}
if(!in_array(key($trail), $parentKeys)) {
$uniqueParents[] = array(
'id' => key($trail),
'title' => current($trail)
);
$parentKeys[] = key($trail);
}
}
$siblingHref = $this->url('vudl-sibling') . '?id=' . $this->layout()->vudlID;
if(count($uniqueParents) <= 1) {
$siblingHref .= '&trail=' . $uniqueParents[0]['id'];
}
?>
<nav class="sibling-form navbar" role="navigation">
<ul class="nav navbar-nav">
<? if(count($uniqueParents) > 1): ?>
<li class="dropdown">
<a id="sibling-prev" class="btn btn-default" data-toggle="dropdown" title="<?=$this->transEsc('Prev Item in Collection')?>">
<?=$this->transEsc('Prev Item')?> <span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="sibling-prev">
<li role="presentation" class="dropdown-header"><?=$this->transEsc('Choose a collection') ?></li>
<? foreach($uniqueParents as $trail): ?>
<li role="presentation">
<a role="menuitem" tabindex="-1" href="<?=$siblingHref ?>&trail=<?=$trail['id'] ?>&prev=1">
<?=$trail['title'] ?>
</a>
</li>
<? endforeach; ?>
</ul>
</li>
<? else: ?>
<li>
<a href="<?=$siblingHref ?>&prev=1" class="btn btn-default" title="<?=$this->transEsc('Prev Item in Collection')?>">
<i class="fa fa-angle-left"></i>
<?=$this->transEsc('Prev Item')?>
</a>
</li>
<? endif; ?>
<li class="btn-group">
<a href="javascript:prevPage()" class="turn-button btn btn-default<? if($this->outline['counts'][$this->initList] <= 1): ?> hidden<? endif; ?>">Prev Page</a>
<a href="<?=$this->url('vudl-grid', array('id'=>$this->id)) ?>" class="grid-btn btn btn-default"><i class="fa fa-th"></i></a>
<a href="javascript:nextPage()" class="turn-button btn btn-default<? if($this->outline['counts'][$this->initList] <= 1): ?> hidden<? endif; ?>">Next Page</a>
</li>
<? if(count($uniqueParents) > 1): ?>
<li class="dropdown">
<a id="sibling-next" class="btn btn-default" data-toggle="dropdown" title="<?=$this->transEsc('Next Item in Collection')?>">
<?=$this->transEsc('Next Item')?> <span class="caret"></span>
</a>
<ul class="dropdown-menu" role="menu" aria-labelledby="sibling-next">
<li role="presentation" class="dropdown-header"><?=$this->transEsc('Choose a collection') ?></li>
<? foreach($uniqueParents as $trail): ?>
<li role="presentation">
<a role="menuitem" tabindex="-1" href="<?=$siblingHref ?>&trail=<?=$trail['id'] ?>&next=1">
<?=$trail['title'] ?>
</a>
</li>
<? endforeach; ?>
</ul>
</li>
<? else: ?>
<li>
<a href="<?=$siblingHref ?>&next=1" class="btn btn-default" title="<?=$this->transEsc('Next Item in Collection')?>">
<?=$this->transEsc('Next Item')?>
<i class="fa fa-angle-right"></i>
</a>
</li>
<? endif; ?>
</ul>
</nav>
\ No newline at end of file
themes/bootstrap3/templates/vudl/record.phtml
+ 2
− 29
View file @ 9ebaaa10
......@@ -44,34 +44,7 @@
loading_pages = false;
<? endif; ?>
</script>
<form class="form-horizontal text-center siblings-form" action="<?=$this->url('vudl-sibling') ?>" method="get">
<input type="hidden" name="id" value="<?=$this->layout()->vudlID ?>"/>
<button class="btn btn-default" type="submit" name="prev_x" value="1" title="<?=$this->transEsc('Prev Item in Collection')?>">&larr; <?=$this->transEsc('Prev Item')?></button>
<? $parents = array(); ?>
<? $parentKeys = array(); ?>
<? foreach($this->parents as $trail): ?>
<? if(is_array($trail)): ?>
<? end($trail); ?>
<? endif; ?>
<? if(!in_array(key($trail), $parentKeys)): ?>
<? $uniqueParents[] = array(
'id' => key($trail),
'title' => current($trail)
); ?>
<? $parentKeys[] = key($trail); ?>
<? endif; ?>
<? endforeach; ?>
<? if(count($uniqueParents) > 1): ?>
<select class="form-control trail" name="trail">
<? foreach($uniqueParents as $trail): ?>
<option value="<?=$trail['id'] ?>"><?=$trail['title'] ?></option>
<? endforeach; ?>
</select>
<? else: ?>
<input type="hidden" name="trail" value="<?=$uniqueParents[0]['id'] ?>"/>
<? endif; ?>
<button class="btn btn-default" type="submit" name="next_x" value="1" title="<?=$this->transEsc('Next Item in Collection')?>"><?=$this->transEsc('Next Item')?> &rarr;</button>
</form>
<?=$this->context($this)->renderInContext('vudl/navigation.phtml'); ?>
<div class="vudl row">
<div class="panel-group col-sm-3" id="side-nav">
<div class="panel">
......@@ -96,7 +69,7 @@
</h4>
</div>
<div id="collapse<?=$key ?>" class="panel-collapse collapse<? if($key==$this->initList): ?> in<? endif; ?>">
<div class="panel-body item-list" id="list<?=$key ?>">
<div class="panel-body item-list" id="list<?=$key ?>" list-index="<?=$key ?>">
<!-- PRE LOADING PLACEHOLDERS -->
<? for($i=0;$i<current(array_keys($list))-1;$i++): ?>
<a class="page-link unloaded" id="item<?=$i ?>" title="<?=$i ?>">Loading...</a>
......
themes/bootstrap3/templates/vudl/views/audio.phtml
+ 0
− 7
View file @ 9ebaaa10
......@@ -26,13 +26,6 @@
</a>
</li>
<li class="active"><a>Player and Downloads</a></li>
<? if($this->counts[0] > 1): ?>
<li class="pull-right static hidden-xs">
<a class="pull-left" href="javascript:prevPage()">Prev Page</a>
<a class="pull-left" href="<?=$this->url('vudl-grid', array('id'=>$this->id)) ?>"><i class="fa fa-th"></i></a>
<a class="pull-left" href="javascript:nextPage()">Next Page</a>
</li>
<? endif; ?>
</ul>
<div class="tab-container text-center tab-content">
<audio controls preload="auto">
......
themes/bootstrap3/templates/vudl/views/download.phtml
+ 0
− 7
View file @ 9ebaaa10
......@@ -16,13 +16,6 @@
</a>
</li>
<li class="active"><a href="#master" id="master-tab">Downloads</a></li>
<? if($this->counts[0] > 1): ?>
<li class="pull-right static">
<a class="pull-left" href="javascript:prevPage()">Prev Page</a>
<a class="pull-left" href="<?=$this->url('vudl-grid', array('id'=>$this->id)) ?>"><i class="fa fa-th"></i></a>
<a class="pull-left" href="javascript:nextPage()">Next Page</a>
</li>
<? endif; ?>
</ul>
<div class="tab-container text-center tab-content">
<?=$this->context($this)->renderInContext('vudl/master-tab.phtml', array())?>
......
themes/bootstrap3/templates/vudl/views/page.phtml
+ 0
− 14
View file @ 9ebaaa10
......@@ -60,13 +60,6 @@
updateFunction(pageData, 'medium-tab');
});
</script>
<? if($this->counts[0] > 1): ?>
<div class="row btn-group visible-xs">
<a href="javascript:prevPage()" class="btn btn-default">Prev Page</a>
<a href="<?=$this->url('vudl-grid', array('id'=>$this->id)) ?>" class="btn btn-default grid-btn"><i class="fa fa-th"></i></a>
<a href="javascript:nextPage()" class="btn btn-default">Next Page</a>
</div>
<? endif; ?>
<ul class="nav nav-tabs">
<li class="static opener">
<a onClick="toggleSideNav()">
......@@ -79,13 +72,6 @@
<li class="hidden-xs"><a href="#image" id="large-tab" onClick="showPreview('large', this)">Large</a></li>
<li><a href="#zoom" id="zoom-tab">Zoom</a></li>
<li><a href="#master" id="master-tab">Downloads</a></li>
<? if($this->counts[0] > 1): ?>
<li class="pull-right static hidden-xs">
<a class="pull-left" href="javascript:prevPage()">Prev Page</a>
<a class="pull-left" href="<?=$this->url('vudl-grid', array('id'=>$this->id)) ?>"><i class="fa fa-th"></i></a>
<a class="pull-left" href="javascript:nextPage()">Next Page</a>
</li>
<? endif; ?>
</ul>
<div class="tab-content">
<div class="loading-bar front">
......
themes/bootstrap3/templates/vudl/views/video.phtml
+ 0
− 7
View file @ 9ebaaa10
......@@ -26,13 +26,6 @@
</a>
</li>
<li class="active"><a>Player and Downloads</a></li>
<? if($this->counts[0] > 1): ?>
<li class="pull-right static hidden-xs">
<a class="pull-left" href="javascript:prevPage()">Prev Page</a>
<a class="pull-left" href="<?=$this->url('vudl-grid', array('id'=>$this->id)) ?>"><i class="fa fa-th"></i></a>
<a class="pull-left" href="javascript:nextPage()">Next Page</a>
</li>
<? endif; ?>
</ul>
<div class="tab-container text-center tab-content">
<video controls>
......
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