From: Chris Cormack Date: Thu, 3 Feb 2011 19:52:39 +0000 (+1300) Subject: Merge branch 'bug_5462_signoff' of git://github.com/colinsc/koha into new/enh/bug_5462 X-Git-Tag: html_template_pro~418 X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=commitdiff_plain;h=3b5aa120d71ebc7c3db7fb2177d360df03d5ed35;hp=e29aca325d199468673365ee7540760b38630833;p=koha_gimpoz Merge branch 'bug_5462_signoff' of git://github.com/colinsc/koha into new/enh/bug_5462 --- diff --git a/admin/auth_subfields_structure.pl b/admin/auth_subfields_structure.pl index cee3312c34..432d49667f 100755 --- a/admin/auth_subfields_structure.pl +++ b/admin/auth_subfields_structure.pl @@ -370,8 +370,8 @@ if ($op eq 'add_form') { $row_data{row} = $i; push(@loop_data, \%row_data); } - $template->param('use-heading-flags-p' => 1); - $template->param('heading-edit-subfields-p' => 1); + $template->param('use_heading_flags_p' => 1); + $template->param('heading_edit_subfields_p' => 1); $template->param(action => "Edit subfields", tagfield => $tagfield, tagfieldinput => "", diff --git a/admin/auth_tag_structure.pl b/admin/auth_tag_structure.pl index b6ae347271..27c48e9bf2 100755 --- a/admin/auth_tag_structure.pl +++ b/admin/auth_tag_structure.pl @@ -120,13 +120,13 @@ if ($op eq 'add_form') { if ($searchfield) { $template->param(action => "Modify tag", searchfield => "$searchfield"); - $template->param('heading-modify-tag-p' => 1); + $template->param('heading_modify_tag_p' => 1); } else { $template->param(action => "Add tag", searchfield => ""); - $template->param('heading-add-tag-p' => 1); + $template->param('heading_add_tag_p' => 1); } - $template->param('use-heading-flags-p' => 1); + $template->param('use_heading_flags_p' => 1); $template->param(liblibrarian => $data->{'liblibrarian'}, libopac => $data->{'libopac'}, repeatable => "".$data->{'repeatable'}, diff --git a/admin/authorised_values.pl b/admin/authorised_values.pl index 77ab6f1b45..c26f3a9ec5 100755 --- a/admin/authorised_values.pl +++ b/admin/authorised_values.pl @@ -76,15 +76,15 @@ if ($op eq 'add_form') { } if ($id) { $template->param(action_modify => 1); - $template->param('heading-modify-authorized-value-p' => 1); + $template->param('heading_modify_authorized_value_p' => 1); } elsif ( ! $data->{'category'} ) { $template->param(action_add_category => 1); - $template->param('heading-add-new-category-p' => 1); + $template->param('heading_add_new_category_p' => 1); } else { $template->param(action_add_value => 1); - $template->param('heading-add-authorized-value-p' => 1); + $template->param('heading_add_authorized_value_p' => 1); } - $template->param('use-heading-flags-p' => 1); + $template->param('use_heading_flags_p' => 1); $template->param( category => $data->{'category'}, authorised_value => $data->{'authorised_value'}, lib => $data->{'lib'}, diff --git a/admin/branches.pl b/admin/branches.pl index 758fa32f4a..f4bcf661ad 100755 --- a/admin/branches.pl +++ b/admin/branches.pl @@ -76,14 +76,14 @@ $template->param( ($op || 'else') => 1 ); if ( $op eq 'add' ) { # If the user has pressed the "add new branch" button. - $template->param( 'heading-branches-add-branch-p' => 1 ); + $template->param( 'heading_branches_add_branch_p' => 1 ); editbranchform($branchcode,$template); } elsif ( $op eq 'edit' ) { # if the user has pressed the "edit branch settings" button. - $template->param( 'heading-branches-add-branch-p' => 0, + $template->param( 'heading_branches_add_branch_p' => 0, 'add' => 1, ); editbranchform($branchcode,$template); } @@ -103,7 +103,7 @@ elsif ( $op eq 'add_validate' ) { if ($existing > 0) { $mod_branch = 0; _branch_to_template($params, $template); # preserve most (FIXME) of user's input - $template->param( 'heading-branches-add-branch-p' => 1, 'add' => 1, 'ERROR1' => 1 ); + $template->param( 'heading_branches_add_branch_p' => 1, 'add' => 1, 'ERROR1' => 1 ); } } if ($mod_branch) { @@ -113,7 +113,7 @@ elsif ( $op eq 'add_validate' ) { # copy input parameters back to form # FIXME - doing this doesn't preserve any branch group selections, but good enough for now editbranchform($branchcode,$template); - $template->param( 'heading-branches-add-branch-p' => 1, 'add' => 1, "ERROR$error" => 1 ); + $template->param( 'heading_branches_add_branch_p' => 1, 'add' => 1, "ERROR$error" => 1 ); } else { $template->param( else => 1); default("MESSAGE2",$template); @@ -160,7 +160,7 @@ elsif ( $op eq 'delete_confirmed' ) { elsif ( $op eq 'editcategory' ) { # If the user has pressed the "add new category" or "modify" buttons. - $template->param( 'heading-branches-edit-category-p' => 1 ); + $template->param( 'heading_branches_edit_category_p' => 1 ); editcatform($categorycode,$template); } elsif ( $op eq 'addcategory_validate' ) { @@ -221,7 +221,7 @@ sub default { my $innertemplate = shift or return; $innertemplate->param($message => 1) if $message; $innertemplate->param( - 'heading-branches-p' => 1, + 'heading_branches_p' => 1, ); branchinfotable("",$innertemplate); } diff --git a/admin/marc_subfields_structure.pl b/admin/marc_subfields_structure.pl index 372a8114c6..0049376da4 100755 --- a/admin/marc_subfields_structure.pl +++ b/admin/marc_subfields_structure.pl @@ -364,8 +364,8 @@ if ( $op eq 'add_form' ) { $row_data{row} = $j; push( @loop_data, \%row_data ); } - $template->param( 'use-heading-flags-p' => 1 ); - $template->param( 'heading-edit-subfields-p' => 1 ); + $template->param( 'use_heading_flags_p' => 1 ); + $template->param( 'heading_edit_subfields_p' => 1 ); $template->param( action => "Edit subfields", tagfield => $tagfield, diff --git a/admin/marctagstructure.pl b/admin/marctagstructure.pl index a20f77c132..92e0d99b19 100755 --- a/admin/marctagstructure.pl +++ b/admin/marctagstructure.pl @@ -118,12 +118,12 @@ if ($op eq 'add_form') { if ($searchfield) { $template->param(searchfield => $searchfield); $template->param(action => "Modify tag"); - $template->param('heading-modify-tag-p' => 1); + $template->param('heading_modify_tag_p' => 1); } else { $template->param(action => "Add tag"); - $template->param('heading-add-tag-p' => 1); + $template->param('heading_add_tag_p' => 1); } - $template->param('use-heading-flags-p' => 1); + $template->param('use_heading_flags_p' => 1); $template->param(liblibrarian => $data->{'liblibrarian'}, libopac => $data->{'libopac'}, repeatable => CGI::checkbox(-name=>'repeatable', diff --git a/admin/systempreferences.pl b/admin/systempreferences.pl index 9ff009dbeb..b33c7ece4c 100755 --- a/admin/systempreferences.pl +++ b/admin/systempreferences.pl @@ -486,30 +486,30 @@ sub GetPrefParams { $params->{'prefoptions'} = $data->{'options'}; if ( not defined( $data->{'type'} ) ) { - $params->{'type-free'} = 1; + $params->{'type_free'} = 1; $params->{'fieldlength'} = ( defined( $data->{'options'} ) and $data->{'options'} and $data->{'options'} > 0 ); } elsif ( $data->{'type'} eq 'Upload' ) { - $params->{'type-upload'} = 1; + $params->{'type_upload'} = 1; } elsif ( $data->{'type'} eq 'Choice' ) { - $params->{'type-choice'} = 1; + $params->{'type_choice'} = 1; } elsif ( $data->{'type'} eq 'YesNo' ) { - $params->{'type-yesno'} = 1; + $params->{'type_yesno'} = 1; $data->{'value'} = C4::Context->boolean_preference( $data->{'variable'} ); if ( defined( $data->{'value'} ) and $data->{'value'} eq '1' ) { - $params->{'value-yes'} = 1; + $params->{'value_yes'} = 1; } else { - $params->{'value-no'} = 1; + $params->{'value_no'} = 1; } } elsif ( $data->{'type'} eq 'Integer' || $data->{'type'} eq 'Float' ) { - $params->{'type-free'} = 1; + $params->{'type_free'} = 1; $params->{'fieldlength'} = ( defined( $data->{'options'} ) and $data->{'options'} and $data->{'options'} > 0 ) ? $data->{'options'} : 10; } elsif ( $data->{'type'} eq 'Textarea' ) { - $params->{'type-textarea'} = 1; + $params->{'type_textarea'} = 1; $data->{options} =~ /(.*)\|(.*)/; $params->{'cols'} = $1; $params->{'rows'} = $2; } elsif ( $data->{'type'} eq 'Themes' ) { - $params->{'type-choice'} = 1; + $params->{'type_choice'} = 1; my $type = ''; ( $data->{'variable'} =~ m#opac#i ) ? ( $type = 'opac' ) : ( $type = 'intranet' ); @options = (); @@ -527,7 +527,7 @@ sub GetPrefParams { $counter++; } } elsif ( $data->{'type'} eq 'ClassSources' ) { - $params->{'type-choice'} = 1; + $params->{'type_choice'} = 1; my $type = ''; @options = (); my $sources = GetClassSources(); @@ -564,13 +564,13 @@ sub GetPrefParams { my $languages_loop = getTranslatedLanguages( $interface, $theme, $lang, $currently_selected_languages ); $params->{'languages_loop'} = $languages_loop; - $params->{'type-langselector'} = 1; + $params->{'type_langselector'} = 1; } else { - $params->{'type-free'} = 1; + $params->{'type_free'} = 1; $params->{'fieldlength'} = ( defined( $data->{'options'} ) and $data->{'options'} and $data->{'options'} > 0 ) ? $data->{'options'} : 30; } - if ( $params->{'type-choice'} || $params->{'type-free'} || $params->{'type-yesno'} ) { + if ( $params->{'type_choice'} || $params->{'type_free'} || $params->{'type_yesno'} ) { $params->{'oneline'} = 1; } @@ -787,7 +787,7 @@ if ( $op eq 'add_form' ) { $row_data->{delete} = "$script_name?op=delete_confirm&searchfield=" . $results->[$i]{'variable'}; push( @loop_data, $row_data ); } - $tab = ( $tab ? $tab : "local-use" ); + $tab = ( $tab ? $tab : "local_use" ); $template->param( loop => \@loop_data, $tab => 1 ); if ( $offset > 0 ) { my $prevpage = $offset - $pagesize; diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc index 1655afcf7a..28dc6333ff 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc @@ -45,36 +45,36 @@ - - + " name="" - value="sms" disabled="disabled" /> + value="sms" disabled="disabled" /> " name="" - value="sms" onclick = "$('#none'+'').attr('checked','');" /> + value="sms" onclick = "$('#none'+'').attr('checked','');" /> - - + " name="" - value="email" disabled="disabled" /> + value="email" disabled="disabled" /> " name="" - value="email" onclick = "$('#none'+'').attr('checked','');" /> + value="email" onclick = "$('#none'+'').attr('checked','');" /> @@ -99,18 +99,18 @@ - - + " name="" - value="rss" disabled="disabled" /> + value="rss" disabled="disabled" /> " name="" - value="rss" onclick = "$('#none'+'').attr('checked','');" /> + value="rss" onclick = "$('#none'+'').attr('checked','');" /> diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc index 1fc624a29b..4e0d0b080f 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc +++ b/koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc @@ -6,15 +6,15 @@
  • Cataloging
  • Circulation
  • Creators
    • -
  • Enhanced Content
    • -
  • I18N/L10N
    • -
  • Local Use
    • +
  • Enhanced Content
    • +
  • I18N/L10N
    • +
  • Local Use
  • Logs
  • OPAC
  • Patrons
  • Searching
  • Serials
    • -
  • Staff Client
    • -
  • Web Services
    • +
  • Staff Client
    • +
  • Web Services
    • 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 0dbff36524..f63fbe6b31 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 @@ -32,8 +32,8 @@ function displayMoreConstraint(numlayer){ Confirm Deletion of Subfield ? Data deleted - - Edit MARC subfields constraints + + Edit MARC subfields constraints @@ -46,8 +46,8 @@ function displayMoreConstraint(numlayer){ -

    - Edit MARC subfields constraints for field authority +

    + Edit MARC subfields constraints for field authority

    " name="Aform" method="post"> diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl index 5752cfeacd..2449fd9a82 100644 --- a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl +++ b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl @@ -1,7 +1,7 @@ -Koha › Administration › Authority MARC framework <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="use-heading-flags-p" --> - <!-- TMPL_IF NAME="heading-modify-tag-p" -->› <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> › Modify tag<!-- /TMPL_IF --> - <!-- TMPL_IF NAME="heading-add-tag-p" -->› <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> › New tag<!-- /TMPL_IF --> +<title>Koha › Administration › Authority MARC framework <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="use_heading_flags_p" --> + <!-- TMPL_IF NAME="heading_modify_tag_p" -->› <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> › Modify tag<!-- /TMPL_IF --> + <!-- TMPL_IF NAME="heading_add_tag_p" -->› <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> › New tag<!-- /TMPL_IF --> <!-- TMPL_ELSE -->› <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->› <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> › Confirm Deletion<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirmed" -->› <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> › Data Deleted<!-- /TMPL_IF --> @@ -69,9 +69,9 @@ return false; -