gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Bug 14306: Changes for basket and detail templates 

A simple regex is added to the basket and detail templates to select the
URLs passed separately from MARC21 555$u by GetMarcNotes. Note that the
regex tests if a note starts with http:// or https:// and does not contain
any whitespace in order to be considered as a url.
These URLs are put in an anchor tag.

This touches four places:
[1] opac detail, tab title notes
[2] catalogue detail, tab Descriptions
[3] opac basket, more details, notes
[4] staff basket, more details, notes

Test plan:
[1] Edit a record. Add a 500$a, 555$a and a URL in 555$u.
    Put "http://this is not a url" in the 500$a (whitespace!).
[2] Check opac-detail, tab Title Notes. Check the URL.
[3] Do the same for catalogue/detail.
[4] Add record to cart in OPAC. Open basket. Check More details.
[5] Repeat previous step in staff.

Signed-off-by: Marc Véron <veron@veron.ch>

Signed-off-by: Katrin Fischer <katrin.fischer.83@web.de>

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
This commit is contained in:
Marcel de Rooy 2015-08-27 09:49:40 +02:00 committed by Brendan A Gallagher
parent ffbb575061
commit 01994e2c48
4 changed files with 33 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
koha-tmpl/intranet-tmpl/prog/en/modules/basket/basket.tt
View File

@ -242,8 +242,14 @@ function batchDelete(){
<th scope="row">Notes</th>
<td>
[% FOREACH MARCNOTE IN BIBLIO_RESULT.MARCNOTES %]
<p>- [% MARCNOTE.marcnote %]</p>
[% END %]</td>
<p>
[% IF MARCNOTE.marcnote.match('^https?://\S+$') %]
- <a target="_blank" href="[% MARCNOTE.marcnote %]">[% MARCNOTE.marcnote %]</a>
[% ELSE %]
- [% MARCNOTE.marcnote %]
[% END %]
[% END %]
</td>
</tr>
[% END %]

12
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt
View File

@ -856,11 +856,17 @@ function verify_images() {
[% IF ( MARCNOTES ) %]
[% FOREACH MARCNOTE IN MARCNOTES %]
<p>[% MARCNOTE.marcnote FILTER html_line_break %]</p>
<p>
[% IF MARCNOTE.marcnote.match('^https?://\S+$') %]
<a target="_blank" href="[% MARCNOTE.marcnote %]">[% MARCNOTE.marcnote %]</a>
[% ELSE %]
[% MARCNOTE.marcnote FILTER html_line_break %]
[% END %]
</p>
[% END %]
[% ELSE %]
[% ELSE %]
[% IF ( notes ) %]
<p>[% notes %]</p>
<p>[% notes %]</p>
[% END %]
[% END %]
</div>

11
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-basket.tt
View File

@ -151,8 +151,15 @@
<th scope="row">Notes</th>
<td>
[% FOREACH MARCNOTE IN BIBLIO_RESULT.MARCNOTES %]
<p>- [% MARCNOTE.marcnote %]</p>
[% END %]</td>
<p>
[% IF MARCNOTE.marcnote.match('^https?://\S+$') %]
- <a target="_blank" href="[% MARCNOTE.marcnote %]">[% MARCNOTE.marcnote %]</a>
[% ELSE %]
- [% MARCNOTE.marcnote %]
[% END %]
</p>
[% END %]
</td>
</tr>
[% END %]

8
koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt
View File

@ -717,7 +717,13 @@
[% IF ( MARCNOTES ) %]
<div id="marcnotes">
[% FOREACH MARCNOTE IN MARCNOTES %]
<p>[% MARCNOTE.marcnote FILTER html_line_break %]</p>
<p>
[% IF MARCNOTE.marcnote.match('^https?://\S+$') %]
<a target="_blank" href="[% MARCNOTE.marcnote %]">[% MARCNOTE.marcnote %]</a>
[% ELSE %]
[% MARCNOTE.marcnote FILTER html_line_break %]
[% END %]
</p>
[% END %]
</div>
[% ELSE %]