diff --git a/themes/bootstrap3/templates/RecordDriver/SolrDefault/list-entry.phtml b/themes/bootstrap3/templates/RecordDriver/SolrDefault/list-entry.phtml index d653aa00fe6f5489e504a6f9bdc1f0b33174cf9b..8840dc3e6ece7195d46db7198b1a2eb5205c3b6a 100644 --- a/themes/bootstrap3/templates/RecordDriver/SolrDefault/list-entry.phtml +++ b/themes/bootstrap3/templates/RecordDriver/SolrDefault/list-entry.phtml @@ -11,9 +11,9 @@ } ?> <div class="row result<? if($this->driver->supportsAjaxStatus()): ?> ajaxItem<? endif ?>"> - <label class="pull-left"><?=$this->record($this->driver)->getCheckbox() ?></label> - <input type="hidden" value="<?=$id ?>" class="hiddenId"/> <div class="col-xs-2 left"> + <label class="pull-left"><?=$this->record($this->driver)->getCheckbox() ?></label> + <input type="hidden" value="<?=$id ?>" class="hiddenId"/> <a href="<?=$this->recordLink()->getUrl($this->driver)?>"> <? if ($summThumb = $this->record($this->driver)->getThumbnail()): ?> <img src="<?=$this->escapeHtmlAttr($summThumb)?>" alt="<?=$this->transEsc('Cover Image')?>"/> @@ -185,6 +185,7 @@ <li><a><?=$this->transEsc('confirm_dialog_no')?></a></li> </ul> </div> + + <?=$openUrl?'<span class="Z3988" title="'.$this->escapeHtmlAttr($openUrl).'"></span>':''?> </div> - <?=$openUrl?'<span class="Z3988" title="'.$this->escapeHtmlAttr($openUrl).'"></span>':''?> </div> diff --git a/themes/bootstrap3/templates/admin/config/home.phtml b/themes/bootstrap3/templates/admin/config/home.phtml index 250fbde4b949a552b9f87d3a2eb8d5d96bf324b6..f3bf5ef0b99c5e3ee39c57e4a8b559e841da00e5 100644 --- a/themes/bootstrap3/templates/admin/config/home.phtml +++ b/themes/bootstrap3/templates/admin/config/home.phtml @@ -1,20 +1,22 @@ <? - // Set page title. - $this->headTitle($this->translate('VuFind Administration - Configuration')); + // Set page title. + $this->headTitle($this->translate('VuFind Administration - Configuration')); ?> -<div class="<?=$this->layoutClass('mainbody')?>"> - <h2><?=$this->transEsc('Configuration')?></h2> - <?=$this->flashmessages()?> - <p>Most VuFind configuration is handled by editing the configuration files in <strong><?=$this->escapeHtml($this->baseConfigPath)?></strong>.</p> - <p>Some basic settings can also be adjusted through the auto-configuration tool.</p> - <? if (!$this->showInstallLink): ?> - <p><?=$this->transEsc('Auto configuration is currently disabled') ?>.</p> - <p><a href="<?=$this->url('admin/config', array('action' => 'EnableAutoConfig'))?>"><?=$this->transEsc('Enable Auto Config')?></a></p> - <? else: ?> - <p><a href="<?=$this->url('install-home')?>"><?=$this->transEsc('auto_configure_title')?></a></p> - <? endif; ?> -</div> +<div class="row"> + <div class="<?=$this->layoutClass('mainbody')?>"> + <h2><?=$this->transEsc('Configuration')?></h2> + <?=$this->flashmessages()?> + <p>Most VuFind configuration is handled by editing the configuration files in <strong><?=$this->escapeHtml($this->baseConfigPath)?></strong>.</p> + <p>Some basic settings can also be adjusted through the auto-configuration tool.</p> + <? if (!$this->showInstallLink): ?> + <p><?=$this->transEsc('Auto configuration is currently disabled') ?>.</p> + <p><a href="<?=$this->url('admin/config', array('action' => 'EnableAutoConfig'))?>"><?=$this->transEsc('Enable Auto Config')?></a></p> + <? else: ?> + <p><a href="<?=$this->url('install-home')?>"><?=$this->transEsc('auto_configure_title')?></a></p> + <? endif; ?> + </div> -<div class="<?=$this->layoutClass('sidebar')?>"> - <?=$this->render("admin/menu.phtml")?> + <div class="<?=$this->layoutClass('sidebar')?>"> + <?=$this->render("admin/menu.phtml")?> + </div> </div> \ No newline at end of file diff --git a/themes/bootstrap3/templates/admin/home.phtml b/themes/bootstrap3/templates/admin/home.phtml index 7b7fed8f372b6618200a3cf9100a0c568f2104b6..ff6c1da76d08b7f48c2d9604486200380480112a 100644 --- a/themes/bootstrap3/templates/admin/home.phtml +++ b/themes/bootstrap3/templates/admin/home.phtml @@ -1,47 +1,49 @@ <? - // Set page title. - $this->headTitle($this->translate('VuFind Administration - Home')); + // Set page title. + $this->headTitle($this->translate('VuFind Administration - Home')); - // Set up map of core name => label - $coreLabels = array( - 'biblio' => $this->translate('Bibliographic Index'), - 'authority' => $this->translate('Authority Index'), - 'stats' => $this->translate('Usage Statistics Index') - ); + // Set up map of core name => label + $coreLabels = array( + 'biblio' => $this->translate('Bibliographic Index'), + 'authority' => $this->translate('Authority Index'), + 'stats' => $this->translate('Usage Statistics Index') + ); ?> -<div class="<?=$this->layoutClass('mainbody')?>"> - <h2><?=$this->transEsc('VuFind Administration')?></h2> - <? $cores = is_object($this->xml) ? $this->xml->xpath('/response/lst[@name="status"]/lst') : array(); ?> - <? foreach ($cores as $core): ?> - <? $coreName = (string)$core['name']; ?> - <? $coreLabel = isset($coreLabels[$coreName]) ? $coreLabels[$coreName] : ucwords($coreName) . ' Index'; ?> - <h3><?=$this->transEsc($coreLabel)?></h3> - <table class="table table-striped"> - <tr> - <th><?=$this->transEsc('Record Count')?>: </th> - <? $recordCount = $core->xpath('//lst[@name="' . $coreName . '"]/lst/int[@name="numDocs"]') ?> - <td><?=$this->escapeHtml((string)array_pop($recordCount))?></td> - </tr> - <tr> - <th><?=$this->transEsc('Start Time')?>: </th> - <? $startTime = $core->xpath('//lst[@name="' . $coreName . '"]/date[@name="startTime"]') ?> - <td><?=$this->escapeHtml(strftime("%b %d, %Y %l:%M:%S%p", strtotime((string)array_pop($startTime))))?></td> - </tr> - <tr> - <th><?=$this->transEsc('Last Modified')?>: </th> - <? $lastModified = $core->xpath('//lst[@name="' . $coreName . '"]/lst/date[@name="lastModified"]') ?> - <td><?=$this->escapeHtml(strftime("%b %d, %Y %l:%M:%S%p", strtotime((string)array_pop($lastModified))))?></td> - </tr> - <tr> - <th><?=$this->transEsc('Uptime')?>: </th> - <? $uptime = $core->xpath('//lst[@name="' . $coreName . '"]/long[@name="uptime"]') ?> - <td><?=$this->printms((string)array_pop($uptime))?></td> - </tr> - </table> - <? endforeach; ?> -</div> +<div class="row"> + <div class="<?=$this->layoutClass('mainbody')?>"> + <h2><?=$this->transEsc('VuFind Administration')?></h2> + <? $cores = is_object($this->xml) ? $this->xml->xpath('/response/lst[@name="status"]/lst') : array(); ?> + <? foreach ($cores as $core): ?> + <? $coreName = (string)$core['name']; ?> + <? $coreLabel = isset($coreLabels[$coreName]) ? $coreLabels[$coreName] : ucwords($coreName) . ' Index'; ?> + <h3><?=$this->transEsc($coreLabel)?></h3> + <table class="table table-striped"> + <tr> + <th><?=$this->transEsc('Record Count')?>: </th> + <? $recordCount = $core->xpath('//lst[@name="' . $coreName . '"]/lst/int[@name="numDocs"]') ?> + <td><?=$this->escapeHtml((string)array_pop($recordCount))?></td> + </tr> + <tr> + <th><?=$this->transEsc('Start Time')?>: </th> + <? $startTime = $core->xpath('//lst[@name="' . $coreName . '"]/date[@name="startTime"]') ?> + <td><?=$this->escapeHtml(strftime("%b %d, %Y %l:%M:%S%p", strtotime((string)array_pop($startTime))))?></td> + </tr> + <tr> + <th><?=$this->transEsc('Last Modified')?>: </th> + <? $lastModified = $core->xpath('//lst[@name="' . $coreName . '"]/lst/date[@name="lastModified"]') ?> + <td><?=$this->escapeHtml(strftime("%b %d, %Y %l:%M:%S%p", strtotime((string)array_pop($lastModified))))?></td> + </tr> + <tr> + <th><?=$this->transEsc('Uptime')?>: </th> + <? $uptime = $core->xpath('//lst[@name="' . $coreName . '"]/long[@name="uptime"]') ?> + <td><?=$this->printms((string)array_pop($uptime))?></td> + </tr> + </table> + <? endforeach; ?> + </div> -<div class="<?=$this->layoutClass('sidebar')?>"> - <?=$this->render("admin/menu.phtml")?> + <div class="<?=$this->layoutClass('sidebar')?>"> + <?=$this->render("admin/menu.phtml")?> + </div> </div> \ No newline at end of file diff --git a/themes/bootstrap3/templates/admin/maintenance/home.phtml b/themes/bootstrap3/templates/admin/maintenance/home.phtml index 13f09793e48bb25b639e9fe66b79dfda1883fca7..04977b734003c8ae828cf98b82e57830a6f31067 100644 --- a/themes/bootstrap3/templates/admin/maintenance/home.phtml +++ b/themes/bootstrap3/templates/admin/maintenance/home.phtml @@ -2,23 +2,26 @@ // Set page title. $this->headTitle($this->translate('VuFind Administration - System Maintenance')); ?> -<div class="<?=$this->layoutClass('mainbody')?>"> - <h2><?=$this->transEsc('System Maintenance')?></h2> - <h3>Utilities</h3> - <?=$this->flashmessages()?> - <form method="get" action="<?=$this->url('admin/maintenance', array('action' => 'DeleteExpiredSearches'))?>"> - <label for="del_daysOld" style="font-weight: normal;">Delete unsaved user search histories older than</label> - <input id="del_daysOld" type="text" name="daysOld" size="5" value="2"/> days. - <input type="submit" name="submit" value="<?=$this->transEsc('Submit')?>"/> - </form> - <form method="get" action="<?=$this->url('admin/maintenance', array('action' => 'DeleteExpiredSessions'))?>"> - <label for="delsess_daysOld" style="font-weight: normal;">Delete user sessions older than</label> - <input id="delsess_daysOld" type="text" name="daysOld" size="5" value="2"/> days. - <input type="submit" name="submit" value="<?=$this->transEsc('Submit')?>"/> - </form> -</div> +<div class="row"> + <div class="<?=$this->layoutClass('mainbody')?>"> + <h2><?=$this->transEsc('System Maintenance')?></h2> -<div class="<?=$this->layoutClass('sidebar')?>"> - <?=$this->render("admin/menu.phtml")?> + <h3>Utilities</h3> + <?=$this->flashmessages()?> + <form method="get" action="<?=$this->url('admin/maintenance', array('action' => 'DeleteExpiredSearches'))?>"> + <label for="del_daysOld" style="font-weight: normal;">Delete unsaved user search histories older than</label> + <input id="del_daysOld" type="text" name="daysOld" size="5" value="2"/> days. + <input type="submit" name="submit" value="<?=$this->transEsc('Submit')?>"/> + </form> + <form method="get" action="<?=$this->url('admin/maintenance', array('action' => 'DeleteExpiredSessions'))?>"> + <label for="delsess_daysOld" style="font-weight: normal;">Delete user sessions older than</label> + <input id="delsess_daysOld" type="text" name="daysOld" size="5" value="2"/> days. + <input type="submit" name="submit" value="<?=$this->transEsc('Submit')?>"/> + </form> + </div> + + <div class="<?=$this->layoutClass('sidebar')?>"> + <?=$this->render("admin/menu.phtml")?> + </div> </div> \ No newline at end of file diff --git a/themes/bootstrap3/templates/admin/socialstats/home.phtml b/themes/bootstrap3/templates/admin/socialstats/home.phtml index cf04a0bb7cb65ad6bbec934492abd1e3d828e4bd..8f881ecf7d461673c7edc43d86615504dc8077b7 100644 --- a/themes/bootstrap3/templates/admin/socialstats/home.phtml +++ b/themes/bootstrap3/templates/admin/socialstats/home.phtml @@ -2,28 +2,31 @@ // Set page title. $this->headTitle($this->translate('VuFind Administration - Social Statistics')); ?> -<div class="<?=$this->layoutClass('mainbody')?>"> - <h2><?=$this->transEsc('Social Statistics')?></h2> - <h3>Comments</h3> - <table class="table table-striped"> - <tr><th>Total Users</th><th>Total Resources</th><th>Total Comments</th></tr> - <tr><td><?=$comments['users']?></td><td><?=$comments['resources']?></td><td><?=$comments['total']?></td></tr> - </table> +<div class="row"> + <div class="<?=$this->layoutClass('mainbody')?>"> + <h2><?=$this->transEsc('Social Statistics')?></h2> - <h3>Favorites</h3> - <table class="table table-striped"> - <tr><th>Total Users</th><th>Total Resources</th><th>Total Lists</th><th>Total Saved Items</th></tr> - <tr><td><?=$favorites['users']?></td><td><?=$favorites['resources']?></td><td><?=$favorites['lists']?></td><td><?=$favorites['total']?></td></tr> - </table> + <h3>Comments</h3> + <table class="table table-striped"> + <tr><th>Total Users</th><th>Total Resources</th><th>Total Comments</th></tr> + <tr><td><?=$comments['users']?></td><td><?=$comments['resources']?></td><td><?=$comments['total']?></td></tr> + </table> - <h3>Tags</h3> - <table class="table table-striped"> - <tr><th>Total Users</th><th>Total Resources</th><th>Total Tags</th></tr> - <tr><td><?=$tags['users']?></td><td><?=$tags['resources']?></td><td><?=$tags['total']?></td></tr> - </table> -</div> + <h3>Favorites</h3> + <table class="table table-striped"> + <tr><th>Total Users</th><th>Total Resources</th><th>Total Lists</th><th>Total Saved Items</th></tr> + <tr><td><?=$favorites['users']?></td><td><?=$favorites['resources']?></td><td><?=$favorites['lists']?></td><td><?=$favorites['total']?></td></tr> + </table> -<div class="<?=$this->layoutClass('sidebar')?>"> - <?=$this->render("admin/menu.phtml")?> + <h3>Tags</h3> + <table class="table table-striped"> + <tr><th>Total Users</th><th>Total Resources</th><th>Total Tags</th></tr> + <tr><td><?=$tags['users']?></td><td><?=$tags['resources']?></td><td><?=$tags['total']?></td></tr> + </table> + </div> + + <div class="<?=$this->layoutClass('sidebar')?>"> + <?=$this->render("admin/menu.phtml")?> + </div> </div> \ No newline at end of file diff --git a/themes/bootstrap3/templates/admin/statistics/home.phtml b/themes/bootstrap3/templates/admin/statistics/home.phtml index ff208f4f867b873c7ebb5bda8813c3bc3a31abe6..626db3e1d0b995dda361651d8ec605d1c79d63df 100644 --- a/themes/bootstrap3/templates/admin/statistics/home.phtml +++ b/themes/bootstrap3/templates/admin/statistics/home.phtml @@ -3,90 +3,93 @@ $this->headTitle($this->translate('VuFind Administration - Statistics')); ?> <style> -table { + table { table-layout: fixed; width: 100%; -} -tr td:first-child { + } + tr td:first-child { width:50%; -} + } </style> -<div class="<?=$this->layoutClass('mainbody')?>"> - <h2><?=$this->transEsc('Statistics')?></h2> - <? if(null !== $this->totalSearches || null !== $this->emptySearches || null !== $this->totalRecordViews): ?> - <h3>Executive Summary</h3> - <table class="table table-striped"> - <? if(null !== $this->totalSearches): ?><tr><td>Total Searches</td><td><?=$this->totalSearches ?></td></tr><? endif; ?> - <? if(null !== $this->emptySearches): ?><tr><td>0 Hit Searches</td><td><?=$this->emptySearches ?></td></tr><? endif; ?> - <? if(null !== $this->totalRecordViews): ?><tr><td>Total Record Views</td><td><?=$this->totalRecordViews ?></td></tr><? endif; ?> - </table> - <? endif; ?> +<div class="row"> + <div class="<?=$this->layoutClass('mainbody')?>"> + <h2><?=$this->transEsc('Statistics')?></h2> - <? if(!empty($this->topSearches)): ?> - <h3>Top Searches<? if($this->searchesBySource): ?> by Source<? endif; ?></h3> - <? if($this->searchesBySource): ?> - <? foreach($this->topSearches as $source=>$searches): ?> - <span style="font-size:14px"><?=$source ?></span> - <table class="table table-striped"> - <? foreach($searches as $search): ?> - <tr><td><?=$search['value'] ?></td><td><?=$search['count'] ?></td></tr> - <? endforeach; ?> - </table> - <? endforeach; ?> - <? else: ?> + <? if(null !== $this->totalSearches || null !== $this->emptySearches || null !== $this->totalRecordViews): ?> + <h3>Executive Summary</h3> <table class="table table-striped"> - <? foreach($this->topSearches as $search): ?> - <tr><td><?=$search['value'] ?></td><td><?=$search['count'] ?></td><td><?=$search['source'] ?></td></tr> - <? endforeach; ?> + <? if(null !== $this->totalSearches): ?><tr><td>Total Searches</td><td><?=$this->totalSearches ?></td></tr><? endif; ?> + <? if(null !== $this->emptySearches): ?><tr><td>0 Hit Searches</td><td><?=$this->emptySearches ?></td></tr><? endif; ?> + <? if(null !== $this->totalRecordViews): ?><tr><td>Total Record Views</td><td><?=$this->totalRecordViews ?></td></tr><? endif; ?> </table> <? endif; ?> - <? endif; ?> - <? if(!empty($this->topRecords)): ?> - <h3>Top Records<? if($this->recordsBySource): ?> by Source<? endif; ?></h3> - <? if($this->recordsBySource): ?> - <? foreach($this->topRecords as $source=>$records): ?> - <span style="font-size:14px"><?=$source ?></span> + <? if(!empty($this->topSearches)): ?> + <h3>Top Searches<? if($this->searchesBySource): ?> by Source<? endif; ?></h3> + <? if($this->searchesBySource): ?> + <? foreach($this->topSearches as $source=>$searches): ?> + <span style="font-size:14px"><?=$source ?></span> + <table class="table table-striped"> + <? foreach($searches as $search): ?> + <tr><td><?=$search['value'] ?></td><td><?=$search['count'] ?></td></tr> + <? endforeach; ?> + </table> + <? endforeach; ?> + <? else: ?> <table class="table table-striped"> - <? foreach($records as $record): ?> - <tr><td><?=$record['value'] ?></td><td><?=$record['count'] ?></td></tr> + <? foreach($this->topSearches as $search): ?> + <tr><td><?=$search['value'] ?></td><td><?=$search['count'] ?></td><td><?=$search['source'] ?></td></tr> + <? endforeach; ?> + </table> + <? endif; ?> + <? endif; ?> + + <? if(!empty($this->topRecords)): ?> + <h3>Top Records<? if($this->recordsBySource): ?> by Source<? endif; ?></h3> + <? if($this->recordsBySource): ?> + <? foreach($this->topRecords as $source=>$records): ?> + <span style="font-size:14px"><?=$source ?></span> + <table class="table table-striped"> + <? foreach($records as $record): ?> + <tr><td><?=$record['value'] ?></td><td><?=$record['count'] ?></td></tr> + <? endforeach; ?> + </table> <? endforeach; ?> + <? else: ?> + <table class="table table-striped"> + <? foreach($this->topRecords as $record): ?> + <tr><td><?=$record['value'] ?></td><td><?=$record['count'] ?></td><td><?=$record['source'] ?></td></tr> + <? endforeach; ?> </table> - <? endforeach; ?> - <? else: ?> + <? endif; ?> + <? endif; ?> + + <? if(!empty($this->browserStats)): ?> + <h3>Browser Usage</h3> + <? + $total = 0; + foreach($this->browserStats as $browser) { + $total += $browser['count']; + } + ?> <table class="table table-striped"> - <? foreach($this->topRecords as $record): ?> - <tr><td><?=$record['value'] ?></td><td><?=$record['count'] ?></td><td><?=$record['source'] ?></td></tr> - <? endforeach; ?> + <? foreach($this->browserStats as $browser): ?> + <tr><td><?=$browser['browserName'] ?></td><td><?=$browser['count'] ?></td><td><?=round($browser['count']*100/$total, 2) ?>%</td></tr> + <? endforeach; ?> </table> + <h4 style="display:inline">Top Versions</h4>: + <? foreach($this->topVersions as $i=>$browser): ?> + <span style="padding:0 3px<? if($this->currentBrowser == $browser['browserName']): ?>;background:#E5ECF9<? endif; ?>"><?=$browser['browserName'] ?> (<?=$browser['count'] ?>)</span><? if(++$i < count($this->topVersions)): ?>,<? endif; ?> + <? endforeach; ?> <? endif; ?> - <? endif; ?> - <? if(!empty($this->browserStats)): ?> - <h3>Browser Usage</h3> - <? - $total = 0; - foreach($this->browserStats as $browser) { - $total += $browser['count']; - } - ?> - <table class="table table-striped"> - <? foreach($this->browserStats as $browser): ?> - <tr><td><?=$browser['browserName'] ?></td><td><?=$browser['count'] ?></td><td><?=round($browser['count']*100/$total, 2) ?>%</td></tr> - <? endforeach; ?> - </table> - <h4 style="display:inline">Top Versions</h4>: - <? foreach($this->topVersions as $i=>$browser): ?> - <span style="padding:0 3px<? if($this->currentBrowser == $browser['browserName']): ?>;background:#E5ECF9<? endif; ?>"><?=$browser['browserName'] ?> (<?=$browser['count'] ?>)</span><? if(++$i < count($this->topVersions)): ?>,<? endif; ?> - <? endforeach; ?> - <? endif; ?> - - <? if(empty($this->topSearches) && empty($this->topRecords) && empty($this->browserStats)): ?> - No statistic sources. - <? endif; ?> -</div> + <? if(empty($this->topSearches) && empty($this->topRecords) && empty($this->browserStats)): ?> + No statistic sources. + <? endif; ?> + </div> -<div class="<?=$this->layoutClass('sidebar')?>"> - <?=$this->render("admin/menu.phtml")?> + <div class="<?=$this->layoutClass('sidebar')?>"> + <?=$this->render("admin/menu.phtml")?> + </div> </div> \ No newline at end of file diff --git a/themes/bootstrap3/templates/admin/tags/home.phtml b/themes/bootstrap3/templates/admin/tags/home.phtml index 4afe094691b13b56c342e1ed5820f37f8c647b47..46f5be1cf31635f70c0476c0f789f608f8ba9149 100644 --- a/themes/bootstrap3/templates/admin/tags/home.phtml +++ b/themes/bootstrap3/templates/admin/tags/home.phtml @@ -1,20 +1,22 @@ <? - // Set page title. - $this->headTitle($this->translate('VuFind Administration - Tag Management')); + // Set page title. + $this->headTitle($this->translate('VuFind Administration - Tag Management')); ?> -<div class="<?=$this->layoutClass('mainbody')?>"> - <h2><?=$this->translate('Tag Management')?></h2> +<div class="row"> + <div class="<?=$this->layoutClass('mainbody')?>"> + <h2><?=$this->translate('Tag Management')?></h2> - <?=$this->render("admin/tags/menu.phtml")?> + <?=$this->render("admin/tags/menu.phtml")?> - <h3><?=$this->translate('Statistics')?></h3> - <table class="table table-striped"> - <tr><th><?=$this->transEsc('total_users')?></th><th><?=$this->transEsc('total_resources')?></th><th><?=$this->transEsc('total_tags')?></th><th><?=$this->transEsc('unique_tags')?></th><th><?=$this->transEsc('anonymous_tags')?></th></tr> - <tr><td><?=$statistics['users']?></td><td><?=$statistics['resources']?></td><td><?=$statistics['total']?></td><td><?=$statistics['unique']?></td><td><?=$statistics['anonymous']?></td></tr> - </table> + <h3><?=$this->translate('Statistics')?></h3> + <table class="table table-striped"> + <tr><th><?=$this->transEsc('total_users')?></th><th><?=$this->transEsc('total_resources')?></th><th><?=$this->transEsc('total_tags')?></th><th><?=$this->transEsc('unique_tags')?></th><th><?=$this->transEsc('anonymous_tags')?></th></tr> + <tr><td><?=$statistics['users']?></td><td><?=$statistics['resources']?></td><td><?=$statistics['total']?></td><td><?=$statistics['unique']?></td><td><?=$statistics['anonymous']?></td></tr> + </table> -</div> + </div> -<div class="<?=$this->layoutClass('sidebar')?>"> - <?=$this->render("admin/menu.phtml")?> + <div class="<?=$this->layoutClass('sidebar')?>"> + <?=$this->render("admin/menu.phtml")?> + </div> </div> \ No newline at end of file diff --git a/themes/bootstrap3/templates/admin/tags/list.phtml b/themes/bootstrap3/templates/admin/tags/list.phtml index 6cae43183399a24e2a231800d61541a9196116b5..3dea8a100b810c085dce0af71dbb02e4d7c64098 100644 --- a/themes/bootstrap3/templates/admin/tags/list.phtml +++ b/themes/bootstrap3/templates/admin/tags/list.phtml @@ -2,29 +2,26 @@ // Set page title. $this->headTitle($this->translate('VuFind Administration - Tag Management')); ?> -<div class="<?=$this->layoutClass('mainbody')?>"> - <h2><?=$this->translate('Tag Management')?></h2> - <h3><?=$this->translate('List Tags')?></h3> - <?=$this->render("admin/tags/menu.phtml")?> +<div class="row"> + <div class="<?=$this->layoutClass('mainbody')?>"> + <h2><?=$this->translate('Tag Management')?></h2> + <h3><?=$this->translate('List Tags')?></h3> - <?=$this->flashmessages()?> + <?=$this->render("admin/tags/menu.phtml")?> - <div class="tagForm"> - <form action="<?= $this->url('admin/tags', array('action' => 'List'))?>" method="get"> + <?=$this->flashmessages()?> - <fieldset> - <legend><?=$this->translate('filter_tags')?></legend> + <div class="tagForm"> + <form action="<?= $this->url('admin/tags', array('action' => 'List'))?>" method="get"> - <table> - <tr> - <th><label for="user_id"><?=$this->translate('Username')?></label></th> - <th><label for="tag_id"><?=$this->translate('Tag')?></label></th> - <th><label for="resource_id"><?=$this->translate('Title')?></label></th> - </tr> - <tr> - <td> - <select name="user_id" id="user_id"> + <fieldset> + <legend><?=$this->translate('filter_tags')?></legend> + + <div class="row"> + <div class="col-sm-3"> + <label for="user_id"><?=$this->translate('Username')?></label> + <select name="user_id" id="user_id" class="form-control"> <option value="ALL"><?=$this->translate('All')?></option> <? foreach($this->uniqueUsers as $user):?> <option value="<?= $user['user_id'] ?>"<? if(isset($this->params['user_id']) && $user['user_id'] == $this->params['user_id']): ?> selected="selected"<? endif;?>> @@ -32,9 +29,10 @@ </option> <? endforeach;?> </select> - </td> - <td> - <select name="tag_id" id="tag_id"> + </div> + <div class="col-sm-3"> + <label for="tag_id"><?=$this->translate('Tag')?></label> + <select name="tag_id" id="tag_id" class="form-control"> <option value="ALL"><?=$this->translate('All')?></option> <? foreach($this->uniqueTags as $tag):?> <option value="<?= $tag['tag_id'] ?>"<? if(isset($this->params['tag_id']) && $tag['tag_id'] == $this->params['tag_id']): ?> selected="selected"<? endif;?>> @@ -42,9 +40,10 @@ </option> <? endforeach;?> </select> - </td> - <td> - <select name="resource_id" id="resource_id"> + </div> + <div class="col-sm-3"> + <label for="resource_id"><?=$this->translate('Title')?></label> + <select name="resource_id" id="resource_id" class="form-control"> <option value="ALL"><?=$this->translate('All')?></option> <? foreach($this->uniqueResources as $resource):?> <option value="<?= $resource['resource_id']; ?>" title="<?=$resource['title'] ?>"<? if(isset($this->params['resource_id']) && $resource['resource_id'] == $this->params['resource_id']): ?> selected="selected"<? endif;?>> @@ -52,58 +51,59 @@ </option> <? endforeach;?> </select> - </td> - </tr> - </table> - - <input type="submit" value="<?=$this->transEsc('Filter')?>"> - <? if((isset($this->params['user_id']) && !is_null($this->params['user_id'])) || (isset($this->params['tag_id']) && !is_null($this->params['tag_id'])) || (isset($this->params['resource_id']) && !is_null($this->params['resource_id']))):?> - <a href="<?= $this->url('admin/tags', array('action' => 'List')); ?>"><?=$this->translate('clear_tag_filter')?></a> - <? endif;?> + </div> + <div class="col-sm-3"> + <input type="submit" value="<?=$this->transEsc('Filter')?>" class="btn btn-primary"> + <? if((isset($this->params['user_id']) && !is_null($this->params['user_id'])) || (isset($this->params['tag_id']) && !is_null($this->params['tag_id'])) || (isset($this->params['resource_id']) && !is_null($this->params['resource_id']))):?> + <a href="<?= $this->url('admin/tags', array('action' => 'List')); ?>"><?=$this->translate('clear_tag_filter')?></a> + <? endif;?> + </div> + </div> - </fieldset> + </fieldset> - </form> - </div> + </form> + </div> - <? if(count($this->results) > 0):?> - <div class="tagsList"> - <form action="<?= $this->url('admin/tags', array('action' => 'Delete'))?>" method="post"> - <input type="hidden" name="user_id" value="<?=isset($this->params['user_id']) ? $this->params['user_id'] : '' ?>" /> - <input type="hidden" name="tag_id" value="<?=isset($this->params['tag_id']) ? $this->params['tag_id'] : '' ?>" /> - <input type="hidden" name="resource_id" value="<?=isset($this->params['resource_id']) ? $this->params['resource_id'] : '' ?>" /> - <input type="hidden" name="origin" value="list" /> + <? if(count($this->results) > 0):?> + <div class="tagsList"> + <form action="<?= $this->url('admin/tags', array('action' => 'Delete'))?>" method="post"> + <input type="hidden" name="user_id" value="<?=isset($this->params['user_id']) ? $this->params['user_id'] : '' ?>" /> + <input type="hidden" name="tag_id" value="<?=isset($this->params['tag_id']) ? $this->params['tag_id'] : '' ?>" /> + <input type="hidden" name="resource_id" value="<?=isset($this->params['resource_id']) ? $this->params['resource_id'] : '' ?>" /> + <input type="hidden" name="origin" value="list" /> - <table class="table table-striped"> - <tr> - <th> </th> - <th><?=$this->translate('Username')?></th> - <th><?=$this->translate('Tag')?></th> - <th><?=$this->translate('Title')?></th> - </tr> + <table class="table table-striped"> + <tr> + <th> </th> + <th><?=$this->translate('Username')?></th> + <th><?=$this->translate('Tag')?></th> + <th><?=$this->translate('Title')?></th> + </tr> - <? foreach ($this->results as $tag): ?> - <tr> - <td><?=$this->render('admin/tags/checkbox', array('tag'=>$tag)) ; ?></td> - <td><?=$tag->username ?> (<?= $tag->user_id?>)</td> - <td><?=$tag->tag?> (<?= $tag->tag_id?>)</td> - <td><?=$tag->title?> (<?= $tag->resource_id?>)</td> - </tr> - <? endforeach;?> - </table> + <? foreach ($this->results as $tag): ?> + <tr> + <td><?=$this->render('admin/tags/checkbox', array('tag'=>$tag)) ; ?></td> + <td><?=$tag->username ?> (<?= $tag->user_id?>)</td> + <td><?=$tag->tag?> (<?= $tag->tag_id?>)</td> + <td><?=$tag->title?> (<?= $tag->resource_id?>)</td> + </tr> + <? endforeach;?> + </table> - <input type="submit" name="deleteSelected" value="<?=$this->transEsc('delete_selected')?>"> - <input type="submit" name="deletePage" value="<?=$this->transEsc('delete_page')?>"> - <input type="submit" name="deleteFilter" value="<?=$this->transEsc('delete_all')?>"> + <input type="submit" name="deleteSelected" value="<?=$this->transEsc('delete_selected')?>" class="btn btn-default"> + <input type="submit" name="deletePage" value="<?=$this->transEsc('delete_page')?>" class="btn btn-default"> + <input type="submit" name="deleteFilter" value="<?=$this->transEsc('delete_all')?>" class="btn btn-default"> - </form> - </div> - <?=$this->paginationControl($this->results, 'Sliding', 'admin/tags/pagination.phtml', array('params' => $this->params))?> - <? else:?> - <p><?=$this->translate('tag_filter_empty')?></p> - <? endif;?> -</div> + </form> + </div> + <?=$this->paginationControl($this->results, 'Sliding', 'admin/tags/pagination.phtml', array('params' => $this->params))?> + <? else:?> + <p><?=$this->translate('tag_filter_empty')?></p> + <? endif;?> + </div> -<div class="<?=$this->layoutClass('sidebar')?>"> - <?=$this->render("admin/menu.phtml")?> + <div class="<?=$this->layoutClass('sidebar')?>"> + <?=$this->render("admin/menu.phtml")?> + </div> </div> \ No newline at end of file diff --git a/themes/bootstrap3/templates/admin/tags/manage.phtml b/themes/bootstrap3/templates/admin/tags/manage.phtml index 27f6a0471411398777d4595433963315b6985cdf..b401a0954c74469a5eb030b1cd57139b60d98ea6 100644 --- a/themes/bootstrap3/templates/admin/tags/manage.phtml +++ b/themes/bootstrap3/templates/admin/tags/manage.phtml @@ -2,87 +2,89 @@ // Set page title. $this->headTitle($this->translate('VuFind Administration - Tag Maintenance')); ?> -<div class="<?=$this->layoutClass('mainbody')?>"> - <h2><?=$this->translate('Tag Management')?></h2> - <h3><?=$this->translate('Manage Tags')?></h3> - - <?=$this->render("admin/tags/menu.phtml")?> - - <?=$this->flashmessages()?> - - <form class="form-horizontal" action="<?= $this->url('admin/tags', array('action' => 'Manage'));?>" method="post"> - - <label for="type"><?=$this->translate('delete_tags_by')?>:</label> - - <select id="type" name="type"> - <option value="user" <? if("user" == $this->type) echo " selected=selected";?>><?=$this->translate('Username')?></option> - <option value="tag" <? if("tag" == $this->type) echo " selected=selected";?>><?=$this->translate('Tag')?></option> - <option value="resource" <? if("resource" == $this->type) echo " selected=selected";?>><?=$this->translate('Title')?></option> - </select> - - <input type="submit" value="<?=$this->translate('Submit')?>" /> - - </form> - - <? if(false !== $this->type):?> - - <form action="<?= $this->url('admin/tags', array('action' => 'Delete'))?>" method="post"> - +<div class="row"> + <div class="<?=$this->layoutClass('mainbody')?>"> + <h2><?=$this->translate('Tag Management')?></h2> + <h3><?=$this->translate('Manage Tags')?></h3> + + <?=$this->render("admin/tags/menu.phtml")?> + + <?=$this->flashmessages()?> + + <form class="form-horizontal" action="<?= $this->url('admin/tags', array('action' => 'Manage'));?>" method="post" role="form"> + <div class="form-group"> + <label for="type" class="col-sm-2 control-label"><?=$this->translate('delete_tags_by')?>:</label> + <div class="col-sm-6"> + <select id="type" name="type" class="form-control"> + <option value="user" <? if("user" == $this->type) echo " selected=selected";?>><?=$this->translate('Username')?></option> + <option value="tag" <? if("tag" == $this->type) echo " selected=selected";?>><?=$this->translate('Tag')?></option> + <option value="resource" <? if("resource" == $this->type) echo " selected=selected";?>><?=$this->translate('Title')?></option> + </select> + </div> + <div class="col-sm-4"> + <input type="submit" value="<?=$this->translate('Submit')?>" class="btn btn-primary"/> + </div> + </div> + </form> + + <? if(false !== $this->type):?> + <form class="form-horizontal" action="<?= $this->url('admin/tags', array('action' => 'Delete'))?>" method="post"> <input type="hidden" name="origin" value="manage" /> <input type="hidden" name="type" value="<?= $this->type; ?>" /> - - <? if("user" == $type):?> - - <label for="user_id"><?=$this->translate('Username')?></label> - - <select name="user_id" id="user_id"> - <? foreach($this->uniqueUsers as $user):?> - <option value="<?= $user['user_id'] ?>"> - <?= $user['username'] ?> - </option> - <? endforeach;?> - </select> - - <input type="submit" name="deleteFilter" value="<?=$this->translate('delete_tags')?>" /> - - <? elseif("tag" == $type):?> - - <label for="tag_id"><?=$this->translate('Tag')?></label> - - <select name="tag_id" id="tag_id"> - <? foreach($this->uniqueTags as $tag):?> - <option value="<?= $tag['tag_id'] ?>"> - <?= $tag['tag'] ?> - </option> - <? endforeach;?> - </select> - - <input type="submit" name="deleteFilter" value="<?=$this->translate('delete_tags')?>" /> - - <? elseif("resource" == $type):?> - - <label for="resource_id"><?=$this->translate('Title')?></label> - - <select name="resource_id" id="resource_id"> - <? foreach($this->uniqueResources as $resource):?> - <option value="<?=$resource['resource_id'] ?>" title="<?=$resource['title'] ?>"> - <?=$this->truncate($resource['title'], 80) ?> (<?= $resource['resource_id'] ?>) - </option> - <? endforeach;?> - </select> - - <input type="submit" name="deleteFilter" value="<?=$this->translate('delete_tags')?>" /> - - <? endif;?> - + <? if("user" == $type):?> + <div class="form-group"> + <label for="user_id" class="col-sm-2 control-label"><?=$this->translate('Username')?></label> + <div class="col-sm-6"> + <select name="user_id" id="user_id" class="form-control"> + <? foreach($this->uniqueUsers as $user):?> + <option value="<?= $user['user_id'] ?>"> + <?= $user['username'] ?> + </option> + <? endforeach;?> + </select> + </div> + <div class="col-sm-4"> + <input type="submit" name="deleteFilter" value="<?=$this->translate('delete_tags')?>" class="btn btn-primary"/> + </div> + </div> + <? elseif("tag" == $type):?> + <div class="form-group"> + <label for="tag_id" class="col-sm-2 control-label"><?=$this->translate('Tag')?></label> + <div class="col-sm-6"> + <select name="tag_id" id="tag_id" class="form-control"> + <? foreach($this->uniqueTags as $tag):?> + <option value="<?= $tag['tag_id'] ?>"> + <?= $tag['tag'] ?> + </option> + <? endforeach;?> + </select> + </div> + <div class="col-sm-4"> + <input type="submit" name="deleteFilter" value="<?=$this->translate('delete_tags')?>" class="btn btn-primary"/> + </div> + </div> + <? elseif("resource" == $type):?> + <div class="form-group"> + <label for="resource_id" class="col-sm-2 control-label"><?=$this->translate('Title')?></label> + <div class="col-sm-6"> + <select name="resource_id" id="resource_id" class="form-control"> + <? foreach($this->uniqueResources as $resource):?> + <option value="<?=$resource['resource_id'] ?>" title="<?=$resource['title'] ?>"> + <?=$this->truncate($resource['title'], 80) ?> (<?= $resource['resource_id'] ?>) + </option> + <? endforeach;?> + </select> + </div> + <div class="col-sm-4"> + <input type="submit" name="deleteFilter" value="<?=$this->translate('delete_tags')?>" class="btn btn-primary"/> + </div> + <? endif;?> </form> + <? endif;?> - <? endif;?> - - </form> - -</div> + </div> -<div class="<?=$this->layoutClass('sidebar')?>"> - <?=$this->render("admin/menu.phtml")?> + <div class="<?=$this->layoutClass('sidebar')?>"> + <?=$this->render("admin/menu.phtml")?> + </div> </div> \ No newline at end of file diff --git a/themes/bootstrap3/templates/admin/tags/pagination.phtml b/themes/bootstrap3/templates/admin/tags/pagination.phtml index a4bea21cd5e8e71202bff5d7b6c9d234b4331206..c7f104b7740025e30d6a03d22285228d7d48fcb7 100644 --- a/themes/bootstrap3/templates/admin/tags/pagination.phtml +++ b/themes/bootstrap3/templates/admin/tags/pagination.phtml @@ -1,62 +1,60 @@ <? if ($this->pageCount): ?> - <div class="pagination"> - <ul> - <!-- Previous page link --> - <li<? if (isset($this->previous)): ?>> - <? $newParams = $this->params; $newParams['page'] = $this->previous; ?> - <a href="<?= $this->currentPath() . '?' . http_build_query($newParams); ?>"> - < <?=$this->translate('Previous')?> - </a> - <? else: ?> - class="disabled"> <span><?=$this->translate('Previous')?></span> - <? endif; ?> - </li> + <ul class="pagination"> + <!-- Previous page link --> + <li<? if (isset($this->previous)): ?>> + <? $newParams = $this->params; $newParams['page'] = $this->previous; ?> + <a href="<?= $this->currentPath() . '?' . http_build_query($newParams); ?>"> + « <?=$this->translate('Previous')?> + </a> + <? else: ?> + class="disabled"> <span>« <?=$this->translate('Previous')?></span> + <? endif; ?> + </li> - <!-- First page link --> - <li<? if (isset($this->first) && $this->first != $this->current): ?>> - <? $newParams = $this->params; $newParams['page'] = $this->first; ?> - <a href="<?= $this->currentPath() . '?' . http_build_query($newParams); ?>"> - <?=$this->translate('First')?> - </a> - <? else: ?> - class="disabled"> <span><?=$this->translate('First')?></span> - <? endif; ?> - </li> - - <!-- Numbered page links --> - <? foreach ($this->pagesInRange as $page): ?> - <li<? if ($page != $this->current): ?>> - <? $newParams = $this->params; $newParams['page'] = $page; ?> - <a href="<?= $this->currentPath() . '?' . http_build_query($newParams); ?>"> - <? echo $page; ?> - </a> - <? else: ?> - class="active"> <span><? echo $page; ?></span> - <? endif; ?> - </li> - <? endforeach; ?> + <!-- First page link --> + <li<? if (isset($this->first) && $this->first != $this->current): ?>> + <? $newParams = $this->params; $newParams['page'] = $this->first; ?> + <a href="<?= $this->currentPath() . '?' . http_build_query($newParams); ?>"> + <?=$this->translate('First')?> + </a> + <? else: ?> + class="disabled"> <span><?=$this->translate('First')?></span> + <? endif; ?> + </li> - <!-- Last page link --> - <li<? if (isset($this->last) && $this->last != $this->current): ?>> - <? $newParams = $this->params; $newParams['page'] = $this->last; ?> + <!-- Numbered page links --> + <? foreach ($this->pagesInRange as $page): ?> + <li<? if ($page != $this->current): ?>> + <? $newParams = $this->params; $newParams['page'] = $page; ?> <a href="<?= $this->currentPath() . '?' . http_build_query($newParams); ?>"> - <?=$this->translate('Last')?> + <? echo $page; ?> </a> <? else: ?> - class="disabled"> <span><?=$this->translate('Last')?></span> + class="active"> <span><? echo $page; ?></span> <? endif; ?> </li> + <? endforeach; ?> - <!-- Next page link --> - <li<? if (isset($this->next)): ?>> - <? $newParams = $this->params; $newParams['page'] = $this->next; ?> - <a href="<?= $this->currentPath() . '?' . http_build_query($newParams); ?>"> - <?=$this->translate('Next')?> > - </a> - <? else: ?> - class="disabled"> <span><?=$this->translate('Next')?> ></span> - <? endif; ?> - </li> - </ul> - </div> + <!-- Last page link --> + <li<? if (isset($this->last) && $this->last != $this->current): ?>> + <? $newParams = $this->params; $newParams['page'] = $this->last; ?> + <a href="<?= $this->currentPath() . '?' . http_build_query($newParams); ?>"> + <?=$this->translate('Last')?> + </a> + <? else: ?> + class="disabled"> <span><?=$this->translate('Last')?></span> + <? endif; ?> + </li> + + <!-- Next page link --> + <li<? if (isset($this->next)): ?>> + <? $newParams = $this->params; $newParams['page'] = $this->next; ?> + <a href="<?= $this->currentPath() . '?' . http_build_query($newParams); ?>"> + <?=$this->translate('Next')?> > + </a> + <? else: ?> + class="disabled"> <span><?=$this->translate('Next')?> »</span> + <? endif; ?> + </li> + </ul> <? endif; ?> diff --git a/themes/bootstrap3/templates/missingrecord/home.phtml b/themes/bootstrap3/templates/missingrecord/home.phtml index 35e586f0772552c037aeac336ab13b6e4bb5d81b..ee08a0248ed89c16c0d691ddc0f212aa13e8e912 100644 --- a/themes/bootstrap3/templates/missingrecord/home.phtml +++ b/themes/bootstrap3/templates/missingrecord/home.phtml @@ -1,3 +1 @@ -<div class="<?=$this->layoutClass('mainbody')?>"> - <?=$this->flashmessages()?> -</div> +<?=$this->flashmessages()?> diff --git a/themes/bootstrap3/templates/myresearch/bulk-action-buttons.phtml b/themes/bootstrap3/templates/myresearch/bulk-action-buttons.phtml index 0322da29265afcea3b7c888542cdf38fcf73461a..fcd8b87bd120cb5b03b2a1a09f6420e89e6a08ca 100644 --- a/themes/bootstrap3/templates/myresearch/bulk-action-buttons.phtml +++ b/themes/bootstrap3/templates/myresearch/bulk-action-buttons.phtml @@ -3,10 +3,12 @@ <input type="hidden" name="listName" value="<?=$this->escapeHtmlAttr($list->title)?>" /> <? endif; ?> <? $user = $this->auth()->isLoggedIn(); ?> -<label class="checkbox"> - <input type="checkbox" name="selectAll" class="checkbox-select-all"/> - <?=$this->transEsc('select_page')?> | <?=$this->transEsc('with_selected')?>: -</label> +<div class="checkbox"> + <label> + <input type="checkbox" name="selectAll" class="checkbox-select-all"/> + <?=$this->transEsc('select_page')?> | <?=$this->transEsc('with_selected')?>: + </label> +</div> <input class="btn btn-default" type="submit" name="email" value="<?=$this->transEsc('Email')?>" title="<?=$this->transEsc('email_selected')?>"/> <? if ((!is_null($this->list) && $this->list->editAllowed($user)) || is_null($this->list) && $user): ?> <input class="btn btn-default" id="<?=$this->idPrefix?>delete_list_items_<?=!is_null($this->list) ? $this->escapeHtmlAttr($this->list->id) : ''?>" type="submit" name="delete" value="<?=$this->transEsc('Delete')?>" title="<?=$this->transEsc('delete_selected')?>"/> diff --git a/themes/bootstrap3/templates/myresearch/checkedout.phtml b/themes/bootstrap3/templates/myresearch/checkedout.phtml index 00e17ea22791761fadda276fb7d74be2a28af2de..80cac1ff16f56cf70a11c3be91ddd54976cdb483 100644 --- a/themes/bootstrap3/templates/myresearch/checkedout.phtml +++ b/themes/bootstrap3/templates/myresearch/checkedout.phtml @@ -6,122 +6,124 @@ $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Checked Out Items') . '</li>'; ?> -<div class="<?=$this->layoutClass('mainbody')?>"> - <h2><?=$this->transEsc('Your Checked Out Items')?></h2> - <?=$this->flashmessages()?> +<div class="row"> + <div class="<?=$this->layoutClass('mainbody')?>"> + <h2><?=$this->transEsc('Your Checked Out Items')?></h2> + <?=$this->flashmessages()?> - <? if (!empty($this->transactions)): ?> - <? if ($this->renewForm): ?> - <form name="renewals" action="" method="post" id="renewals"> - <div class="toolbar"> - <input type="submit" class="btn btn-default" name="renewSelected" value="<?=$this->transEsc("renew_selected")?>" /> - <input type="submit" class="btn btn-default" name="renewAll" value="<?=$this->transEsc('renew_all')?>" /> - </div> - <? endif; ?> - - <? $i = 0; foreach ($this->transactions as $resource): ?> - <hr/> - <? $ilsDetails = $resource->getExtraDetail('ils_details'); ?> - <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId())?>" class="row"> - <? if ($this->renewForm): ?> - <? if (isset($ilsDetails['renewable']) && $ilsDetails['renewable'] && isset($ilsDetails['renew_details'])): ?> - <? $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $ilsDetails['renew_details']); ?> - <input class="pull-left" type="checkbox" name="renewSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" id="checkbox_<?=$safeId?>" /> - <input class="pull-left" type="hidden" name="renewAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" /> - <? endif; ?> - <? endif; ?> - <div class="col-sm-2 text-center"> - <? if ($summThumb = $this->record($resource)->getThumbnail()): ?> - <img src="<?=$this->escapeHtmlAttr($summThumb)?>" class="recordcover" alt="<?=$this->transEsc('Cover Image')?>"/> - <? else: ?> - <img src="<?=$this->url('cover-unavailable')?>" class="recordcover" alt="<?=$this->transEsc('No Cover Image')?>"/> - <? endif; ?> + <? if (!empty($this->transactions)): ?> + <? if ($this->renewForm): ?> + <form name="renewals" action="" method="post" id="renewals"> + <div class="toolbar"> + <input type="submit" class="btn btn-default" name="renewSelected" value="<?=$this->transEsc("renew_selected")?>" /> + <input type="submit" class="btn btn-default" name="renewAll" value="<?=$this->transEsc('renew_all')?>" /> </div> - <div class="col-sm-6"> - <? - // If this is a non-missing Solr record, we should display a link: - if (is_a($resource, 'VuFind\\RecordDriver\\SolrDefault') && !is_a($resource, 'VuFind\\RecordDriver\\Missing')) { - $title = $resource->getTitle(); - $title = empty($title) ? $this->transEsc('Title not available') : $this->escapeHtml($title); - echo '<a href="' . $this->recordLink()->getUrl($resource) . - '" class="title">' . $title . '</a>'; - } else if (isset($ilsDetails['title']) && !empty($ilsDetails['title'])){ - // If the record is not available in Solr, perhaps the ILS driver sent us a title we can show... - echo $this->escapeHtml($ilsDetails['title']); - } else { - // Last resort -- indicate that no title could be found. - echo $this->transEsc('Title not available'); - } - ?><br/> - <? $listAuthor = $resource->getPrimaryAuthor(); if (!empty($listAuthor)): ?> - <?=$this->transEsc('by')?>: - <a href="<?=$this->record($resource)->getLink('author', $listAuthor)?>"><?=$this->escapeHtml($listAuthor)?></a><br/> - <? endif; ?> - <? $formats = $resource->getFormats(); if (count($formats) > 0): ?> - <?=str_replace('class="', 'class="label label-info ', $this->record($resource)->getFormatList())?> - <br/> - <? endif; ?> - <? if (isset($ilsDetails['volume']) && !empty($ilsDetails['volume'])): ?> - <strong><?=$this->transEsc('Volume')?>:</strong> <?=$this->escapeHtml($ilsDetails['volume'])?> - <br /> - <? endif; ?> + <? endif; ?> - <? if (isset($ilsDetails['publication_year']) && !empty($ilsDetails['publication_year'])): ?> - <strong><?=$this->transEsc('Year of Publication')?>:</strong> <?=$this->escapeHtml($ilsDetails['publication_year'])?> - <br /> + <? $i = 0; foreach ($this->transactions as $resource): ?> + <hr/> + <? $ilsDetails = $resource->getExtraDetail('ils_details'); ?> + <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId())?>" class="row"> + <? if ($this->renewForm): ?> + <? if (isset($ilsDetails['renewable']) && $ilsDetails['renewable'] && isset($ilsDetails['renew_details'])): ?> + <? $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $ilsDetails['renew_details']); ?> + <input class="pull-left" type="checkbox" name="renewSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" id="checkbox_<?=$safeId?>" /> + <input class="pull-left" type="hidden" name="renewAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['renew_details'])?>" /> + <? endif; ?> <? endif; ?> + <div class="col-sm-2 text-center"> + <? if ($summThumb = $this->record($resource)->getThumbnail()): ?> + <img src="<?=$this->escapeHtmlAttr($summThumb)?>" class="recordcover" alt="<?=$this->transEsc('Cover Image')?>"/> + <? else: ?> + <img src="<?=$this->url('cover-unavailable')?>" class="recordcover" alt="<?=$this->transEsc('No Cover Image')?>"/> + <? endif; ?> + </div> + <div class="col-sm-6"> + <? + // If this is a non-missing Solr record, we should display a link: + if (is_a($resource, 'VuFind\\RecordDriver\\SolrDefault') && !is_a($resource, 'VuFind\\RecordDriver\\Missing')) { + $title = $resource->getTitle(); + $title = empty($title) ? $this->transEsc('Title not available') : $this->escapeHtml($title); + echo '<a href="' . $this->recordLink()->getUrl($resource) . + '" class="title">' . $title . '</a>'; + } else if (isset($ilsDetails['title']) && !empty($ilsDetails['title'])){ + // If the record is not available in Solr, perhaps the ILS driver sent us a title we can show... + echo $this->escapeHtml($ilsDetails['title']); + } else { + // Last resort -- indicate that no title could be found. + echo $this->transEsc('Title not available'); + } + ?><br/> + <? $listAuthor = $resource->getPrimaryAuthor(); if (!empty($listAuthor)): ?> + <?=$this->transEsc('by')?>: + <a href="<?=$this->record($resource)->getLink('author', $listAuthor)?>"><?=$this->escapeHtml($listAuthor)?></a><br/> + <? endif; ?> + <? $formats = $resource->getFormats(); if (count($formats) > 0): ?> + <?=str_replace('class="', 'class="label label-info ', $this->record($resource)->getFormatList())?> + <br/> + <? endif; ?> + <? if (isset($ilsDetails['volume']) && !empty($ilsDetails['volume'])): ?> + <strong><?=$this->transEsc('Volume')?>:</strong> <?=$this->escapeHtml($ilsDetails['volume'])?> + <br /> + <? endif; ?> - <? if (isset($ilsDetails['institution_name']) && !empty($ilsDetails['institution_name'])): ?> - <strong><?=$this->transEsc('location_' . $ilsDetails['institution_name'], array(), $ilsDetails['institution_name'])?></strong> - <br /> - <? endif; ?> + <? if (isset($ilsDetails['publication_year']) && !empty($ilsDetails['publication_year'])): ?> + <strong><?=$this->transEsc('Year of Publication')?>:</strong> <?=$this->escapeHtml($ilsDetails['publication_year'])?> + <br /> + <? endif; ?> - <? if (isset($ilsDetails['renew'])): ?> - <strong><?=$this->transEsc('Renewed')?>:</strong> <?=$this->transEsc($ilsDetails['renew'])?> - <? if (isset($ilsDetails['renewLimit'])): ?> - / <?=$this->transEsc($ilsDetails['renewLimit'])?> + <? if (isset($ilsDetails['institution_name']) && !empty($ilsDetails['institution_name'])): ?> + <strong><?=$this->transEsc('location_' . $ilsDetails['institution_name'], array(), $ilsDetails['institution_name'])?></strong> + <br /> <? endif; ?> - <br /> - <? endif; ?> - <? $showStatus = true; ?> + <? if (isset($ilsDetails['renew'])): ?> + <strong><?=$this->transEsc('Renewed')?>:</strong> <?=$this->transEsc($ilsDetails['renew'])?> + <? if (isset($ilsDetails['renewLimit'])): ?> + / <?=$this->transEsc($ilsDetails['renewLimit'])?> + <? endif; ?> + <br /> + <? endif; ?> - <? if (isset($this->renewResult[$ilsDetails['item_id']])): ?> - <? $renewDetails = $this->renewResult[$ilsDetails['item_id']]; ?> - <? if (isset($renewDetails['success']) && $renewDetails['success']): ?> - <? $showStatus = false; ?> - <strong><?=$this->transEsc('Due Date')?>: <?=$this->escapeHtml($renewDetails['new_date'])?> <? if (isset($renewDetails['new_time'])): ?><?=$this->escapeHtml($renewDetails['new_time'])?><? endif; ?></strong> - <div class="alert alert-success"><?=$this->transEsc('renew_success')?></div> + <? $showStatus = true; ?> + + <? if (isset($this->renewResult[$ilsDetails['item_id']])): ?> + <? $renewDetails = $this->renewResult[$ilsDetails['item_id']]; ?> + <? if (isset($renewDetails['success']) && $renewDetails['success']): ?> + <? $showStatus = false; ?> + <strong><?=$this->transEsc('Due Date')?>: <?=$this->escapeHtml($renewDetails['new_date'])?> <? if (isset($renewDetails['new_time'])): ?><?=$this->escapeHtml($renewDetails['new_time'])?><? endif; ?></strong> + <div class="alert alert-success"><?=$this->transEsc('renew_success')?></div> + <? else: ?> + <strong><?=$this->transEsc('Due Date')?>: <?=$this->escapeHtml($ilsDetails['duedate'])?><? if (isset($ilsDetails['dueTime'])): ?> <?=$this->escapeHtml($ilsDetails['dueTime'])?><? endif; ?></strong> + <div class="alert alert-danger"><?=$this->transEsc('renew_fail')?><? if (isset($renewDetails['sysMessage'])): ?>: <?=$this->escapeHtml($renewDetails['sysMessage'])?><? endif; ?></div> + <? endif; ?> <? else: ?> <strong><?=$this->transEsc('Due Date')?>: <?=$this->escapeHtml($ilsDetails['duedate'])?><? if (isset($ilsDetails['dueTime'])): ?> <?=$this->escapeHtml($ilsDetails['dueTime'])?><? endif; ?></strong> - <div class="alert alert-danger"><?=$this->transEsc('renew_fail')?><? if (isset($renewDetails['sysMessage'])): ?>: <?=$this->escapeHtml($renewDetails['sysMessage'])?><? endif; ?></div> - <? endif; ?> - <? else: ?> - <strong><?=$this->transEsc('Due Date')?>: <?=$this->escapeHtml($ilsDetails['duedate'])?><? if (isset($ilsDetails['dueTime'])): ?> <?=$this->escapeHtml($ilsDetails['dueTime'])?><? endif; ?></strong> - <? if ($showStatus): ?> - <? if (isset($ilsDetails['dueStatus']) && $ilsDetails['dueStatus'] == "overdue"): ?> - <div class="alert alert-danger"><?=$this->transEsc("renew_item_overdue")?></div> - <? elseif (isset($ilsDetails['dueStatus']) && $ilsDetails['dueStatus'] == "due"): ?> - <div class="alert alert-info"><?=$this->transEsc("renew_item_due")?></div> + <? if ($showStatus): ?> + <? if (isset($ilsDetails['dueStatus']) && $ilsDetails['dueStatus'] == "overdue"): ?> + <div class="alert alert-danger"><?=$this->transEsc("renew_item_overdue")?></div> + <? elseif (isset($ilsDetails['dueStatus']) && $ilsDetails['dueStatus'] == "due"): ?> + <div class="alert alert-info"><?=$this->transEsc("renew_item_due")?></div> + <? endif; ?> <? endif; ?> <? endif; ?> - <? endif; ?> - <? if ($showStatus && isset($ilsDetails['message']) && !empty($ilsDetails['message'])): ?> - <div class="alert alert-info"><?=$this->transEsc($ilsDetails['message'])?></div> - <? endif; ?> - <? if (isset($ilsDetails['renewable']) && $ilsDetails['renewable'] && isset($ilsDetails['renew_link'])): ?> - <a href="<?=$this->escapeHtmlAttr($ilsDetails['renew_link'])?>"><?=$this->transEsc('renew_item')?></a> - <? endif; ?> + <? if ($showStatus && isset($ilsDetails['message']) && !empty($ilsDetails['message'])): ?> + <div class="alert alert-info"><?=$this->transEsc($ilsDetails['message'])?></div> + <? endif; ?> + <? if (isset($ilsDetails['renewable']) && $ilsDetails['renewable'] && isset($ilsDetails['renew_link'])): ?> + <a href="<?=$this->escapeHtmlAttr($ilsDetails['renew_link'])?>"><?=$this->transEsc('renew_item')?></a> + <? endif; ?> + </div> </div> - </div> - <? endforeach; ?> - <? if ($this->renewForm): ?></form><? endif; ?> - <? else: ?> - <?=$this->transEsc('You do not have any items checked out')?>. - <? endif; ?> -</div> + <? endforeach; ?> + <? if ($this->renewForm): ?></form><? endif; ?> + <? else: ?> + <?=$this->transEsc('You do not have any items checked out')?>. + <? endif; ?> + </div> -<div class="<?=$this->layoutClass('sidebar')?>"> - <?=$this->context($this)->renderInContext("myresearch/menu.phtml", array('active' => 'checkedout'))?> + <div class="<?=$this->layoutClass('sidebar')?>"> + <?=$this->context($this)->renderInContext("myresearch/menu.phtml", array('active' => 'checkedout'))?> + </div> </div> \ No newline at end of file diff --git a/themes/bootstrap3/templates/myresearch/holds.phtml b/themes/bootstrap3/templates/myresearch/holds.phtml index 813cebc29114c7697a9f08bcc1f766a9f761be26..61d6bf3e3298df8bb3aab26e89cc0d4095acdbc6 100644 --- a/themes/bootstrap3/templates/myresearch/holds.phtml +++ b/themes/bootstrap3/templates/myresearch/holds.phtml @@ -6,147 +6,149 @@ $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('My Holds') . '</li>'; ?> -<div class="<?=$this->layoutClass('mainbody')?>"> - <h2><?=$this->transEsc('Your Holds and Recalls') ?></h2> +<div class="row"> + <div class="<?=$this->layoutClass('mainbody')?>"> + <h2><?=$this->transEsc('Your Holds and Recalls') ?></h2> - <?=$this->flashmessages()?> + <?=$this->flashmessages()?> - <? if (!empty($this->recordList)): ?> - <? if ($this->cancelForm): ?> - <form name="cancelForm" class="inline" action="" method="post" id="cancelHold"> - <input type="hidden" id="submitType" name="cancelSelected" value="1"/> - <input type="hidden" id="cancelConfirm" name="confirm" value="0"/> - <div class="btn-group"> - <input id="cancelSelected" name="cancelSelected" type="submit" value="<?=$this->transEsc("hold_cancel_selected") ?>" class="btn btn-default dropdown-toggle" data-toggle="dropdown"/> - <ul class="dropdown-menu"> - <li class="disabled"><a><?=$this->transEsc("confirm_hold_cancel_selected_text") ?></a></li> - <li><a href="#" onClick="$('#cancelConfirm').val(1);$('#submitType').attr('name','cancelSelected');$(this).parents('form').submit(); return false;"><?=$this->transEsc('confirm_dialog_yes') ?></a></li> - <li><a href="#" onClick="return false;"><?=$this->transEsc('confirm_dialog_no')?></a></li> - </ul> - </div> - <div class="btn-group"> - <input id="cancelAll" name="cancelAll" type="submit" value="<?=$this->transEsc("hold_cancel_all") ?>" class="btn btn-default dropdown-toggle" data-toggle="dropdown"/> - <ul class="dropdown-menu"> - <li class="disabled"><a><?=$this->transEsc("confirm_hold_cancel_all_text") ?></a></li> - <li><a href="#" onClick="$('#cancelConfirm').val(1);$('#submitType').attr('name','cancelAll');$(this).parents('form').submit(); return false;"><?=$this->transEsc('confirm_dialog_yes') ?></a></li> - <li><a href="#" onClick="return false;"><?=$this->transEsc('confirm_dialog_no')?></a></li> - </ul> - </div> - <? endif; ?> - - <? $iteration = 0; ?> - <? foreach ($this->recordList as $resource): ?> - <hr/> - <? $iteration++; ?> - <? $ilsDetails = $resource->getExtraDetail('ils_details'); ?> - <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId()) ?>" class="row"> - <? if ($this->cancelForm && isset($ilsDetails['cancel_details'])): ?> - <? $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $resource->getUniqueId()); ?> - <input type="hidden" name="cancelAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" /> - <div class="pull-left"> - <input type="checkbox" name="cancelSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" id="checkbox_<?=$safeId?>" /> + <? if (!empty($this->recordList)): ?> + <? if ($this->cancelForm): ?> + <form name="cancelForm" class="inline" action="" method="post" id="cancelHold"> + <input type="hidden" id="submitType" name="cancelSelected" value="1"/> + <input type="hidden" id="cancelConfirm" name="confirm" value="0"/> + <div class="btn-group"> + <input id="cancelSelected" name="cancelSelected" type="submit" value="<?=$this->transEsc("hold_cancel_selected") ?>" class="btn btn-default dropdown-toggle" data-toggle="dropdown"/> + <ul class="dropdown-menu"> + <li class="disabled"><a><?=$this->transEsc("confirm_hold_cancel_selected_text") ?></a></li> + <li><a href="#" onClick="$('#cancelConfirm').val(1);$('#submitType').attr('name','cancelSelected');$(this).parents('form').submit(); return false;"><?=$this->transEsc('confirm_dialog_yes') ?></a></li> + <li><a href="#" onClick="return false;"><?=$this->transEsc('confirm_dialog_no')?></a></li> + </ul> </div> - <? endif; ?> - <div class="col-sm-2 text-center"> - <? if ($summThumb = $this->record($resource)->getThumbnail()): ?> - <img src="<?=$this->escapeHtmlAttr($summThumb)?>" class="recordcover" alt="<?=$this->transEsc('Cover Image')?>"/> - <? else: ?> - <img src="<?=$this->url('cover-unavailable')?>" class="recordcover" alt="<?=$this->transEsc('No Cover Image')?>"/> - <? endif; ?> - </div> - <div class="col-sm-6"> - <? - // If this is a non-missing Solr record, we should display a link: - if (is_a($resource, 'VuFind\\RecordDriver\\SolrDefault') && !is_a($resource, 'VuFind\\RecordDriver\\Missing')) { - $title = $resource->getTitle(); - $title = empty($title) ? $this->transEsc('Title not available') : $this->escapeHtml($title); - echo '<a href="' . $this->recordLink()->getUrl($resource) - . '" class="title">' . $title . '</a>'; - } else if (isset($ilsDetails['title']) && !empty($ilsDetails['title'])){ - // If the record is not available in Solr, perhaps the ILS driver sent us a title we can show... - echo $this->escapeHtml($ilsDetails['title']); - } else { - // Last resort -- indicate that no title could be found. - echo $this->transEsc('Title not available'); - } - ?><br/> - <? $listAuthor = $resource->getPrimaryAuthor(); if (!empty($listAuthor)): ?> - <?=$this->transEsc('by')?>: - <a href="<?=$this->record($resource)->getLink('author', $listAuthor)?>"><?=$this->escapeHtml($listAuthor)?></a><br/> - <? endif; ?> + <div class="btn-group"> + <input id="cancelAll" name="cancelAll" type="submit" value="<?=$this->transEsc("hold_cancel_all") ?>" class="btn btn-default dropdown-toggle" data-toggle="dropdown"/> + <ul class="dropdown-menu"> + <li class="disabled"><a><?=$this->transEsc("confirm_hold_cancel_all_text") ?></a></li> + <li><a href="#" onClick="$('#cancelConfirm').val(1);$('#submitType').attr('name','cancelAll');$(this).parents('form').submit(); return false;"><?=$this->transEsc('confirm_dialog_yes') ?></a></li> + <li><a href="#" onClick="return false;"><?=$this->transEsc('confirm_dialog_no')?></a></li> + </ul> + </div> + <? endif; ?> - <? $formats = $resource->getFormats(); if (count($formats) > 0): ?> - <?=str_replace('class="', 'class="label label-info ', $this->record($resource)->getFormatList())?> - <br/> - <? endif; ?> - <? if (isset($ilsDetails['volume']) && !empty($ilsDetails['volume'])): ?> - <strong><?=$this->transEsc('Volume')?>:</strong> <?=$this->escapeHtml($ilsDetails['volume'])?> - <br /> + <? $iteration = 0; ?> + <? foreach ($this->recordList as $resource): ?> + <hr/> + <? $iteration++; ?> + <? $ilsDetails = $resource->getExtraDetail('ils_details'); ?> + <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId()) ?>" class="row"> + <? if ($this->cancelForm && isset($ilsDetails['cancel_details'])): ?> + <? $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $resource->getUniqueId()); ?> + <input type="hidden" name="cancelAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" /> + <div class="pull-left"> + <input type="checkbox" name="cancelSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" id="checkbox_<?=$safeId?>" /> + </div> <? endif; ?> + <div class="col-sm-2 text-center"> + <? if ($summThumb = $this->record($resource)->getThumbnail()): ?> + <img src="<?=$this->escapeHtmlAttr($summThumb)?>" class="recordcover" alt="<?=$this->transEsc('Cover Image')?>"/> + <? else: ?> + <img src="<?=$this->url('cover-unavailable')?>" class="recordcover" alt="<?=$this->transEsc('No Cover Image')?>"/> + <? endif; ?> + </div> + <div class="col-sm-6"> + <? + // If this is a non-missing Solr record, we should display a link: + if (is_a($resource, 'VuFind\\RecordDriver\\SolrDefault') && !is_a($resource, 'VuFind\\RecordDriver\\Missing')) { + $title = $resource->getTitle(); + $title = empty($title) ? $this->transEsc('Title not available') : $this->escapeHtml($title); + echo '<a href="' . $this->recordLink()->getUrl($resource) + . '" class="title">' . $title . '</a>'; + } else if (isset($ilsDetails['title']) && !empty($ilsDetails['title'])){ + // If the record is not available in Solr, perhaps the ILS driver sent us a title we can show... + echo $this->escapeHtml($ilsDetails['title']); + } else { + // Last resort -- indicate that no title could be found. + echo $this->transEsc('Title not available'); + } + ?><br/> + <? $listAuthor = $resource->getPrimaryAuthor(); if (!empty($listAuthor)): ?> + <?=$this->transEsc('by')?>: + <a href="<?=$this->record($resource)->getLink('author', $listAuthor)?>"><?=$this->escapeHtml($listAuthor)?></a><br/> + <? endif; ?> - <? if (isset($ilsDetails['publication_year']) && !empty($ilsDetails['publication_year'])): ?> - <strong><?=$this->transEsc('Year of Publication')?>:</strong> <?=$this->escapeHtml($ilsDetails['publication_year'])?> - <br /> - <? endif; ?> + <? $formats = $resource->getFormats(); if (count($formats) > 0): ?> + <?=str_replace('class="', 'class="label label-info ', $this->record($resource)->getFormatList())?> + <br/> + <? endif; ?> + <? if (isset($ilsDetails['volume']) && !empty($ilsDetails['volume'])): ?> + <strong><?=$this->transEsc('Volume')?>:</strong> <?=$this->escapeHtml($ilsDetails['volume'])?> + <br /> + <? endif; ?> - <? if (!empty($ilsDetails['requestGroup'])): ?> - <strong><?=$this->transEsc('hold_requested_group') ?>:</strong> <?=$this->transEsc('location_' . $ilsDetails['requestGroup'], array(), $ilsDetails['requestGroup'])?> - <br /> - <? endif; ?> + <? if (isset($ilsDetails['publication_year']) && !empty($ilsDetails['publication_year'])): ?> + <strong><?=$this->transEsc('Year of Publication')?>:</strong> <?=$this->escapeHtml($ilsDetails['publication_year'])?> + <br /> + <? endif; ?> - <? /* Depending on the ILS driver, the "location" value may be a string or an ID; figure out the best - value to display... */ ?> - <? $pickupDisplay = ''; ?> - <? $pickupTranslate = false; ?> - <? if (isset($ilsDetails['location'])): ?> - <? if ($this->pickup): ?> - <? foreach ($this->pickup as $library): ?> - <? if ($library['locationID'] == $ilsDetails['location']): ?> - <? $pickupDisplay = $library['locationDisplay']; ?> - <? $pickupTranslate = true; ?> - <? endif; ?> - <? endforeach; ?> + <? if (!empty($ilsDetails['requestGroup'])): ?> + <strong><?=$this->transEsc('hold_requested_group') ?>:</strong> <?=$this->transEsc('location_' . $ilsDetails['requestGroup'], array(), $ilsDetails['requestGroup'])?> + <br /> <? endif; ?> - <? if (empty($pickupDisplay)): ?> - <? $pickupDisplay = $ilsDetails['location']; ?> + + <? /* Depending on the ILS driver, the "location" value may be a string or an ID; figure out the best + value to display... */ ?> + <? $pickupDisplay = ''; ?> + <? $pickupTranslate = false; ?> + <? if (isset($ilsDetails['location'])): ?> + <? if ($this->pickup): ?> + <? foreach ($this->pickup as $library): ?> + <? if ($library['locationID'] == $ilsDetails['location']): ?> + <? $pickupDisplay = $library['locationDisplay']; ?> + <? $pickupTranslate = true; ?> + <? endif; ?> + <? endforeach; ?> + <? endif; ?> + <? if (empty($pickupDisplay)): ?> + <? $pickupDisplay = $ilsDetails['location']; ?> + <? endif; ?> + <? endif; ?> + <? if (!empty($pickupDisplay)): ?> + <strong><?=$this->transEsc('pick_up_location') ?>:</strong> + <?=$pickupTranslate ? $this->transEsc($pickupDisplay) : $this->escapeHtml($pickupDisplay)?> + <br /> <? endif; ?> - <? endif; ?> - <? if (!empty($pickupDisplay)): ?> - <strong><?=$this->transEsc('pick_up_location') ?>:</strong> - <?=$pickupTranslate ? $this->transEsc($pickupDisplay) : $this->escapeHtml($pickupDisplay)?> - <br /> - <? endif; ?> - <strong><?=$this->transEsc('Created') ?>:</strong> <?=$this->escapeHtml($ilsDetails['create']) ?> | - <strong><?=$this->transEsc('Expires') ?>:</strong> <?=$this->escapeHtml($ilsDetails['expire']) ?> - <br /> + <strong><?=$this->transEsc('Created') ?>:</strong> <?=$this->escapeHtml($ilsDetails['create']) ?> | + <strong><?=$this->transEsc('Expires') ?>:</strong> <?=$this->escapeHtml($ilsDetails['expire']) ?> + <br /> - <? if (isset($this->cancelResults['items'])): ?> - <? foreach ($this->cancelResults['items'] as $itemId=>$cancelResult): ?> - <? if ($itemId == $ilsDetails['item_id'] && $cancelResult['success'] == false): ?> - <div class="alert alert-danger"><?=$this->transEsc($cancelResult['status']) ?><? if ($cancelResult['sysMessage']) echo ' : ' . $this->transEsc($cancelResult['sysMessage']); ?></div> - <? endif; ?> - <? endforeach; ?> - <? endif; ?> + <? if (isset($this->cancelResults['items'])): ?> + <? foreach ($this->cancelResults['items'] as $itemId=>$cancelResult): ?> + <? if ($itemId == $ilsDetails['item_id'] && $cancelResult['success'] == false): ?> + <div class="alert alert-danger"><?=$this->transEsc($cancelResult['status']) ?><? if ($cancelResult['sysMessage']) echo ' : ' . $this->transEsc($cancelResult['sysMessage']); ?></div> + <? endif; ?> + <? endforeach; ?> + <? endif; ?> - <? if (isset($ilsDetails['available']) && $ilsDetails['available'] == true): ?> - <div class="text-success"><?=$this->transEsc("hold_available") ?></div> - <? elseif (isset($ilsDetails['position'])): ?> - <p><strong><?=$this->transEsc("hold_queue_position") ?>:</strong> <?=$this->escapeHtml($ilsDetails['position']) ?></p> - <? endif; ?> - <? if (isset($ilsDetails['cancel_link'])): ?> - <p><a href="<?=$this->escapeHtmlAttr($ilsDetails['cancel_link']) ?>"><?=$this->transEsc("hold_cancel") ?></a></p> - <? endif; ?> + <? if (isset($ilsDetails['available']) && $ilsDetails['available'] == true): ?> + <div class="text-success"><?=$this->transEsc("hold_available") ?></div> + <? elseif (isset($ilsDetails['position'])): ?> + <p><strong><?=$this->transEsc("hold_queue_position") ?>:</strong> <?=$this->escapeHtml($ilsDetails['position']) ?></p> + <? endif; ?> + <? if (isset($ilsDetails['cancel_link'])): ?> + <p><a href="<?=$this->escapeHtmlAttr($ilsDetails['cancel_link']) ?>"><?=$this->transEsc("hold_cancel") ?></a></p> + <? endif; ?> + </div> </div> - </div> - <? endforeach; ?> - <? if ($this->cancelForm): ?></form><? endif; ?> - <? else: ?> - <?=$this->transEsc('You do not have any holds or recalls placed') ?>. - <? endif; ?> -</div> + <? endforeach; ?> + <? if ($this->cancelForm): ?></form><? endif; ?> + <? else: ?> + <?=$this->transEsc('You do not have any holds or recalls placed') ?>. + <? endif; ?> + </div> -<div class="<?=$this->layoutClass('sidebar')?>"> - <?=$this->context($this)->renderInContext("myresearch/menu.phtml", array('active' => 'holds'))?> + <div class="<?=$this->layoutClass('sidebar')?>"> + <?=$this->context($this)->renderInContext("myresearch/menu.phtml", array('active' => 'holds'))?> + </div> </div> \ No newline at end of file diff --git a/themes/bootstrap3/templates/myresearch/illrequests.phtml b/themes/bootstrap3/templates/myresearch/illrequests.phtml index dd07aaf5e724744e8082b1894667287533530f0a..ca2373fbfd42097e20fb21740541de02f6e5e905 100644 --- a/themes/bootstrap3/templates/myresearch/illrequests.phtml +++ b/themes/bootstrap3/templates/myresearch/illrequests.phtml @@ -7,151 +7,153 @@ . '<li class="active">' . $this->transEsc('Interlibrary Loan Requests') . '</li>'; ?> -<div class="<?=$this->layoutClass('mainbody')?>"> - <h2><?=$this->transEsc('Interlibrary Loan Requests') ?></h2> +<div class="row"> + <div class="<?=$this->layoutClass('mainbody')?>"> + <h2><?=$this->transEsc('Interlibrary Loan Requests') ?></h2> - <?=$this->flashmessages()?> + <?=$this->flashmessages()?> - <? if (!empty($this->recordList)): ?> - <? if ($this->cancelForm): ?> - <form name="cancelForm" class="inline" action="" method="post" id="cancelILLRequest"> - <input type="hidden" id="submitType" name="cancelSelected" value="1"/> - <input type="hidden" id="cancelConfirm" name="confirm" value="0"/> - <div class="btn-group"> - <input id="cancelSelected" name="cancelSelected" type="submit" value="<?=$this->transEsc("ill_request_cancel_selected") ?>" class="btn btn-default dropdown-toggle" data-toggle="dropdown"/> - <ul class="dropdown-menu"> - <li class="disabled"><a><?=$this->transEsc("confirm_ill_request_cancel_selected_text") ?></a></li> - <li><a href="#" onClick="$('#cancelConfirm').val(1);$('#submitType').attr('name','cancelSelected');$(this).parents('form').submit(); return false;"><?=$this->transEsc('confirm_dialog_yes') ?></a></li> - <li><a href="#" onClick="return false;"><?=$this->transEsc('confirm_dialog_no')?></a></li> - </ul> - </div> - <div class="btn-group"> - <input id="cancelAll" name="cancelAll" type="submit" value="<?=$this->transEsc("ill_request_cancel_all") ?>" class="btn btn-default dropdown-toggle" data-toggle="dropdown"/> - <ul class="dropdown-menu"> - <li class="disabled"><a><?=$this->transEsc("confirm_ill_request_cancel_all_text") ?></a></li> - <li><a href="#" onClick="$('#cancelConfirm').val(1);$('#submitType').attr('name','cancelAll');$(this).parents('form').submit(); return false;"><?=$this->transEsc('confirm_dialog_yes') ?></a></li> - <li><a href="#" onClick="return false;"><?=$this->transEsc('confirm_dialog_no')?></a></li> - </ul> - </div> - <? endif; ?> - - <? $iteration = 0; ?> - <? foreach ($this->recordList as $resource): ?> - <hr/> - <? $iteration++; ?> - <? $ilsDetails = $resource->getExtraDetail('ils_details'); ?> - <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId()) ?>" class="row"> - <? if ($this->cancelForm && isset($ilsDetails['cancel_details'])): ?> - <? $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $resource->getUniqueId()); ?> - <input type="hidden" name="cancelAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" /> - <div class="pull-left"> - <input type="checkbox" name="cancelSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" id="checkbox_<?=$safeId?>" /> + <? if (!empty($this->recordList)): ?> + <? if ($this->cancelForm): ?> + <form name="cancelForm" class="inline" action="" method="post" id="cancelILLRequest"> + <input type="hidden" id="submitType" name="cancelSelected" value="1"/> + <input type="hidden" id="cancelConfirm" name="confirm" value="0"/> + <div class="btn-group"> + <input id="cancelSelected" name="cancelSelected" type="submit" value="<?=$this->transEsc("ill_request_cancel_selected") ?>" class="btn btn-default dropdown-toggle" data-toggle="dropdown"/> + <ul class="dropdown-menu"> + <li class="disabled"><a><?=$this->transEsc("confirm_ill_request_cancel_selected_text") ?></a></li> + <li><a href="#" onClick="$('#cancelConfirm').val(1);$('#submitType').attr('name','cancelSelected');$(this).parents('form').submit(); return false;"><?=$this->transEsc('confirm_dialog_yes') ?></a></li> + <li><a href="#" onClick="return false;"><?=$this->transEsc('confirm_dialog_no')?></a></li> + </ul> </div> - <? endif; ?> - <div class="col-sm-2 text-center"> - <? if ($summThumb = $this->record($resource)->getThumbnail()): ?> - <img src="<?=$this->escapeHtmlAttr($summThumb)?>" class="recordcover" alt="<?=$this->transEsc('Cover Image')?>"/> - <? else: ?> - <img src="<?=$this->url('cover-unavailable')?>" class="recordcover" alt="<?=$this->transEsc('No Cover Image')?>"/> - <? endif; ?> - </div> - <div class="col-sm-6"> - <? - // If this is a non-missing Solr record, we should display a link: - if (is_a($resource, 'VuFind\\RecordDriver\\SolrDefault') && !is_a($resource, 'VuFind\\RecordDriver\\Missing')) { - $title = $resource->getTitle(); - $title = empty($title) ? $this->transEsc('Title not available') : $this->escapeHtml($title); - echo '<a href="' . $this->recordLink()->getUrl($resource) - . '" class="title">' . $title . '</a>'; - } else if (isset($ilsDetails['title']) && !empty($ilsDetails['title'])){ - // If the record is not available in Solr, perhaps the ILS driver sent us a title we can show... - echo $this->escapeHtml($ilsDetails['title']); - } else { - // Last resort -- indicate that no title could be found. - echo $this->transEsc('Title not available'); - } - ?><br/> - <? $listAuthor = $resource->getPrimaryAuthor(); if (!empty($listAuthor)): ?> - <?=$this->transEsc('by')?>: - <a href="<?=$this->record($resource)->getLink('author', $listAuthor)?>"><?=$this->escapeHtml($listAuthor)?></a><br/> - <? endif; ?> - - <? $formats = $resource->getFormats(); if (count($formats) > 0): ?> - <?=str_replace('class="', 'class="label label-info ', $this->record($resource)->getFormatList())?> - <br/> - <? endif; ?> - <? if (isset($ilsDetails['volume']) && !empty($ilsDetails['volume'])): ?> - <strong><?=$this->transEsc('Volume')?>:</strong> <?=$this->escapeHtml($ilsDetails['volume'])?> - <br /> - <? endif; ?> + <div class="btn-group"> + <input id="cancelAll" name="cancelAll" type="submit" value="<?=$this->transEsc("ill_request_cancel_all") ?>" class="btn btn-default dropdown-toggle" data-toggle="dropdown"/> + <ul class="dropdown-menu"> + <li class="disabled"><a><?=$this->transEsc("confirm_ill_request_cancel_all_text") ?></a></li> + <li><a href="#" onClick="$('#cancelConfirm').val(1);$('#submitType').attr('name','cancelAll');$(this).parents('form').submit(); return false;"><?=$this->transEsc('confirm_dialog_yes') ?></a></li> + <li><a href="#" onClick="return false;"><?=$this->transEsc('confirm_dialog_no')?></a></li> + </ul> + </div> + <? endif; ?> - <? if (isset($ilsDetails['publication_year']) && !empty($ilsDetails['publication_year'])): ?> - <strong><?=$this->transEsc('Year of Publication')?>:</strong> <?=$this->escapeHtml($ilsDetails['publication_year'])?> - <br /> + <? $iteration = 0; ?> + <? foreach ($this->recordList as $resource): ?> + <hr/> + <? $iteration++; ?> + <? $ilsDetails = $resource->getExtraDetail('ils_details'); ?> + <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId()) ?>" class="row"> + <? if ($this->cancelForm && isset($ilsDetails['cancel_details'])): ?> + <? $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $resource->getUniqueId()); ?> + <input type="hidden" name="cancelAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" /> + <div class="pull-left"> + <input type="checkbox" name="cancelSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" id="checkbox_<?=$safeId?>" /> + </div> <? endif; ?> + <div class="col-sm-2 text-center"> + <? if ($summThumb = $this->record($resource)->getThumbnail()): ?> + <img src="<?=$this->escapeHtmlAttr($summThumb)?>" class="recordcover" alt="<?=$this->transEsc('Cover Image')?>"/> + <? else: ?> + <img src="<?=$this->url('cover-unavailable')?>" class="recordcover" alt="<?=$this->transEsc('No Cover Image')?>"/> + <? endif; ?> + </div> + <div class="col-sm-6"> + <? + // If this is a non-missing Solr record, we should display a link: + if (is_a($resource, 'VuFind\\RecordDriver\\SolrDefault') && !is_a($resource, 'VuFind\\RecordDriver\\Missing')) { + $title = $resource->getTitle(); + $title = empty($title) ? $this->transEsc('Title not available') : $this->escapeHtml($title); + echo '<a href="' . $this->recordLink()->getUrl($resource) + . '" class="title">' . $title . '</a>'; + } else if (isset($ilsDetails['title']) && !empty($ilsDetails['title'])){ + // If the record is not available in Solr, perhaps the ILS driver sent us a title we can show... + echo $this->escapeHtml($ilsDetails['title']); + } else { + // Last resort -- indicate that no title could be found. + echo $this->transEsc('Title not available'); + } + ?><br/> + <? $listAuthor = $resource->getPrimaryAuthor(); if (!empty($listAuthor)): ?> + <?=$this->transEsc('by')?>: + <a href="<?=$this->record($resource)->getLink('author', $listAuthor)?>"><?=$this->escapeHtml($listAuthor)?></a><br/> + <? endif; ?> - <? /* Depending on the ILS driver, the "location" value may be a string or an ID; figure out the best - value to display... */ ?> - <? $pickupDisplay = ''; ?> - <? $pickupTranslate = false; ?> - <? if (isset($ilsDetails['location'])): ?> - <? if ($this->pickup): ?> - <? foreach ($this->pickup as $library): ?> - <? if ($library['locationID'] == $ilsDetails['location']): ?> - <? $pickupDisplay = $library['locationDisplay']; ?> - <? $pickupTranslate = true; ?> - <? endif; ?> - <? endforeach; ?> + <? $formats = $resource->getFormats(); if (count($formats) > 0): ?> + <?=str_replace('class="', 'class="label label-info ', $this->record($resource)->getFormatList())?> + <br/> <? endif; ?> - <? if (empty($pickupDisplay)): ?> - <? $pickupDisplay = $ilsDetails['location']; ?> + <? if (isset($ilsDetails['volume']) && !empty($ilsDetails['volume'])): ?> + <strong><?=$this->transEsc('Volume')?>:</strong> <?=$this->escapeHtml($ilsDetails['volume'])?> + <br /> <? endif; ?> - <? endif; ?> - <? if (!empty($pickupDisplay)): ?> - <strong><?=$this->transEsc('pick_up_location') ?>:</strong> - <?=$pickupTranslate ? $this->transEsc($pickupDisplay) : $this->escapeHtml($pickupDisplay)?> - <br /> - <? endif; ?> - <strong><?=$this->transEsc('Created') ?>:</strong> <?=$this->escapeHtml($ilsDetails['create']) ?> - <? if (!empty($ilsDetails['expire'])): ?> - | <strong><?=$this->transEsc('Expires') ?>:</strong> <?=$this->escapeHtml($ilsDetails['expire']) ?> - <? endif; ?> - <br /> + <? if (isset($ilsDetails['publication_year']) && !empty($ilsDetails['publication_year'])): ?> + <strong><?=$this->transEsc('Year of Publication')?>:</strong> <?=$this->escapeHtml($ilsDetails['publication_year'])?> + <br /> + <? endif; ?> - <? if (isset($this->cancelResults['items'])): ?> - <? foreach ($this->cancelResults['items'] as $itemId=>$cancelResult): ?> - <? if ($itemId == $ilsDetails['item_id'] && $cancelResult['success'] == false): ?> - <div class="alert alert-danger"><?=$this->transEsc($cancelResult['status']) ?><? if ($cancelResult['sysMessage']) echo ' : ' . $this->transEsc($cancelResult['sysMessage']); ?></div> + <? /* Depending on the ILS driver, the "location" value may be a string or an ID; figure out the best + value to display... */ ?> + <? $pickupDisplay = ''; ?> + <? $pickupTranslate = false; ?> + <? if (isset($ilsDetails['location'])): ?> + <? if ($this->pickup): ?> + <? foreach ($this->pickup as $library): ?> + <? if ($library['locationID'] == $ilsDetails['location']): ?> + <? $pickupDisplay = $library['locationDisplay']; ?> + <? $pickupTranslate = true; ?> + <? endif; ?> + <? endforeach; ?> <? endif; ?> - <? endforeach; ?> - <? endif; ?> + <? if (empty($pickupDisplay)): ?> + <? $pickupDisplay = $ilsDetails['location']; ?> + <? endif; ?> + <? endif; ?> + <? if (!empty($pickupDisplay)): ?> + <strong><?=$this->transEsc('pick_up_location') ?>:</strong> + <?=$pickupTranslate ? $this->transEsc($pickupDisplay) : $this->escapeHtml($pickupDisplay)?> + <br /> + <? endif; ?> - <? if (isset($ilsDetails['in_transit']) && $ilsDetails['in_transit']): ?> - <div class="text-success"><?=$this->transEsc("ill_request_in_transit") . (is_string($ilsDetails['in_transit']) ? ': ' . $this->transEsc('institution_' . $ilsDetails['in_transit'], array(), $ilsDetails['in_transit']) : '') ?></div> - <? endif; ?> - <? if (isset($ilsDetails['processed']) && $ilsDetails['processed']): ?> - <div class="text-success"><?=$this->transEsc("ill_request_processed") . (is_string($ilsDetails['processed']) ? ': ' . $ilsDetails['processed'] : '') ?></div> - <? endif; ?> - <? if (isset($ilsDetails['available']) && $ilsDetails['available']): ?> - <div class="text-success"><?=$this->transEsc("ill_request_available") ?></div> - <? endif; ?> - <? if (isset($ilsDetails['canceled']) && $ilsDetails['canceled']): ?> - <div class="text-success"><?=$this->transEsc("ill_request_canceled") . (is_string($ilsDetails['canceled']) ? ': ' . $ilsDetails['canceled'] : '') ?></div> - <? endif; ?> - <? if (isset($ilsDetails['cancel_link'])): ?> - <p><a href="<?=$this->escapeHtmlAttr($ilsDetails['cancel_link']) ?>"><?=$this->transEsc("ill_request_cancel") ?></a></p> - <? endif; ?> + <strong><?=$this->transEsc('Created') ?>:</strong> <?=$this->escapeHtml($ilsDetails['create']) ?> + <? if (!empty($ilsDetails['expire'])): ?> + | <strong><?=$this->transEsc('Expires') ?>:</strong> <?=$this->escapeHtml($ilsDetails['expire']) ?> + <? endif; ?> + <br /> + <? if (isset($this->cancelResults['items'])): ?> + <? foreach ($this->cancelResults['items'] as $itemId=>$cancelResult): ?> + <? if ($itemId == $ilsDetails['item_id'] && $cancelResult['success'] == false): ?> + <div class="alert alert-danger"><?=$this->transEsc($cancelResult['status']) ?><? if ($cancelResult['sysMessage']) echo ' : ' . $this->transEsc($cancelResult['sysMessage']); ?></div> + <? endif; ?> + <? endforeach; ?> + <? endif; ?> + + <? if (isset($ilsDetails['in_transit']) && $ilsDetails['in_transit']): ?> + <div class="text-success"><?=$this->transEsc("ill_request_in_transit") . (is_string($ilsDetails['in_transit']) ? ': ' . $this->transEsc('institution_' . $ilsDetails['in_transit'], array(), $ilsDetails['in_transit']) : '') ?></div> + <? endif; ?> + <? if (isset($ilsDetails['processed']) && $ilsDetails['processed']): ?> + <div class="text-success"><?=$this->transEsc("ill_request_processed") . (is_string($ilsDetails['processed']) ? ': ' . $ilsDetails['processed'] : '') ?></div> + <? endif; ?> + <? if (isset($ilsDetails['available']) && $ilsDetails['available']): ?> + <div class="text-success"><?=$this->transEsc("ill_request_available") ?></div> + <? endif; ?> + <? if (isset($ilsDetails['canceled']) && $ilsDetails['canceled']): ?> + <div class="text-success"><?=$this->transEsc("ill_request_canceled") . (is_string($ilsDetails['canceled']) ? ': ' . $ilsDetails['canceled'] : '') ?></div> + <? endif; ?> + <? if (isset($ilsDetails['cancel_link'])): ?> + <p><a href="<?=$this->escapeHtmlAttr($ilsDetails['cancel_link']) ?>"><?=$this->transEsc("ill_request_cancel") ?></a></p> + <? endif; ?> + + </div> </div> - </div> - <? endforeach; ?> - <? if ($this->cancelForm): ?></form><? endif; ?> - <? else: ?> - <?=$this->transEsc('You do not have any interlibrary loan requests placed') ?>. - <? endif; ?> -</div> + <? endforeach; ?> + <? if ($this->cancelForm): ?></form><? endif; ?> + <? else: ?> + <?=$this->transEsc('You do not have any interlibrary loan requests placed') ?>. + <? endif; ?> + </div> -<div class="<?=$this->layoutClass('sidebar')?>"> - <?=$this->context($this)->renderInContext("myresearch/menu.phtml", array('active' => 'ILLRequests'))?> + <div class="<?=$this->layoutClass('sidebar')?>"> + <?=$this->context($this)->renderInContext("myresearch/menu.phtml", array('active' => 'ILLRequests'))?> + </div> </div> diff --git a/themes/bootstrap3/templates/myresearch/mylist.phtml b/themes/bootstrap3/templates/myresearch/mylist.phtml index 23dce7302d7f316227cc43d0aab31f9163c3373b..b0c5531db413d12801ee0a9dc2703a6558053048 100644 --- a/themes/bootstrap3/templates/myresearch/mylist.phtml +++ b/themes/bootstrap3/templates/myresearch/mylist.phtml @@ -21,54 +21,56 @@ <?=$this->flashmessages()?> -<div class="<?=$this->layoutClass('mainbody')?>"> - <div class="clearfix hidden-print"> - <p class="lead pull-left"><?=$list ? $this->escapeHtml($list->title) : $this->transEsc("Your Favorites")?></p> - <div class="pull-right"> - <? if (isset($list)): ?> - <? if ($list->editAllowed($account->isLoggedIn())): ?> - <a href="<?=$this->url('editList', array('id' => $list->id)) ?>" class="btn btn-link" title="<?=$this->transEsc("edit_list")?>"><i class="fa fa-edit"></i> <?=$this->transEsc("edit_list")?></a> - <div class="btn-group"> - <a class="btn btn-link dropdown-toggle" data-toggle="dropdown" href="<?=$this->url('myresearch-deletelist') ?>?listID=<?=urlencode($list->id)?>"> - <i class="fa fa-trash-o"></i> <?=$this->transEsc("delete_list")?> - </a> - <ul class="dropdown-menu"> - <li><a href="<?=$this->url('myresearch-deletelist') ?>?listID=<?=urlencode($list->id)?>&confirm=1"><?=$this->transEsc('Delete') ?></a></li> - <li><a href="#"><?=$this->transEsc('confirm_dialog_no')?></a></li> - </ul> - </div> - <? endif; ?> - <? elseif ($recordTotal > 0): ?> - <?=$this->transEsc("Showing")?> - <strong><?=$this->escapeHtml($this->results->getStartRecord())?></strong> - <strong><?=$this->escapeHtml($this->results->getEndRecord())?></strong> - <?=$this->transEsc('of')?> <strong><?=number_format($recordTotal)?></strong> - <? endif; ?> - </div> - </div> -<? if ($list && !empty($list->description)): ?> - <p><?=$this->escapeHtml($list->description)?></p> -<? endif; ?> - <? if ($recordTotal > 0): ?> - <div class="resulthead"> +<div class="row"> + <div class="<?=$this->layoutClass('mainbody')?>"> + <div class="clearfix hidden-print"> + <p class="lead pull-left"><?=$list ? $this->escapeHtml($list->title) : $this->transEsc("Your Favorites")?></p> <div class="pull-right"> - <?=$this->render('search/controls/sort.phtml')?> + <? if (isset($list)): ?> + <? if ($list->editAllowed($account->isLoggedIn())): ?> + <a href="<?=$this->url('editList', array('id' => $list->id)) ?>" class="btn btn-link" title="<?=$this->transEsc("edit_list")?>"><i class="fa fa-edit"></i> <?=$this->transEsc("edit_list")?></a> + <div class="btn-group"> + <a class="btn btn-link dropdown-toggle" data-toggle="dropdown" href="<?=$this->url('myresearch-deletelist') ?>?listID=<?=urlencode($list->id)?>"> + <i class="fa fa-trash-o"></i> <?=$this->transEsc("delete_list")?> + </a> + <ul class="dropdown-menu"> + <li><a href="<?=$this->url('myresearch-deletelist') ?>?listID=<?=urlencode($list->id)?>&confirm=1"><?=$this->transEsc('Delete') ?></a></li> + <li><a href="#"><?=$this->transEsc('confirm_dialog_no')?></a></li> + </ul> + </div> + <? endif; ?> + <? elseif ($recordTotal > 0): ?> + <?=$this->transEsc("Showing")?> + <strong><?=$this->escapeHtml($this->results->getStartRecord())?></strong> - <strong><?=$this->escapeHtml($this->results->getEndRecord())?></strong> + <?=$this->transEsc('of')?> <strong><?=number_format($recordTotal)?></strong> + <? endif; ?> </div> </div> - <form class="form-inline" method="post" name="bulkActionForm" action="<?=$this->url('cart-myresearchbulk')?>"> - <?=$this->context($this)->renderInContext('myresearch/bulk-action-buttons.phtml', array('idPrefix' => '', 'list' => isset($list) ? $list : null, 'account' => $this->account))?> - <? foreach ($this->results->getResults() as $i=>$current): ?> - <?=$this->record($current)->getListEntry($list, $user)?> - <? endforeach; ?> - </form> - <?=$this->paginationControl($this->results->getPaginator(), 'Sliding', 'search/pagination.phtml', array('results' => $this->results))?> - <? else: ?> - <p><?=$this->transEsc('You do not have any saved resources')?></p> + <? if ($list && !empty($list->description)): ?> + <p><?=$this->escapeHtml($list->description)?></p> <? endif; ?> -</div> + <? if ($recordTotal > 0): ?> + <div class="resulthead"> + <div class="pull-right"> + <?=$this->render('search/controls/sort.phtml')?> + </div> + </div> + <form class="form-inline" method="post" name="bulkActionForm" action="<?=$this->url('cart-myresearchbulk')?>"> + <?=$this->context($this)->renderInContext('myresearch/bulk-action-buttons.phtml', array('idPrefix' => '', 'list' => isset($list) ? $list : null, 'account' => $this->account))?> + <? foreach ($this->results->getResults() as $i=>$current): ?> + <?=$this->record($current)->getListEntry($list, $user)?> + <? endforeach; ?> + </form> + <?=$this->paginationControl($this->results->getPaginator(), 'Sliding', 'search/pagination.phtml', array('results' => $this->results))?> + <? else: ?> + <p><?=$this->transEsc('You do not have any saved resources')?></p> + <? endif; ?> + </div> -<div class="<?=$this->layoutClass('sidebar')?>"> - <?=$this->context($this)->renderInContext("myresearch/menu.phtml", array('active' => isset($list) ? 'list' . $list['id'] : 'favorites'))?> - <? foreach ($this->results->getRecommendations('side') as $current): ?> - <?=$this->recommend($current)?> - <? endforeach; ?> + <div class="<?=$this->layoutClass('sidebar')?>"> + <?=$this->context($this)->renderInContext("myresearch/menu.phtml", array('active' => isset($list) ? 'list' . $list['id'] : 'favorites'))?> + <? foreach ($this->results->getRecommendations('side') as $current): ?> + <?=$this->recommend($current)?> + <? endforeach; ?> + </div> </div> diff --git a/themes/bootstrap3/templates/myresearch/newpassword.phtml b/themes/bootstrap3/templates/myresearch/newpassword.phtml index f59028d6f8b2022c59b21af430f60a6b9bfc29f4..498bbcb311e8be6ae965bc1316ca2a1db97a28dc 100644 --- a/themes/bootstrap3/templates/myresearch/newpassword.phtml +++ b/themes/bootstrap3/templates/myresearch/newpassword.phtml @@ -1,28 +1,33 @@ -<div class="<?=$this->layoutClass('mainbody')?>"> - <h2><?=$this->transEsc('Create New Password') ?></h2> - <?=$this->flashmessages() ?> - <? if (!$this->auth()->getManager()->supportsPasswordChange($this->auth_method)): ?> - <div class="error"><?=$this->transEsc('recovery_new_disabled') ?></div> - <? elseif (!isset($this->hash)): ?> - <div class="error"><?=$this->transEsc('recovery_user_not_found') ?></div> - <? else: ?> - <form class="form-horizontal" action="<?=$this->url('myresearch-newpassword') ?>" method="post"> - <input type="hidden" value="<?=$this->escapeHtmlAttr($this->hash) ?>" name="hash"/> - <input type="hidden" value="<?=$this->escapeHtmlAttr($this->username) ?>" name="username"/> - <input type="hidden" value="<?=$this->escapeHtmlAttr($this->auth_method) ?>" name="auth_method"/> - <?=$this->auth()->getNewPasswordForm() ?> - <?=$this->recaptcha()->html($this->useRecaptcha) ?> - <div class="form-group"> - <div class="col-sm-9 col-sm-offset-3"> - <input class="btn btn-primary" name="submit" type="submit"/> - </div> +<? if ($this->auth()->isLoggedIn()): ?> + <div class="row"> + <div class="<?=$this->layoutClass('mainbody')?>"> +<? endif; ?> + +<h2><?=$this->transEsc('Create New Password') ?></h2> +<?=$this->flashmessages() ?> +<? if (!$this->auth()->getManager()->supportsPasswordChange($this->auth_method)): ?> + <div class="error"><?=$this->transEsc('recovery_new_disabled') ?></div> +<? elseif (!isset($this->hash)): ?> + <div class="error"><?=$this->transEsc('recovery_user_not_found') ?></div> +<? else: ?> + <form class="form-horizontal" action="<?=$this->url('myresearch-newpassword') ?>" method="post"> + <input type="hidden" value="<?=$this->escapeHtmlAttr($this->hash) ?>" name="hash"/> + <input type="hidden" value="<?=$this->escapeHtmlAttr($this->username) ?>" name="username"/> + <input type="hidden" value="<?=$this->escapeHtmlAttr($this->auth_method) ?>" name="auth_method"/> + <?=$this->auth()->getNewPasswordForm() ?> + <?=$this->recaptcha()->html($this->useRecaptcha) ?> + <div class="form-group"> + <div class="col-sm-9 col-sm-offset-3"> + <input class="btn btn-primary" name="submit" type="submit"/> </div> - </form> - <? endif; ?> -</div> + </div> + </form> +<? endif; ?> <? if ($this->auth()->isLoggedIn()): ?> - <div class="<?=$this->layoutClass('sidebar')?>"> - <?=$this->context($this)->renderInContext("myresearch/menu.phtml", array('active' => 'newpassword'))?> + </div> + <div class="<?=$this->layoutClass('sidebar')?>"> + <?=$this->context($this)->renderInContext("myresearch/menu.phtml", array('active' => 'newpassword'))?> + </div> </div> <? endif; ?> \ No newline at end of file diff --git a/themes/bootstrap3/templates/myresearch/profile.phtml b/themes/bootstrap3/templates/myresearch/profile.phtml index d34e8daea32c589236d58fdfe82ed560a400da90..fdb3d50c1e68df1aa713109190ca429dc7de25ff 100644 --- a/themes/bootstrap3/templates/myresearch/profile.phtml +++ b/themes/bootstrap3/templates/myresearch/profile.phtml @@ -12,53 +12,55 @@ $arrTemplate = '<tr><th>%%LABEL%%:</th><td> %%VALUE%%</td></tr>'; ?> -<div class="<?=$this->layoutClass('mainbody')?>"> - <h2><?=$this->transEsc('Your Profile')?></h2> - <?=$this->flashmessages();?> - <table class="table table-striped"> - <? - echo $this->renderArray( - $arrTemplate, $this->profile, - array( - $this->transEsc('First Name') => 'firstname', - $this->transEsc('Last Name') => 'lastname' - ) - ); - ?> - <? if ($showHomeLibForm): ?> - <tr><th><?=$this->transEsc('Preferred Library')?>:</th> +<div class="row"> + <div class="<?=$this->layoutClass('mainbody')?>"> + <h2><?=$this->transEsc('Your Profile')?></h2> + <?=$this->flashmessages();?> + <table class="table table-striped"> <? - $selected = (isset($this->profile['home_library']) && $this->profile['home_library'] != "") - ? $this->profile['home_library'] : $this->defaultPickupLocation - ?> - <td> - <form id="profile_form" class="form-inline" action="" method="post"> - <select id="home_library" name="home_library"> - <? foreach ($this->pickup as $lib): ?> - <option value="<?=$this->escapeHtmlAttr($lib['locationID'])?>"<?=($selected == $lib['locationID'])?' selected="selected"':''?>><?=$this->escapeHtml($lib['locationDisplay'])?></option> - <? endforeach; ?> - </select> - <input class="btn btn-default" type="submit" value="<?=$this->transEsc('Save')?>" /> - </form> - </td> - <? endif; ?> - <? echo $this->renderArray( - $arrTemplate, $this->profile, - array( - $this->transEsc('Address') . ' 1' => 'address1', - $this->transEsc('Address') . ' 2' => 'address2', - $this->transEsc('Zip') => 'zip', - $this->transEsc('City') => 'city', - $this->transEsc('Country') => 'country', - $this->transEsc('Phone Number') => 'phone', - $this->transEsc('Group') => 'group' - ) + $arrTemplate, $this->profile, + array( + $this->transEsc('First Name') => 'firstname', + $this->transEsc('Last Name') => 'lastname' + ) ); - ?> + ?> + <? if ($showHomeLibForm): ?> + <tr><th><?=$this->transEsc('Preferred Library')?>:</th> + <? + $selected = (isset($this->profile['home_library']) && $this->profile['home_library'] != "") + ? $this->profile['home_library'] : $this->defaultPickupLocation + ?> + <td> + <form id="profile_form" class="form-inline" action="" method="post"> + <select id="home_library" name="home_library"> + <? foreach ($this->pickup as $lib): ?> + <option value="<?=$this->escapeHtmlAttr($lib['locationID'])?>"<?=($selected == $lib['locationID'])?' selected="selected"':''?>><?=$this->escapeHtml($lib['locationDisplay'])?></option> + <? endforeach; ?> + </select> + <input class="btn btn-default" type="submit" value="<?=$this->transEsc('Save')?>" /> + </form> + </td> + <? endif; ?> + <? + echo $this->renderArray( + $arrTemplate, $this->profile, + array( + $this->transEsc('Address') . ' 1' => 'address1', + $this->transEsc('Address') . ' 2' => 'address2', + $this->transEsc('Zip') => 'zip', + $this->transEsc('City') => 'city', + $this->transEsc('Country') => 'country', + $this->transEsc('Phone Number') => 'phone', + $this->transEsc('Group') => 'group' + ) + ); + ?> </table> -</div> + </div> -<div class="<?=$this->layoutClass('sidebar')?>"> - <?=$this->context($this)->renderInContext("myresearch/menu.phtml", array('active' => 'profile'))?> + <div class="<?=$this->layoutClass('sidebar')?>"> + <?=$this->context($this)->renderInContext("myresearch/menu.phtml", array('active' => 'profile'))?> + </div> </div> \ No newline at end of file diff --git a/themes/bootstrap3/templates/myresearch/storageretrievalrequests.phtml b/themes/bootstrap3/templates/myresearch/storageretrievalrequests.phtml index d142b6180e26f556e41230deb52e9faccf5de1e2..6d8c54402641fd46fcfe99dbc8ab8a2517ded789 100644 --- a/themes/bootstrap3/templates/myresearch/storageretrievalrequests.phtml +++ b/themes/bootstrap3/templates/myresearch/storageretrievalrequests.phtml @@ -1,153 +1,154 @@ <? - // Set up page title: - $this->headTitle($this->translate('Storage Retrieval Requests')); + // Set up page title: + $this->headTitle($this->translate('Storage Retrieval Requests')); - // Set up breadcrumbs: - $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Storage Retrieval Requests') . '</li>'; + // Set up breadcrumbs: + $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . '">' . $this->transEsc('Your Account') . '</a></li> <li class="active">' . $this->transEsc('Storage Retrieval Requests') . '</li>'; ?> +<div class="row"> + <div class="<?=$this->layoutClass('mainbody')?>"> + <h2><?=$this->transEsc('Storage Retrieval Requests') ?></h2> -<div class="<?=$this->layoutClass('mainbody')?>"> - <h2><?=$this->transEsc('Storage Retrieval Requests') ?></h2> + <?=$this->flashmessages()?> - <?=$this->flashmessages()?> - - <? if (!empty($this->recordList)): ?> - <? if ($this->cancelForm): ?> - <form name="cancelForm" class="inline" action="" method="post" id="cancelStorageRetrievalRequest"> - <input type="hidden" id="submitType" name="cancelSelected" value="1"/> - <input type="hidden" id="cancelConfirm" name="confirm" value="0"/> - <div class="btn-group"> - <input id="cancelSelected" name="cancelSelected" type="submit" value="<?=$this->transEsc("storage_retrieval_request_cancel_selected") ?>" class="btn btn-default dropdown-toggle" data-toggle="dropdown"/> - <ul class="dropdown-menu"> - <li class="disabled"><a><?=$this->transEsc("confirm_storage_retrieval_request_cancel_selected_text") ?></a></li> - <li><a href="#" onClick="$('#cancelConfirm').val(1);$('#submitType').attr('name','cancelSelected');$(this).parents('form').submit(); return false;"><?=$this->transEsc('confirm_dialog_yes') ?></a></li> - <li><a href="#" onClick="return false;"><?=$this->transEsc('confirm_dialog_no')?></a></li> - </ul> - </div> - <div class="btn-group"> - <input id="cancelAll" name="cancelAll" type="submit" value="<?=$this->transEsc("storage_retrieval_request_cancel_all") ?>" class="btn btn-default dropdown-toggle" data-toggle="dropdown"/> - <ul class="dropdown-menu"> - <li class="disabled"><a><?=$this->transEsc("confirm_storage_retrieval_request_cancel_all_text") ?></a></li> - <li><a href="#" onClick="$('#cancelConfirm').val(1);$('#submitType').attr('name','cancelAll');$(this).parents('form').submit(); return false;"><?=$this->transEsc('confirm_dialog_yes') ?></a></li> - <li><a href="#" onClick="return false;"><?=$this->transEsc('confirm_dialog_no')?></a></li> - </ul> - </div> - <? endif; ?> - - <? $iteration = 0; ?> - <? foreach ($this->recordList as $resource): ?> - <hr/> - <? $iteration++; ?> - <? $ilsDetails = $resource->getExtraDetail('ils_details'); ?> - <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId()) ?>" class="row"> - <? if ($this->cancelForm && isset($ilsDetails['cancel_details'])): ?> - <? $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $resource->getUniqueId()); ?> - <input type="hidden" name="cancelAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" /> - <div class="pull-left"> - <input type="checkbox" name="cancelSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" id="checkbox_<?=$safeId?>" /> + <? if (!empty($this->recordList)): ?> + <? if ($this->cancelForm): ?> + <form name="cancelForm" class="inline" action="" method="post" id="cancelStorageRetrievalRequest"> + <input type="hidden" id="submitType" name="cancelSelected" value="1"/> + <input type="hidden" id="cancelConfirm" name="confirm" value="0"/> + <div class="btn-group"> + <input id="cancelSelected" name="cancelSelected" type="submit" value="<?=$this->transEsc("storage_retrieval_request_cancel_selected") ?>" class="btn btn-default dropdown-toggle" data-toggle="dropdown"/> + <ul class="dropdown-menu"> + <li class="disabled"><a><?=$this->transEsc("confirm_storage_retrieval_request_cancel_selected_text") ?></a></li> + <li><a href="#" onClick="$('#cancelConfirm').val(1);$('#submitType').attr('name','cancelSelected');$(this).parents('form').submit(); return false;"><?=$this->transEsc('confirm_dialog_yes') ?></a></li> + <li><a href="#" onClick="return false;"><?=$this->transEsc('confirm_dialog_no')?></a></li> + </ul> </div> - <? endif; ?> - <div class="col-sm-2 text-center"> - <? if ($summThumb = $this->record($resource)->getThumbnail()): ?> - <img src="<?=$this->escapeHtmlAttr($summThumb)?>" class="recordcover" alt="<?=$this->transEsc('Cover Image')?>"/> - <? else: ?> - <img src="<?=$this->url('cover-unavailable')?>" class="recordcover" alt="<?=$this->transEsc('No Cover Image')?>"/> - <? endif; ?> - </div> - <div class="col-sm-6"> - <? - // If this is a non-missing Solr record, we should display a link: - if (is_a($resource, 'VuFind\\RecordDriver\\SolrDefault') && !is_a($resource, 'VuFind\\RecordDriver\\Missing')) { - $title = $resource->getTitle(); - $title = empty($title) ? $this->transEsc('Title not available') : $this->escapeHtml($title); - echo '<a href="' . $this->recordLink()->getUrl($resource) - . '" class="title">' . $title . '</a>'; - } else if (isset($ilsDetails['title']) && !empty($ilsDetails['title'])){ - // If the record is not available in Solr, perhaps the ILS driver sent us a title we can show... - echo $this->escapeHtml($ilsDetails['title']); - } else { - // Last resort -- indicate that no title could be found. - echo $this->transEsc('Title not available'); - } - ?><br/> - <? $listAuthor = $resource->getPrimaryAuthor(); if (!empty($listAuthor)): ?> - <?=$this->transEsc('by')?>: - <a href="<?=$this->record($resource)->getLink('author', $listAuthor)?>"><?=$this->escapeHtml($listAuthor)?></a><br/> - <? endif; ?> - - <? $formats = $resource->getFormats(); if (count($formats) > 0): ?> - <?=str_replace('class="', 'class="label label-info ', $this->record($resource)->getFormatList())?> - <br/> - <? endif; ?> - <? if (isset($ilsDetails['volume']) && !empty($ilsDetails['volume'])): ?> - <strong><?=$this->transEsc('Volume')?>:</strong> <?=$this->escapeHtml($ilsDetails['volume'])?> - <br /> - <? endif; ?> + <div class="btn-group"> + <input id="cancelAll" name="cancelAll" type="submit" value="<?=$this->transEsc("storage_retrieval_request_cancel_all") ?>" class="btn btn-default dropdown-toggle" data-toggle="dropdown"/> + <ul class="dropdown-menu"> + <li class="disabled"><a><?=$this->transEsc("confirm_storage_retrieval_request_cancel_all_text") ?></a></li> + <li><a href="#" onClick="$('#cancelConfirm').val(1);$('#submitType').attr('name','cancelAll');$(this).parents('form').submit(); return false;"><?=$this->transEsc('confirm_dialog_yes') ?></a></li> + <li><a href="#" onClick="return false;"><?=$this->transEsc('confirm_dialog_no')?></a></li> + </ul> + </div> + <? endif; ?> - <? if (isset($ilsDetails['publication_year']) && !empty($ilsDetails['publication_year'])): ?> - <strong><?=$this->transEsc('Year of Publication')?>:</strong> <?=$this->escapeHtml($ilsDetails['publication_year'])?> - <br /> + <? $iteration = 0; ?> + <? foreach ($this->recordList as $resource): ?> + <hr/> + <? $iteration++; ?> + <? $ilsDetails = $resource->getExtraDetail('ils_details'); ?> + <div id="record<?=$this->escapeHtmlAttr($resource->getUniqueId()) ?>" class="row"> + <? if ($this->cancelForm && isset($ilsDetails['cancel_details'])): ?> + <? $safeId = preg_replace('/[^a-zA-Z0-9]/', '', $resource->getUniqueId()); ?> + <input type="hidden" name="cancelAllIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" /> + <div class="pull-left"> + <input type="checkbox" name="cancelSelectedIDS[]" value="<?=$this->escapeHtmlAttr($ilsDetails['cancel_details']) ?>" id="checkbox_<?=$safeId?>" /> + </div> <? endif; ?> + <div class="col-sm-2 text-center"> + <? if ($summThumb = $this->record($resource)->getThumbnail()): ?> + <img src="<?=$this->escapeHtmlAttr($summThumb)?>" class="recordcover" alt="<?=$this->transEsc('Cover Image')?>"/> + <? else: ?> + <img src="<?=$this->url('cover-unavailable')?>" class="recordcover" alt="<?=$this->transEsc('No Cover Image')?>"/> + <? endif; ?> + </div> + <div class="col-sm-6"> + <? + // If this is a non-missing Solr record, we should display a link: + if (is_a($resource, 'VuFind\\RecordDriver\\SolrDefault') && !is_a($resource, 'VuFind\\RecordDriver\\Missing')) { + $title = $resource->getTitle(); + $title = empty($title) ? $this->transEsc('Title not available') : $this->escapeHtml($title); + echo '<a href="' . $this->recordLink()->getUrl($resource) + . '" class="title">' . $title . '</a>'; + } else if (isset($ilsDetails['title']) && !empty($ilsDetails['title'])){ + // If the record is not available in Solr, perhaps the ILS driver sent us a title we can show... + echo $this->escapeHtml($ilsDetails['title']); + } else { + // Last resort -- indicate that no title could be found. + echo $this->transEsc('Title not available'); + } + ?><br/> + <? $listAuthor = $resource->getPrimaryAuthor(); if (!empty($listAuthor)): ?> + <?=$this->transEsc('by')?>: + <a href="<?=$this->record($resource)->getLink('author', $listAuthor)?>"><?=$this->escapeHtml($listAuthor)?></a><br/> + <? endif; ?> - <? /* Depending on the ILS driver, the "location" value may be a string or an ID; figure out the best - value to display... */ ?> - <? $pickupDisplay = ''; ?> - <? $pickupTranslate = false; ?> - <? if (isset($ilsDetails['location'])): ?> - <? if ($this->pickup): ?> - <? foreach ($this->pickup as $library): ?> - <? if ($library['locationID'] == $ilsDetails['location']): ?> - <? $pickupDisplay = $library['locationDisplay']; ?> - <? $pickupTranslate = true; ?> - <? endif; ?> - <? endforeach; ?> + <? $formats = $resource->getFormats(); if (count($formats) > 0): ?> + <?=str_replace('class="', 'class="label label-info ', $this->record($resource)->getFormatList())?> + <br/> <? endif; ?> - <? if (empty($pickupDisplay)): ?> - <? $pickupDisplay = $ilsDetails['location']; ?> + <? if (isset($ilsDetails['volume']) && !empty($ilsDetails['volume'])): ?> + <strong><?=$this->transEsc('Volume')?>:</strong> <?=$this->escapeHtml($ilsDetails['volume'])?> + <br /> <? endif; ?> - <? endif; ?> - <? if (!empty($pickupDisplay)): ?> - <strong><?=$this->transEsc('pick_up_location') ?>:</strong> - <?=$pickupTranslate ? $this->transEsc($pickupDisplay) : $this->escapeHtml($pickupDisplay)?> - <br /> - <? endif; ?> - <strong><?=$this->transEsc('Created') ?>:</strong> <?=$this->escapeHtml($ilsDetails['create']) ?> - <? if (!empty($ilsDetails['expire'])): ?> - | <strong><?=$this->transEsc('Expires') ?>:</strong> <?=$this->escapeHtml($ilsDetails['expire']) ?> - <? endif; ?> - <br /> + <? if (isset($ilsDetails['publication_year']) && !empty($ilsDetails['publication_year'])): ?> + <strong><?=$this->transEsc('Year of Publication')?>:</strong> <?=$this->escapeHtml($ilsDetails['publication_year'])?> + <br /> + <? endif; ?> - <? if (isset($this->cancelResults['items'])): ?> - <? foreach ($this->cancelResults['items'] as $itemId=>$cancelResult): ?> - <? if ($itemId == $ilsDetails['item_id'] && $cancelResult['success'] == false): ?> - <div class="alert alert-danger"><?=$this->transEsc($cancelResult['status']) ?><? if ($cancelResult['sysMessage']) echo ' : ' . $this->transEsc($cancelResult['sysMessage']); ?></div> + <? /* Depending on the ILS driver, the "location" value may be a string or an ID; figure out the best + value to display... */ ?> + <? $pickupDisplay = ''; ?> + <? $pickupTranslate = false; ?> + <? if (isset($ilsDetails['location'])): ?> + <? if ($this->pickup): ?> + <? foreach ($this->pickup as $library): ?> + <? if ($library['locationID'] == $ilsDetails['location']): ?> + <? $pickupDisplay = $library['locationDisplay']; ?> + <? $pickupTranslate = true; ?> + <? endif; ?> + <? endforeach; ?> <? endif; ?> - <? endforeach; ?> - <? endif; ?> + <? if (empty($pickupDisplay)): ?> + <? $pickupDisplay = $ilsDetails['location']; ?> + <? endif; ?> + <? endif; ?> + <? if (!empty($pickupDisplay)): ?> + <strong><?=$this->transEsc('pick_up_location') ?>:</strong> + <?=$pickupTranslate ? $this->transEsc($pickupDisplay) : $this->escapeHtml($pickupDisplay)?> + <br /> + <? endif; ?> - <? if (isset($ilsDetails['processed']) && $ilsDetails['processed']): ?> - <div class="text-success"><?=$this->transEsc("storage_retrieval_request_processed") . (is_string($ilsDetails['processed']) ? ': ' . $ilsDetails['processed'] : '') ?></div> - <? endif; ?> - <? if (isset($ilsDetails['available']) && $ilsDetails['available']): ?> - <div class="text-success"><?=$this->transEsc("storage_retrieval_request_available") ?></div> - <? endif; ?> - <? if (isset($ilsDetails['canceled']) && $ilsDetails['canceled']): ?> - <div class="text-success"><?=$this->transEsc("storage_retrieval_request_canceled") . (is_string($ilsDetails['canceled']) ? ': ' . $ilsDetails['canceled'] : '') ?></div> - <? endif; ?> - <? if (isset($ilsDetails['cancel_link'])): ?> - <p><a href="<?=$this->escapeHtmlAttr($ilsDetails['cancel_link']) ?>"><?=$this->transEsc("storage_retrieval_request_cancel") ?></a></p> - <? endif; ?> + <strong><?=$this->transEsc('Created') ?>:</strong> <?=$this->escapeHtml($ilsDetails['create']) ?> + <? if (!empty($ilsDetails['expire'])): ?> + | <strong><?=$this->transEsc('Expires') ?>:</strong> <?=$this->escapeHtml($ilsDetails['expire']) ?> + <? endif; ?> + <br /> + <? if (isset($this->cancelResults['items'])): ?> + <? foreach ($this->cancelResults['items'] as $itemId=>$cancelResult): ?> + <? if ($itemId == $ilsDetails['item_id'] && $cancelResult['success'] == false): ?> + <div class="alert alert-danger"><?=$this->transEsc($cancelResult['status']) ?><? if ($cancelResult['sysMessage']) echo ' : ' . $this->transEsc($cancelResult['sysMessage']); ?></div> + <? endif; ?> + <? endforeach; ?> + <? endif; ?> + + <? if (isset($ilsDetails['processed']) && $ilsDetails['processed']): ?> + <div class="text-success"><?=$this->transEsc("storage_retrieval_request_processed") . (is_string($ilsDetails['processed']) ? ': ' . $ilsDetails['processed'] : '') ?></div> + <? endif; ?> + <? if (isset($ilsDetails['available']) && $ilsDetails['available']): ?> + <div class="text-success"><?=$this->transEsc("storage_retrieval_request_available") ?></div> + <? endif; ?> + <? if (isset($ilsDetails['canceled']) && $ilsDetails['canceled']): ?> + <div class="text-success"><?=$this->transEsc("storage_retrieval_request_canceled") . (is_string($ilsDetails['canceled']) ? ': ' . $ilsDetails['canceled'] : '') ?></div> + <? endif; ?> + <? if (isset($ilsDetails['cancel_link'])): ?> + <p><a href="<?=$this->escapeHtmlAttr($ilsDetails['cancel_link']) ?>"><?=$this->transEsc("storage_retrieval_request_cancel") ?></a></p> + <? endif; ?> + + </div> </div> - </div> - <? endforeach; ?> - <? if ($this->cancelForm): ?></form><? endif; ?> - <? else: ?> - <?=$this->transEsc('You do not have any storage retrieval requests placed') ?>. - <? endif; ?> -</div> + <? endforeach; ?> + <? if ($this->cancelForm): ?></form><? endif; ?> + <? else: ?> + <?=$this->transEsc('You do not have any storage retrieval requests placed') ?>. + <? endif; ?> + </div> -<div class="<?=$this->layoutClass('sidebar')?>"> - <?=$this->context($this)->renderInContext("myresearch/menu.phtml", array('active' => 'storageRetrievalRequests'))?> + <div class="<?=$this->layoutClass('sidebar')?>"> + <?=$this->context($this)->renderInContext("myresearch/menu.phtml", array('active' => 'storageRetrievalRequests'))?> + </div> </div> diff --git a/themes/bootstrap3/templates/search/history.phtml b/themes/bootstrap3/templates/search/history.phtml index fd9e8e11f5a05443264c938d74de36303a2cf683..04874808ab5df41caf5b83551951e41a5c33342c 100644 --- a/themes/bootstrap3/templates/search/history.phtml +++ b/themes/bootstrap3/templates/search/history.phtml @@ -7,25 +7,27 @@ . '<li class="active">' . $this->transEsc('History') . '</li>'; ?> -<div class="<?=$this->layoutClass('mainbody')?>"> - <? if (!empty($this->saved)): ?> - <h2><?=$this->transEsc("history_saved_searches")?></h2> - <?=$this->context()->renderInContext('search/history-table.phtml', array('showSaved' => true));?> - <? endif; ?> +<div class="row"> + <div class="<?=$this->layoutClass('mainbody')?>"> + <? if (!empty($this->saved)): ?> + <h2><?=$this->transEsc("history_saved_searches")?></h2> + <?=$this->context()->renderInContext('search/history-table.phtml', array('showSaved' => true));?> + <? endif; ?> - <h2><?=$this->transEsc("history_recent_searches")?></h2> - <? if (!empty($this->unsaved)): ?> - <?=$this->context()->renderInContext('search/history-table.phtml', array('showSaved' => false));?> - <? else: ?> - <?=$this->transEsc("history_no_searches")?> - <? endif; ?> -</div> + <h2><?=$this->transEsc("history_recent_searches")?></h2> + <? if (!empty($this->unsaved)): ?> + <?=$this->context()->renderInContext('search/history-table.phtml', array('showSaved' => false));?> + <? else: ?> + <?=$this->transEsc("history_no_searches")?> + <? endif; ?> + </div> -<div class="<?=$this->layoutClass('sidebar')?>"> - <?=$this->context($this)->renderInContext( - "myresearch/menu.phtml", - // Only activate search history in account menu if user is logged in. - $this->auth()->isLoggedIn() ? array('active' => 'history') : array() - ); - ?> + <div class="<?=$this->layoutClass('sidebar')?>"> + <?=$this->context($this)->renderInContext( + "myresearch/menu.phtml", + // Only activate search history in account menu if user is logged in. + $this->auth()->isLoggedIn() ? array('active' => 'history') : array() + ); + ?> + </div> </div> \ No newline at end of file diff --git a/themes/bootstrap3/templates/search/reserves.phtml b/themes/bootstrap3/templates/search/reserves.phtml index fee492a001b7ae160a123353f593b2cdc6c2e914..803e04b15b85ebbb1feb252880c04f67f0b39023 100644 --- a/themes/bootstrap3/templates/search/reserves.phtml +++ b/themes/bootstrap3/templates/search/reserves.phtml @@ -5,58 +5,56 @@ // Set up breadcrumbs: $this->layout()->breadcrumbs = '<li class="active">' . $this->transEsc('Reserves') . '</li>'; ?> -<div class="<?=$this->layoutClass('mainbody')?>"> - <h2><?=$this->transEsc('Search For Items on Reserve')?></h2> - <form method="get" action="" name="searchForm" class="form-horizontal"> - <? if (is_array($this->courseList)): ?> - <div class="form-group"> - <label for="reserves_by_course" class="col-sm-2 control-label"><?=$this->transEsc('By Course')?>:</label> - <div class="col-sm-6"> - <select name="course" id="reserves_by_course" class="form-control"> - <option></option> - <? foreach ($this->courseList as $courseId => $courseName): ?> - <option value="<?=$this->escapeHtmlAttr($courseId)?>"><?=$this->escapeHtml($courseName)?></option> - <? endforeach; ?> - </select> - </div> - <div class="col-sm-2"> - <input class="btn btn-primary" type="submit" name="submit" value="<?=$this->transEsc('Find')?>"/> - </div> +<h2><?=$this->transEsc('Search For Items on Reserve')?></h2> +<form method="get" action="" name="searchForm" class="form-horizontal"> + <? if (is_array($this->courseList)): ?> + <div class="form-group"> + <label for="reserves_by_course" class="col-sm-2 control-label"><?=$this->transEsc('By Course')?>:</label> + <div class="col-sm-5"> + <select name="course" id="reserves_by_course" class="form-control"> + <option></option> + <? foreach ($this->courseList as $courseId => $courseName): ?> + <option value="<?=$this->escapeHtmlAttr($courseId)?>"><?=$this->escapeHtml($courseName)?></option> + <? endforeach; ?> + </select> </div> - <? endif; ?> + <div class="col-sm-2"> + <input class="btn btn-primary" type="submit" name="submit" value="<?=$this->transEsc('Find')?>"/> + </div> + </div> + <? endif; ?> - <? if (is_array($this->instList)): ?> - <div class="form-group"> - <label for="reserves_by_inst" class="col-sm-2 control-label"><?=$this->transEsc('By Instructor')?>:</label> - <div class="col-sm-6"> - <select name="inst" id="reserves_by_inst" class="form-control"> - <option></option> - <? foreach ($this->instList as $instId => $instName): ?> - <option value="<?=$this->escapeHtmlAttr($instId)?>"><?=$this->escapeHtml($instName)?></option> - <? endforeach; ?> - </select> - </div> - <div class="col-sm-2"> - <input class="btn btn-primary" type="submit" name="submit" value="<?=$this->transEsc('Find')?>"/> - </div> + <? if (is_array($this->instList)): ?> + <div class="form-group"> + <label for="reserves_by_inst" class="col-sm-2 control-label"><?=$this->transEsc('By Instructor')?>:</label> + <div class="col-sm-5"> + <select name="inst" id="reserves_by_inst" class="form-control"> + <option></option> + <? foreach ($this->instList as $instId => $instName): ?> + <option value="<?=$this->escapeHtmlAttr($instId)?>"><?=$this->escapeHtml($instName)?></option> + <? endforeach; ?> + </select> + </div> + <div class="col-sm-2"> + <input class="btn btn-primary" type="submit" name="submit" value="<?=$this->transEsc('Find')?>"/> </div> - <? endif; ?> + </div> + <? endif; ?> - <? if (is_array($this->deptList)): ?> - <div class="form-group"> - <label for="reserves_by_dept" class="col-sm-2 control-label"><?=$this->transEsc('By Department')?>:</label> - <div class="col-sm-6"> - <select name="dept" id="reserves_by_dept" class="form-control"> - <option></option> - <? foreach ($this->deptList as $deptId => $deptName): ?> - <option value="<?=$this->escapeHtmlAttr($deptId)?>"><?=$this->escapeHtml($deptName)?></option> - <? endforeach; ?> - </select> - </div> - <div class="col-sm-2"> - <input class="btn btn-primary" type="submit" name="submit" value="<?=$this->transEsc('Find')?>"/> - </div> + <? if (is_array($this->deptList)): ?> + <div class="form-group"> + <label for="reserves_by_dept" class="col-sm-2 control-label"><?=$this->transEsc('By Department')?>:</label> + <div class="col-sm-5"> + <select name="dept" id="reserves_by_dept" class="form-control"> + <option></option> + <? foreach ($this->deptList as $deptId => $deptName): ?> + <option value="<?=$this->escapeHtmlAttr($deptId)?>"><?=$this->escapeHtml($deptName)?></option> + <? endforeach; ?> + </select> + </div> + <div class="col-sm-2"> + <input class="btn btn-primary" type="submit" name="submit" value="<?=$this->transEsc('Find')?>"/> </div> - <? endif; ?> - </form> -</div> \ No newline at end of file + </div> + <? endif; ?> +</form> \ No newline at end of file diff --git a/themes/bootstrap3/templates/search/reservessearch.phtml b/themes/bootstrap3/templates/search/reservessearch.phtml index 572074e8c6b79e64470203fd3289fd51d4a02a2d..a07330cfa934d9ed623188638145d7b0dd5d050b 100644 --- a/themes/bootstrap3/templates/search/reservessearch.phtml +++ b/themes/bootstrap3/templates/search/reservessearch.phtml @@ -9,69 +9,71 @@ $reservesLookfor = $this->params->getDisplayQuery(); ?> -<div class="<?=$this->layoutClass('mainbody')?>"> - <h3><?=$this->transEsc('Search For Items on Reserve')?></h3> - <form class="form-inline" method="get" action="" name="reservesSearchForm"> - <label for="reservesSearchForm_lookfor"><?=$this->transEsc("Your search terms")?></label> - <input id="reservesSearchForm_lookfor" type="text" name="lookfor" size="40" value="<?=$this->escapeHtmlAttr($reservesLookfor)?>" <?=$this->searchOptions('SolrReserves')->autocompleteEnabled() ? ' class="autocomplete searcher:SolrReserves type:Reserves"' : ''?> /> - <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc("Find")?>"/> - </form> - <script type="text/javascript">$("#reservesSearchForm_lookfor").focus()</script> +<div class="row"> + <div class="<?=$this->layoutClass('mainbody')?>"> + <h3><?=$this->transEsc('Search For Items on Reserve')?></h3> + <form class="form-inline" method="get" action="" name="reservesSearchForm"> + <label for="reservesSearchForm_lookfor"><?=$this->transEsc("Your search terms")?></label> + <input id="reservesSearchForm_lookfor" type="text" name="lookfor" size="40" value="<?=$this->escapeHtmlAttr($reservesLookfor)?>" <?=$this->searchOptions('SolrReserves')->autocompleteEnabled() ? ' class="autocomplete searcher:SolrReserves type:Reserves"' : ''?> /> + <input class="btn btn-default" type="submit" name="submit" value="<?=$this->transEsc("Find")?>"/> + </form> + <script type="text/javascript">$("#reservesSearchForm_lookfor").focus()</script> - <div class="resulthead"> - <div class="pull-left"> - <? if (($recordTotal = $this->results->getResultTotal()) > 0): ?> - <?=$this->transEsc("Showing")?> - <strong><?=$this->results->getStartRecord()?></strong> - <strong><?=$this->results->getEndRecord()?></strong> - <?=$this->transEsc('of')?> <strong><?=number_format($recordTotal)?></strong> - <?=$this->transEsc('for search')?>: <strong>'<?=$this->escapeHtml($reservesLookfor)?>'</strong>, - <? endif; ?> - <? if ($qtime = $this->results->getQuerySpeed()): ?> - <?=$this->transEsc('query time')?>: <?=$this->escapeHtml(round($qtime, 2))?>s - <? endif; ?> - </div> + <div class="resulthead"> + <div class="pull-left"> + <? if (($recordTotal = $this->results->getResultTotal()) > 0): ?> + <?=$this->transEsc("Showing")?> + <strong><?=$this->results->getStartRecord()?></strong> - <strong><?=$this->results->getEndRecord()?></strong> + <?=$this->transEsc('of')?> <strong><?=number_format($recordTotal)?></strong> + <?=$this->transEsc('for search')?>: <strong>'<?=$this->escapeHtml($reservesLookfor)?>'</strong>, + <? endif; ?> + <? if ($qtime = $this->results->getQuerySpeed()): ?> + <?=$this->transEsc('query time')?>: <?=$this->escapeHtml(round($qtime, 2))?>s + <? endif; ?> + </div> - <div class="pull-right"> - <?=$this->render('search/controls/sort.phtml')?> + <div class="pull-right"> + <?=$this->render('search/controls/sort.phtml')?> + </div> </div> - </div> - <? if ($recordTotal < 1): ?> - <p class="error"><?=$this->transEsc('nohit_prefix')?> - <strong><?=$this->escapeHtml($reservesLookfor)?></strong> - <?=$this->transEsc('nohit_suffix')?></p> - <? if (isset($this->parseError)): ?> - <p class="error"><?=$this->transEsc('nohit_parse_error')?></p> - <? endif; ?> - <? else: ?> - <table class="table table-striped"> - <tr> - <th class="department"><?=$this->transEsc('Department')?></th> - <th class="course"><?=$this->transEsc('Course')?></th> - <th class="instructor"><?=$this->transEsc('Instructor')?></th> - <th class="items"><?=$this->transEsc('Items')?></th> - </tr> - <? foreach ($this->results->getResults() as $record): ?> - <? - $url = $this->currentPath() . $this->escapeHtmlAttr( - '?inst=' . urlencode($record->getInstructorId()) - . '&course=' . urlencode($record->getCourseId()) - . '&dept=' . urlencode($record->getDepartmentId()) - ); - ?> + <? if ($recordTotal < 1): ?> + <p class="error"><?=$this->transEsc('nohit_prefix')?> - <strong><?=$this->escapeHtml($reservesLookfor)?></strong> - <?=$this->transEsc('nohit_suffix')?></p> + <? if (isset($this->parseError)): ?> + <p class="error"><?=$this->transEsc('nohit_parse_error')?></p> + <? endif; ?> + <? else: ?> + <table class="table table-striped"> <tr> - <td class="department"><a href="<?=$url?>"><?=$this->escapeHtml($record->getDepartment())?></a></td> - <td class="course"><a href="<?=$url?>"><?=$this->escapeHtml($record->getCourse())?></a></td> - <td class="instructor"><a href="<?=$url?>"><?=$this->escapeHtml($record->getInstructor())?></a></td> - <td class="items"><?=$this->escapeHtml($record->getItemCount())?></td> + <th class="department"><?=$this->transEsc('Department')?></th> + <th class="course"><?=$this->transEsc('Course')?></th> + <th class="instructor"><?=$this->transEsc('Instructor')?></th> + <th class="items"><?=$this->transEsc('Items')?></th> </tr> - <? endforeach; ?> - </table> - <?=$this->paginationControl($this->results->getPaginator(), 'Sliding', 'search/pagination.phtml', array('results' => $this->results))?> - <? endif; ?> -</div> + <? foreach ($this->results->getResults() as $record): ?> + <? + $url = $this->currentPath() . $this->escapeHtmlAttr( + '?inst=' . urlencode($record->getInstructorId()) + . '&course=' . urlencode($record->getCourseId()) + . '&dept=' . urlencode($record->getDepartmentId()) + ); + ?> + <tr> + <td class="department"><a href="<?=$url?>"><?=$this->escapeHtml($record->getDepartment())?></a></td> + <td class="course"><a href="<?=$url?>"><?=$this->escapeHtml($record->getCourse())?></a></td> + <td class="instructor"><a href="<?=$url?>"><?=$this->escapeHtml($record->getInstructor())?></a></td> + <td class="items"><?=$this->escapeHtml($record->getItemCount())?></td> + </tr> + <? endforeach; ?> + </table> + <?=$this->paginationControl($this->results->getPaginator(), 'Sliding', 'search/pagination.phtml', array('results' => $this->results))?> + <? endif; ?> + </div> -<? /* Narrow Search Options */ ?> -<div class="<?=$this->layoutClass('sidebar')?>"> - <? foreach ($this->results->getRecommendations('side') as $current): ?> - <?=$this->recommend($current)?> - <? endforeach; ?> + <? /* Narrow Search Options */ ?> + <div class="<?=$this->layoutClass('sidebar')?>"> + <? foreach ($this->results->getRecommendations('side') as $current): ?> + <?=$this->recommend($current)?> + <? endforeach; ?> + </div> + <? /* End Narrow Search Options */ ?> </div> -<? /* End Narrow Search Options */ ?> diff --git a/themes/bootstrap3/templates/vudl/about.phtml b/themes/bootstrap3/templates/vudl/about.phtml index c55587c5b0dc0fd11da8686f1ef7d1c1fe226f12..f453520acbd2d4cc333c784edecece951e5f0229 100644 --- a/themes/bootstrap3/templates/vudl/about.phtml +++ b/themes/bootstrap3/templates/vudl/about.phtml @@ -3,20 +3,22 @@ $this->layout()->breadcrumbs = false; ?> -<div class="<?=$this->layoutClass('mainbody')?>"> - <div class="alert alert-info"> - <h2><?=$this->transEsc('Powered By') ?> <a href="http://vudl.org">VuDL</a></h2> +<div class="row"> + <div class="<?=$this->layoutClass('mainbody')?>"> + <div class="alert alert-info"> + <h2><?=$this->transEsc('Powered By') ?> <a href="http://vudl.org">VuDL</a></h2> + </div> + <li><strong>Total Collections:</strong> <?=$this->totals['folders'] ?></li> + <li><strong>Total Resources:</strong> <?=$this->totals['resources'] ?></li> + <!-- These counts aren't working yet -- + <li><strong>Total Images:</strong> <?=$this->totals['images'] ?></li> + <li><strong>Total PDFs:</strong> <?=$this->totals['pdfs'] ?></li> --> </div> - <li><strong>Total Collections:</strong> <?=$this->totals['folders'] ?></li> - <li><strong>Total Resources:</strong> <?=$this->totals['resources'] ?></li> - <!-- These counts aren't working yet -- - <li><strong>Total Images:</strong> <?=$this->totals['images'] ?></li> - <li><strong>Total PDFs:</strong> <?=$this->totals['pdfs'] ?></li> --> -</div> -<div class="<?=$this->layoutClass('sidebar')?>"> - <ul class="list-group"> - <li class="list-group-item title"><?=$this->transEsc('Content') ?></li> - <li class="list-group-item"><a href="http://vudl.org">VuDL</a></li> - </ul> + <div class="<?=$this->layoutClass('sidebar')?>"> + <ul class="list-group"> + <li class="list-group-item title"><?=$this->transEsc('Content') ?></li> + <li class="list-group-item"><a href="http://vudl.org">VuDL</a></li> + </ul> + </div> </div> \ No newline at end of file diff --git a/themes/bootstrap3/templates/vudl/denied.phtml b/themes/bootstrap3/templates/vudl/denied.phtml index 8a7815544ed5979c40da433f12795fb93a31544f..eb285ce7440630c018a06c4077b133ec9d920b25 100644 --- a/themes/bootstrap3/templates/vudl/denied.phtml +++ b/themes/bootstrap3/templates/vudl/denied.phtml @@ -2,9 +2,6 @@ $this->headTitle($this->translate($this->title) .' - '. $this->translate('vudl_access_denied')); $this->layout()->breadcrumbs = false; ?> - -<div class="<?=$this->layoutClass('mainbody')?>"> - <div class="alert alert-danger"> - <?=$this->transEsc('vudl_access_denied')?> - </div> +<div class="alert alert-danger"> + <?=$this->transEsc('vudl_access_denied')?> </div>