Bugzilla – Attachment 76333 Details for
Bug 20988
[OMNIBUS] Internationalization: wrap all translatable text inside t() calls
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Bug 20988: Modify templates so that they can be parsed as HTML
Bug-20988-Modify-templates-so-that-they-can-be-par.patch (text/plain), 31.48 KB, created by
Julian Maurice
on 2018-06-25 07:20:26 UTC
(
hide
)
Description:
Bug 20988: Modify templates so that they can be parsed as HTML
Filename:
MIME Type:
Creator:
Julian Maurice
Created:
2018-06-25 07:20:26 UTC
Size:
31.48 KB
patch
obsolete
>From b7a5eccc5cace52c140a4f4ec480284baa1e52c0 Mon Sep 17 00:00:00 2001 >From: Julian Maurice <julian.maurice@biblibre.com> >Date: Fri, 22 Jun 2018 13:12:23 +0200 >Subject: [PATCH] Bug 20988: Modify templates so that they can be parsed as > HTML > >This is required for koha-i18n [1] to work correctly > >[1] https://github.com/jajm/koha-i18n >--- > .../prog/en/modules/acqui/parcel.tt | 4 +- > .../prog/en/modules/acqui/supplier.tt | 4 +- > .../prog/en/modules/admin/preferences.tt | 10 ++-- > .../prog/en/modules/catalogue/detail.tt | 6 +- > .../value_builder/unimarc_field_210c.tt | 5 +- > .../en/modules/circ/selectbranchprinter.tt | 4 +- > .../prog/en/modules/ill/ill-requests.tt | 2 +- > .../en/modules/serials/serials-collection.tt | 3 +- > .../prog/en/modules/tools/holidays.tt | 3 +- > .../tools/marc_modification_templates.tt | 57 ++++++++++++------- > .../bootstrap/en/includes/bodytag.inc | 14 ++--- > .../bootstrap/en/modules/opac-detail.tt | 8 +-- > .../bootstrap/en/modules/opac-tags.tt | 2 +- > .../bootstrap/en/modules/sco/sco-main.tt | 2 +- > 14 files changed, 73 insertions(+), 51 deletions(-) > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >index 96c2f51ee3..fd234bac5b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/parcel.tt >@@ -176,10 +176,10 @@ > [% IF ( loop_order.left_holds_on_order ) %] > <span class="button" title="Can't cancel order, ([% loop_order.holds_on_order %]) holds are linked with this order cancel holds first">Can't cancel order</span><br> > [% ELSE %] >- <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber %]&biblionumber=[% loop_order.biblionumber %]&referrer=[% "/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid" | uri %]">Cancel order</a><br /> >+ <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber %]&biblionumber=[% loop_order.biblionumber %]&referrer=[% '/cgi-bin/koha/acqui/parcel.pl?invoiceid=' _ invoiceid | uri %]">Cancel order</a><br /> > [% END %] > [% IF ( loop_order.can_del_bib ) %] >- <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber %]&biblionumber=[% loop_order.biblionumber %]&del_biblio=1&referrer=[% "/cgi-bin/koha/acqui/parcel.pl?invoiceid=$invoiceid" | uri %]">Cancel order and catalog record</a><br /> >+ <a href="/cgi-bin/koha/acqui/cancelorder.pl?ordernumber=[% loop_order.ordernumber %]&biblionumber=[% loop_order.biblionumber %]&del_biblio=1&referrer=[% '/cgi-bin/koha/acqui/parcel.pl?invoiceid=' _ invoiceid | uri %]">Cancel order and catalog record</a><br /> > [% ELSE %] > <span class="button" title="Can't delete catalog record, see constraints below">Can't cancel order and delete catalog record</span><br> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >index 1d7b033a97..8aa5c13245 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt >@@ -232,7 +232,7 @@ > [% END %] > <ol> > <li><label for="discount">Discount: </label> >- <input type="text" size="6" id="discount" name="discount" value="[% discount | format ("%.1f") %]" />%</li> >+ <input type="text" size="6" id="discount" name="discount" value="[% discount | format ('%.1f') %]" />%</li> > <li> > <label for="deliverytime">Delivery time: </label> > <input type="text" size="2" id="deliverytime" name="deliverytime" value="[% deliverytime %]" /> days >@@ -279,7 +279,7 @@ > <p><strong>Invoice item price includes tax: </strong> > [% IF ( invoiceincgst ) %]Yes[% ELSE %]No[% END %]</p>[% END %] > <p><strong>Discount: </strong> >- [% discount | format("%.1f") %] %</p> >+ [% discount | format('%.1f') %] %</p> > <p><strong>Tax rate: </strong> > [% ( tax_rate || 0 ) * 100 %] %</p> > [% IF deliverytime.defined %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >index 2db4b2d68c..5f31fa0101 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences.tt >@@ -79,9 +79,9 @@ > [% IF ( CHUNK.type_text ) %] > [% CHUNK.contents %] > [% ELSIF ( CHUNK.type_input ) %] >- <input type="[%IF CHUNK.input_type %][% CHUNK.input_type %][% ELSE %]text[% END %]" name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or "short" %]" value="[% CHUNK.value| html %]" autocomplete="off" /> [% IF ( CHUNK.dateinput ) %]<span class="hint">[% INCLUDE 'date-format.inc' %]</span>[% END %] >+ <input type="[%IF CHUNK.input_type %][% CHUNK.input_type %][% ELSE %]text[% END %]" name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or 'short' %]" value="[% CHUNK.value| html %]" autocomplete="off" /> [% IF ( CHUNK.dateinput ) %]<span class="hint">[% INCLUDE 'date-format.inc' %]</span>[% END %] > [% ELSIF ( CHUNK.type_select ) %] >- <select name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or "choice" %]"> >+ <select name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or 'choice' %]"> > [% FOREACH CHOICE IN CHUNK.CHOICES.sort('value') %] > [% IF ( CHOICE.selected ) %] > <option value="[% CHOICE.value %]" selected="selected"> >@@ -93,15 +93,15 @@ > [% END %] > </select> > [% ELSIF ( CHUNK.type_multiple ) %] >- <select name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or "choice" %]" multiple="multiple"> >+ <select name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or 'choice' %]" multiple="multiple"> > [% FOREACH CHOICE IN CHUNK.CHOICES %][% IF ( CHOICE.selected ) %]<option value="[% CHOICE.value %]" selected="selected">[% ELSE %]<option value="[% CHOICE.value %]">[% END %][% CHOICE.text %]</option>[% END %] > </select> > [% ELSIF ( CHUNK.type_textarea ) || ( CHUNK.type_htmlarea )%] > [% IF ( CHUNK.type_htmlarea ) && ( Koha.Preference('UseWYSIWYGinSystemPreferences') ) %] >- <textarea name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or "short" %] mce" rows="20" cols="60">[% CHUNK.value %]</textarea> >+ <textarea name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or 'short' %] mce" rows="20" cols="60">[% CHUNK.value %]</textarea> > [% ELSE %] > <a class="expand-textarea" style="display: none" href="#">Click to Edit</a> >- <textarea name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or "short" %]" rows="10" cols="40">[% CHUNK.value %]</textarea> >+ <textarea name="pref_[% CHUNK.name %]" id="pref_[% CHUNK.name %]" class="preference preference-[% CHUNK.class or 'short' %]" rows="10" cols="40">[% CHUNK.value %]</textarea> > <a class="collapse-textarea" style="display:none" href="#">Click to collapse</br></a> > [% END %] > [% ELSIF ( CHUNK.type_languages ) %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >index ec6695c2ce..c67d6e2ecd 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tt >@@ -550,7 +550,7 @@ > [% IF ( Koha.Preference('NovelistSelectStaffEnabled') && Koha.Preference('NovelistSelectStaffProfile') && Koha.Preference('NovelistSelectStaffView') == 'above' ) %] > <span class="results_summary NovelistSelect" style="display:none;"> > <span class="label">Novelist Select: </span> >- <div data-novelist-novelistselect=[% normalized_isbn %]></div> >+ <div data-novelist-novelistselect="[% normalized_isbn %]"></div> > </span> > [% END %] > >@@ -582,7 +582,7 @@ > [% IF ( Koha.Preference('NovelistSelectStaffEnabled') && Koha.Preference('NovelistSelectStaffProfile') && Koha.Preference('NovelistSelectStaffView') == 'below' ) %] > <span class="results_summary NovelistSelect" style="display:none;"> > <span class="label">Novelist Select: </span> >- <div data-novelist-novelistselect=[% normalized_isbn %]></div> >+ <div data-novelist-novelistselect="[% normalized_isbn %]"></div> > </span> > [% END %] > </div> >@@ -807,7 +807,7 @@ > > [% IF ( Koha.Preference('NovelistSelectStaffEnabled') && Koha.Preference('NovelistSelectStaffProfile') && Koha.Preference('NovelistSelectStaffView') == 'tab' ) %] > <div id="NovelistSelect" class="novelistSelect"> >- <div data-novelist-novelistselect=[% normalized_isbn %]></div> >+ <div data-novelist-novelistselect="[% normalized_isbn %]"></div> > </div> > [% END %] > >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt >index 31797ada8e..2edbc325d2 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/value_builder/unimarc_field_210c.tt >@@ -66,7 +66,8 @@ > <td>[% resul.used %] times</td> > <td> > [% IF ( resul.to_report ) %] >- <a href="javascript:report('[% resul.to_report |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]')"><img alt="choose" src="[% interface %]/[% theme %]/images/arrow.gif" width="32" /></a> >+ [% report = BLOCK %][% resul.to_report |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %][% END %] >+ <a href="javascript:report('[% report %]')"><img alt="choose" src="[% interface %]/[% theme %]/images/arrow.gif" width="32" /></a> > [% END %] > </td> > </tr> >@@ -92,4 +93,4 @@ > </script> > [% END %] > >-[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] >\ No newline at end of file >+[% INCLUDE 'intranet-bottom.inc' popup_window=1 %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt >index 220e5b032f..69da8a6b7b 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/circ/selectbranchprinter.tt >@@ -36,7 +36,7 @@ Updated:<ul> > [% END %] > [% END %] > </ul> >-<form method="post" action="[% referer or "/cgi-bin/koha/circ/circulation.pl" |html %]"> >+<form method="post" action="[% referer or '/cgi-bin/koha/circ/circulation.pl' |html %]"> > <div class="noshow"> > [% FOREACH recycle_loo IN recycle_loop %] > <input type="text" name="[% recycle_loo.param %]" value="[% recycle_loo.value |html %]" /> >@@ -82,7 +82,7 @@ Updated:<ul> > [% FOREACH recycle_loo IN recycle_loop %] > <input type="text" name="[% recycle_loo.param %]" value="[% recycle_loo.value |html %]" /> > [% END %] >- <input type="hidden" name="oldreferer" value="[% referer or "/cgi-bin/koha/circ/circulation.pl" |html %]" /> >+ <input type="hidden" name="oldreferer" value="[% referer or '/cgi-bin/koha/circ/circulation.pl' |html %]" /> > </div> > </form> > <!-- /updated --> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >index 70f31cad16..8ab1027c10 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/ill/ill-requests.tt >@@ -371,7 +371,7 @@ > <label for="partners" class="required">Select partner libraries:</label> > <select size="5" multiple="true" id="partners" name="partners" required="required"> > [% FOREACH partner IN whole.value.partners %] >- <option value=[% partner.email %]> >+ <option value="[% partner.email %]"> > [% partner.branchcode _ " - " _ partner.surname %] > </option> > [% END %] >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >index 8ba726417a..a7c3f85642 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/serials/serials-collection.tt >@@ -243,7 +243,8 @@ > </td> > [% IF ( routing ) %] > <td class="actions"> >- <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serial.serialseq.replace("'", "\\'") |html %] ([% serial.publisheddate | $KohaDates %])'); return false" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print list</a> >+ [% serialseq = BLOCK %][% serial.serialseq.replace("'", "\\'") |html %][% END %] >+ <a href="" onclick="print_slip([% serial.subscriptionid |html %], '[% serialseq %] ([% serial.publisheddate | $KohaDates %])'); return false" class="btn btn-default btn-xs"><i class="fa fa-print"></i> Print list</a> > </td> > [% END %] > </tr> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >index 5d65cef917..b7252ad288 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tt >@@ -321,7 +321,8 @@ td.repeatableyearly a.ui-state-default { background: #FFCC66 none; color : Bl > <tr> > <td><a href="/cgi-bin/koha/tools/holidays.pl?branch=[% branch %]&calendardate=[% HOLIDAYS_LOO.DATE %]"><span title="[% HOLIDAYS_LOO.DATE_SORT %]">[% HOLIDAYS_LOO.DATE %]</span></a></td> > <td>[% HOLIDAYS_LOO.TITLE |html %]</td> >- <td>[% HOLIDAYS_LOO.DESCRIPTION.replace('\\\r\\\n', '<br />') |html %]</td> >+ [% br = BLOCK %]<br/>[% END %] >+ <td>[% HOLIDAYS_LOO.DESCRIPTION.replace('\\\r\\\n', br) |html %]</td> > </tr> > [% END %] > </tbody> >diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >index b281356246..deea161cb5 100644 >--- a/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/tools/marc_modification_templates.tt >@@ -162,26 +162,45 @@ > </td> > <td>[% ActionsLoo.description %]</td> > <td> >+ [% mmta_id = BLOCK %][% ActionsLoo.mmta_id |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %][% END %] >+ [% ordering = BLOCK %][% ActionsLoo.ordering |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %][% END %] >+ [% action = BLOCK %][% ActionsLoo.action |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %][% END %] >+ [% field_number = BLOCK %][% ActionsLoo.field_number |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %][% END %] >+ [% from_field = BLOCK %][% ActionsLoo.from_field |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %][% END %] >+ [% from_subfield = BLOCK %][% ActionsLoo.from_subfield |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %][% END %] >+ [% field_value = BLOCK %][% ActionsLoo.field_value |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %][% END %] >+ [% to_field = BLOCK %][% ActionsLoo.to_field |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %][% END %] >+ [% to_subfield = BLOCK %][% ActionsLoo.to_subfield |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %][% END %] >+ [% to_regex_search = BLOCK %][% ActionsLoo.to_regex_search |replace('\\\\', '\\\\') |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %][% END %] >+ [% to_regex_replace = BLOCK %][% ActionsLoo.to_regex_replace |replace('\\\\', '\\\\') |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %][% END %] >+ [% to_regex_modifiers = BLOCK %][% ActionsLoo.to_regex_modifiers |replace('\\\\', '\\\\') |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %][% END %] >+ [% conditional = BLOCK %][% ActionsLoo.conditional |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %][% END %] >+ [% conditional_field = BLOCK %][% ActionsLoo.conditional_field |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %][% END %] >+ [% conditional_subfield = BLOCK %][% ActionsLoo.conditional_subfield |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %][% END %] >+ [% conditional_comparison = BLOCK %][% ActionsLoo.conditional_comparison |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %][% END %] >+ [% conditional_value = BLOCK %][% ActionsLoo.conditional_value |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %][% END %] >+ [% conditional_regex = BLOCK %][% ActionsLoo.conditional_regex |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %][% END %] >+ [% description = BLOCK %][% ActionsLoo.description |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %][% END %] > <a class="btn btn-default btn-xs" href="#modaction" onclick='editAction( >- "[% ActionsLoo.mmta_id |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", >- "[% ActionsLoo.ordering |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", >- "[% ActionsLoo.action |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", >- "[% ActionsLoo.field_number |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", >- "[% ActionsLoo.from_field |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", >- "[% ActionsLoo.from_subfield |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", >- "[% ActionsLoo.field_value |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", >- "[% ActionsLoo.to_field |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", >- "[% ActionsLoo.to_subfield |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", >- "[% ActionsLoo.to_regex_search |replace('\\\\', '\\\\') |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", >- "[% ActionsLoo.to_regex_replace |replace('\\\\', '\\\\') |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", >- "[% ActionsLoo.to_regex_modifiers |replace('\\\\', '\\\\') |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", >- "[% ActionsLoo.conditional |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", >- "[% ActionsLoo.conditional_field |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", >- "[% ActionsLoo.conditional_subfield |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", >- "[% ActionsLoo.conditional_comparison |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", >- "[% ActionsLoo.conditional_value |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", >- "[% ActionsLoo.conditional_regex |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]", >- "[% ActionsLoo.description |replace('\\\\', '\\\\') |replace("'", "\'") |replace('"', '\"') |replace('\n', '\\n') |replace('\r', '\\r') %]" >+ "[% mmta_id %]", >+ "[% ordering %]", >+ "[% action %]", >+ "[% field_number %]", >+ "[% from_field %]", >+ "[% from_subfield %]", >+ "[% field_value %]", >+ "[% to_field %]", >+ "[% to_subfield %]", >+ "[% to_regex_search %]", >+ "[% to_regex_replace %]", >+ "[% to_regex_modifiers %]", >+ "[% conditional %]", >+ "[% conditional_field %]", >+ "[% conditional_subfield %]", >+ "[% conditional_comparison %]", >+ "[% conditional_value %]", >+ "[% conditional_regex %]", >+ "[% description %]" > );updateAllEvery();'><i class="fa fa-pencil"></i> Edit</a> > </td> > <td> >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/includes/bodytag.inc b/koha-tmpl/opac-tmpl/bootstrap/en/includes/bodytag.inc >index 487d7e94f4..ef6dc36115 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/includes/bodytag.inc >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/includes/bodytag.inc >@@ -1,15 +1,15 @@ >-[% classprop = 'class="' %] >+[% classes = [] %] > [% IF LoginBranchcode.defined %] >- [% classprop = classprop _ 'branch-' _ LoginBranchcode %] >+ [% classes.push('branch-' _ LoginBranchcode) %] > [% ELSE %] >- [% classprop = classprop _ 'branch-default' %] >+ [% classes.push('branch-default') %] > [% END %] > [% IF bodyclass.defined %] >- [% classprop = classprop _ ' ' _ bodyclass %] >+ [% classes.push(bodyclass) %] > [% END %] >-[% classprop = classprop _ '"' %] > > [% IF bodyid.defined %] >- [% idprop = 'ID="' _ bodyid _ '" ' %] >+ <body id="[% bodyid %]" class="[% classes.join(' ') %]"> >+[% ELSE %] >+ <body class="[% classes.join(' ') %]"> > [% END %] >-<body [%idprop%][% classprop %] > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >index 7567a7c67d..9bb6763e5f 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-detail.tt >@@ -536,7 +536,7 @@ > [% IF ( NovelistSelectView == 'above') %] > <span class="results_summary NovelistSelect" style="display:none;"> > <span class="label">Novelist Select: </span> >- <div data-novelist-novelistselect=[% normalized_isbn %]></div> >+ <div data-novelist-novelistselect="[% normalized_isbn %]"></div> > </span> > [% END %] > [% END # / IF NovelistSelectProfile %] >@@ -805,7 +805,7 @@ > > [% IF ( NovelistSelectProfile && NovelistSelectView == 'tab' && (normalized_isbn || normalized_upc) ) %] > <div id="NovelistSelect" > >- <div data-novelist-novelistselect=[% IF normalized_isbn %][% normalized_isbn %][% ELSE %][% normalized_upc %][% END %]></div> >+ <div data-novelist-novelistselect="[% IF normalized_isbn %][% normalized_isbn %][% ELSE %][% normalized_upc %][% END %]"></div> > </div> > [% END # / IF NovelistSelectProfile && NovelistSelectView == 'tab' %] > >@@ -1033,7 +1033,7 @@ > <p> > [% SET ctrl_preload = ' controls preload=none' #translatability %] > <[% HTML5MediaParent _ ctrl_preload %] > >- <[% HTML5MediaSet.child _ ' src="' _ HTML5MediaSet.srcblock _'"' _ HTML5MediaSet.typeblock %] /> >+ <[% HTML5MediaSet.child %] src="[% HTML5MediaSet.srcblock %]" [% HTML5MediaSet.typeblock %] /> > <span>[[% HTML5MediaParent %] tag not supported by your browser.]</span> > </[% HTML5MediaParent %]> > </p> >@@ -1136,7 +1136,7 @@ > [% IF ( NovelistSelectProfile && NovelistSelectView == 'right' && ( normalized_isbn || normalized_upc ) ) %] > <div id="NovelistSelect"> > <h4>Novelist Select</h4> >- <div data-novelist-novelistselect=[% IF normalized_isbn %][% normalized_isbn %][% ELSE %][% normalized_upc %][% END %]></div> >+ <div data-novelist-novelistselect="[% IF normalized_isbn %][% normalized_isbn %][% ELSE %][% normalized_upc %][% END %]"></div> > </div> > [% END %] > >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >index ae6020957b..7a07171728 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/opac-tags.tt >@@ -82,7 +82,7 @@ > [% END %]: > </label> > <div class="input-append"> >- <input type="text" name="limit" style="text-align: right;" maxlength="4" size="4" value="[% limit or "100" %]" /> >+ <input type="text" name="limit" style="text-align: right;" maxlength="4" size="4" value="[% limit or '100' %]" /> > <input type="submit" value="OK" class="btn" /> > </div> > [% IF Koha.Preference( 'opacuserlogin' ) == 1 %] >diff --git a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >index 7d8903a765..4900405487 100644 >--- a/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >+++ b/koha-tmpl/opac-tmpl/bootstrap/en/modules/sco/sco-main.tt >@@ -218,7 +218,7 @@ > <div id="borrowerdetails"> > [% IF ( issues_count ) %] > <table id="loanTable" class="table table-bordered table-striped"> >- <caption>Checkouts for [% borrowername %] <span class="count">([% issues_count %] total)</span></caption> >+ <caption>Checkouts for [% borrowername %] <span class="count">([% issues_count %] total)</span></caption> > <!-- ISSUES TABLE ROWS --> > <thead> > <tr> >-- >2.17.1
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=76333">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 20988
: 76333 |
76334
|
76335
|
76336
|
76337
|
76338
|
76339
|
76340
|
76341
|
76342
|
76343
|
76344
|
76345
|
76346
|
76347
|
76348
|
76349
|
76350
|
76351
|
76352
|
76353
|
76354
|
76355
|
76356
|
76357
|
76358
|
76359
|
76360
|
76361
|
76362
|
76363
|
76364
|
76365
|
76934
|
76935