[Koha-patches] [PATCH] Bug 3162 Fix only for [3.0.x]
Zeno Tajoli
tajoli at cilea.it
Sun May 17 23:26:17 CEST 2009
From: Zeno Tajoli <zeno at mail.cile>
---
admin/auth_subfields_structure.pl | 123 +++++++++++---------
.../en/modules/admin/auth_subfields_structure.tmpl | 6 +-
.../help/admin/auth_subfields_structure.tmpl | 6 +-
3 files changed, 73 insertions(+), 62 deletions(-)
diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl
index b166777..00326cc 100755
--- a/admin/auth_subfields_structure.pl
+++ b/admin/auth_subfields_structure.pl
@@ -179,34 +179,37 @@ if ($op eq 'add_form') {
);
$row_data{ohidden} = CGI::scrolling_list(-name=>'ohidden',
-id=>"ohidden$i",
- -values=>['0','1','2'],
- -labels => {'0'=>'Show','1'=>'Show Collapsed',
- '2' =>'Hide',
- },
- -default=>substr($data->{'hidden'},0,1),
- -size=>1,
- -multiple=>0,
- );
- $row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
- -id=>"ihidden$i",
- -values=>['0','1','2'],
- -labels => {'0'=>'Show','1'=>'Show Collapsed',
- '2' =>'Hide',
- },
- -default=>substr($data->{'hidden'},1,1),
- -size=>1,
- -multiple=>0,
- );
- $row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
- -id=>"ehidden$i",
- -values=>['0','1','2'],
- -labels => {'0'=>'Show','1'=>'Show Collapsed',
- '2' =>'Hide',
- },
- -default=>substr($data->{'hidden'}." ",2,1),
+ #-values=>['0','1','2'],
+ #-labels => {'0'=>'Show','1'=>'Show Collapsed',
+ # '2' =>'Hide',
+ # },
+ -values=>['0','-5'],
+ -labels => {'0'=>'Show All','-5'=>'Hide All',},
+ -default=>$data->{'hidden'},
+ #-default=>"-5",
-size=>1,
-multiple=>0,
);
+ #$row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
+ # -id=>"ihidden$i",
+ # -values=>['0','1','2'],
+ # -labels => {'0'=>'Show','1'=>'Show Collapsed',
+ # '2' =>'Hide',
+ # },
+ # -default=>substr($data->{'hidden'},1,1),
+ # -size=>1,
+ # -multiple=>0,
+ # );
+ #$row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
+ # -id=>"ehidden$i",
+ # -values=>['0','1','2'],
+ # -labels => {'0'=>'Show','1'=>'Show Collapsed',
+ # '2' =>'Hide',
+ # },
+ # -default=>substr($data->{'hidden'}." ",2,1),
+ # -size=>1,
+ # -multiple=>0,
+ # );
$row_data{tagsubfieldinput} = "<input type=\"hidden\" name=\"tagsubfield\" value=\"".$data->{'tagsubfield'}."\" id=\"tagsubfield\" />";
$row_data{tagsubfield} = $data->{'tagsubfield'};
$row_data{liblibrarian} = CGI::escapeHTML($data->{'liblibrarian'});
@@ -293,39 +296,44 @@ if ($op eq 'add_form') {
);
$row_data{ohidden} = CGI::scrolling_list(-name=>'ohidden',
-id=>"ohidden$i",
- -values=>['0','1','2'],
- -labels => {'0'=>'Show','1'=>'Show Collapsed',
- '2' =>'Hide',
- },
- -default=>"0",
+ #-values=>['0','1','2'],
+ #-labels => {'0'=>'Show','1'=>'Show Collapsed',
+ # '2' =>'Hide',
+ # },
+ -values=>['0','-5'],
+ -labels => {'0'=>'Show All','-5'=>'Hide All',},
+ #-default=>"0",
+ -default=>$data->{'hidden'},
+ #-default=>"-5",
-size=>1,
-multiple=>0,
);
- $row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
- -id=>"ihidden$i",
- -values=>['0','1','2'],
- -labels => {'0'=>'Show','1'=>'Show Collapsed',
- '2' =>'Hide',
- },
- -default=>"0",
- -size=>1,
- -multiple=>0,
- );
- $row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
- -id=>"ehidden$i",
- -values=>['0','1','2'],
- -labels => {'0'=>'Show','1'=>'Show Collapsed',
- '2' =>'Hide',
- },
- -default=>"0",
- -size=>1,
- -multiple=>0,
- );
- $row_data{tagsubfieldinput} =
- "<label><input type=\"text\" name=\"tagsubfield\" value=\""
- . $data->{'tagsubfield'}
- . "\" size=\"1\" id=\"tagsubfield\" maxlength=\"1\" /></label>";
+ #$row_data{ihidden} = CGI::scrolling_list(-name=>'ihidden',
+ # -id=>"ihidden$i",
+ # -values=>['0','1','2'],
+ # -labels => {'0'=>'Show','1'=>'Show Collapsed',
+ # '2' =>'Hide',
+ # },
+ # -default=>"0",
+ # -size=>1,
+ # -multiple=>0,
+ # );
+ #$row_data{ehidden} = CGI::scrolling_list(-name=>'ehidden',
+ # -id=>"ehidden$i",
+ # -values=>['0','1','2'],
+ # -labels => {'0'=>'Show','1'=>'Show Collapsed',
+ # '2' =>'Hide',
+ # },
+ # -default=>"0",
+ # -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} = "";
@@ -409,8 +417,8 @@ if ($op eq 'add_form') {
my @seealso = $input->param('seealso');
my @hidden;
my @ohidden = $input->param('ohidden');
- my @ihidden = $input->param('ihidden');
- my @ehidden = $input->param('ehidden');
+ #my @ihidden = $input->param('ihidden');
+ #my @ehidden = $input->param('ehidden');
my @authorised_values = $input->param('authorised_value');
my $authtypecode = $input->param('authtypecode');
my @frameworkcodes = $input->param('frameworkcode');
@@ -429,7 +437,8 @@ if ($op eq 'add_form') {
my $authorised_value =$authorised_values[$i];
my $frameworkcode =$frameworkcodes[$i];
my $value_builder=$value_builder[$i];
- my $hidden = $ohidden[$i].$ihidden[$i].$ehidden[$i]; #collate from 3 hiddens;
+ #my $hidden = $ohidden[$i].$ihidden[$i].$ehidden[$i]; #collate from 3 hiddens;
+ my $hidden = $ohidden[$i]; #collate from 3 hiddens;
my $isurl = $input->param("isurl$i")?1:0;
if ($liblibrarian) {
unless (C4::Context->config('demo') eq 1) {
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 9203fd8..973a953 100644
--- 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
@@ -88,9 +88,9 @@ function displayMoreConstraint(numlayer){
<fieldset>
<legend>Display</legend>
<ol>
- <li><label for="ohidden<!-- TMPL_VAR NAME="row" -->">Opac:</label><!-- TMPL_VAR name="ohidden" --> </li>
- <li><label for="ihidden<!-- TMPL_VAR NAME="row" -->">Intranet:</label><!-- TMPL_VAR name="ihidden" --> </li>
- <li><label for="ehidden<!-- TMPL_VAR NAME="row" -->">Editor:</label><!-- TMPL_VAR name="ehidden" --> (see online help)</li>
+ <li><label for="ohidden<!-- TMPL_VAR NAME="row" -->">Select to display or not:</label><!-- TMPL_VAR name="ohidden" --> </li>
+ <!-- <li><label for="ihidden<!-- TMPL_VAR NAME="row" -->">Intranet:</label><!-- TMPL_VAR name="ihidden" --> </li> -->
+ <!-- <li><label for="ehidden<!-- TMPL_VAR NAME="row" -->">Editor:</label><!-- TMPL_VAR name="ehidden" --> (see online help)</li> -->
</ol>
</fieldset>
</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl
index 543a137..36c026e 100644
--- a/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl
+++ b/koha-tmpl/intranet-tmpl/prog/en/modules/help/admin/auth_subfields_structure.tmpl
@@ -17,7 +17,8 @@
<li>Text for librarian : what appears before the subfield in the librarian interface</li>
<li>Text for OPAC : what appears before the field in the OPAC. If empty, the text for librarian is used instead</li>
<li>Managed in tab : deals with the tab where the subfield is shown. Ignore means that the subfield is not managed. </li>
-<li>hidden : allows you to select possible visibility conditions. Each section OPAC INTRANET or Editor can be set separately:</li>
+<!-- <li>hidden : allows you to select possible visibility conditions. Each section OPAC INTRANET or Editor can be set separately:</li> -->
+ <li>Display: allows you to select possible visibility conditions. It is used only with the 'MARC View'. </li>
<li><b>Is a linking field : Select this if you want to use this field for linking other authorities to this authority. The kohafield should be set to auth_header.linkid in this subfield(preferred) or any other subfield in this field :</b>
<li>URL : if checked, the subfield is an URL, and can be clicked</li>
<li>Auth value : means the value is not free, but in the authorized value list of the selected type</li>
@@ -32,4 +33,5 @@
</li>
</ul>
-<!-- TMPL_INCLUDE name="help-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE name="help-bottom.inc" -->
+
--
1.5.6.3
More information about the Koha-patches
mailing list