Skip to content
Snippets Groups Projects
Commit 934b7865 authored by Claas Kazzer's avatar Claas Kazzer Committed by André Lahmann
Browse files

refs #5375:

* merging foundation5 updates from finc/pullrequest_foundation5 into master
parent 6399b9ed
Branches
Tags
No related merge requests found
Showing
with 59 additions and 32 deletions
...@@ -53,7 +53,9 @@ class LayoutClass extends \VuFind\View\Helper\AbstractLayoutClass ...@@ -53,7 +53,9 @@ class LayoutClass extends \VuFind\View\Helper\AbstractLayoutClass
{ {
switch ($class) { switch ($class) {
case 'mainbody': case 'mainbody':
return $this->left ? 'medium-9 columns medium-push-3' : 'medium-9 columns'; return $this->left
? 'medium-9 columns medium-push-3'
: 'medium-9 columns';
case 'sidebar': case 'sidebar':
return $this->left return $this->left
? 'sidebar medium-3 columns medium-pull-9 hide-for-print' ? 'sidebar medium-3 columns medium-pull-9 hide-for-print'
......
/* DO NOT edit this finc.css */
// Make all finc-relevant changes here
/* DO NOT edit this finc.css */
<!-- recorddriver - solrai - core -->
<div class="row" vocab="http://schema.org/" resource="#record" typeof="<?=$this->driver->getSchemaOrgFormats()?> Product"> <div class="row" vocab="http://schema.org/" resource="#record" typeof="<?=$this->driver->getSchemaOrgFormats()?> Product">
<div class="col-sm-3 medium-3 columns"> <div class="col-sm-3 medium-3 columns bookimgs">
<div class="text-center"> <? /* div class="text-center" --> <!-- deactivated, CK - reactivate to centre images */ ?>
<ul class="clearing-thumbs" data-clearing><? /* added clearing lightbox for images, CK, to remove, also remove data-caption+content in img links */ ?>
<li>
<? /* Display thumbnail if appropriate: */ ?> <? /* Display thumbnail if appropriate: */ ?>
<? $mediumThumb = $this->record($this->driver)->getThumbnail('medium'); $largeThumb = $this->record($this->driver)->getThumbnail('large'); ?> <? $mediumThumb = $this->record($this->driver)->getThumbnail('medium'); $largeThumb = $this->record($this->driver)->getThumbnail('large'); ?>
<? if ($mediumThumb): ?> <? if ($mediumThumb): ?>
<? if ($largeThumb): ?><a href="<?=$this->escapeHtmlAttr($largeThumb)?>"><? endif; ?> <? if ($largeThumb): ?><a href="<?=$this->escapeHtmlAttr($largeThumb)?>"><? endif; ?>
<img alt="<?=$this->transEsc('Cover Image')?>" class="recordcover" src="<?=$this->escapeHtmlAttr($mediumThumb);?>"/> <img alt="<?=$this->transEsc('Cover Image')?>" class="recordcover" src="<?=$this->escapeHtmlAttr($mediumThumb);?>" data-caption="<?=$this->transEsc('Cover Image')?>"/>
<? if ($largeThumb): ?></a><? endif; ?> <? if ($largeThumb): ?></a><? endif; ?>
<? else: ?> <? else: ?>
<img src="<?=$this->url('cover-unavailable')?>" class="recordcover" alt="<?=$this->transEsc('No Cover Image')?>"/> <img src="<?=$this->url('cover-unavailable')?>" class="recordcover" alt="<?=$this->transEsc('No Cover Image')?>" data-caption="<?=$this->transEsc('No Cover Image')?>"/>
<? endif; ?> <? endif; ?>
</li>
<li>
<? /* Display qrcode if appropriate: */ ?> <? /* Display qrcode if appropriate: */ ?>
<? $QRCode = $this->record($this->driver)->getQRCode("core"); ?> <? $QRCode = $this->record($this->driver)->getQRCode("core"); ?>
<? if($QRCode): ?> <? if($QRCode): ?>
<span class="hidden-xs hide-for-small"> <span class="hidden-xs hide-for-small">
<br/><img alt="<?=$this->transEsc('QR Code')?>" class="qrcode" src="<?=$this->escapeHtmlAttr($QRCode);?>"/> <br/><img alt="<?=$this->transEsc('QR Code')?>" data-caption="<?=$this->transEsc('QR Code')?>" class="qrcode" src="<?=$this->escapeHtmlAttr($QRCode);?>"/>
</span> </span>
<? endif; ?> <? endif; ?>
</div> <? /* /div> <!-- deactivated, CK - reactivate to centre image */ ?>
</li>
</ul>
<? // if you have a preview tab but want to move or remove the preview link
// from this area of the record view, this can be split into
// getPreviewData() (should stay here) and
// getPreviewLink() (can go in your desired tab) ?>
<?=$this->record($this->driver)->getPreviews()?> <?=$this->record($this->driver)->getPreviews()?>
</div> </div>
...@@ -37,7 +46,7 @@ ...@@ -37,7 +46,7 @@
<? if ($this->userlist()->getMode() !== 'disabled'): ?> <? if ($this->userlist()->getMode() !== 'disabled'): ?>
<? /* Display the lists that this record is saved to */ ?> <? /* Display the lists that this record is saved to */ ?>
<div class="savedLists hidden alert alert-info" id="savedLists"> <div class="savedLists hide alert-box info alert alert-info" id="savedLists" data-alert tabindex="0" aria-live="assertive" role="dialogalert">
<strong><?=$this->transEsc("Saved in")?>:</strong> <strong><?=$this->transEsc("Saved in")?>:</strong>
</div> </div>
<? endif; ?> <? endif; ?>
...@@ -245,7 +254,7 @@ ...@@ -245,7 +254,7 @@
<tr> <tr>
<th><?=$this->transEsc('Tags')?>: </th> <th><?=$this->transEsc('Tags')?>: </th>
<td> <td>
<span class="pull-right"> <span class="pull-right hide-for-print">
<i class="fa fa-plus"></i> <a id="tagRecord" class="modal-link" href="<?=$this->recordLink()->getActionUrl($this->driver, 'AddTag')?>" title="<?=$this->transEsc('Add Tag')?>"><?=$this->transEsc('Add Tag')?></a> <i class="fa fa-plus"></i> <a id="tagRecord" class="modal-link" href="<?=$this->recordLink()->getActionUrl($this->driver, 'AddTag')?>" title="<?=$this->transEsc('Add Tag')?>"><?=$this->transEsc('Add Tag')?></a>
</span> </span>
<div id="tagList"> <div id="tagList">
...@@ -262,3 +271,4 @@ ...@@ -262,3 +271,4 @@
<?/* End Main Details */?> <?/* End Main Details */?>
</div> </div>
</div> </div>
<!-- recorddriver - solrai - core - END -->
\ No newline at end of file
<!-- recorddriver - solrai - link-isn -->
<?=$this->url('search-results')?>?join=AND&amp;bool0[]=AND&amp;<? $issns = $this->issns; if (isset($issns)): ?><? foreach ($issns as $issn): ?>lookfor0[]=<?=$this->escapeHtml($issn)?>&amp;type0[]=ISN&amp;<? endforeach; ?><? endif; ?>sort=year&amp;view=list <?=$this->url('search-results')?>?join=AND&amp;bool0[]=AND&amp;<? $issns = $this->issns; if (isset($issns)): ?><? foreach ($issns as $issn): ?>lookfor0[]=<?=$this->escapeHtml($issn)?>&amp;type0[]=ISN&amp;<? endforeach; ?><? endif; ?>sort=year&amp;view=list
<!-- recorddriver - solrai - link-isn - END -->
\ No newline at end of file
<!-- recorddriver - solrai - result-list -->
<div class="<?=$this->driver->supportsAjaxStatus()?'ajaxItem ':''?>col-xs-11 small-11 columns"> <div class="<?=$this->driver->supportsAjaxStatus()?'ajaxItem ':''?>col-xs-11 small-11 columns">
<div class="row"> <div class="row">
<div class="col-sm-2 col-xs-3 small-3 medium-2 columns left"> <div class="col-sm-2 col-xs-3 small-3 medium-2 columns left">
<input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getUniqueID())?>" class="hiddenId" /> <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getUniqueID())?>" class="hiddenId" />
<input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getResourceSource())?>" class="hiddenSource" /> <input type="hidden" value="<?=$this->escapeHtmlAttr($this->driver->getResourceSource())?>" class="hiddenSource" />
<a href="<?=$this->recordLink()->getUrl($this->driver)?>"> <a href="<?=$this->recordLink()->getUrl($this->driver)?>" class="cover">
<? if ($summThumb = $this->record($this->driver)->getThumbnail()): ?> <? if ($summThumb = $this->record($this->driver)->getThumbnail()): ?>
<img class="recordcover" src="<?=$this->escapeHtmlAttr($summThumb)?>" alt="<?=$this->transEsc('Cover Image')?>"/> <img class="recordcover" src="<?=$this->escapeHtmlAttr($summThumb)?>" alt="<?=$this->transEsc('Cover Image')?>"/>
<? else: ?> <? else: ?>
...@@ -27,14 +28,13 @@ ...@@ -27,14 +28,13 @@
?> ?>
</a> </a>
</div> </div>
<div> <div>
<? if($this->driver->isCollection()): ?> <? if($this->driver->isCollection()): ?>
<?=implode('<br>', $this->driver->getSummary()); ?> <?=implode('<br>', $this->driver->getSummary()); ?>
<? else: ?> <? else: ?>
<? $summAuthors = $this->driver->getCombinedAuthors(); if (!empty($summAuthors)): ?> <? $summAuthors = $this->driver->getCombinedAuthors(); if (!empty($summAuthors)): ?>
<? foreach($summAuthors as $summAuthor) : ?> <? foreach($summAuthors as $summAuthor) : ?>
<a href="<?=$this->record($this->driver)->getLink('author', $summAuthor)?>"><? <a href="<?=$this->record($this->driver)->getLink('author', $summAuthor)?> class="author"><?
$summHighlightedAuthor = $this->driver->getHighlightedAuthor(); $summHighlightedAuthor = $this->driver->getHighlightedAuthor();
echo !empty($summHighlightedAuthor) echo !empty($summHighlightedAuthor)
? $this->highlight($summHighlightedAuthor) ? $this->highlight($summHighlightedAuthor)
...@@ -101,14 +101,14 @@ ...@@ -101,14 +101,14 @@
</div> </div>
<? endif; ?> <? endif; ?>
<div class="callnumAndLocation ajax-availability hidden"> <div class="callnumAndLocation ajax-availability hide">
<? if ($this->driver->supportsAjaxStatus()): ?> <? if ($this->driver->supportsAjaxStatus()): ?>
<strong class="hideIfDetailed"><?=$this->transEsc('Call Number')?>:</strong> <strong class="hideIfDetailed"><?=$this->transEsc('Call Number')?>:</strong>
<span class="callnumber ajax-availability hidden"> <span class="callnumber ajax-availability hide">
<?=$this->transEsc('Loading')?>&nbsp;...<br/> <?=$this->transEsc('Loading')?>&nbsp;...<br/>
</span> </span>
<strong><?=$this->transEsc('Located')?>:</strong> <strong><?=$this->transEsc('Located')?>:</strong>
<span class="location ajax-availability hidden"> <span class="location ajax-availability hide">
<?=$this->transEsc('Loading')?>&nbsp;... <?=$this->transEsc('Loading')?>&nbsp;...
</span> </span>
<div class="locationDetails"></div> <div class="locationDetails"></div>
...@@ -140,16 +140,17 @@ ...@@ -140,16 +140,17 @@
<? endif; ?> <? endif; ?>
<? endif; ?> <? endif; ?>
<?=str_replace('class="', 'class="label label-info ', $this->record($this->driver)->getFormatList())?> <?=str_replace('class="', 'class="label info label-info ', $this->record($this->driver)->getFormatList())?>
<? if (!$openUrlActive && empty($urls) && $this->driver->supportsAjaxStatus()): ?> <? if (!$openUrlActive && empty($urls) && $this->driver->supportsAjaxStatus()): ?>
<span class="status ajax-availability hidden"> <span class="status ajax-availability hide">
<span class="label label-default"><?=$this->transEsc('Loading')?>&nbsp;...</span> <span class="label secondary label-default"><?=$this->transEsc('Loading')?>&nbsp;...</span>
</span> </span>
<? endif; ?> <? endif; ?>
<?=$this->record($this->driver)->getPreviews()?> <?=$this->record($this->driver)->getPreviews()?>
</div> </div>
<div class="col-xs-3 hidden-print small-3 columns hide-for-print right">
<div class="small-3 columns right hide-for-print">
<? /* Display qrcode if appropriate: */ ?> <? /* Display qrcode if appropriate: */ ?>
<? if ($QRCode = $this->record($this->driver)->getQRCode("results")): ?> <? if ($QRCode = $this->record($this->driver)->getQRCode("results")): ?>
<? <?
...@@ -158,7 +159,7 @@ ...@@ -158,7 +159,7 @@
?> ?>
<span class="hidden-xs hide-for-small"> <span class="hidden-xs hide-for-small">
<i class="fa fa-qrcode"></i> <a href="<?=$this->escapeHtmlAttr($QRCode);?>" class="qrcodeLink"><?=$this->transEsc('qrcode_show')?></a> <i class="fa fa-qrcode"></i> <a href="<?=$this->escapeHtmlAttr($QRCode);?>" class="qrcodeLink"><?=$this->transEsc('qrcode_show')?></a>
<div class="qrcode hidden"> <div class="qrcode hide">
<script type="text/template" class="qrCodeImgTag"> <script type="text/template" class="qrCodeImgTag">
<img alt="<?=$this->transEsc('QR Code')?>" src="<?=$this->escapeHtmlAttr($QRCode);?>"/> <img alt="<?=$this->transEsc('QR Code')?>" src="<?=$this->escapeHtmlAttr($QRCode);?>"/>
</script> </script>
...@@ -168,10 +169,10 @@ ...@@ -168,10 +169,10 @@
<? if ($this->userlist()->getMode() !== 'disabled'): ?> <? if ($this->userlist()->getMode() !== 'disabled'): ?>
<? /* Add to favorites */ ?> <? /* Add to favorites */ ?>
<i class="fa fa-heart"></i> <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" class="save-record modal-link" id="<?=$this->driver->getUniqueId() ?>" title="<?=$this->transEsc('Add to favorites')?>"><?=$this->transEsc('Add to favorites')?></a><br/> <i class="fa fa-star"></i> <a href="<?=$this->recordLink()->getActionUrl($this->driver, 'Save')?>" class="save-record modal-link" id="<?=$this->driver->getUniqueId() ?>" title="<?=$this->transEsc('Add to favorites')?>"><?=$this->transEsc('Add to favorites')?></a><br/>
<? /* Saved lists */ ?> <? /* Saved lists */ ?>
<div class="savedLists alert alert-info alert-box info hidden"> <div class="savedLists alert alert-info alert-box info hide" data-alert tabindex="0" aria-live="assertive" role="dialogalert">
<strong><?=$this->transEsc("Saved in")?>:</strong> <strong><?=$this->transEsc("Saved in")?>:</strong>
</div> </div>
<? endif; ?> <? endif; ?>
...@@ -192,4 +193,5 @@ ...@@ -192,4 +193,5 @@
<?=$openUrl?'<span class="Z3988" title="'.$this->escapeHtmlAttr($openUrl).'"></span>':''?> <?=$openUrl?'<span class="Z3988" title="'.$this->escapeHtmlAttr($openUrl).'"></span>':''?>
</div> </div>
</div> </div>
</div> </div>
\ No newline at end of file <!-- recorddriver - solrai - result-list - END -->
\ No newline at end of file
<!-- recordtab - description -->
<? <?
// Set page title. // Set page title.
$this->headTitle($this->translate('Description') . ': ' . $this->driver->getBreadcrumb()); $this->headTitle($this->translate('Description') . ': ' . $this->driver->getBreadcrumb());
...@@ -248,3 +249,4 @@ ...@@ -248,3 +249,4 @@
<tr><td><?=$this->transEsc('no_description')?></td></tr> <tr><td><?=$this->transEsc('no_description')?></td></tr>
<? endif; ?> <? endif; ?>
</table> </table>
<!-- recordtab - description - END -->
\ No newline at end of file
<!-- recordtab - staffviewarray -->
<? <?
// Set page title. // Set page title.
$this->headTitle($this->translate('Staff View') . ': ' . $this->driver->getBreadcrumb()); $this->headTitle($this->translate('Staff View') . ': ' . $this->driver->getBreadcrumb());
...@@ -20,4 +21,5 @@ ...@@ -20,4 +21,5 @@
</td> </td>
</tr> </tr>
<? endforeach; ?> <? endforeach; ?>
</table> </table>
\ No newline at end of file <!-- recordtab - staffviewarray - END -->
\ No newline at end of file
<!-- ajax - resolverlinks -->
<div> <div>
<? if (!empty($this->electronic)): ?> <? if (!empty($this->electronic)): ?>
<div class="openurls"> <div class="openurls">
...@@ -49,3 +50,4 @@ ...@@ -49,3 +50,4 @@
<? endif; ?> <? endif; ?>
</div> </div>
</div> </div>
<!-- ajax - resolverlinks - END -->
\ No newline at end of file
<!-- footer -->
<hr/> <hr/>
<div class="row"> <div class="row">
<div class="col-sm-4 medium-4 columns"> <div class="col-sm-4 medium-4 columns">
...@@ -26,3 +27,4 @@ ...@@ -26,3 +27,4 @@
</ul> </ul>
</div> </div>
</div> </div>
<!-- footer - END -->
\ No newline at end of file
...@@ -13,10 +13,10 @@ $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . ...@@ -13,10 +13,10 @@ $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') .
<?=$this->flashmessages() ?> <?=$this->flashmessages() ?>
<form class="form-horizontal" method="post" action="" name="acquisitionForm"> <form class="form-horizontal" method="post" action="" name="acquisitionForm">
<h6><?=$this->transEsc('Please send only one form per acquisition proposal.') ?></h6> <h6><?=$this->transEsc('Please send only one form per acquisition proposal.') ?></h6>
<div class="form-group"> <div class="form-group row">
<label class="col-sm-3 medium-3 columns control-label" for="acquisition_subject"><?=$this->transEsc('Subject area') ?><span class="required">*</span></label> <label class="col-sm-3 medium-3 columns control-label" for="acquisition_subject"><?=$this->transEsc('Subject area') ?><span class="required">*</span></label>
<div class="col-sm-9 medium-9 columns"> <div class="col-sm-9 medium-9 columns">
<select name="subject" class="form-control"> <select name="subject" class="form-control auto">
<option value="-1"><?=$this->transEsc('Please select a subject area') ?></option> <option value="-1"><?=$this->transEsc('Please select a subject area') ?></option>
<? if (isset($subjectlist) && is_array($subjectlist)): ?> <? if (isset($subjectlist) && is_array($subjectlist)): ?>
<? foreach ($subjectlist as $value): ?> <? foreach ($subjectlist as $value): ?>
...@@ -29,7 +29,7 @@ $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . ...@@ -29,7 +29,7 @@ $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') .
<? endif;*/ ?> <? endif;*/ ?>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group row">
<label class="col-sm-3 medium-3 columns control-label" for="acquistion_reasons"><?=$this->transEsc('Please give reasons for your suggestion') ?><span class="required">*</span></label> <label class="col-sm-3 medium-3 columns control-label" for="acquistion_reasons"><?=$this->transEsc('Please give reasons for your suggestion') ?><span class="required">*</span></label>
<div class="col-sm-9 medium-9 columns"> <div class="col-sm-9 medium-9 columns">
<textarea id="acquisition_reasons" type="text" cols="50" rows="5" name="reasons"><? if (isset($values['reasons']) && !empty($values['reasons'])): ?><?=$this->transEsc($values['reasons']) ?><? endif; ?></textarea> <textarea id="acquisition_reasons" type="text" cols="50" rows="5" name="reasons"><? if (isset($values['reasons']) && !empty($values['reasons'])): ?><?=$this->transEsc($values['reasons']) ?><? endif; ?></textarea>
...@@ -39,7 +39,7 @@ $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . ...@@ -39,7 +39,7 @@ $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') .
<? endif;*/ ?> <? endif;*/ ?>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group row">
<label class="col-sm-3 medium-3 columns control-label" for="acquistion_proposal"><?=$this->transEsc('Your acquisition proposal') ?><span class="required">*</span></label> <label class="col-sm-3 medium-3 columns control-label" for="acquistion_proposal"><?=$this->transEsc('Your acquisition proposal') ?><span class="required">*</span></label>
<div class="col-sm-9 medium-9 columns"> <div class="col-sm-9 medium-9 columns">
<textarea id="acquisition_proposal" type="text" cols="50" rows="5" name="proposal"><? if (isset($values['proposal']) && !empty($values['proposal'])): ?><?=$this->transEsc($values['proposal']) ?><? endif; ?></textarea> <textarea id="acquisition_proposal" type="text" cols="50" rows="5" name="proposal"><? if (isset($values['proposal']) && !empty($values['proposal'])): ?><?=$this->transEsc($values['proposal']) ?><? endif; ?></textarea>
...@@ -49,12 +49,12 @@ $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') . ...@@ -49,12 +49,12 @@ $this->layout()->breadcrumbs = '<li><a href="' . $this->url('myresearch-home') .
<? endif;*/ ?> <? endif;*/ ?>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group row">
<div class="col-sm-9 col-sm-offset-3 medium-9 columns medium-offset-3"> <div class="col-sm-9 col-sm-offset-3 medium-9 columns medium-offset-3">
<input class="btn btn-primary button tiny" type="submit" name="submit" value="<?=$this->transEsc('Submit') ?>"/> <input class="btn btn-primary button tiny" type="submit" name="submit" value="<?=$this->transEsc('Submit') ?>"/>
</div> </div>
</div> </div>
<div class="form-group"> <div class="form-group row">
<div class="col-sm-9 col-sm-offset-3 medium-9 columns medium-offset-3"> <div class="col-sm-9 col-sm-offset-3 medium-9 columns medium-offset-3">
<?=$this->transEsc('note_mandatory_fields') ?> <?=$this->transEsc('note_mandatory_fields') ?>
</div> </div>
......
File added
File added
File added
File added
File added
File added
File added
File added
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment