(bug #3197) Subfield code box was not present on new subfield tab in Admin/Authority

Signed-off-by: Galen Charlton <galen.charlton@liblime.com>
Signed-off-by: Henri-Damien LAURENT <henridamien.laurent@biblibre.com>

diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl
index 133559f..b166777 100755 (executable)
--- a/admin/auth_subfields_structure.pl
+++ b/admin/auth_subfields_structure.pl
@@ -322,7 +322,10 @@ if ($op eq 'add_form') {
                                        -size=>1,
                                        -multiple=>0,
                                        );
-               $row_data{tagsubfieldinput} = "<input type=\"text\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\" />";
+               $row_data{tagsubfieldinput} = 
+                       "<label><input type=\"text\" name=\"tagsubfield\" value=\""
+                       . $data->{'tagsubfield'}
+                       . "\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\" /></label>";
                $row_data{tagsubfield} = $data->{'tagsubfield'};
                $row_data{liblibrarian} = "";
                $row_data{libopac} = "";

diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
index bf9ceba..9203fd8 100644 (file)
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
@@ -73,8 +73,13 @@ function displayMoreConstraint(numlayer){
         <!-- TMPL_LOOP NAME="loop" -->
         <div id="sub<!-- TMPL_VAR NAME="tagsubfield" -->field">
                        <fieldset class="rows"><ol>
-                
-                <li><input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR name="tagsubfield" -->" /><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable: </label><!-- TMPL_VAR NAME="repeatable" -->&nbsp;</li>
+
+                    <!-- TMPL_IF NAME="new_subfield" -->
+                <li><label for="tagsubfieldinput<!-- TMPL_VAR NAME="row" -->">Subfield code: </label><!-- TMPL_VAR NAME="tagsubfieldinput" -->&nbsp;</li> 
+                    <!-- TMPL_ELSE -->
+                <input type="hidden" name="tagsubfield" value="<!-- TMPL_VAR name="tagsubfield" -->" />
+                    <!-- /TMPL_IF --> 
+                <li><label for="repeatable<!-- TMPL_VAR NAME="row" -->">Repeatable: </label><!-- TMPL_VAR NAME="repeatable" -->&nbsp;</li>
                 <li><label for="mandatory<!-- TMPL_VAR NAME="row" -->">Mandatory: </label><!-- TMPL_VAR NAME="mandatory" -->&nbsp;</li>
                 <li><label for="liblibrarian<!-- TMPL_VAR NAME="row" -->">Text for librarian: </label><input id="liblibrarian<!-- TMPL_VAR NAME="row" -->" type="text" name="liblibrarian" value="<!-- TMPL_VAR NAME="liblibrarian" -->" size="40" maxlength="80" /></li>
                 <li><label for="libopac<!-- TMPL_VAR NAME="row" -->">Text for OPAC: </label><input type="text" id="libopac<!-- TMPL_VAR NAME="row" -->" name="libopac" value="<!-- TMPL_VAR NAME="libopac" -->" size="40" maxlength="80" /></li>