Attachment #80661 for bug #21526

View | Details | Raw Unified | Return to bug 21526
Collapse All | Expand All

Lines 106-112 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt (-1 / +1 lines)
106	[% biblio_lis.overlay_status \| html %]	106	[% biblio_lis.overlay_status \| html %]
107	[% END %]	107	[% END %]
108	[% IF ( biblio.match_biblionumber ) %]	108	[% IF ( biblio.match_biblionumber ) %]
109	Matches biblio [% biblio.match_biblionumber \| uri %] (score = [% biblio.match_score \| html %]): <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.match_biblionumber \| html %]">[% biblio.match_citation \| html %]</a>	109	Matches biblio [% biblio.match_biblionumber \| uri %] (score = [% biblio.match_score \| html %]): <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=[% biblio.match_biblionumber \| uri %]">[% biblio.match_citation \| html %]</a>
110	[% END %]	110	[% END %]
111	</span>	111	</span>
112	</li>	112	</li>

Lines 55-62 div#result { margin-top: 1em; } Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/authorities/merge.tt (-2 / +2 lines)
55	<fieldset class="rows">	55	<fieldset class="rows">
56	<legend>Merge reference</legend>	56	<legend>Merge reference</legend>
57	<ol>	57	<ol>
58	<li class="radio"><input type="radio" value="[% recordid1 \| uri %]" checked="checked" id="mergereference1" name="mergereference" onclick="changeFramework('[% frameworkcode1 \| html %]')" /><label for="mergereference1">[% title1 \| html %] [% FOREACH subtitl1 IN subtitle1 %] [% subtitl1.subfield \| html %][% END %] (<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 \| html %]" title="MARC" class="preview-merge-reference" target="_blank">[% recordid1 \| html %][% IF frameworklabel1 %] — [% frameworklabel1 \| html %][% END %]</a>)</label></li>	58	<li class="radio"><input type="radio" value="[% recordid1 \| uri %]" checked="checked" id="mergereference1" name="mergereference" onclick="changeFramework('[% frameworkcode1 \| html %]')" /><label for="mergereference1">[% title1 \| html %] [% FOREACH subtitl1 IN subtitle1 %] [% subtitl1.subfield \| html %][% END %] (<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid1 \| uri %]" title="MARC" class="preview-merge-reference" target="_blank">[% recordid1 \| html %][% IF frameworklabel1 %] — [% frameworklabel1 \| html %][% END %]</a>)</label></li>
59	<li class="radio"><input type="radio" value="[% recordid2 \| uri %]" id="mergereference2" name="mergereference" onclick="changeFramework('[% frameworkcode2 \| html %]')" /><label for="mergereference2">[% title2 \| html %] [% FOREACH subtitl2 IN subtitle2 %] [% subtitl2.subfield \| html %][% END %] (<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid2 \| html %]" title="MARC" class="preview-merge-reference" target="_blank">[% recordid2 \| html %][% IF frameworklabel2 %] — [% frameworklabel2 \| html %][% END %]</a>)</label></li>	59	<li class="radio"><input type="radio" value="[% recordid2 \| uri %]" id="mergereference2" name="mergereference" onclick="changeFramework('[% frameworkcode2 \| html %]')" /><label for="mergereference2">[% title2 \| html %] [% FOREACH subtitl2 IN subtitle2 %] [% subtitl2.subfield \| html %][% END %] (<a href="/cgi-bin/koha/authorities/detail.pl?authid=[% recordid2 \| uri %]" title="MARC" class="preview-merge-reference" target="_blank">[% recordid2 \| html %][% IF frameworklabel2 %] — [% frameworklabel2 \| html %][% END %]</a>)</label></li>
60		60
61	[% IF frameworkselect %]	61	[% IF frameworkselect %]
62	<li><label for="frameworkcode">Using framework:</label>	62	<li><label for="frameworkcode">Using framework:</label>

Lines 105-111 div#result { margin-top: 1em; } Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tt (-1 / +1 lines)
105	[% FOREACH subtitle IN record.subtitles %]	105	[% FOREACH subtitle IN record.subtitles %]
106	[% subtitle.subfield \| html %]	106	[% subtitle.subfield \| html %]
107	[% END %]	107	[% END %]
108	([% record.biblionumber \| uri %]) <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% record.biblionumber \| html %]" class="previewData">View MARC</a>	108	([% record.biblionumber \| uri %]) <a href="/cgi-bin/koha/catalogue/showmarc.pl?id=[% record.biblionumber \| uri %]" class="previewData">View MARC</a>
109	</label>	109	</label>
110	</li>	110	</li>
111	[% END %]	111	[% END %]

Lines 92-98 Link Here

(-)a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/reserveratios.tt (-1 / +1 lines)
92	[% END %]	92	[% END %]
93	</ul>	93	</ul>
94	</td>	94	</td>
95	<td>[% IF ( reserveloo.thisratio_atleast1 ) %]<p>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]<!-- [% reserveloo.ratiocalc \| uri %] --><a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber \| uri %]&booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&rr_quantity_to_order=[% reserveloo.ratiocalc \| html %]">[% END %]<b>[% reserveloo.ratiocalc \| html %] to order</b>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]</a>[% END %]	95	<td>[% IF ( reserveloo.thisratio_atleast1 ) %]<p>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]<!-- [% reserveloo.ratiocalc \| uri %] --><a href="/cgi-bin/koha/acqui/neworderempty.pl?biblionumber=[% reserveloo.biblionumber \| uri %]&booksellerid=[% booksellerid \| uri %]&basketno=[% basketno \| uri %]&rr_quantity_to_order=[% reserveloo.ratiocalc \| uri %]">[% END %]<b>[% reserveloo.ratiocalc \| html %] to order</b>[% IF ( CAN_user_acquisition && basketno && booksellerid ) %]</a>[% END %]
96	[% IF ( reserveloo.pendingorders ) %]<br><b>[% reserveloo.pendingorders \| html %] pending</b>[% END %]</p>[% END %]</td>	96	[% IF ( reserveloo.pendingorders ) %]<br><b>[% reserveloo.pendingorders \| html %] pending</b>[% END %]</p>[% END %]</td>
97	</tr>	97	</tr>
98	[% END %]	98	[% END %]

Lines 286-292 Link Here

(-)a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-user.tt (-2 / +1 lines)
286	[% IF ISSUE.renewed %]<span class="blabel label-success">Renewed!</span><br />[% END %]	286	[% IF ISSUE.renewed %]<span class="blabel label-success">Renewed!</span><br />[% END %]
287	[% IF ( ISSUE.status ) %]	287	[% IF ( ISSUE.status ) %]
288	[% IF ( canrenew ) %]	288	[% IF ( canrenew ) %]
289	<input type="checkbox" name="item" value="[% ISSUE.itemnumber \| uri %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&item=[% ISSUE.itemnumber \| html %]&borrowernumber=[% ISSUE.borrowernumber \| uri %]">Renew</a>	289	<input type="checkbox" name="item" value="[% ISSUE.itemnumber \| uri %]"/> <a href="/cgi-bin/koha/opac-renew.pl?from=opac_user&item=[% ISSUE.itemnumber \| uri %]&borrowernumber=[% ISSUE.borrowernumber \| uri %]">Renew</a>
290	[% END %]	290	[% END %]
291	[% IF ISSUE.renewalfee > 0 %]	291	[% IF ISSUE.renewalfee > 0 %]
292	<span class="renewalfee">Fee for item type '[% ItemTypes.GetDescription( ISSUE.renewalitemtype) \| html %]': [% ISSUE.renewalfee \| $Price %]</span>	292	<span class="renewalfee">Fee for item type '[% ItemTypes.GetDescription( ISSUE.renewalitemtype) \| html %]': [% ISSUE.renewalfee \| $Price %]</span>
293	-

Return to bug 21526