Skip to content
This repository has been archived by the owner on Jan 25, 2021. It is now read-only.

Commit

Permalink
Merge branch 'development'
Browse files Browse the repository at this point in the history
  • Loading branch information
edelm committed Mar 10, 2017
2 parents 976e72d + f4f882f commit 54b3b51
Show file tree
Hide file tree
Showing 6 changed files with 15 additions and 13 deletions.
4 changes: 4 additions & 0 deletions local/config/vufind/NationalLicences.ini
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ nl-cambridge-unauthorized="https://shibboleth.cambridge.org/Shibboleth.sso/disco
nl-oxford-authorized="https://academic.oup.com/{JOURNAL-URL-CODE}/article-lookup/doi/{DOI}"
nl-oxford-unauthorized="https://shibboleth2sp.sams2.oup.com/Shibboleth.sso/Login?entityID=https%3A%2F%2Feduid.ch%2Fidp%2Fshibboleth&target=https%3A%2F%2Fshibboleth2sp.sams2.oup.com%2Fshib%3Fdest%3Dhttps%253A%252F%252Facademic.oup.com%252FSHIBBOLETH%253Fdest%253Dhttps%25253A%25252F%25252Facademic.oup.com%25252F{JOURNAL-URL-CODE}%25252Farticle-lookup%25252Fdoi%25252F{DOI}"

nl-springer-authorized="http://link.springer.com/{DOI}"
nl-springer-unauthorized="https://fsso.springer.com/federation/init?entityId=https://eduid.ch/idp/shibboleth&returnUrl=http://link.springer.com/{DOI}"





Expand Down
3 changes: 3 additions & 0 deletions module/Swissbib/src/Swissbib/View/Helper/NationalLicences.php
Original file line number Diff line number Diff line change
Expand Up @@ -405,6 +405,9 @@ protected function getPublisherBlueprintUrl($userAuthorized)
case 'NL-oxford':
$urlBlueprintKey = 'nl-oxford-' . $urlBlueprintKey;
break;
case 'NL-springer':
$urlBlueprintKey = 'nl-springer-' . $urlBlueprintKey;
break;
}

$blueprintUrl = "";
Expand Down
3 changes: 2 additions & 1 deletion themes/sbvfrdmulti/templates/HelpPage/de/faq.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,8 @@
</h4>
</div>
<div id="collapse8" class="panel-collapse collapse">
<div class="panel-body"><p>Ja, Ihre Bibliothekskarte gilt für alle <a href="<?= $this->redirectProtocolWrapper()->getWrappedURL('https://www.informationsverbund.ch/21.0.html') ?>" target="_blank">IDS- oder NEBIS-Bibliotheken</a>.</p></div>
<div class="panel-body"><p>Ja, Ihre Bibliothekskarte gilt für alle IDS- oder NEBIS-Bibliotheken:
IDS Basel Bern, IDS Luzern, NEBIS, IDS St. Gallen, St. Galler Bibliotheksnetz (SGBN) und Aargauer Bibliotheksnetz.</p></div>
</div>
</div>
<div class="panel panel-default">
Expand Down
6 changes: 2 additions & 4 deletions themes/sbvfrdmulti/templates/HelpPage/en/faq.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,8 @@
</h4>
</div>
<div id="collapse8" class="panel-collapse collapse">
<div class="panel-body"><p>Yes, your library user-ID is valid in all <a
href="<?= $this->redirectProtocolWrapper()->getWrappedURL(
'https://www.informationsverbund.ch/21.0.html'
) ?>" target="_blank">IDS or NEBIS libraries</a>.</p></div>
<div class="panel-body"><p>Yes, your library user-ID is valid in all IDS or NEBIS libraries:
IDS Basel Bern, IDS Luzern, NEBIS, IDS St. Gallen, St. Galler Bibliotheksnetz (SGBN) und Aargauer Bibliotheksnetz.</p></div>
</div>
</div>
<div class="panel panel-default">
Expand Down
6 changes: 2 additions & 4 deletions themes/sbvfrdmulti/templates/HelpPage/fr/faq.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -116,10 +116,8 @@
</h4>
</div>
<div id="collapse8" class="panel-collapse collapse">
<div class="panel-body"><p>Oui, votre carte de lecteur est valable dans toutes les bibliothèques <a
href="<?= $this->redirectProtocolWrapper()->getWrappedURL(
'https://www.informationsverbund.ch/21.0.html'
) ?>" target="_blank">IDS ou NEBIS</a>.</p></div>
<div class="panel-body"><p>Oui, votre carte de lecteur est valable dans toutes les bibliothèques IDS ou NEBIS:
IDS Basel Bern, IDS Luzern, NEBIS, IDS St. Gallen, St. Galler Bibliotheksnetz (SGBN) und Aargauer Bibliotheksnetz.</p></div>
</div>
</div>
<div class="panel panel-default">
Expand Down
6 changes: 2 additions & 4 deletions themes/sbvfrdmulti/templates/HelpPage/it/faq.phtml
Original file line number Diff line number Diff line change
Expand Up @@ -125,10 +125,8 @@
</h4>
</div>
<div id="collapse8" class="panel-collapse collapse">
<div class="panel-body"><p>Yes, your library user-ID is valid in all <a
href="<?= $this->redirectProtocolWrapper()->getWrappedURL(
'https://www.informationsverbund.ch/21.0.html'
) ?>" target="_blank">IDS or NEBIS libraries</a>.</p></div>
<div class="panel-body"><p>Yes, your library user-ID is valid in all IDS or NEBIS libraries:
IDS Basel Bern, IDS Luzern, NEBIS, IDS St. Gallen, St. Galler Bibliotheksnetz (SGBN) und Aargauer Bibliotheksnetz.</p></div>
</div>
</div>
<div class="panel panel-default">
Expand Down

0 comments on commit 54b3b51

Please sign in to comment.