Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 6458: Incorrect translation processing / acqui/...

Browse source 
Patch removes template directives from within HTML tags from
- acquisitions > new vendor / modify vendor / vendor details
- acquisitions > late orders
- acquisitons > vendor x > basket groups

Signed-off-by: Owen Leonard <oleonard@myacpl.org>
Signed-off-by: Chris Cormack <chrisc@catalyst.net.nz>
This commit is contained in:
Katrin Fischer 2011-08-22 23:47:02 +02:00 committed by Chris Cormack
parent 637953df93
commit d5a9eea519
3 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/basketgroup.tt
View file

@ -222,14 +222,16 @@ function submitForm(form) {
<h3><label for="billingplace">Billing Place:</label></h3>
<select name="billingplace" id="billingplace">
[% FOREACH billingplaceloo IN billingplaceloop %]
<option value="[% billingplaceloo.value %]" [% IF ( billingplaceloo.selected ) %]selected[% END %]>[% billingplaceloo.branchname %]</option>
[% IF ( billingplaceloo.selected ) %]<option value="[% billingplaceloo.value %]" selected="selected">[% billingplaceloo.branchname %]</option>
[% ELSE %]<option value="[% billingplaceloo.value %]">[% billingplaceloo.branchname %]</option>[% END%]
[% END %]
</select>
<h3><label for="deliveryplace">Delivery Place:</label></h3>
<select name="deliveryplace" id="deliveryplace">
<option value="">--</option>
[% FOREACH deliveryplaceloo IN deliveryplaceloop %]
<option value="[% deliveryplaceloo.value %]" [% IF ( deliveryplaceloo.selected ) %]selected[% END %]>[% deliveryplaceloo.branchname %]</option>
[% IF ( deliveryplaceloo.selected ) %]<option value="[% deliveryplaceloo.value %]" selected="selected">[% deliveryplaceloo.branchname %]</option>
[% ELSE %]<option value="[% deliveryplaceloo.value %]">[% deliveryplaceloo.branchname %]</option>[% END %]
[% END %]
</select>
<p>or</p>
@ -272,8 +274,10 @@ function submitForm(form) {
<div class="yui-g">
<div id="bgtabs" class="yui-navset">
<ul class="yui-nav">
<li[% UNLESS ( closed ) %] class="selected"[% END %]><a href="#opened"><em>Opened</em></a></li>
<li[% IF ( closed ) %] class="selected"[% END %]><a href="#closed"><em>Closed</em></a></li>
[% UNLESS ( closed ) %]<li class="selected"><a href="#opened"><em>Opened</em></a></li>
[% ELSE%]<li><a href="#opened"><em>Opened</em></a></li>[% END %]
[% IF ( closed ) %]<li class="selected"><a href="#closed"><em>Closed</em></a></li>
[% ELSE %]<li><a href="#closed"><em>Closed</em></a></li>[% END %]
</ul>
<div class="yui-content">
<div id="opened">

6
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/lateorders.tt
View file

@ -38,7 +38,8 @@
<th>&nbsp;</th>
</tr>
[% FOREACH lateorder IN lateorders %]
<tr[% UNLESS ( loop.odd ) %] class="highlight"[% END %]>
[% UNLESS ( loop.odd ) %]<tr class="highlight">
[% ELSE %]<tr>[% END %]
<td>
[% lateorder.orderdate %]
([% lateorder.latesince %] days)
@ -101,7 +102,8 @@
<select id="supplierid" size="1" tabindex="" name="supplierid">
<option value=""/>
[% FOREACH SUPPLIER_LOO IN SUPPLIER_LOOP %]
<option value="[% SUPPLIER_LOO.id %]"[% IF ( SUPPLIER_LOO.selected ) %] selected="selected"[% END %]>[% SUPPLIER_LOO.name %]</option>
[% IF ( SUPPLIER_LOO.selected ) %]<option value="[% SUPPLIER_LOO.id %]" selected="selected">[% SUPPLIER_LOO.name %]</option>
[% ELSE %]<option value="[% SUPPLIER_LOO.id %]">[% SUPPLIER_LOO.name %]</option>[% END %]
[% END %]
</select>
</ol>

10
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/supplier.tt
View file

@ -89,18 +89,16 @@ if (f.company.value == "") {
<li><label for="list_currency">List prices are</label>
<select name="list_currency" id="list_currency">
[% FOREACH loop_currenc IN loop_currency %]
<option value="[% loop_currenc.currency %]"
[% IF ( loop_currenc.listprice ) %]selected="1"[% END %]>
[% loop_currenc.currency %]</option>
[% IF ( loop_currenc.listprice ) %]<option value="[% loop_currenc.currency %]" selected="1">[% loop_currenc.currency %]</option>
[% ELSE %]<option value="[% loop_currenc.currency %]">[% loop_currenc.currency %]</option>[% END %]
[% END %]
</select>
</li>
<li><label for="invoice_currency">Invoice prices are</label>
<select name="invoice_currency" id="invoice_currency">
[% FOREACH loop_currenc IN loop_currency %]
<option value="[% loop_currenc.currency %]"
[% IF ( loop_currenc.invoiceprice ) %]selected="1"[% END %]>
[% loop_currenc.currency %]</option>
[% IF ( loop_currenc.invoiceprice ) %]<option value="[% loop_currenc.currency %]" selected="1">[% loop_currenc.currency %]</option>
[% ELSE %]<option value="[% loop_currenc.currency %]">[% loop_currenc.currency %]</option>[% END %]
[% END %]
</select>
</li>