[Koha-cvs] CVS: koha/admin marc_subfields_structure.pl,1.34,1.35

[Owen Leonard]

Update of /cvsroot/koha/koha/admin
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv14954/admin

Modified Files:
	marc_subfields_structure.pl 
Log Message:
Adding id attributes to script-generated form fields to allow more flexible interface (tying label for attribute to input's id allows label to be clicked to transfer focus to the form field)

Index: marc_subfields_structure.pl
===================================================================
RCS file: /cvsroot/koha/koha/admin/marc_subfields_structure.pl,v
retrieving revision 1.34
retrieving revision 1.35
diff -C2 -r1.34 -r1.35
*** marc_subfields_structure.pl	10 Feb 2005 22:42:56 -0000	1.34
--- marc_subfields_structure.pl	14 Feb 2005 22:07:59 -0000	1.35
***************
*** 164,167 ****
--- 164,168 ----
  	  	}
  		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
+ 					-id=>"tab$i",
  					-values=>['-1','0','1','2','3','4','5','6','7','8','9','10'],
  					-labels => {'-1' =>'ignore','0'=>'0','1'=>'1',
***************
*** 174,182 ****
  					-multiple=>0,
  					);
! 		$row_data{tagsubfield} =$data->{'tagsubfield'}."<input type='hidden' name='tagsubfield' value='".$data->{'tagsubfield'}."'>";
  		$row_data{liblibrarian} = CGI::escapeHTML($data->{'liblibrarian'});
  		$row_data{libopac} = CGI::escapeHTML($data->{'libopac'});
  		$row_data{seealso} = CGI::escapeHTML($data->{'seealso'});
  		$row_data{kohafield}= CGI::scrolling_list( -name=>"kohafield",
  					-values=> \@kohafields,
  					-default=> "$data->{'kohafield'}",
--- 175,184 ----
  					-multiple=>0,
  					);
! 		$row_data{tagsubfield} =$data->{'tagsubfield'}."<input type=\"hidden\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" id=\"tagsubfield\">";
  		$row_data{liblibrarian} = CGI::escapeHTML($data->{'liblibrarian'});
  		$row_data{libopac} = CGI::escapeHTML($data->{'libopac'});
  		$row_data{seealso} = CGI::escapeHTML($data->{'seealso'});
  		$row_data{kohafield}= CGI::scrolling_list( -name=>"kohafield",
+ 					-id=>"kohafield$i",
  					-values=> \@kohafields,
  					-default=> "$data->{'kohafield'}",
***************
*** 185,188 ****
--- 187,191 ----
  					);
  		$row_data{authorised_value}  = CGI::scrolling_list(-name=>'authorised_value',
+ 					-id=>'authorised_value',
  					-values=> \@authorised_values,
  					-default=>$data->{'authorised_value'},
***************
*** 191,194 ****
--- 194,198 ----
  					);
  		$row_data{value_builder}  = CGI::scrolling_list(-name=>'value_builder',
+ 					-id=>'value_builder',
  					-values=> \@value_builder,
  					-default=>$data->{'value_builder'},
***************
*** 197,200 ****
--- 201,205 ----
  					);
  		$row_data{authtypes}  = CGI::scrolling_list(-name=>'authtypecode',
+ 					-id=>'authtypecode',
  					-values=> \@authtypes,
  					-default=>$data->{'authtypecode'},
***************
*** 202,210 ****
  					-multiple=>0,
  					);
! 		$row_data{repeatable} = CGI::checkbox("repeatable$i",$data->{'repeatable'}?'checked':'',1,'');
! 		$row_data{mandatory} = CGI::checkbox("mandatory$i",$data->{'mandatory'}?'checked':'',1,'');
! 		$row_data{hidden} = CGI::checkbox("hidden$i",$data->{'hidden'}?'checked':'',1,'');
! 		$row_data{isurl} = CGI::checkbox("isurl$i",$data->{'isurl'}?'checked':'',1,'');
! 		$row_data{bgcolor} = $toggle;
  		$row_data{link} = CGI::escapeHTML($data->{'link'});
  		push(@loop_data, \%row_data);
--- 207,232 ----
  					-multiple=>0,
  					);
! 		$row_data{repeatable} = CGI::checkbox(-name=>"repeatable$i",
! 	-checked => $data->{'repeatable'}?'checked':'',
! 	-value => 1,
! 	-label => '',
! 	-id => "repeatable$i");
! 		$row_data{mandatory} = CGI::checkbox(-name => "mandatory$i",
! 	-checked => $data->{'mandatory'}?'checked':'',
! 	-value => 1,
! 	-label => '',
! 	-id => "mandatory$i");
! 		$row_data{hidden} = CGI::checkbox( -name=>"hidden$i",
! 			-id => "hidden$i",
! 			-checked => $data->{'hidden'}?'checked':'',
! 			-value => 1,
! 			-label => '');
! 		$row_data{isurl} = CGI::checkbox( -name => "isurl$i",
! 			-id => "isurl$i",
! 			-checked => $data->{'isurl'}?'checked':'',
! 			-value => 1,
! 			-label => '');
! 		$row_data{row} = $i;
! 		$row_data{toggle} = $toggle;
  		$row_data{link} = CGI::escapeHTML($data->{'link'});
  		push(@loop_data, \%row_data);
***************
*** 215,218 ****
--- 237,241 ----
  		my %row_data;  # get a fresh hash for the row data
  		$row_data{tab} = CGI::scrolling_list(-name=>'tab',
+ 					-id => "tab$i",
  					-values=>['-1','0','1','2','3','4','5','6','7','8','9','10'],
  					-labels => {'-1' =>'ignore','0'=>'0','1'=>'1',
***************
*** 225,237 ****
  					-multiple=>0,
  					);
! 		$row_data{tagsubfield} = "<input type=\"text\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" size=\"3\" maxlength=\"1\">";
  		$row_data{liblibrarian} = "";
  		$row_data{libopac} = "";
  		$row_data{seealso} = "";
! 		$row_data{repeatable} = CGI::checkbox('repeatable','',1,'');
! 		$row_data{mandatory} = CGI::checkbox('mandatory','',1,'');
! 		$row_data{hidden} = CGI::checkbox('hidden','',1,'');
! 		$row_data{isurl} = CGI::checkbox('isurl','',1,'');
  		$row_data{kohafield}= CGI::scrolling_list( -name=>'kohafield',
  					-values=> \@kohafields,
  					-default=> "",
--- 248,277 ----
  					-multiple=>0,
  					);
! 		$row_data{tagsubfield} = "<input type=\"text\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\">";
  		$row_data{liblibrarian} = "";
  		$row_data{libopac} = "";
  		$row_data{seealso} = "";
! 		$row_data{repeatable} = CGI::checkbox( -name=> 'repeatable',
! 				-id => "repeatable$i",
! 				-checked => '',
! 				-value => 1,
! 				-label => '');
! 		$row_data{mandatory} = CGI::checkbox( -name=> 'mandatory',
! 			-id => "mandatory$i",
! 			-checked => '',
! 			-value => 1,
! 			-label => '');
! 		$row_data{hidden} = CGI::checkbox( -name => 'hidden',
! 			-id => "hidden$i",
! 			-checked=> '',
! 			-value => 1,
! 			-label => '');
! 		$row_data{isurl} = CGI::checkbox(-name => 'isurl',
! 			-id => "isurl$i",
! 			-checked => '',
! 			-value => 1,
! 			-label => '');
  		$row_data{kohafield}= CGI::scrolling_list( -name=>'kohafield',
+ 					-id => "kohafield$i",
  					-values=> \@kohafields,
  					-default=> "",
***************
*** 240,243 ****
--- 280,284 ----
  					);
  		$row_data{authorised_value}  = CGI::scrolling_list(-name=>'authorised_value',
+ 					-id => 'authorised_value',
  					-values=> \@authorised_values,
  					-size=>1,
***************
*** 245,248 ****
--- 286,290 ----
  					);
  		$row_data{authtypes}  = CGI::scrolling_list(-name=>'authtypecode',
+ 					-id => 'authtypecode',
  					-values=> \@authtypes,
  					-size=>1,
***************
*** 250,254 ****
  					);
  		$row_data{link} = CGI::escapeHTML($data->{'link'});
! 		$row_data{bgcolor} = $toggle;
  		push(@loop_data, \%row_data);
  	}
--- 292,297 ----
  					);
  		$row_data{link} = CGI::escapeHTML($data->{'link'});
! 		$row_data{toggle} = $toggle;
! 		$row_data{row} = $i;
  		push(@loop_data, \%row_data);
  	}