Merge branch 'bug_5462_signoff' of git://github.com/colinsc/koha into new/enh/bug_5462
authorChris Cormack <chrisc@catalyst.net.nz>
Thu, 3 Feb 2011 19:52:39 +0000 (08:52 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Thu, 3 Feb 2011 19:52:39 +0000 (08:52 +1300)
47 files changed:
admin/auth_subfields_structure.pl
admin/auth_tag_structure.pl
admin/authorised_values.pl
admin/branches.pl
admin/marc_subfields_structure.pl
admin/marctagstructure.pl
admin/systempreferences.pl
koha-tmpl/intranet-tmpl/prog/en/includes/messaging-preference-form.inc
koha-tmpl/intranet-tmpl/prog/en/includes/prefs-menu.inc
koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_subfields_structure.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/auth_tag_structure.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/authtypes.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/branches.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/categorie.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/marc_subfields_structure.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/marctagstructure.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced-content.pref [deleted file]
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n-l10n.pref [deleted file]
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/local-use.pref [deleted file]
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/local_use.pref [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref [deleted file]
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web-services.pref [deleted file]
koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/en/modules/admin/systempreferences.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/z3950servers.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/advsearch.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/detail.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/moredetail.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/results.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/circ/transferstoreceive.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/maint/catmaintain.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/virtualshelves/shelves.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
opac/opac-reserve.pl
opac/opac-search.pl
reserve/request.pl

index cee3312..432d496 100755 (executable)
@@ -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 => "<input type=\"hidden\" name=\"tagfield\" value=\"$tagfield\" />",
index b6ae347..27c48e9 100755 (executable)
@@ -120,13 +120,13 @@ if ($op eq 'add_form') {
        if ($searchfield) {
                $template->param(action => "Modify tag",
                                                                searchfield => "<input type=\"hidden\" name=\"tagfield\" value=\"$searchfield\" />$searchfield");
-               $template->param('heading-modify-tag-p' => 1);
+               $template->param('heading_modify_tag_p' => 1);
        } else {
                $template->param(action => "Add tag",
                                                                searchfield => "<input type=\"text\" name=\"tagfield\" size=\"5\" maxlength=\"3\" />");
-               $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'},
index 77ab6f1..c26f3a9 100755 (executable)
@@ -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'},
index 758fa32..f4bcf66 100755 (executable)
@@ -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);
 }
index 372a811..0049376 100755 (executable)
@@ -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,
index a20f77c..92e0d99 100755 (executable)
@@ -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',
index 9ff009d..b33c7ec 100755 (executable)
@@ -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&amp;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;
index 1655afc..28dc633 100644 (file)
       <!-- TMPL_ELSE -->
       <td>-</td>
       <!-- /TMPL_IF -->
-      <!-- TMPL_IF NAME="transport-sms" -->
+      <!-- TMPL_IF NAME="transport_sms" -->
       <!-- TMPL_IF NAME="SMSSendDriver" --><td>
           <!-- TMPL_IF NAME="messaging_form_inactive" -->
                  <input type="checkbox"
                  id="sms<!-- TMPL_VAR NAME="message_attribute_id" -->"
                  name="<!-- TMPL_VAR NAME="message_attribute_id" -->"
-                 value="sms"   <!-- TMPL_VAR NAME="transport-sms" --> disabled="disabled" />
+                 value="sms"   <!-- TMPL_VAR NAME="transport_sms" --> disabled="disabled" />
           <!-- TMPL_ELSE -->
                  <input type="checkbox"
                  id="sms<!-- TMPL_VAR NAME="message_attribute_id" -->"
                  name="<!-- TMPL_VAR NAME="message_attribute_id" -->"
-                 value="sms"   <!-- TMPL_VAR NAME="transport-sms"   --> onclick = "$('#none'+'<!-- TMPL_VAR NAME="message_attribute_id" -->').attr('checked','');" />
+                 value="sms"   <!-- TMPL_VAR NAME="transport_sms"   --> onclick = "$('#none'+'<!-- TMPL_VAR NAME="message_attribute_id" -->').attr('checked','');" />
           <!-- /TMPL_IF -->
       </td><!-- /TMPL_IF -->
       <!-- TMPL_ELSE -->
       <td>-</td>
       <!-- /TMPL_IF -->
 
-      <!-- TMPL_IF NAME="transport-email" -->
+      <!-- TMPL_IF NAME="transport_email" -->
       <td>
           <!-- TMPL_IF NAME="messaging_form_inactive" -->
             <input type="checkbox"
                  id="email<!-- TMPL_VAR NAME="message_attribute_id" -->"
                  name="<!-- TMPL_VAR NAME="message_attribute_id" -->"
-                 value="email"   <!-- TMPL_VAR NAME="transport-email"   --> disabled="disabled" />
+                 value="email"   <!-- TMPL_VAR NAME="transport_email"   --> disabled="disabled" />
           <!-- TMPL_ELSE -->
             <input type="checkbox"
                  id="email<!-- TMPL_VAR NAME="message_attribute_id" -->"
                  name="<!-- TMPL_VAR NAME="message_attribute_id" -->"
-                 value="email"   <!-- TMPL_VAR NAME="transport-email"   --> onclick = "$('#none'+'<!-- TMPL_VAR NAME="message_attribute_id" -->').attr('checked','');" />
+                 value="email"   <!-- TMPL_VAR NAME="transport_email"   --> onclick = "$('#none'+'<!-- TMPL_VAR NAME="message_attribute_id" -->').attr('checked','');" />
           <!-- /TMPL_IF -->
       </td>
       <!-- TMPL_ELSE -->
       <td>-</td>
       <!-- /TMPL_IF -->
 
-<!--       <!-- TMPL_IF NAME="transport-rss" -->
+<!--       <!-- TMPL_IF NAME="transport_rss" -->
       <td>
           <!-- TMPL_IF NAME="messaging_form_inactive" -->
             <input type="checkbox"
                  id="rss<!-- TMPL_VAR NAME="message_attribute_id" -->"
                  name="<!-- TMPL_VAR NAME="message_attribute_id" -->"
-                 value="rss"   <!-- TMPL_VAR NAME="transport-rss"   --> disabled="disabled" />
+                 value="rss"   <!-- TMPL_VAR NAME="transport_rss"   --> disabled="disabled" />
           <!-- TMPL_ELSE -->
             <input type="checkbox"
                  id="rss<!-- TMPL_VAR NAME="message_attribute_id" -->"
                  name="<!-- TMPL_VAR NAME="message_attribute_id" -->"
-                 value="rss"   <!-- TMPL_VAR NAME="transport-rss"   --> onclick = "$('#none'+'<!-- TMPL_VAR NAME="message_attribute_id" -->').attr('checked','');" />
+                 value="rss"   <!-- TMPL_VAR NAME="transport_rss"   --> onclick = "$('#none'+'<!-- TMPL_VAR NAME="message_attribute_id" -->').attr('checked','');" />
           <!-- /TMPL_IF -->
       </td>
       <!-- TMPL_ELSE -->
index 1fc624a..4e0d0b0 100644 (file)
@@ -6,15 +6,15 @@
 <!-- TMPL_IF NAME="cataloguing" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Cataloging" href="/cgi-bin/koha/admin/preferences.pl?tab=cataloguing">Cataloging</a></li>
 <!-- TMPL_IF NAME="circulation" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Circulation" href="/cgi-bin/koha/admin/preferences.pl?tab=circulation">Circulation</a></li>
 <!-- TMPL_IF NAME="creators" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Creators" href="/cgi-bin/koha/admin/preferences.pl?tab=creators">Creators</a></li>
-<!-- TMPL_IF NAME="enhanced-content" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Enhanced Content Settings" href="/cgi-bin/koha/admin/preferences.pl?tab=enhanced-content">Enhanced Content</a></li>
-<!-- TMPL_IF NAME="i18n-l10n" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Internationalization and Localization" href="/cgi-bin/koha/admin/preferences.pl?tab=i18n-l10n">I18N/L10N</a></li>
-<!-- TMPL_IF NAME="local-use" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/admin/systempreferences.pl">Local Use</a></li>
+<!-- TMPL_IF NAME="enhanced_content" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Enhanced Content Settings" href="/cgi-bin/koha/admin/preferences.pl?tab=enhanced_content">Enhanced Content</a></li>
+<!-- TMPL_IF NAME="i18n_l10n" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Internationalization and Localization" href="/cgi-bin/koha/admin/preferences.pl?tab=i18n_l10n">I18N/L10N</a></li>
+<!-- TMPL_IF NAME="local_use" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/admin/systempreferences.pl">Local Use</a></li>
 <!-- TMPL_IF NAME="logs" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Transaction Logs" href="/cgi-bin/koha/admin/preferences.pl?tab=logs">Logs</a></li>
 <!-- TMPL_IF NAME="opac" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Online Public Access Catalog" href="/cgi-bin/koha/admin/preferences.pl?tab=opac">OPAC</a></li>
 <!-- TMPL_IF NAME="patrons" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Patrons" href="/cgi-bin/koha/admin/preferences.pl?tab=patrons">Patrons</a></li>
 <!-- TMPL_IF NAME="searching" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Searching" href="/cgi-bin/koha/admin/preferences.pl?tab=searching">Searching</a></li>
 <!-- TMPL_IF NAME="serials" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Serials" href="/cgi-bin/koha/admin/preferences.pl?tab=serials">Serials</a></li>
-<!-- TMPL_IF NAME="staff-client" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Staff Client" href="/cgi-bin/koha/admin/preferences.pl?tab=staff-client">Staff Client</a></li>
-<!-- TMPL_IF NAME="web-services" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Web Services" href="/cgi-bin/koha/admin/preferences.pl?tab=web-services">Web Services</a></li>
+<!-- TMPL_IF NAME="staff_client" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Staff Client" href="/cgi-bin/koha/admin/preferences.pl?tab=staff_client">Staff Client</a></li>
+<!-- TMPL_IF NAME="web_services" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a title="Web Services" href="/cgi-bin/koha/admin/preferences.pl?tab=web_services">Web Services</a></li>
 </ul>
 </div>
index 0dbff36..f63fbe6 100644 (file)
@@ -32,8 +32,8 @@ function displayMoreConstraint(numlayer){
   <!-- TMPL_IF NAME="delete_confirm" -->Confirm Deletion of Subfield <!-- TMPL_VAR NAME="tagsubfield" -->?<!-- /TMPL_IF -->
   <!-- TMPL_IF NAME="delete_confirmed" -->Data deleted<!-- /TMPL_IF -->
   <!-- TMPL_IF NAME="add_form" -->
-  <!-- TMPL_IF NAME="use-heading-flags-p" -->
-  <!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints<!-- /TMPL_IF -->
+  <!-- TMPL_IF NAME="use_heading_flags_p" -->
+  <!-- TMPL_IF NAME="heading_edit_subfields_p" -->Edit MARC subfields constraints<!-- /TMPL_IF -->
   <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
   <!-- /TMPL_IF -->
 </div>
@@ -46,8 +46,8 @@ function displayMoreConstraint(numlayer){
 
 <!-- TMPL_IF NAME="add_form" -->
 
-    <h1><!-- TMPL_IF NAME="use-heading-flags-p" -->
-    <!-- TMPL_IF NAME="heading-edit-subfields-p" -->Edit MARC subfields constraints for field <!-- TMPL_VAR name="tagfield" --> authority <!-- TMPL_VAR name="authtypecode" --><!-- /TMPL_IF -->
+    <h1><!-- TMPL_IF NAME="use_heading_flags_p" -->
+    <!-- TMPL_IF NAME="heading_edit_subfields_p" -->Edit MARC subfields constraints for field <!-- TMPL_VAR name="tagfield" --> authority <!-- TMPL_VAR name="authtypecode" --><!-- /TMPL_IF -->
     <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></h1>
     <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate" />
index 5752cfe..2449fd9 100644 (file)
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo; Authority MARC framework <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="use-heading-flags-p" -->
-    <!-- TMPL_IF NAME="heading-modify-tag-p" -->&rsaquo; <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> &rsaquo; Modify tag<!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="heading-add-tag-p" -->&rsaquo; <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> &rsaquo; New tag<!-- /TMPL_IF -->
+<title>Koha &rsaquo; Administration &rsaquo; Authority MARC framework <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="use_heading_flags_p" -->
+    <!-- TMPL_IF NAME="heading_modify_tag_p" -->&rsaquo; <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> &rsaquo; Modify tag<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="heading_add_tag_p" -->&rsaquo; <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> &rsaquo; New tag<!-- /TMPL_IF -->
     <!-- TMPL_ELSE -->&rsaquo; <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirm" -->&rsaquo; <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> &rsaquo; Confirm Deletion<!-- /TMPL_IF --><!-- TMPL_IF NAME="delete_confirmed" -->&rsaquo; <!-- TMPL_IF NAME="authtypecode" --><!-- TMPL_VAR NAME="authtypecode" --> Framework<!-- TMPL_ELSE -->Default Framework<!-- /TMPL_IF --> &rsaquo; Data Deleted<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.min.js"></script>
@@ -69,9 +69,9 @@ return false;
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="cat-search.inc" -->
 
-<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="use-heading-flags-p" -->
-    <!-- TMPL_IF NAME="heading-modify-tag-p" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; <!-- TMPL_IF NAME="authtypecode" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->"><!-- TMPL_VAR NAME="authtypecode" --> Framework</a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default Framework</a><!-- /TMPL_IF --> &rsaquo; Modify tag<!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="heading-add-tag-p" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; <!-- TMPL_IF NAME="authtypecode" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->"><!-- TMPL_VAR NAME="authtypecode" --> Framework</a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default Framework</a><!-- /TMPL_IF --> &rsaquo; New tag<!-- /TMPL_IF -->
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <!-- TMPL_IF NAME="add_form" --><!-- TMPL_IF NAME="use_heading_flags_p" -->
+    <!-- TMPL_IF NAME="heading_modify_tag_p" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; <!-- TMPL_IF NAME="authtypecode" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->"><!-- TMPL_VAR NAME="authtypecode" --> Framework</a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default Framework</a><!-- /TMPL_IF --> &rsaquo; Modify tag<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="heading_add_tag_p" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; <!-- TMPL_IF NAME="authtypecode" --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl?authtypecode=<!-- TMPL_VAR NAME="authtypecode" -->"><!-- TMPL_VAR NAME="authtypecode" --> Framework</a><!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Default Framework</a><!-- /TMPL_IF --> &rsaquo; New tag<!-- /TMPL_IF -->
     <!-- TMPL_ELSE --><a href="/cgi-bin/koha/admin/auth_tag_structure.pl">Authority MARC Framework</a> &rsaquo; <!-- TMPL_VAR NAME="action" -->
     <!-- /TMPL_IF -->
     <!-- TMPL_ELSE -->
@@ -99,14 +99,14 @@ return false;
 <!-- TMPL_IF NAME="add_form" -->
 
     <h2>
-    <!-- TMPL_IF NAME="use-heading-flags-p" -->
-    <!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag<!-- /TMPL_IF -->
-    <!-- TMPL_IF NAME="heading-add-tag-p" -->New tag<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="use_heading_flags_p" -->
+    <!-- TMPL_IF NAME="heading_modify_tag_p" -->Modify tag<!-- /TMPL_IF -->
+    <!-- TMPL_IF NAME="heading_add_tag_p" -->New tag<!-- /TMPL_IF -->
     <!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
     </h2>
     <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
         <input type="hidden" name="op" value="add_validate" />
-        <!-- TMPL_IF NAME="heading-modify-tag-p" --><input type="hidden" name="modif" value="1" /><!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="heading_modify_tag_p" --><input type="hidden" name="modif" value="1" /><!-- /TMPL_IF -->
         <input type="hidden" name="authtypecode" value="<!-- TMPL_VAR NAME="authtypecode" -->" />
         <fieldset class="rows"><ol>
                <li><span class="label">Tag</span><!-- TMPL_VAR NAME="searchfield" --></li>
index 1a21466..264ef21 100644 (file)
@@ -55,7 +55,7 @@ $(document).ready(function() {
 <div id="breadcrumbs">
          <a href="/cgi-bin/koha/mainpage.pl">Home</a>
 &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a>
-&rsaquo; <a href="<!-- TMPL_IF NAME="script_name" -->">Authority Types</a>
+&rsaquo; <a href="<!-- TMPL_VAR NAME="script_name" -->">Authority Types</a>
 <!-- TMPL_IF NAME="add_form" -->
 &rsaquo; <!-- TMPL_IF NAME="authtypecode" -->Modify<!-- TMPL_ELSE -->New<!-- /TMPL_IF --> Authority Type
 <!-- TMPL_ELSIF NAME="delete_confirm" -->
index 14da769..4b6e3f1 100644 (file)
@@ -5,7 +5,7 @@
 <!-- TMPL_ELSIF NAME="delete_category" -->
     &rsaquo; Confirm Deletion of Group <!-- TMPL_VAR name="categorycode" -->
 <!-- TMPL_ELSIF name="add" -->
-    &rsaquo;<!-- TMPL_IF name="heading-branches-add-branch-p" -->New library<!-- TMPL_ELSE -->Modify library <!-- TMPL_VAR name="branchcode" --><!-- /TMPL_IF -->
+    &rsaquo;<!-- TMPL_IF name="heading_branches_add_branch_p" -->New library<!-- TMPL_ELSE -->Modify library <!-- TMPL_VAR name="branchcode" --><!-- /TMPL_IF -->
 <!-- TMPL_ELSIF name="delete_confirm" -->
     &rsaquo; Confirm deletion of library '<!-- TMPL_VAR NAME="branchcode" -->'
 <!-- /TMPL_IF -->
@@ -27,7 +27,7 @@
 <!-- TMPL_ELSIF NAME="delete_category" -->
 &rsaquo; Confirm Deletion of Group <!-- TMPL_VAR name="categorycode" -->
 <!-- TMPL_ELSIF name="add" -->
-&rsaquo; <!-- TMPL_IF name="heading-branches-add-branch-p" -->New library<!-- TMPL_ELSE -->Modify library <!-- TMPL_VAR name="branchcode" --><!-- /TMPL_IF -->
+&rsaquo; <!-- TMPL_IF name="heading_branches_add_branch_p" -->New library<!-- TMPL_ELSE -->Modify library <!-- TMPL_VAR name="branchcode" --><!-- /TMPL_IF -->
 <!-- TMPL_ELSIF name="delete_confirm" -->
 &rsaquo; Confirm deletion of library '<!-- TMPL_VAR NAME="branchcode" -->'
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF name="add" -->
     <!-- TMPL_IF name="ERROR1" --><div class="dialog message">Library with that code already exists &mdash; Please enter a unique code</div><!-- /TMPL_IF -->
-  <h3><!-- TMPL_IF name="heading-branches-add-branch-p" -->New library<!-- TMPL_ELSE -->Modify library<!-- /TMPL_IF --></h3>
+  <h3><!-- TMPL_IF name="heading_branches_add_branch_p" -->New library<!-- TMPL_ELSE -->Modify library<!-- /TMPL_IF --></h3>
     <form action="<!-- TMPL_VAR name="action" -->" name="Aform" method="post">
        <fieldset class="rows">
         <input type="hidden" name="op" value="add_validate" />
-        <!-- TMPL_IF name="heading-branches-add-branch-p" -->
+        <!-- TMPL_IF name="heading_branches_add_branch_p" -->
             <input type="hidden" name="add" value="1" />
         <!-- TMPL_ELSE -->
             <input type="hidden" name="add" value="0" />
         <!-- /TMPL_IF -->
         <ol><li>
-            <!-- TMPL_IF name="heading-branches-add-branch-p" -->
+            <!-- TMPL_IF name="heading_branches_add_branch_p" -->
             <label for="branchcode">Library code</label>
                 <input type="text" name="branchcode" id="branchcode" size="10" maxlength="10" value="<!-- TMPL_VAR name="branchcode" escape="HTML" -->" />
             <!-- TMPL_ELSE -->
                 <td><!-- TMPL_VAR name="branch_name" escape="HTML" --></td>
                 <td><!-- TMPL_VAR name="branch_code" escape="HTML" --></td>
                 <td>
-                    <!-- TMPL_IF name="address-empty-p" -->
+                    <!-- TMPL_IF name="address_empty_p" -->
                         (nothing entered)
                     <!-- TMPL_ELSE -->
                         <!-- TMPL_IF name="branchaddress1" -->
                     <!-- /TMPL_IF -->
                 </td>
                 <td>
-                    <!-- TMPL_UNLESS name="no-categories-p" -->
+                    <!-- TMPL_UNLESS name="no_categories_p" -->
                         <!-- TMPL_LOOP name="category_list" -->
                             <!-- TMPL_VAR name="categoryname" --><br />
                         <!-- /TMPL_LOOP -->
index 100719a..736f3bb 100644 (file)
                                        <!-- TMPL_IF NAME="type_S" --><option value="S" selected="selected">Staff</option><!-- TMPL_ELSE --><option value="S">Staff</option><!-- /TMPL_IF -->
                                        <!-- TMPL_IF NAME="type_I" --><option value="I" selected="selected">Organization</option><!-- TMPL_ELSE --><option value="I">Organization</option><!-- /TMPL_IF -->
                                        <!-- TMPL_IF NAME="type_P" --><option value="P" selected="selected">Professional</option><!-- TMPL_ELSE --><option value="P">Professional</option><!-- /TMPL_IF -->
-                                       <!-- TMPL_IF NXME="type_X" --><option value="X" selected="selected">Statistical</option><!-- TMPL_ELSE --><option value="X">Statistical</option><!-- /TMPL_IF -->
+                                       <!-- TMPL_IF NAME="type_X" --><option value="X" selected="selected">Statistical</option><!-- TMPL_ELSE --><option value="X">Statistical</option><!-- /TMPL_IF -->
                                        </select>
        </li></ol>
 </fieldset>
index 212d8a2..bb7fab2 100644 (file)
@@ -1,5 +1,5 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
-<title>Koha &rsaquo; Administration &rsaquo;<!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-edit-subfields-p" --> MARC Subfield Structure &rsaquo; Edit MARC subfields constraints<!-- /TMPL_IF --><!-- TMPL_ELSE --> MARC Subfield Structure &rsaquo; <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
+<title>Koha &rsaquo; Administration &rsaquo;<!-- TMPL_IF name="add_form" --><!-- TMPL_IF NAME="use_heading_flags_p" --><!-- TMPL_IF NAME="heading_edit_subfields_p" --> MARC Subfield Structure &rsaquo; Edit MARC subfields constraints<!-- /TMPL_IF --><!-- TMPL_ELSE --> MARC Subfield Structure &rsaquo; <!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --><!-- /TMPL_IF -->
 <!-- TMPL_IF name="delete_confirm" --> MARC Subfield Structure &rsaquo; Confirm Deletion of Subfield <!-- TMPL_VAR NAME="tagsubfield" --><!-- /TMPL_IF --><!-- TMPL_IF name="delete_confirmed" --> MARC Subfield Structure &rsaquo; Subfield Deleted<!-- /TMPL_IF --><!-- TMPL_IF name="else" -->MARC Subfield Structure<!-- /TMPL_IF --></title>
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <script type="text/javascript">
@@ -38,8 +38,8 @@
 <div id="breadcrumbs">
   <a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/admin/admin-home.pl">Administration</a> &rsaquo; <a href="/cgi-bin/koha/admin/biblio_framework.pl">MARC Frameworks</a> &rsaquo; <a href="/cgi-bin/koha/admin/marctagstructure.pl?frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->&amp;searchfield=<!-- TMPL_VAR name="tagfield" -->"><!-- TMPL_VAR NAME="frameworkcode" --> Framework Structure</a> &rsaquo;
   <!-- TMPL_IF name="add_form" -->
-  <!-- TMPL_IF NAME="use-heading-flags-p" -->
-  <!-- TMPL_IF NAME="heading-edit-subfields-p" --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Tag <!-- TMPL_VAR NAME="tagfield" --> Subfield Structure</a> &rsaquo; Edit subfields constraints
+  <!-- TMPL_IF NAME="use_heading_flags_p" -->
+  <!-- TMPL_IF NAME="heading_edit_subfields_p" --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Tag <!-- TMPL_VAR NAME="tagfield" --> Subfield Structure</a> &rsaquo; Edit subfields constraints
   <!-- /TMPL_IF -->
   <!-- TMPL_ELSE --> <a href="/cgi-bin/koha/admin/marc_subfields_structure.pl?tagfield=<!-- TMPL_VAR NAME="tagfield" -->&amp;frameworkcode=<!-- TMPL_VAR NAME="frameworkcode" -->">Tag <!-- TMPL_VAR NAME="tagfield" --> Subfield Structure</a> &rsaquo; <!-- TMPL_VAR NAME="action" -->
   <!-- /TMPL_IF -->
@@ -59,8 +59,8 @@
 
 <!-- TMPL_IF NAME="add_form" -->
     <h1>
-        <!-- TMPL_IF NAME="use-heading-flags-p" -->
-            <!-- TMPL_IF NAME="heading-edit-subfields-p" -->Tag <!-- TMPL_VAR NAME="tagfield" --> Subfield Constraints<!-- /TMPL_IF -->
+        <!-- TMPL_IF NAME="use_heading_flags_p" -->
+            <!-- TMPL_IF NAME="heading_edit_subfields_p" -->Tag <!-- TMPL_VAR NAME="tagfield" --> Subfield Constraints<!-- /TMPL_IF -->
         <!-- TMPL_ELSE -->
             <!-- TMPL_VAR NAME="action" -->
         <!-- /TMPL_IF -->
index eb912d6..e587967 100644 (file)
@@ -76,7 +76,7 @@ $(document).ready(function() {
 
     <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post">
        
-      <fieldset class="rows"><legend><!-- TMPL_IF NAME="use-heading-flags-p" --><!-- TMPL_IF NAME="heading-modify-tag-p" -->Modify tag <input type="hidden" name="modif" value="1" /><!-- TMPL_VAR NAME="searchfield" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="heading-add-tag-p" -->Add tag<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></legend>  <input type="hidden" name="op" value="add_validate" />
+      <fieldset class="rows"><legend><!-- TMPL_IF NAME="use_heading_flags_p" --><!-- TMPL_IF NAME="heading_modify_tag_p" -->Modify tag <input type="hidden" name="modif" value="1" /><!-- TMPL_VAR NAME="searchfield" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="heading_add_tag_p" -->Add tag<!-- /TMPL_IF --><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF --></legend>  <input type="hidden" name="op" value="add_validate" />
        <input type="hidden" name="frameworkcode" value="<!-- TMPL_VAR NAME="frameworkcode" -->" />
 
        <ol> <li><label for="tagfield">Tag: </label><input id="tagfield" type="text" name="tagfield" value="<!-- TMPL_VAR NAME="searchfield" -->" maxlength="3" size="3" /></li>    
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced-content.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced-content.pref
deleted file mode 100644 (file)
index 5367a42..0000000
+++ /dev/null
@@ -1,283 +0,0 @@
-Enhanced Content:
-    All:
-        -
-            - <strong>NOTE:</strong> you can only choose one source of cover images from below, otherwise Koha will show the images from all sources selected.
-        -
-            - pref: FRBRizeEditions
-              default: 0
-              choices:
-                  yes: Show
-                  no: "Don't show"
-            - other editions of an item on the staff client (if found by one of the services below).
-        -
-            - pref: OPACFRBRizeEditions
-              default: 0
-              choices:
-                  yes: Show
-                  no: "Don't show"
-            - other editions of an item on the OPAC.
-    Amazon:
-        -
-            - pref: AmazonEnabled
-              default: 0
-              choices:
-                  yes: Use
-                  no: "Don't use"
-            - data from Amazon on the staff interface (including reviews and "Search Inside" links on item detail pages). This requires that you have signed up for and entered an access key.
-        -
-            - pref: OPACAmazonEnabled
-              default: 0
-              choices:
-                  yes: Use
-                  no: "Don't use"
-            - data from Amazon on the OPAC (including reviews and "Search Inside" links on item detail pages). This requires that you have signed up for and entered an access key.
-        -
-            - Use Amazon data from its
-            - pref: AmazonLocale
-              choices:
-                  US: American
-                  CA: Canadian
-                  DE: German
-                  FR: French
-                  JP: Japanese
-                  UK: British
-            - website.
-        -
-            - Access Amazon content using the access key
-            - pref: AWSAccessKeyID
-            - (free, at <a href="http://aws.amazon.com/">http://aws.amazon.com/</a>).
-        -
-            - Access Amazon content (other than book jackets) using the private key
-            - pref: AWSPrivateKey
-            - (free, at <a href="http://aws.amazon.com/">http://aws.amazon.com/</a>).
-        -
-            - Put the associate tag
-            - pref: AmazonAssocTag
-            - on links to Amazon. This can net your library referral fees if a patron decides to buy an item.
-        -
-            - pref: AmazonCoverImages
-              default: 1
-              choices:
-                  yes: Show
-                  no: "Don't show"
-            - cover images from Amazon on search results and item detail pages on the staff interface.
-        -
-            - pref: AmazonReviews
-              default: 1
-              choices:
-                  yes: Show
-                  no: "Don't show"
-            - reviews from Amazon on item detail pages on the staff interface.
-        -
-            - pref: AmazonSimilarItems
-              default: 1
-              choices:
-                  yes: Show
-                  no: "Don't show"
-            - similar items, as determined by Amazon, on item detail pages on the staff interface.
-        -
-            - pref: OPACAmazonCoverImages
-              default: 1
-              choices:
-                  yes: Show
-                  no: "Don't show"
-            - cover images from Amazon on search results and item detail pages on the OPAC.
-        -
-            - pref: OPACAmazonSimilarItems
-              default: 1
-              choices:
-                  yes: Show
-                  no: "Don't show"
-            - similar items, as determined by Amazon, on item detail pages on the OPAC.
-        -
-            - pref: OPACAmazonReviews
-              default: 1
-              choices:
-                  yes: Show
-                  no: "Don't show"
-            - reviews from Amazon on item detail pages on the OPAC.
-    Babelthèque:
-        -
-            - pref: Babeltheque
-              choices:
-                  yes: Do
-                  no: "Don't"
-            - include information (such as reviews and citations) from Babelthèque in item detail pages on the OPAC.
-    Baker and Taylor:
-        -
-            - pref: BakerTaylorEnabled
-              choices:
-                  yes: Add
-                  no: "Don't add"
-            - Baker and Taylor links and cover images to the OPAC and staff client. This requires that you have entered in a username and password (which can be seen in image links).
-        -
-            - 'Baker and Taylor "My Library Bookstore" links should be accessed at <code>https://'
-            - pref: BakerTaylorBookstoreURL
-              class: url
-            - <em>isbn</em></code> (this should be filled in with something like <code>ocls.mylibrarybookstore.com/MLB/actions/searchHandler.do?nextPage=bookDetails&amp;parentNum=10923&amp;key=</code>). Leave it blank to disable these links.
-        -
-            - Access Baker and Taylor using username
-            - pref: BakerTaylorUsername
-              class: password
-            - and password
-            - pref: BakerTaylorPassword
-              class: password
-            - .
-    Google:
-        -
-            - pref: GoogleJackets
-              choices:
-                  yes: Add
-                  no: "Don't add"
-            - cover images from Google Books to search results and item detail pages on the OPAC.
-    Library Thing:
-        # Awkward syntax below, due to quoting conflicts
-        -
-            - pref: ThingISBN
-              choices:
-                  yes: Use
-                  no: "Don't use"
-            - the ThingISBN service to show other editions of a title (when either FRBRizeEditions or OPACFRBRizeEditions is on). This is separate from Library Thing for Libraries.
-        -
-            - pref: LibraryThingForLibrariesEnabled
-              choices:
-                  yes: Show
-                  no: "Don't show"
-            - "reviews, similar items, and tags from Library Thing for Libraries on item detail pages on the OPAC. If you've enabled this, you need to "
-            - <a href="http://www.librarything.com/forlibraries/">sign up</a>, then enter in your ID below.
-        -
-            - Access Library Thing for Libraries using the customer ID
-            - pref: LibraryThingForLibrariesID
-            - .
-        -
-            - Show Library Thing for Libraries content
-            - pref: LibraryThingForLibrariesTabbedView
-              choices:
-                  yes: in tabs.
-                  no: in line with the bibliographic information.
-    OCLC:
-        -
-            - pref: XISBN
-              choices:
-                  yes: Use
-                  no: "Don't use"
-            - the OCLC xISBN service to show other editions of a title (when either FRBRizeEditions or OPACFRBRizeEditions is on).
-        -
-            - Use the <a href="http://www.worldcat.org/affiliate/webservices/xisbn/app.jsp">OCLC affiliate ID</a>
-            - pref: OCLCAffiliateID
-            - to access the xISBN service. Note that unless you have signed up for an ID, you are limited to 1000 requests per day.
-        -
-            - Only use the xISBN service
-            - pref: XISBNDailyLimit
-              class: integer
-            - times a day. Unless you are paying for the xISBN service, you should leave this at the default of 999 (as detailed above).
-    Syndetics:
-        -
-            - pref: SyndeticsEnabled
-              choices:
-                  yes: Use
-                  no: "Don't use"
-            - content from Syndetics. Note that this requires that you have signed up for the service and entered in your client code below.
-        -
-            - Use the client code
-            - pref: SyndeticsClientCode
-            - to access Syndetics.
-        -
-            - pref: SyndeticsCoverImages
-              choices:
-                  yes: Show
-                  no: "Don't show"
-            - cover images from Syndetics on search results and item detail pages on the OPAC in a
-            - pref: SyndeticsCoverImageSize
-              choices:
-                  MC: medium
-                  LC: large
-            - size.
-        -
-            - pref: SyndeticsAuthorNotes
-              choices:
-                  yes: Show
-                  no: "Don't show"
-            - notes about the author of a title from Syndetics on item detail pages on the OPAC.
-        -
-            - pref: SyndeticsAwards
-              choices:
-                  yes: Show
-                  no: "Don't show"
-            - information from Syndetics about the awards a title has won on item detail pages on the OPAC.
-        -
-            - pref: SyndeticsEditions
-              choices:
-                  yes: Show
-                  no: "Don't show"
-            - information about other editions of a title from Syndetics on item detail pages on the OPAC (when OPACFRBRizeEditions is on).
-        -
-            - pref: SyndeticsExcerpt
-              choices:
-                  yes: Show
-                  no: "Don't show"
-            - excerpts from of a title from Syndetics on item detail pages on the OPAC.
-        -
-            - pref: SyndeticsReviews
-              choices:
-                  yes: Show
-                  no: "Don't show"
-            - reviews of a title from Syndetics on item detail pages on the OPAC.
-        -
-            - pref: SyndeticsSeries
-              choices:
-                  yes: Show
-                  no: "Don't show"
-            - "information on other books in a title's series from Syndetics on item detail pages on the OPAC."
-        -
-            - pref: SyndeticsSummary
-              choices:
-                  yes: Show
-                  no: "Don't show"
-            - a summary of a title from Syndetics on item detail pages on the OPAC.
-        -
-            - pref: SyndeticsTOC
-              choices:
-                  yes: Show
-                  no: "Don't show"
-            - the table of contents of a title from Syndetics on item detail pages on the OPAC.
-    Tagging:
-        -
-            - pref: TagsEnabled
-              choices:
-                  yes: Allow
-                  no: "Don't allow"
-            - patrons and staff to put tags on items.
-        -
-            - pref: TagsModeration
-              choices:
-                  yes: Require
-                  no: "Don't require"
-            - that tags submitted by patrons be reviewed by a staff member before being shown.
-        -
-            - Show
-            - pref: TagsShowOnList
-              class: integer
-            - tags on search results on the OPAC.
-        -
-            - pref: TagsInputOnList
-              choices:
-                  yes: Allow
-                  no: "Don't allow"
-            - patrons to input tags on search results on the OPAC.
-        -
-            - Show
-            - pref: TagsShowOnDetail
-              class: integer
-            - tags on item detail pages on the OPAC.
-        -
-            - pref: TagsInputOnDetail
-              choices:
-                  yes: Allow
-                  no: "Don't allow"
-            - patrons to input tags on item detail pages on the OPAC.
-        -
-            - Allow tags in the dictionary of the ispell executable
-            - pref: TagsExternalDictionary
-              class: file
-            - on the server to be approved without moderation.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/enhanced_content.pref
new file mode 100644 (file)
index 0000000..5367a42
--- /dev/null
@@ -0,0 +1,283 @@
+Enhanced Content:
+    All:
+        -
+            - <strong>NOTE:</strong> you can only choose one source of cover images from below, otherwise Koha will show the images from all sources selected.
+        -
+            - pref: FRBRizeEditions
+              default: 0
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - other editions of an item on the staff client (if found by one of the services below).
+        -
+            - pref: OPACFRBRizeEditions
+              default: 0
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - other editions of an item on the OPAC.
+    Amazon:
+        -
+            - pref: AmazonEnabled
+              default: 0
+              choices:
+                  yes: Use
+                  no: "Don't use"
+            - data from Amazon on the staff interface (including reviews and "Search Inside" links on item detail pages). This requires that you have signed up for and entered an access key.
+        -
+            - pref: OPACAmazonEnabled
+              default: 0
+              choices:
+                  yes: Use
+                  no: "Don't use"
+            - data from Amazon on the OPAC (including reviews and "Search Inside" links on item detail pages). This requires that you have signed up for and entered an access key.
+        -
+            - Use Amazon data from its
+            - pref: AmazonLocale
+              choices:
+                  US: American
+                  CA: Canadian
+                  DE: German
+                  FR: French
+                  JP: Japanese
+                  UK: British
+            - website.
+        -
+            - Access Amazon content using the access key
+            - pref: AWSAccessKeyID
+            - (free, at <a href="http://aws.amazon.com/">http://aws.amazon.com/</a>).
+        -
+            - Access Amazon content (other than book jackets) using the private key
+            - pref: AWSPrivateKey
+            - (free, at <a href="http://aws.amazon.com/">http://aws.amazon.com/</a>).
+        -
+            - Put the associate tag
+            - pref: AmazonAssocTag
+            - on links to Amazon. This can net your library referral fees if a patron decides to buy an item.
+        -
+            - pref: AmazonCoverImages
+              default: 1
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - cover images from Amazon on search results and item detail pages on the staff interface.
+        -
+            - pref: AmazonReviews
+              default: 1
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - reviews from Amazon on item detail pages on the staff interface.
+        -
+            - pref: AmazonSimilarItems
+              default: 1
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - similar items, as determined by Amazon, on item detail pages on the staff interface.
+        -
+            - pref: OPACAmazonCoverImages
+              default: 1
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - cover images from Amazon on search results and item detail pages on the OPAC.
+        -
+            - pref: OPACAmazonSimilarItems
+              default: 1
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - similar items, as determined by Amazon, on item detail pages on the OPAC.
+        -
+            - pref: OPACAmazonReviews
+              default: 1
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - reviews from Amazon on item detail pages on the OPAC.
+    Babelthèque:
+        -
+            - pref: Babeltheque
+              choices:
+                  yes: Do
+                  no: "Don't"
+            - include information (such as reviews and citations) from Babelthèque in item detail pages on the OPAC.
+    Baker and Taylor:
+        -
+            - pref: BakerTaylorEnabled
+              choices:
+                  yes: Add
+                  no: "Don't add"
+            - Baker and Taylor links and cover images to the OPAC and staff client. This requires that you have entered in a username and password (which can be seen in image links).
+        -
+            - 'Baker and Taylor "My Library Bookstore" links should be accessed at <code>https://'
+            - pref: BakerTaylorBookstoreURL
+              class: url
+            - <em>isbn</em></code> (this should be filled in with something like <code>ocls.mylibrarybookstore.com/MLB/actions/searchHandler.do?nextPage=bookDetails&amp;parentNum=10923&amp;key=</code>). Leave it blank to disable these links.
+        -
+            - Access Baker and Taylor using username
+            - pref: BakerTaylorUsername
+              class: password
+            - and password
+            - pref: BakerTaylorPassword
+              class: password
+            - .
+    Google:
+        -
+            - pref: GoogleJackets
+              choices:
+                  yes: Add
+                  no: "Don't add"
+            - cover images from Google Books to search results and item detail pages on the OPAC.
+    Library Thing:
+        # Awkward syntax below, due to quoting conflicts
+        -
+            - pref: ThingISBN
+              choices:
+                  yes: Use
+                  no: "Don't use"
+            - the ThingISBN service to show other editions of a title (when either FRBRizeEditions or OPACFRBRizeEditions is on). This is separate from Library Thing for Libraries.
+        -
+            - pref: LibraryThingForLibrariesEnabled
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - "reviews, similar items, and tags from Library Thing for Libraries on item detail pages on the OPAC. If you've enabled this, you need to "
+            - <a href="http://www.librarything.com/forlibraries/">sign up</a>, then enter in your ID below.
+        -
+            - Access Library Thing for Libraries using the customer ID
+            - pref: LibraryThingForLibrariesID
+            - .
+        -
+            - Show Library Thing for Libraries content
+            - pref: LibraryThingForLibrariesTabbedView
+              choices:
+                  yes: in tabs.
+                  no: in line with the bibliographic information.
+    OCLC:
+        -
+            - pref: XISBN
+              choices:
+                  yes: Use
+                  no: "Don't use"
+            - the OCLC xISBN service to show other editions of a title (when either FRBRizeEditions or OPACFRBRizeEditions is on).
+        -
+            - Use the <a href="http://www.worldcat.org/affiliate/webservices/xisbn/app.jsp">OCLC affiliate ID</a>
+            - pref: OCLCAffiliateID
+            - to access the xISBN service. Note that unless you have signed up for an ID, you are limited to 1000 requests per day.
+        -
+            - Only use the xISBN service
+            - pref: XISBNDailyLimit
+              class: integer
+            - times a day. Unless you are paying for the xISBN service, you should leave this at the default of 999 (as detailed above).
+    Syndetics:
+        -
+            - pref: SyndeticsEnabled
+              choices:
+                  yes: Use
+                  no: "Don't use"
+            - content from Syndetics. Note that this requires that you have signed up for the service and entered in your client code below.
+        -
+            - Use the client code
+            - pref: SyndeticsClientCode
+            - to access Syndetics.
+        -
+            - pref: SyndeticsCoverImages
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - cover images from Syndetics on search results and item detail pages on the OPAC in a
+            - pref: SyndeticsCoverImageSize
+              choices:
+                  MC: medium
+                  LC: large
+            - size.
+        -
+            - pref: SyndeticsAuthorNotes
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - notes about the author of a title from Syndetics on item detail pages on the OPAC.
+        -
+            - pref: SyndeticsAwards
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - information from Syndetics about the awards a title has won on item detail pages on the OPAC.
+        -
+            - pref: SyndeticsEditions
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - information about other editions of a title from Syndetics on item detail pages on the OPAC (when OPACFRBRizeEditions is on).
+        -
+            - pref: SyndeticsExcerpt
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - excerpts from of a title from Syndetics on item detail pages on the OPAC.
+        -
+            - pref: SyndeticsReviews
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - reviews of a title from Syndetics on item detail pages on the OPAC.
+        -
+            - pref: SyndeticsSeries
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - "information on other books in a title's series from Syndetics on item detail pages on the OPAC."
+        -
+            - pref: SyndeticsSummary
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - a summary of a title from Syndetics on item detail pages on the OPAC.
+        -
+            - pref: SyndeticsTOC
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - the table of contents of a title from Syndetics on item detail pages on the OPAC.
+    Tagging:
+        -
+            - pref: TagsEnabled
+              choices:
+                  yes: Allow
+                  no: "Don't allow"
+            - patrons and staff to put tags on items.
+        -
+            - pref: TagsModeration
+              choices:
+                  yes: Require
+                  no: "Don't require"
+            - that tags submitted by patrons be reviewed by a staff member before being shown.
+        -
+            - Show
+            - pref: TagsShowOnList
+              class: integer
+            - tags on search results on the OPAC.
+        -
+            - pref: TagsInputOnList
+              choices:
+                  yes: Allow
+                  no: "Don't allow"
+            - patrons to input tags on search results on the OPAC.
+        -
+            - Show
+            - pref: TagsShowOnDetail
+              class: integer
+            - tags on item detail pages on the OPAC.
+        -
+            - pref: TagsInputOnDetail
+              choices:
+                  yes: Allow
+                  no: "Don't allow"
+            - patrons to input tags on item detail pages on the OPAC.
+        -
+            - Allow tags in the dictionary of the ispell executable
+            - pref: TagsExternalDictionary
+              class: file
+            - on the server to be approved without moderation.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n-l10n.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n-l10n.pref
deleted file mode 100644 (file)
index 591e6ca..0000000
+++ /dev/null
@@ -1,25 +0,0 @@
-I18N/L10N:
-    -
-        - Format dates like
-        - pref: dateformat
-          default: us
-          choices:
-              us: mm/dd/yyyy
-              metric: dd/mm/yyyy
-              iso: yyyy/mm/dd
-        - .
-    -
-        - "Enable the following languages on the staff interface:"
-        - pref: language
-          type: staff-languages
-    -
-        - pref: opaclanguagesdisplay
-          default: 0
-          choices:
-              yes: Allow
-              no: "Don't allow"
-        - patrons to change the language they see on the OPAC.
-    -
-        - "Enable the following languages on the OPAC:"
-        - pref: opaclanguages
-          type: opac-languages
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/i18n_l10n.pref
new file mode 100644 (file)
index 0000000..591e6ca
--- /dev/null
@@ -0,0 +1,25 @@
+I18N/L10N:
+    -
+        - Format dates like
+        - pref: dateformat
+          default: us
+          choices:
+              us: mm/dd/yyyy
+              metric: dd/mm/yyyy
+              iso: yyyy/mm/dd
+        - .
+    -
+        - "Enable the following languages on the staff interface:"
+        - pref: language
+          type: staff-languages
+    -
+        - pref: opaclanguagesdisplay
+          default: 0
+          choices:
+              yes: Allow
+              no: "Don't allow"
+        - patrons to change the language they see on the OPAC.
+    -
+        - "Enable the following languages on the OPAC:"
+        - pref: opaclanguages
+          type: opac-languages
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/local-use.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/local-use.pref
deleted file mode 100644 (file)
index 9d9c592..0000000
+++ /dev/null
@@ -1,3 +0,0 @@
-Local Use:
-    -
-        - Nothing defined yet.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/local_use.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/local_use.pref
new file mode 100644 (file)
index 0000000..9d9c592
--- /dev/null
@@ -0,0 +1,3 @@
+Local Use:
+    -
+        - Nothing defined yet.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff-client.pref
deleted file mode 100644 (file)
index ab546f1..0000000
+++ /dev/null
@@ -1,96 +0,0 @@
-Staff Client:
-    Appearance:
-        -
-            - Use the
-            - pref: template
-              choices: staff-templates
-            - theme on the staff interface.
-        -
-            - "The staff client is located at http://"
-            - pref: staffClientBaseURL
-              class: url
-            - .
-        -
-            - Include the stylesheet at
-            - pref: intranetstylesheet
-              class: url
-            - on all pages in the staff interface, instead of the default. (This should be a complete URL, starting with <code>http://</code>.)
-        -
-            - "Include the following CSS on all pages in the staff client:"
-            - pref: IntranetUserCSS
-              type: textarea
-              class: code
-        -
-            - Include the stylesheet <code><!-- TMPL_VAR NAME="themelang" -->/css/</code>
-            - pref: intranetcolorstylesheet
-              class: file
-            - on all pages in the staff interface. (Leave blank to disable.)
-        -
-            - Use include files from the
-            - pref: intranet_includes
-              class: file
-            - directory in the template directory, instead of <code>includes/</code>. (Leave blank to disable)
-        -
-            - "Show the following HTML in its own column on the main page of the staff client:"
-            - pref: IntranetmainUserblock
-              type: textarea
-              class: code
-        -
-            - "Show the following HTML in the More menu at the top of each page on the staff client (should be a list of links or blank):"
-            - pref: IntranetNav
-              type: textarea
-              class: code
-        -
-            - "Include the following JavaScript on all pages in the staff clien:"
-            - pref: intranetuserjs
-              type: textarea
-              class: code
-        -   
-            - Show biblio records on result page in the staff client
-            - pref: XSLTResultsDisplay
-              choices:
-                  yes: using XSLT stylesheets.
-                  no: normally.
-        -   
-            - Show item details pages in the staff client
-            - pref: XSLTDetailsDisplay
-              choices:
-                  yes: using XSLT stylesheets.
-                  no: normally.              
-        -
-            - Use the Yahoo UI libraries
-            - pref: yuipath
-              choices:
-                  local: "included with Koha (faster, will work if internet goes down)."
-                  "http://yui.yahooapis.com/2.5.1/build": "from Yahoo's own servers (less demand on your servers)."
-    Options:
-        -
-            - pref: viewMARC
-              choices:
-                  yes: Allow
-                  no: "Don't allow"
-            - staff to view records in plain MARC form on the staff client.
-        -
-            - pref: viewLabeledMARC
-              choices:
-                  yes: Allow
-                  no: "Don't allow"
-            - staff to view records in labeled MARC form on the staff client.
-        -
-            - pref: viewISBD
-              choices:
-                  yes: Allow
-                  no: "Don't allow"
-            - staff to view records in ISBD form on the staff client.
-        -
-            - pref: HidePatronName
-              choices:
-                  no: Show
-                  yes: "Don't show"
-            - the names of patrons that have items checked out or on hold on detail pages or the "Place Hold" screen.
-        -
-            - pref: intranetbookbag
-              choices:
-                  yes: Show
-                  no: "Don't show"
-            - the cart option in the staff client.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/staff_client.pref
new file mode 100644 (file)
index 0000000..0d7fedc
--- /dev/null
@@ -0,0 +1,96 @@
+Staff Client:
+    Appearance:
+        -
+            - Use the
+            - pref: template
+              choices: staff-templates
+            - theme on the staff interface.
+        -
+            - "The staff client is located at http://"
+            - pref: staffClientBaseURL
+              class: url
+            - .
+        -
+            - Include the stylesheet at
+            - pref: intranetstylesheet
+              class: url
+            - on all pages in the staff interface, instead of the default. (This should be a complete URL, starting with <code>http://</code>.)
+        -
+            - "Include the following CSS on all pages in the staff client:"
+            - pref: IntranetUserCSS
+              type: textarea
+              class: code
+        -
+            - Include the stylesheet <code><!-- TMPL_VAR NAME="themelang" -->/css/</code>
+            - pref: intranetcolorstylesheet
+              class: file
+            - on all pages in the staff interface. (Leave blank to disable.)
+        -
+            - Use include files from the
+            - pref: intranet_includes
+              class: file
+            - directory in the template directory, instead of <code>includes/</code>. (Leave blank to disable)
+        -
+            - "Show the following HTML in its own column on the main page of the staff client:"
+            - pref: IntranetmainUserblock
+              type: textarea
+              class: code
+        -
+            - "Show the following HTML in the More menu at the top of each page on the staff client (should be a list of links or blank):"
+            - pref: IntranetNav
+              type: textarea
+              class: code
+        -
+            - "Include the following JavaScript on all pages in the staff clien:"
+            - pref: intranetuserjs
+              type: textarea
+              class: code
+        -
+            - Show biblio records on result page in the staff client
+            - pref: XSLTResultsDisplay
+              choices:
+                  yes: using XSLT stylesheets.
+                  no: normally.
+        -
+            - Show item details pages in the staff client
+            - pref: XSLTDetailsDisplay
+              choices:
+                  yes: using XSLT stylesheets.
+                  no: normally.
+        -
+            - Use the Yahoo UI libraries
+            - pref: yuipath
+              choices:
+                  local: "included with Koha (faster, will work if internet goes down)."
+                  "http://yui.yahooapis.com/2.5.1/build": "from Yahoo's own servers (less demand on your servers)."
+    Options:
+        -
+            - pref: viewMARC
+              choices:
+                  yes: Allow
+                  no: "Don't allow"
+            - staff to view records in plain MARC form on the staff client.
+        -
+            - pref: viewLabeledMARC
+              choices:
+                  yes: Allow
+                  no: "Don't allow"
+            - staff to view records in labeled MARC form on the staff client.
+        -
+            - pref: viewISBD
+              choices:
+                  yes: Allow
+                  no: "Don't allow"
+            - staff to view records in ISBD form on the staff client.
+        -
+            - pref: HidePatronName
+              choices:
+                  no: Show
+                  yes: "Don't show"
+            - the names of patrons that have items checked out or on hold on detail pages or the "Place Hold" screen.
+        -
+            - pref: intranetbookbag
+              choices:
+                  yes: Show
+                  no: "Don't show"
+            - the cart option in the staff client.
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web-services.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web-services.pref
deleted file mode 100644 (file)
index f4f5d6f..0000000
+++ /dev/null
@@ -1,34 +0,0 @@
-Web Services:
-    OAI-PMH:
-        -
-            - pref: OAI-PMH
-              choices:
-                  yes: Enable
-                  no: Disable
-            - "Koha's"
-            - '<a href="http://www.openarchives.org/pmh/">OAI-PMH</a> server.'
-        -
-            - Identify records at this site with the prefix
-            - pref: "OAI-PMH:archiveID"
-            - ": ."
-        -
-            - Only return
-            - pref: "OAI-PMH:MaxCount"
-              class: integer
-            - records at a time in response to a ListRecords or ListIdentifiers query.
-        -
-            - YAML OAI Koha server configuration file:
-            - pref: "OAI-PMH:ConfFile"
-              class: file
-            - . If empty, Koha OAI Server operates in normal mode, otherwise it operates in extended mode. In extended mode, it's possible to parameter other formats than marcxml or Dublin Core. OAI-PMH:ConfFile specify a YAML configuration file which list available metadata formats and XSL file used to create them from marcxml records.
-    ILS-DI:
-        -
-            - pref: ILS-DI
-              choices:
-                yes: Enable
-                no: Disable
-            - ILS-DI services for OPAC users
-        -
-            - pref: ILS-DI:AuthorizedIPs
-              class: Text
-            - allowed IPs to use the ILS-DI services
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref b/koha-tmpl/intranet-tmpl/prog/en/modules/admin/preferences/web_services.pref
new file mode 100644 (file)
index 0000000..f4f5d6f
--- /dev/null
@@ -0,0 +1,34 @@
+Web Services:
+    OAI-PMH:
+        -
+            - pref: OAI-PMH
+              choices:
+                  yes: Enable
+                  no: Disable
+            - "Koha's"
+            - '<a href="http://www.openarchives.org/pmh/">OAI-PMH</a> server.'
+        -
+            - Identify records at this site with the prefix
+            - pref: "OAI-PMH:archiveID"
+            - ": ."
+        -
+            - Only return
+            - pref: "OAI-PMH:MaxCount"
+              class: integer
+            - records at a time in response to a ListRecords or ListIdentifiers query.
+        -
+            - YAML OAI Koha server configuration file:
+            - pref: "OAI-PMH:ConfFile"
+              class: file
+            - . If empty, Koha OAI Server operates in normal mode, otherwise it operates in extended mode. In extended mode, it's possible to parameter other formats than marcxml or Dublin Core. OAI-PMH:ConfFile specify a YAML configuration file which list available metadata formats and XSL file used to create them from marcxml records.
+    ILS-DI:
+        -
+            - pref: ILS-DI
+              choices:
+                yes: Enable
+                no: Disable
+            - ILS-DI services for OPAC users
+        -
+            - pref: ILS-DI:AuthorizedIPs
+              class: Text
+            - allowed IPs to use the ILS-DI services
index c8c9de1..5a079a3 100644 (file)
@@ -88,7 +88,7 @@
 
 <!-- TMPL_IF NAME="add_form" -->
     
-        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post" <!-- TMPL_IF NAME="type-upload" -->enctype="multipart/form-data"<!-- /TMPL_IF -->>
+        <form action="<!-- TMPL_VAR NAME="script_name" -->" name="Aform" method="post" <!-- TMPL_IF NAME="type_upload" -->enctype="multipart/form-data"<!-- /TMPL_IF -->>
                 
         <fieldset class="rows"><legend>
         <!-- TMPL_IF NAME="modify" -->Modify
             <li><!-- TMPL_IF NAME="searchfield" --><span class="label">Variable: </span><!-- TMPL_VAR NAME="searchfield" --><input type="hidden" name="variable" value="<!-- TMPL_VAR NAME="searchfield" -->" />
             <!-- TMPL_ELSE --><label for="variable">Variable: </label><input type="text" name="variable" id="variable" size="60" /><!-- /TMPL_IF --></li>
             <li><label for="value">Value: </label>
-                <!-- TMPL_IF NAME="type-free" -->
+                <!-- TMPL_IF NAME="type_free" -->
                     <textarea id="value" name="value" cols="<!-- TMPL_VAR NAME="fieldlength" -->"><!-- TMPL_VAR NAME="value" escape="HTML" --></textarea>
-                <!-- TMPL_ELSIF NAME="type-upload" -->
+                <!-- TMPL_ELSIF NAME="type_upload" -->
                     <input type="file" name="value" />
-                <!-- TMPL_ELSIF NAME="type-textarea" -->
+                <!-- TMPL_ELSIF NAME="type_textarea" -->
                     <textarea name="value" id="value" rows="<!--TMPL_VAR NAME="rows" -->" cols="<!-- TMPL_VAR NAME="cols" -->"><!-- TMPL_VAR NAME="value" escape="HTML" --></textarea>
-                <!-- TMPL_ELSIF NAME="type-choice" -->
+                <!-- TMPL_ELSIF NAME="type_choice" -->
                     <select name="value" id="value">
                         <!-- TMPL_LOOP NAME="options" -->
                             <!-- TMPL_IF NAME="selected" -->
                         <!-- /TMPL_LOOP -->
                     </select>
                 <!-- /TMPL_IF -->
-        <!-- TMPL_IF NAME="type-langselector" -->
+        <!-- TMPL_IF NAME="type_langselector" -->
         <!-- TMPL_IF NAME="languages_loop" -->
     <table>
         <!-- TMPL_LOOP NAME="languages_loop" -->
 
         <!-- /TMPL_IF -->
 
-                <!-- TMPL_IF NAME="type-yesno" -->
-                    <!-- TMPL_IF NAME="value-yes" -->
+                <!-- TMPL_IF NAME="type_yesno" -->
+                    <!-- TMPL_IF NAME="value_yes" -->
                         <input type="radio" name="value" id="value" value="1" checked="checked" /><!-- TMPL_ELSE --><input type="radio" name="value" id="value" value="1" />
                     <!-- /TMPL_IF -->
                     <label for="value" class="yesno">ON</label>
-                    <!-- TMPL_IF NAME="value-no" -->    
+                    <!-- TMPL_IF NAME="value_no" -->
                         <input type="radio" name="value" id="value-no" value="0" checked="checked" /><!-- TMPL_ELSE --><input type="radio" name="value" id="value-no" value="0" />
                     <!-- /TMPL_IF -->
                     <label for="value-no" class="yesno">OFF</label>
         <!-- TMPL_ELSE -->
         <td>
         <!-- /TMPL_IF -->
-            <form action="/cgi-bin/koha/admin/systempreferences.pl" method="post" <!-- TMPL_IF NAME="type-upload" -->enctype="multipart/form-data"<!-- /TMPL_IF -->>
+            <form action="/cgi-bin/koha/admin/systempreferences.pl" method="post" <!-- TMPL_IF NAME="type_upload" -->enctype="multipart/form-data"<!-- /TMPL_IF -->>
 
-                <!-- TMPL_IF NAME="type-free" -->
+                <!-- TMPL_IF NAME="type_free" -->
                 <input type="text" name="value" size="<!-- TMPL_VAR NAME="fieldlength" -->" value="<!-- TMPL_VAR NAME="value" escape="HTML" -->" />
                 <!-- /TMPL_IF -->
-                <!-- TMPL_IF NAME="type-upload" -->
+                <!-- TMPL_IF NAME="type_upload" -->
                 <input type="file" name="value" value="<!-- TMPL_VAR NAME="value" escape="HTML" -->" />
                 <!-- /TMPL_IF -->
-                <!-- TMPL_IF NAME="type-textarea" -->
+                <!-- TMPL_IF NAME="type_textarea" -->
                 <a class="expand-textarea" style="display: none" href="#">Click to Edit</a>
                 <textarea name="value" rows="<!--TMPL_VAR NAME="rows" -->" cols="<!-- TMPL_VAR NAME="cols" -->"><!-- TMPL_VAR NAME="value" escape="HTML" --></textarea>
                 <!-- /TMPL_IF -->
-                <!-- TMPL_IF NAME="type-choice" -->
+                <!-- TMPL_IF NAME="type_choice" -->
                 <select name="value">
                     <!-- TMPL_LOOP NAME="options" -->
                         <!-- TMPL_IF NAME="selected" -->
                     <!-- /TMPL_LOOP -->
                 </select>
                 <!-- /TMPL_IF -->
-                <!-- TMPL_IF NAME="type-langselector" -->
+                <!-- TMPL_IF NAME="type_langselector" -->
                 <!-- TMPL_IF NAME="languages_loop" -->
                 <table>
                 <!-- TMPL_LOOP NAME="languages_loop" -->
 
                 <!-- /TMPL_IF -->
 
-                <!-- TMPL_IF NAME="type-yesno" -->
-                    <!-- TMPL_IF NAME="value-yes" -->
+                <!-- TMPL_IF NAME="type_yesno" -->
+                    <!-- TMPL_IF NAME="value_yes" -->
                         <input type="radio" name="value" value="1" checked="checked" /><!-- TMPL_ELSE --><input type="radio" name="value" value="1" />
                     <!-- /TMPL_IF -->
                     <label for="value" class="yesno">ON</label>
-                    <!-- TMPL_IF NAME="value-no" -->    
+                    <!-- TMPL_IF NAME="value_no" -->
                         <input type="radio" name="value" value="0" checked="checked" /><!-- TMPL_ELSE --><input type="radio" name="value" value="0" />
                     <!-- /TMPL_IF -->
                     <label for="value-no" class="yesno">OFF</label>
index 847435d..93ec488 100644 (file)
 <!-- TMPL_ELSE -->
 <option value="utf8">UTF-8</option>
 <!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="encodingEUC-KR" -->
+<!-- TMPL_IF NAME="encodingEUC_KR" -->
 <option value="EUC-KR" selected="selected">EUC-KR</option>
 <!-- TMPL_ELSE -->
 <option value="EUC-KR">EUC-KR</option>
 <!-- TMPL_ELSE -->
 <option value="ISO_6937">ISO_6937</option>
 <!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="encodingMARC-8" -->
+<!-- TMPL_IF NAME="encodingMARC_8" -->
 <option value="MARC-8" selected="selected">MARC-8</option>
 <!-- TMPL_ELSE -->
 <option value="MARC-8">MARC-8</option>
index 8880f8b..1e9c1a6 100644 (file)
@@ -45,42 +45,42 @@ function Changefwk(FwkList) {
 
 <div id="bibliotabs" class="toptabs numbered">
        <ul>
-            <!-- TMPL_IF name="0XX" -->
+            <!-- TMPL_IF name="zeroXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab0XX">0</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="1XX" -->
+            <!-- TMPL_IF name="oneXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab1XX">1</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="2XX" -->
+            <!-- TMPL_IF name="twoXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab2XX">2</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="3XX" -->
+            <!-- TMPL_IF name="threeXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab3XX">3</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="4XX" -->
+            <!-- TMPL_IF name="fourXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab4XX">4</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="5XX" -->
+            <!-- TMPL_IF name="fiveXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab5XX">5</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="6XX" -->
+            <!-- TMPL_IF name="sixXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab6XX">6</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="7XX" -->
+            <!-- TMPL_IF name="sevenXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab7XX">7</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="8XX" -->
+            <!-- TMPL_IF name="eightXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab8XX">8</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="9XX" -->
+            <!-- TMPL_IF name="nineXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab9XX">9</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="10XX" -->
+            <!-- TMPL_IF name="tenXX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab10XX">Item(s)</a></li>
             <!-- /TMPL_IF -->
         </ul>
     <div id="tab0XX">
-        <!-- TMPL_LOOP NAME="0XX" -->
+        <!-- TMPL_LOOP NAME="zeroXX" -->
             <!-- TMPL_IF name="tag" -->
                 <div class="tag">
                 <div class="tag_title">
@@ -110,7 +110,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab1XX">
-        <!-- TMPL_LOOP NAME="1XX" -->
+        <!-- TMPL_LOOP NAME="oneXX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -140,7 +140,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab2XX">
-        <!-- TMPL_LOOP NAME="2XX" -->
+        <!-- TMPL_LOOP NAME="twoXX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -170,7 +170,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab3XX">
-        <!-- TMPL_LOOP NAME="3XX" -->
+        <!-- TMPL_LOOP NAME="threeXX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -200,7 +200,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab4XX">
-        <!-- TMPL_LOOP NAME="4XX" -->
+        <!-- TMPL_LOOP NAME="fourXX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -230,7 +230,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div  id="tab5XX">
-        <!-- TMPL_LOOP NAME="5XX" -->
+        <!-- TMPL_LOOP NAME="fiveXX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -260,7 +260,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab6XX">
-        <!-- TMPL_LOOP NAME="6XX" -->
+        <!-- TMPL_LOOP NAME="sixXX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -290,7 +290,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div  id="tab7XX">
-        <!-- TMPL_LOOP NAME="7XX" -->
+        <!-- TMPL_LOOP NAME="sevenXX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -320,7 +320,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab8XX">
-        <!-- TMPL_LOOP NAME="8XX" -->
+        <!-- TMPL_LOOP NAME="eightXX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -350,7 +350,7 @@ function Changefwk(FwkList) {
     </div>
 
     <div id="tab9XX">
-        <!-- TMPL_LOOP NAME="9XX" -->
+        <!-- TMPL_LOOP NAME="nineXX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -379,7 +379,7 @@ function Changefwk(FwkList) {
         <!-- /TMPL_LOOP -->
     </div>
 
-     <!-- TMPL_IF name="10XX" -->
+     <!-- TMPL_IF name="tenXX" -->
     <div id="tab10XX">
         <table>
                 <tr>
index 24984de..f751bcb 100644 (file)
 </div>
 <!-- /TMPL_IF -->
 
-<!-- TMPL_IF NAME="template-defined-limits" -->
+<!-- TMPL_IF NAME="template_defined_limits" -->
 <div id="advsearch-itemtype" class="container">
 <!-- TYPE LIMITS -->
     <fieldset>
index 6d878b3..8f53e80 100644 (file)
@@ -91,7 +91,7 @@ function verify_images() {
     <!-- TMPL_LOOP NAME="subtitle" -->
        <h4><!-- TMPL_VAR NAME="subfield" --></h4>
     <!-- /TMPL_LOOP -->
-            <!-- TMPL_UNLESS NAME="item-level_itypes" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->"><!-- /TMPL_UNLESS -->
+            <!-- TMPL_UNLESS NAME="item_level_itypes" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->"><!-- /TMPL_UNLESS -->
             <!-- TMPL_IF name="unititle" --><p><!-- TMPL_VAR name="unititle" escape="html" --></p><!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="author" --><p>By <a href="/cgi-bin/koha/catalogue/search.pl?q=au:<!-- TMPL_VAR NAME="author" ESCAPE="url" -->"><!-- TMPL_VAR NAME="author" --></a></p><!-- /TMPL_IF -->
         <ul>
@@ -218,7 +218,7 @@ function verify_images() {
 <!-- TMPL_IF name="count" -->
         <table>
             <tr>
-                <!-- TMPL_IF NAME="item-level_itypes" --><th>Item type</th><!-- /TMPL_IF -->
+                <!-- TMPL_IF NAME="item_level_itypes" --><th>Item type</th><!-- /TMPL_IF -->
                 <th>Current Location</th>
                 <th>Home Library</th>
                 <!-- TMPL_IF NAME="itemdata_ccode" --><th>Collection</th><!-- /TMPL_IF -->
@@ -234,7 +234,7 @@ function verify_images() {
             </tr>
             <!-- TMPL_LOOP NAME="itemloop" -->
                 <tr>
-                    <!-- TMPL_IF NAME="item-level_itypes" -->
+                    <!-- TMPL_IF NAME="item_level_itypes" -->
                       <td class="itype">
                         <!-- TMPL_IF NAME="noItemTypeImages" -->
                           <!-- TMPL_VAR NAME="description" -->
@@ -452,7 +452,7 @@ function verify_images() {
 <div id="editions"><h4>Editions</h4>
 <table>
 <!-- TMPL_LOOP NAME="XISBNS" --><tr><!-- TMPL_IF NAME="AmazonEnabled" --><td><a href="http://www.amazon.com/gp/reader/<!-- TMPL_VAR NAME="normalized_isbn" -->/ref=sib_dp_pt/002-7879865-0184864#reader-link"><img src="http://images.amazon.com/images/P/<!-- TMPL_VAR NAME="normalized_isbn" -->.01._AA75_PU_PU-5_.jpg" /></a></td><!-- /TMPL_IF -->
-<!-- TMPL_UNLESS NAME="item-level_itypes" --><td><!-- TMPL_IF NAME="noItemTypeImages" --><!-- TMPL_VAR NAME="description" --><!-- TMPL_ELSE --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->"><!-- /TMPL_IF --></td><!-- /TMPL_IF -->
+<!-- TMPL_UNLESS NAME="item_level_itypes" --><td><!-- TMPL_IF NAME="noItemTypeImages" --><!-- TMPL_VAR NAME="description" --><!-- TMPL_ELSE --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->"><!-- /TMPL_IF --></td><!-- /TMPL_IF -->
 <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a> by <!-- TMPL_VAR NAME="author" --> &copy;<!-- TMPL_VAR NAME="copyrightdate" -->
   <!-- TMPL_IF name="publishercode" -->
 <!-- TMPL_VAR NAME="publishercode" --> <!-- TMPL_IF name="place" -->(<!-- TMPL_VAR NAME="place"-->)<!--/TMPL_IF--> <!-- TMPL_IF NAME="publicationyear" -->, <!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="editionstatement" --><!-- TMPL_VAR NAME="editionstatement" --><!-- /TMPL_IF --> <!-- TMPL_IF NAME="editionresponsability" --><!-- TMPL_VAR NAME="editionresponsability" --><!-- /TMPL_IF -->
index 440e652..87741d7 100644 (file)
@@ -22,7 +22,7 @@
     <h2><!-- TMPL_VAR NAME="title" ESCAPE="html" --> <!-- TMPL_IF NAME="author" -->, by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF --></h2>
     <ol class="bibliodetails">
         <li><span class="label">Biblionumber:</span> <!-- TMPL_VAR NAME="biblionumber" -->&nbsp;</li>
-        <!-- TMPL_UNLESS NAME="item-level_itypes" -->
+        <!-- TMPL_UNLESS NAME="item_level_itypes" -->
         <li><span class="label">Item type:</span> <!-- TMPL_VAR NAME="itemtypename" -->&nbsp;</li>
         <!-- /TMPL_UNLESS -->
         <!-- deprecated? <li><span class="label">Loan length:</span> <!-- TMPL_VAR NAME="loanlength" -->&nbsp;</li> -->
@@ -49,7 +49,7 @@
          <!-- /TMPL_UNLESS --><!-- /TMPL_IF --></h4>
             <ol class="bibliodetails">
             <li><span class="label">Home Library:</span> <!-- TMPL_VAR NAME="homebranchname" -->&nbsp;</li>
-           <!-- TMPL_IF NAME="item-level_itypes" -->
+           <!-- TMPL_IF NAME="item_level_itypes" -->
             <li><span class="label">Item type:</span> <!-- TMPL_VAR NAME="itype" -->&nbsp;</li>
            <!-- /TMPL_IF -->
             <!-- TMPL_IF NAME="collection" --><li><span class="label">Collection:</span> <!-- TMPL_VAR NAME="collection" --></li> <!-- /TMPL_IF -->
index 592f3f4..df09c4f 100644 (file)
@@ -407,7 +407,7 @@ function GetZ3950Terms(){
                                             &nbsp;
                                         <!-- /TMPL_IF -->
                                     <p>
-                                    <!-- TMPL_UNLESS NAME="item-level_itypes" -->
+                                    <!-- TMPL_UNLESS NAME="item_level_itypes" -->
                                     <!-- TMPL_UNLESS NAME="noItemTypeImages" --><!-- TMPL_IF name="imageurl" -->
                                     <img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" style="float: left; margin: .1em;" alt="" />
                                     <!-- /TMPL_IF --><!-- /TMPL_UNLESS -->
@@ -415,7 +415,7 @@ function GetZ3950Terms(){
                                     <!-- TMPL_VAR name="summary" --></p>
                                 <!-- TMPL_ELSE -->
                                     <p>
-                                    <!-- TMPL_UNLESS NAME="item-level_itypes" -->
+                                    <!-- TMPL_UNLESS NAME="item_level_itypes" -->
                                     <!-- TMPL_UNLESS NAME="noItemTypeImages" --><!-- TMPL_IF name="imageurl" -->
                                     <img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" style="float: left; margin: .1em;" alt="" />
                                     <!-- /TMPL_IF --><!-- /TMPL_UNLESS -->
@@ -469,7 +469,7 @@ function GetZ3950Terms(){
                                     <ul>
                                     <!-- TMPL_LOOP NAME="available_items_loop" -->
 
-                                        <!-- TMPL_IF NAME="noItemTypeImages" --><li><!-- TMPL_ELSE --><!-- TMPL_IF NAME="item-level_itypes" --><!-- TMPL_IF name="imageurl" --><li style="list-style: none; list-style-type: none;"><img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" alt="<!-- TMPL_VAR name="description" -->" /><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><!-- /TMPL_IF -->
+                                        <!-- TMPL_IF NAME="noItemTypeImages" --><li><!-- TMPL_ELSE --><!-- TMPL_IF NAME="item_level_itypes" --><!-- TMPL_IF name="imageurl" --><li style="list-style: none; list-style-type: none;"><img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" alt="<!-- TMPL_VAR name="description" -->" /><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><!-- /TMPL_IF -->
                                         <!-- TMPL_IF NAME="branchname" --><!-- TMPL_VAR NAME="branchname" --><!-- /TMPL_IF -->
                                         <!-- TMPL_IF NAME="location" --><!-- TMPL_VAR NAME="location" --><!-- /TMPL_IF -->
                                         <!-- TMPL_IF NAME="itemcallnumber" -->[<a href="/cgi-bin/koha/catalogue/search.pl?q=callnum:<!-- TMPL_VAR NAME="itemcallnumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="itemcallnumber" --></a>]<!-- /TMPL_IF -->
@@ -481,7 +481,7 @@ function GetZ3950Terms(){
                                    <span class="status"><!-- TMPL_IF NAME="onloancount" --><!-- TMPL_VAR NAME="onloancount" --><!-- /TMPL_IF --> on loan:</span>
                                     <ul>
                                     <!-- TMPL_LOOP NAME="onloan_items_loop" -->
-                                       <!-- TMPL_IF NAME="noItemTypeImages" --><li><!-- TMPL_ELSE --><!-- TMPL_IF NAME="item-level_itypes" -->
+                                       <!-- TMPL_IF NAME="noItemTypeImages" --><li><!-- TMPL_ELSE --><!-- TMPL_IF NAME="item_level_itypes" -->
                                         <!-- TMPL_IF name="imageurl" -->
                                         <li style="list-style: none; list-style-type: none;"><img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" alt="<!-- TMPL_VAR name="description" -->" />
                                         <!-- TMPL_ELSE --><li><!-- /TMPL_IF -->
@@ -498,7 +498,7 @@ function GetZ3950Terms(){
                                     <span class="unavailable"><!-- TMPL_IF NAME="othercount" --><!-- TMPL_VAR NAME="othercount" --><!-- /TMPL_IF --> unavailable:</span>
                                     <ul>
                                     <!-- TMPL_LOOP NAME="other_items_loop" -->
-                                        <!-- TMPL_IF NAME="noItemTypeImages" --><li><!-- TMPL_ELSE --><!-- TMPL_IF NAME="item-level_itypes" -->
+                                        <!-- TMPL_IF NAME="noItemTypeImages" --><li><!-- TMPL_ELSE --><!-- TMPL_IF NAME="item_level_itypes" -->
                                         <!-- TMPL_IF name="imageurl" -->
                                         <li style="list-style: none; list-style-type: none;"><img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" alt="<!-- TMPL_VAR name="description" -->" />
                                         <!-- TMPL_ELSE --><li><!-- /TMPL_IF -->
index 6230faa..2c46be8 100644 (file)
@@ -254,6 +254,7 @@ $(document).ready(function(){
                <!-- /TMPL_LOOP -->
                </ul>
            </div><!-- /div.record -->
+<!-- /TMPL_IF -->
     </div><!-- /div#tabrecord1 -->
     <div id="tabrecord2">
        <!-- TMPL_IF name="record2" -->
index b9bd702..e001d29 100644 (file)
@@ -13,7 +13,7 @@ $.tablesorter.addParser({
 $(document).ready(function() {
     <!-- TMPL_LOOP NAME="branchesloop" -->
     $.tablesorter.defaults.widgets = ['zebra'];
-    $("#transferst<!-- TMPL_VAR NAME="branchcode" -->").tablesorter({<!-- TMPL_IF ="dateformat_metric" -->
+    $("#transferst<!-- TMPL_VAR NAME="branchcode" -->").tablesorter({<!-- TMPL_IF NAME="dateformat_metric" -->
         dateFormat: 'uk',<!-- /TMPL_IF -->
         sortList: [[0,0]],
         headers: { 1: { sorter: 'articles' }}
index 9597776..57785e2 100644 (file)
@@ -11,7 +11,7 @@
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
 
-<!-- TMPL_IF NAME="allsub-p" -->
+<!-- TMPL_IF NAME="allsub_p" -->
 <table>
 <caption>Results</caption>
 <!-- TMPL_LOOP NAME="loop" -->
@@ -21,7 +21,7 @@
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF NAME="modsub-p" -->
+<!-- TMPL_IF NAME="modsub_p" -->
 <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
 This will change the subject headings on <strong>all</strong> the records this subject is applied to.
 <table>
@@ -34,7 +34,7 @@ This will change the subject headings on <strong>all</strong> the records this s
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF NAME="upsub-p" -->
+<!-- TMPL_IF NAME="upsub_p" -->
 Successfully modified <!-- TMPL_VAR NAME="oldsub" ESCAPE="HTML" -->
 is now <!-- TMPL_VAR NAME="sub" ESCAPE="HTML" -->
 <!-- <![ IGNORE [
@@ -44,7 +44,7 @@ is now <!-- TMPL_VAR NAME="sub" ESCAPE="HTML" -->
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF NAME="undel-p" -->
+<!-- TMPL_IF NAME="undel_p" -->
 <table>
 <thead>
 <tr><th>Title</th><th>Author</th><th>Undelete</th></tr>
@@ -59,13 +59,13 @@ is now <!-- TMPL_VAR NAME="sub" ESCAPE="HTML" -->
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF NAME="finun-p" -->
+<!-- TMPL_IF NAME="finun_p" -->
 <h3>Successfully undeleted</h3>
 <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalog Maintenance</a></p>
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF NAME="fixitemtype-p" -->
+<!-- TMPL_IF NAME="fixitemtype_p" -->
 <form method="post" action="/cgi-bin/koha/maint/catmaintain.pl">
 <table>
 <tr><th scope="row"><label for="itemtype">Itemtype:</label></th><td><input type="hidden" name="bi" value="<!-- TMPL_VAR NAME="bi" ESCAPE="HTML">" />
@@ -77,13 +77,13 @@ is now <!-- TMPL_VAR NAME="sub" ESCAPE="HTML" -->
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF NAME="updatetype-p" -->
+<!-- TMPL_IF NAME="updatetype_p" -->
 <h3>Updated successfully</h3>
 <p><a href="/cgi-bin/koha/maint/catmaintain.pl">Back to Catalog Maintenance</a></p>
 <!-- /TMPL_IF -->
 
 
-<!-- TMPL_IF NAME="mainmenu-p" -->
+<!-- TMPL_IF NAME="mainmenu_p" -->
 
 <h1>Catalog Maintenance</h1>
 <form action="/cgi-bin/koha/maint/catmaintain.pl" method="post">
index 225c4b3..2004a7d 100644 (file)
@@ -369,7 +369,7 @@ function checkMultiHold() {
         </fieldset>
         <!-- TMPL_LOOP name="bibitemloop" -->
           <ol>
-            <!-- TMPL_UNLESS NAME="item-level_itypes" -->
+            <!-- TMPL_UNLESS NAME="item_level_itypes" -->
               <li><span class="label">Item type:</span> <!-- TMPL_VAR NAME="description" --></li>
             <!-- /TMPL_UNLESS -->
 
@@ -380,7 +380,7 @@ function checkMultiHold() {
         <caption>Place a hold on a specific copy</caption>
                <tr>
             <th>Hold</th>
-            <!-- TMPL_IF NAME="item-level_itypes" -->
+            <!-- TMPL_IF NAME="item_level_itypes" -->
                 <th>Item type</th>
             <!-- /TMPL_IF -->
             <th>Barcode</th>
@@ -403,7 +403,7 @@ function checkMultiHold() {
                 <img src="/intranet-tmpl/<!-- TMPL_VAR NAME="theme" -->/img/famfamfam/silk/cross.png" alt="Cannot be put on hold" />
             <!-- /TMPL_IF -->
             </td>
-            <!-- TMPL_IF NAME="item-level_itypes" -->
+            <!-- TMPL_IF NAME="item_level_itypes" -->
                 <td>
                     <!-- TMPL_UNLESS NAME="noItemTypeImages" -->
                         <!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR name="imageurl" -->" alt="" /> <br /> <!-- /TMPL_IF -->
@@ -468,7 +468,7 @@ function checkMultiHold() {
     <table id="requesttitles">
       <tr>
         <th>Title</th>
-        <!-- TMPL_UNLESS NAME="item-level_itypes" -->
+        <!-- TMPL_UNLESS NAME="item_level_itypes" -->
           <th>Item Type</th>
         <!-- /TMPL_UNLESS -->
         <th>Priority</th>
@@ -493,7 +493,7 @@ function checkMultiHold() {
               <span class="not_holdable" title="<!-- TMPL_VAR NAME="biblionumber" -->"></span>
             <!-- /TMPL_UNLESS -->
           </td>
-          <!-- TMPL_UNLESS NAME="item-level_itypes" -->
+          <!-- TMPL_UNLESS NAME="item_level_itypes" -->
             <td>
               <img src="<!-- TMPL_VAR name="imageurl" -->" alt="<!-- TMPL_VAR NAME="itypename" -->" title="<!-- TMPL_VAR NAME="itypename" -->" />
             </td>
index 827f5be..6fb3efa 100644 (file)
@@ -170,7 +170,7 @@ function placeHold () {
     <table>
             <tr>
                 <!--TMPL_IF NAME="manageshelf" --><th class="checkall">&nbsp;</th><!-- /TMPL_IF -->
-                <!-- TMPL_UNLESS NAME="item-level_itypes" --><th>Item Type</th><!-- /TMPL_UNLESS -->
+                <!-- TMPL_UNLESS NAME="item_level_itypes" --><th>Item Type</th><!-- /TMPL_UNLESS -->
                 <th>Title</th>
                 <th>Author</th>
                 <th>Date Added</th>
@@ -192,7 +192,7 @@ function placeHold () {
                                <!-- /TMPL_IF -->
                        </td>
                        <!-- /TMPL_IF -->
-                       <!-- TMPL_UNLESS NAME="item-level_itypes" --><td>
+                       <!-- TMPL_UNLESS NAME="item_level_itypes" --><td>
                 <!-- TMPL_UNLESS NAME="noItemTypeImages" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" /><!-- /TMPL_UNLESS --><!-- TMPL_VAR NAME="description" -->
                        </td><!-- /TMPL_UNLESS -->
                        <td>
index f8956e7..5cd97dc 100644 (file)
@@ -89,7 +89,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
     <div id="views"><span class="view"><span id="Normalview">Normal View</span></span> <span class="view"><a id="MARCview" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">MARC View</a></span> <!-- TMPL_IF NAME="ISBD" --><span class="view"><a id="ISBDview" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">ISBD View</a></span><!-- /TMPL_IF -->
     </div>
 
-    <span class="results_summary"><!-- TMPL_UNLESS NAME="item-level_itypes" -->
+    <span class="results_summary"><!-- TMPL_UNLESS NAME="item_level_itypes" -->
         [
         <!-- TMPL_IF name="description" -->
             <!-- TMPL_VAR NAME="description" -->
@@ -173,7 +173,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
     <!-- TMPL_IF name="copyrightdate" -->
     <span class="results_summary"><span class="label">Year: </span><!-- TMPL_VAR NAME="copyrightdate" --></span>
     <!-- /TMPL_IF -->
-    <!-- TMPL_UNLESS NAME="item-level_itypes" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" />
+    <!-- TMPL_UNLESS NAME="item_level_itypes" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" />
     <span class="results_summary"><span class="label">Item type: </span>
         <!-- TMPL_IF name="description" -->
         <!-- TMPL_VAR NAME="description" -->
@@ -387,7 +387,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
     <!-- TMPL_ELSE -->
        <table id="holdingst">
            <thead><tr>
-               <!-- TMPL_IF NAME="item-level_itypes" --><th>Item type</th><!-- /TMPL_IF -->
+               <!-- TMPL_IF NAME="item_level_itypes" --><th>Item type</th><!-- /TMPL_IF -->
                <th>Location</th>
            <!-- TMPL_IF NAME="itemdata_ccode" --><th>Collection</th><!-- /TMPL_IF -->
            <th>Call Number</th>
@@ -399,7 +399,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
                <th>Date Due</th>
            </tr></thead>
            <tbody><!-- TMPL_LOOP NAME="ITEM_RESULTS" -->
-           <tr><!-- TMPL_IF NAME="item-level_itypes" --><td><!-- TMPL_UNLESS NAME="noItemTypeImages" --><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" title="<!-- TMPL_VAR NAME="description" -->" alt="<!-- TMPL_VAR NAME="description" -->" /><!-- /TMPL_IF --><!-- /TMPL_UNLESS --> <!-- TMPL_VAR NAME="description" --></td><!-- /TMPL_IF -->
+           <tr><!-- TMPL_IF NAME="item_level_itypes" --><td><!-- TMPL_UNLESS NAME="noItemTypeImages" --><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" title="<!-- TMPL_VAR NAME="description" -->" alt="<!-- TMPL_VAR NAME="description" -->" /><!-- /TMPL_IF --><!-- /TMPL_UNLESS --> <!-- TMPL_VAR NAME="description" --></td><!-- /TMPL_IF -->
                <td><!-- TMPL_UNLESS NAME="singleBranchMode" --><!-- TMPL_IF name="branchurl" --><a href="<!-- TMPL_VAR NAME="branchurl" -->"><!-- TMPL_VAR NAME="branchname" --></a><!-- TMPL_ELSE --><!-- TMPL_VAR NAME="branchname" --><!-- /TMPL_IF --><!-- /TMPL_UNLESS --> <span class="shelvingloc"><!-- TMPL_VAR NAME="location_description" --></span> </td>
                <!-- TMPL_IF NAME="itemdata_ccode" --><td><!-- TMPL_VAR NAME="ccode" --></td><!-- /TMPL_IF -->
                <td><!-- TMPL_IF NAME="itemcallnumber" --> <!-- TMPL_VAR NAME="itemcallnumber" --><!-- TMPL_IF NAME="OPACShelfBrowser" -->(<a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;shelfbrowse_itemnumber=<!-- TMPL_VAR NAME="itemnumber" -->#shelfbrowser">Browse Shelf</a>)<!-- /TMPL_IF --><!-- /TMPL_IF --></td>
@@ -720,7 +720,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 <!-- TMPL_ELSE --><span class="no-image">No cover image available</span><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF -->
 
 </td>
-<!-- TMPL_UNLESS NAME="item-level_itypes" --><td><!-- TMPL_VAR NAME="description" --></td><!-- /TMPL_UNLESS --><td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a><!-- TMPL_IF NAME="author" --> by <!-- TMPL_VAR NAME="author" ESCAPE="HTML" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="copyrightdate" --> &copy;<!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->
+<!-- TMPL_UNLESS NAME="item_level_itypes" --><td><!-- TMPL_VAR NAME="description" --></td><!-- /TMPL_UNLESS --><td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a><!-- TMPL_IF NAME="author" --> by <!-- TMPL_VAR NAME="author" ESCAPE="HTML" --><!-- /TMPL_IF --><!-- TMPL_IF NAME="copyrightdate" --> &copy;<!-- TMPL_VAR NAME="copyrightdate" --><!-- /TMPL_IF --><!-- TMPL_IF name="publishercode" -->
     <p><!-- TMPL_VAR NAME="publishercode" ESCAPE="HTML" --> 
        <!-- TMPL_IF name="place" -->(<!-- TMPL_VAR NAME="place"-->)<!--/TMPL_IF--> <!-- TMPL_IF NAME="publicationyear" -->, <!-- TMPL_VAR NAME="publicationyear" --><!-- /TMPL_IF -->
         <!-- TMPL_IF NAME="pages" --><!-- TMPL_VAR NAME="pages" --> <!-- TMPL_VAR NAME="illus" --> <!-- TMPL_VAR NAME="size" --></p><!-- /TMPL_IF -->
index 0e0543c..aaaa16e 100644 (file)
       <!-- TMPL_ELSE -->
       <td>-</td>
       <!-- /TMPL_IF -->
-      <!-- TMPL_IF NAME="transport-sms" -->
+      <!-- TMPL_IF NAME="transport_sms" -->
       <!-- TMPL_IF NAME="SMSSendDriver" --><td><input type="checkbox"
                  id="sms<!-- TMPL_VAR NAME="message_attribute_id" -->"
                  name="<!-- TMPL_VAR NAME="message_attribute_id" -->"
-                 value="sms" <!-- TMPL_VAR NAME="transport-sms"   --> onclick = "document.opacmessaging.none<!-- TMPL_VAR NAME="message_attribute_id" -->.checked=false;" /></td><!-- /TMPL_IF -->
+                 value="sms" <!-- TMPL_VAR NAME="transport_sms"   --> onclick = "document.opacmessaging.none<!-- TMPL_VAR NAME="message_attribute_id" -->.checked=false;" /></td><!-- /TMPL_IF -->
       <!-- TMPL_ELSE -->
       <td>-</td>
       <!-- /TMPL_IF -->
 
-      <!-- TMPL_IF NAME="transport-email" -->
+      <!-- TMPL_IF NAME="transport_email" -->
       <td><input type="checkbox"
                  id="email<!-- TMPL_VAR NAME="message_attribute_id" -->"
                  name="<!-- TMPL_VAR NAME="message_attribute_id" -->"
-                 value="email"   <!-- TMPL_VAR NAME="transport-email"   --> onclick = "document.opacmessaging.none<!-- TMPL_VAR NAME="message_attribute_id" -->.checked=false;" />
+                 value="email"   <!-- TMPL_VAR NAME="transport_email"   --> onclick = "document.opacmessaging.none<!-- TMPL_VAR NAME="message_attribute_id" -->.checked=false;" />
       </td>
       <!-- TMPL_ELSE -->
       <td>-</td>
       <td>-</td>
       <!-- /TMPL_IF -->
 
-<!--       <!-- TMPL_IF NAME="transport-rss" -->
+<!--       <!-- TMPL_IF NAME="transport_rss" -->
       <td><input type="checkbox"
                  id="rss<!-- TMPL_VAR NAME="message_attribute_id" -->"
                  name="<!-- TMPL_VAR NAME="message_attribute_id" -->"
-                 value="rss"  <!-- TMPL_VAR NAME="transport-rss"   --> onclick = "document.opacmessaging.none<!-- TMPL_VAR NAME="message_attribute_id" -->.checked=false;" />
+                 value="rss"  <!-- TMPL_VAR NAME="transport_rss"   --> onclick = "document.opacmessaging.none<!-- TMPL_VAR NAME="message_attribute_id" -->.checked=false;" />
       </td>
       <!-- TMPL_ELSE -->
       <td>-</td>
index 61a7bea..802d79b 100644 (file)
                 <!-- TMPL_UNLESS NAME="none_available" --><tr>
                   <th>Hold</th>
                   <th>Title</th>
-                  <!-- TMPL_UNLESS NAME="item-level_itypes" -->
+                  <!-- TMPL_UNLESS NAME="item_level_itypes" -->
                     <th>Item Type</th>
                   <!-- /TMPL_UNLESS -->
                   <!-- TMPL_IF NAME="showpriority" -->
                         <!-- /TMPL_UNLESS -->
 
                     </td>
-                    <!-- TMPL_IF NAME="holdable" --><!-- TMPL_UNLESS NAME="item-level_itypes" -->
+                    <!-- TMPL_IF NAME="holdable" --><!-- TMPL_UNLESS NAME="item_level_itypes" -->
                                           <td>
                                             <!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="" /><!-- /TMPL_IF -->
                                 <!-- TMPL_VAR NAME="description" -->
                                           </td>
                                         <!-- /TMPL_UNLESS --><!-- /TMPL_IF -->
-                    <!-- TMPL_IF NAME="holdable" --><!-- TMPL_IF NAME="showpriority" --><td><!-- TMPL_VAR name="rank" --> out of <!-- TMPL_VAR NAME="reservecount" --></td><!-- /TMPL_IF --><!-- /TMPL_IF -->
+                    <!-- TMPL_IF NAME="holdable" -->
+                    <!-- TMPL_IF NAME="showpriority" -->
+                    <td>
+                    <!-- TMPL_VAR name="rank" --> out of <!-- TMPL_VAR NAME="reservecount" -->
+                    </td><!-- /TMPL_IF --><!-- /TMPL_IF -->
                    <!-- TMPL_IF NAME="reserve_in_future" -->
                    <!-- TMPL_IF NAME="holdable" --><td>
               <input name="reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->" id="reserve_date_<!-- TMPL_VAR NAME="biblionumber" -->" size="10">
                           <caption>Select a specific copy:</caption>
                           <tr>
                             <th>Copy</th>
-                            <!-- TMPL_IF NAME="item-level_itypes" -->
+                            <!-- TMPL_IF NAME="item_level_itypes" -->
                               <th>Item Type</th>
                             <!-- /TMPL_IF -->
                             <th>Barcode</th>
                                   <img src="/opac-tmpl/<!-- TMPL_VAR NAME="theme" -->/famfamfam/silk/cross.png" alt="Cannot be put on hold" title="Cannot be put on hold" />
                                 <!-- /TMPL_IF --> <!-- TMPL_IF NAME="copynumber" --><!-- TMPL_VAR NAME="copynumber" --><!-- /TMPL_IF -->
                               </td>
-                              <!-- TMPL_IF NAME="item-level_itypes" -->
+                              <!-- TMPL_IF NAME="item_level_itypes" -->
                                 <td>
                                   <!-- TMPL_UNLESS NAME="noItemTypeImages" -->
                                   <!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="" /><!-- /TMPL_IF -->
index c561f67..c53511e 100644 (file)
@@ -372,8 +372,9 @@ $(document).ready(function(){
 <!-- TMPL_IF NAME="RequestOnOpac" --><!-- TMPL_UNLESS NAME="norequests" --><!-- TMPL_IF NAME="opacuserlogin" --><input type="checkbox" id="bib<!-- TMPL_VAR NAME="biblionumber" -->" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->" /> <label for="bib<!-- TMPL_VAR NAME="biblionumber" -->"></label><!-- /TMPL_IF --><!-- /TMPL_UNLESS --><!-- /TMPL_IF --><!-- /TMPL_IF --><!-- /TMPL_IF --></td>
                 <td class="select selectcol"><!-- TMPL_VAR NAME="result_number" -->.</td>
 
-                               <!-- TMPL_UNLESS NAME="item-level_itypes" -->
+                               <!-- TMPL_UNLESS NAME="item_level_itypes" -->
                 <!-- TMPL_UNLESS NAME="noItemTypeImages" -->
+
                                <td class="itypecol">
                 <!-- TMPL_IF name="imageurl" -->
                                <img src="<!-- TMPL_VAR name="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" alt="<!-- TMPL_VAR name="description" -->" />
index 3c04429..196baa1 100644 (file)
@@ -240,7 +240,7 @@ $(function() {
                     <!-- /TMPL_UNLESS -->
                         <td><input type="checkbox" name="REM-<!-- TMPL_VAR NAME="biblionumber" -->"
                                    value="<!-- TMPL_VAR NAME="biblionumber">" /></td>
-                    <!-- TMPL_UNLESS NAME="item-level_itypes" -->
+                    <!-- TMPL_UNLESS NAME="item_level_itypes" -->
                         <td>
                           <!-- TMPL_UNLESS NAME="noItemTypeImages" -->
                           <img src="<!-- TMPL_VAR NAME="imageurl" -->" alt="<!-- TMPL_VAR NAME="description" -->" title="<!-- TMPL_VAR NAME="description" -->" />
index 6801350..331f678 100644 (file)
@@ -28,13 +28,13 @@ $.tablesorter.addParser({
                                widgets : ['zebra'],
                                <!-- TMPL_IF NAME="JacketImages" -->
                                        sortList: [[3,0]],
-                                               <!-- TMPL_IF NAME="item-level_itypes" -->
+                                               <!-- TMPL_IF NAME="item_level_itypes" -->
                                                        headers: { 0: { sorter: false }, 1: { sorter: 'articles' },4: { sorter: false },5: { sorter: false }}
                                                <!-- TMPL_ELSE -->
                                                        headers: { 0: { sorter: false }, 1: { sorter: 'articles' },5: { sorter: false },6: { sorter: false }}
                                                <!-- /TMPL_IF -->
                                <!-- TMPL_ELSE -->
-                                               <!-- TMPL_IF NAME="item-level_itypes" -->
+                                               <!-- TMPL_IF NAME="item_level_itypes" -->
                                                        sortList: [[2,0]],
                                                        headers: { 0: { sorter: 'articles' },3: { sorter: false },4: { sorter: false }}
                                                <!-- TMPL_ELSE -->
@@ -48,13 +48,13 @@ $.tablesorter.addParser({
                                widgets : ['zebra'],
                                <!-- TMPL_IF NAME="JacketImages" -->
                                        sortList: [[1,0]],
-                                               <!-- TMPL_IF NAME="item-level_itypes" -->
+                                               <!-- TMPL_IF NAME="item_level_itypes" -->
                                                        headers: { 0: { sorter: false }, 1: { sorter: 'articles' },4: { sorter: false },5: { sorter: false }}
                                                <!-- TMPL_ELSE -->
                                                        headers: { 0: { sorter: false }, 1: { sorter: 'articles' },5: { sorter: false },6: { sorter: false }}
                                                <!-- /TMPL_IF -->
                                <!-- TMPL_ELSE -->
-                                               <!-- TMPL_IF NAME="item-level_itypes" -->
+                                               <!-- TMPL_IF NAME="item_level_itypes" -->
                                                        sortList: [[0,0]],
                                                        headers: { 0: { sorter: 'articles' },3: { sorter: false }}
                                                <!-- TMPL_ELSE -->
@@ -200,7 +200,7 @@ $.tablesorter.addParser({
        <thead><tr>
                <!-- TMPL_IF NAME="JacketImages" --><th>&nbsp;</th><!-- /TMPL_IF -->
         <th>Title</th>
-               <!-- TMPL_UNLESS NAME="item-level_itypes" --><th>Item Type</th> <!-- /TMPL_UNLESS -->
+               <!-- TMPL_UNLESS NAME="item_level_itypes" --><th>Item Type</th> <!-- /TMPL_UNLESS -->
         <th>Call No.</th>
         <th>Due</th>
         <!-- TMPL_IF name="OpacRenewalAllowed" -->
@@ -240,7 +240,7 @@ $.tablesorter.addParser({
                 <td><a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a><span class="item-details">
                         <!-- TMPL_VAR NAME="author" -->
                     </span></td>
-                <!-- TMPL_UNLESS NAME="item-level_itypes" --><td><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" alt="<!-- TMPL_VAR NAME="description" -->" /><!-- /TMPL_IF --> <!-- TMPL_VAR name="description" --></td><!-- /TMPL_UNLESS -->
+                <!-- TMPL_UNLESS NAME="item_level_itypes" --><td><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" alt="<!-- TMPL_VAR NAME="description" -->" /><!-- /TMPL_IF --> <!-- TMPL_VAR name="description" --></td><!-- /TMPL_UNLESS -->
                 <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
                 <!-- TMPL_IF NAME="overdue" -->
                     <td class="overdue"><!-- TMPL_VAR NAME="date_due" --></td>
@@ -291,7 +291,7 @@ $.tablesorter.addParser({
 <thead><tr>
 <!-- TMPL_IF NAME="JacketImages" --><th>&nbsp;</th><!-- /TMPL_IF -->
 <th>Title</th>
-<!-- TMPL_UNLESS NAME="item-level_itypes" --><th>Item Type</th> <!-- /TMPL_UNLESS -->
+<!-- TMPL_UNLESS NAME="item_level_itypes" --><th>Item Type</th> <!-- /TMPL_UNLESS -->
 <th>Call No.</th>
 <th>Due</th>
 <!-- TMPL_IF name="OpacRenewalAllowed" -->
@@ -322,7 +322,7 @@ $.tablesorter.addParser({
 
 <td><a href="/cgi-bin/koha/opac-detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="title" escape="html" --></a> <span class="item-details"><!-- TMPL_VAR NAME="author" --></span></td>
 
-<!-- TMPL_UNLESS NAME="item-level_itypes" --><td><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" alt="<!-- TMPL_VAR NAME="description" -->" /><!-- /TMPL_IF --> <!-- TMPL_VAR name="description" --></td><!-- /TMPL_UNLESS -->
+<!-- TMPL_UNLESS NAME="item_level_itypes" --><td><!-- TMPL_IF NAME="imageurl" --><img src="<!-- TMPL_VAR NAME="imageurl" -->" title="<!-- TMPL_VAR name="description" -->" alt="<!-- TMPL_VAR NAME="description" -->" /><!-- /TMPL_IF --> <!-- TMPL_VAR name="description" --></td><!-- /TMPL_UNLESS -->
 <td><!-- TMPL_VAR NAME="itemcallnumber" --></td>
 <td><!-- TMPL_VAR NAME="date_due" --></td>
                 <!-- TMPL_IF name="OpacRenewalAllowed" -->
index fca1e0b..3d547b7 100755 (executable)
@@ -290,8 +290,8 @@ my $biblioLoop = [];
 my $numBibsAvailable = 0;
 my $itemdata_enumchron = 0;
 my $anyholdable;
-my $itemLevelTypes = C4::Context->preference('item-level_itypes');
-$template->param('item-level_itypes' => $itemLevelTypes);
+my $itemLevelTypes = C4::Context->preference('item_level_itypes');
+$template->param('item_level_itypes' => $itemLevelTypes);
 
 foreach my $biblioNum (@biblionumbers) {
 
index 0f52650..855aa93 100755 (executable)
@@ -153,7 +153,7 @@ $template->param(search_languages_loop => $languages_limit_loop,);
 # load the Type stuff
 my $itemtypes = GetItemTypes;
 # the index parameter is different for item-level itemtypes
-my $itype_or_itemtype = (C4::Context->preference("item-level_itypes"))?'itype':'itemtype';
+my $itype_or_itemtype = (C4::Context->preference("item_level_itypes"))?'itype':'itemtype';
 my @itemtypesloop;
 my $selected=1;
 my $cnt;
index 7e51364..a31b6e2 100755 (executable)
@@ -330,7 +330,7 @@ foreach my $biblionumber (@biblionumbers) {
         foreach my $itemnumber ( @{ $itemnumbers_of_biblioitem{$biblioitemnumber} } )    {
             my $item = $iteminfos_of->{$itemnumber};
             
-            unless (C4::Context->preference('item-level_itypes')) {
+            unless (C4::Context->preference('item_level_itypes')) {
                 $item->{itype} = $biblioitem->{itemtype};
             }