Merge remote-tracking branch 'origin/new/bug_5327'

[koha_fer] / koha-tmpl / intranet-tmpl / prog / en / modules / acqui / addorderiso2709.tt

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
index 04d0c58..9723094 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/addorderiso2709.tt
@@ -125,8 +125,8 @@
                     [% FOREACH item IN items %]
                     <div id="outeritemblock">
                     <div id="itemblock">
-                        <ol>[% FOREACH iteminformatio IN item.iteminformation %]<li>
-                            <div class="subfield_line" style="[% iteminformatio.hidden %];" id="subfield[% iteminformatio.serialid %][% iteminformatio.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]">
+                        <ol>[% FOREACH iteminformatio IN item.iteminformation %]<li style="[% iteminformatio.hidden %];">
+                            <div class="subfield_line" id="subfield[% iteminformatio.serialid %][% iteminformatio.countitems %][% iteminformatio.subfield %][% iteminformatio.random %]">
 
                                 <label>[% iteminformatio.subfield %] - [% IF ( iteminformatio.mandatory ) %]<b>[% END %][% iteminformatio.marc_lib %][% IF ( iteminformatio.mandatory ) %] *</b>[% END %]</label>
                                 [% iteminformatio.marc_value %]
@@ -184,21 +184,36 @@
                         <li><div class="hint">The 2 following fields are available for your own usage. They can be useful for statistical purposes</div>
                             <label for="sort1">Planning value1: </label>
 
-                            [% IF ( CGIsort1 ) %]
-                                [% CGIsort1 %]
+                            [% IF CGIsort1 %]
+                                <select id="sort1" size="1" name="sort1">
+                                [% FOREACH sort_opt IN CGIsort1 %]
+                                    [% IF sort_opt.default %]
+                                        <option value="[% sort_opt.id %]" selected="selected">[% sort_opt.label %]</option>
+                                    [% ELSE %]
+                                        <option value="[% sort_opt.id %]">[% sort_opt.label %]</option>
+                                    [% END %]
+                                [% END %]
+                                </select>
                             [% ELSE %]
-
                                 <input type="text" id="sort1" size="20" name="sort1" value="[% sort1 %]" />
                             [% END %]
                         </li>
                         <li>
                             <label for="sort2">Planning value2: </label>
 
-                            [% IF ( CGIsort2 ) %]
-                                [% CGIsort2 %]
-                            [% ELSE %]
-                                <input type="text" id="sort2" size="20" name="sort2" value="[% sort2 %]" />
+                        [% IF CGIsort2 %]
+                            <select id="sort2" size="1" name="sort1">
+                            [% FOREACH sort_opt IN CGIsort2 %]
+                                [% IF sort_opt.default %]
+                                    <option value="[% sort_opt.id %]" selected="selected">[% sort_opt.label %]</option>
+                                [% ELSE %]
+                                    <option value="[% sort_opt.id %]">[% sort_opt.label %]</option>
+                                [% END %]
                             [% END %]
+                            </select>
+                        [% ELSE %]
+                             <input type="text" id="sort2" size="20" name="sort2" value="[% sort2 %]" />
+                        [% END %]
                         </li>
                         <li>