The Gitlab instance will be restarted on Monday April 28th at 2AM. There will be a short interruption of service.

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

Merge branch 'master' of https://github.com/vufind-org/vufind

parents 5711a09c c445f141
No related merge requests found
......@@ -84,7 +84,7 @@
}
}
} ?>
<? $listTags = ($this->usertags()->getMode() !== 'disabled') ? $this->driver->getTags(
$list_id, // get tags for all lists if no single list is selected
$user_id, 'tag'
......@@ -103,7 +103,7 @@
<?=$this->escapeHtml($note)?><br/>
<? endforeach; ?>
<? endif; ?>
<? if (count($this->lists) > 0): ?>
<strong><?=$this->transEsc('Saved in')?>:</strong>
<? $i=0;foreach($this->lists as $current): ?>
......@@ -136,24 +136,32 @@
$openUrl = $this->driver->getOpenURL();
$openUrlActive = $this->driver->openURLActive('results');
$urls = $this->record($this->driver)->getLinkDetails();
if ($openUrlActive || !empty($urls)): ?>
if ($openUrlActive || !empty($urls)):
?>
<? if ($openUrlActive): ?>
<br/>
<?=$this->openUrl($openUrl)?>
<? if ($this->driver->replaceURLsWithOpenURL()) $urls = array(); // clear URL list if replace setting is active ?>
<? endif; ?>
<? if (!is_array($urls)) $urls = array();
<?
if ($this->driver->replaceURLsWithOpenURL()) {
// clear URL list if replace setting is active
$urls = array();
}
?>
<? endif;?>
<? if (!is_array($urls)) { $urls = array(); }
if(!$this->driver->isCollection()):
foreach ($urls as $current): ?>
<? endforeach; ?>
<a href="<?=$this->escapeHtml($this->proxyUrl($current['url']))?>" class="fulltext" target="new"><i class="icon-external-link"></i> <?=($current['url'] == $current['desc']) ? $this->transEsc('Get full text') : $this->escapeHtml($current['desc'])?></a>
<? endforeach; ?>
<? endif; ?>
<? endif; ?>
<? endif; ?>
<br/>
<?=str_replace('class="', 'class="label label-info ', $this->record($this->driver)->getFormatList())?>
<? if (!$openUrlActive && empty($urls) && $this->driver->supportsAjaxStatus()): ?>
<span class="status ajax-availability hide"><?=$this->transEsc('Loading')?>...</span>
<br/><br/>
<span class="status ajax-availability hide"><?=$this->transEsc('Loading')?>...</span>
<br/><br/>
<? endif; ?>
<?=$this->record($this->driver)->getPreviews()?>
</div>
......@@ -161,7 +169,7 @@
<div class="span2">
<i class="icon-edit"></i> <a href="<?=$this->url('myresearch-edit')?>?id=<?=urlencode($id)?>&amp;source=<?=urlencode($source)?><? if (!is_null($list_id)):?>&amp;list_id=<?=urlencode($list_id)?><? endif; ?>" class="edit tool"><?=$this->transEsc('Edit')?></a><br/>
<? /* Use a different delete URL if we're removing from a specific list or the overall favorites: */
<? /* Use a different delete URL if we're removing from a specific list or the overall favorites: */
$deleteUrl = is_null($list_id)
? $this->url('myresearch-favorites')
: $this->url('userList', array('id' => $list_id));
......@@ -176,7 +184,7 @@
<li><a><?=$this->transEsc('confirm_dialog_no')?></a></li>
</ul>
</div>
</div>
</div>
<?=$openUrl?'<span class="Z3988" title="'.$this->escapeHtml($openUrl).'"></span>':''?>
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