Merge remote branch 'kc/new/bug_2742' into kcmaster
authorChris Cormack <chrisc@catalyst.net.nz>
Sun, 27 Feb 2011 20:09:33 +0000 (09:09 +1300)
committerChris Cormack <chrisc@catalyst.net.nz>
Sun, 27 Feb 2011 20:09:33 +0000 (09:09 +1300)
110 files changed:
-- [new file with mode: 0644]
C4/AuthoritiesMarc.pm
C4/Charset.pm
C4/Creators/Lib.pm
C4/Form/MessagingPreferences.pm
C4/Items.pm
C4/Members/Messaging.pm
C4/Overdues.pm
C4/Serials.pm
C4/XSLT.pm
acqui/neworderempty.pl
admin/auth_tag_structure.pl
authorities/authorities-home.pl
catalogue/MARCdetail.pl
catalogue/moredetail.pl
catalogue/showmarc.pl
cataloguing/addbiblio.pl
cataloguing/additem.pl
cataloguing/moveitem.pl
circ/branchoverdues.pl
circ/returns.pl
circ/waitingreserves.pl
docs/history.txt
etc/zebradb/marc_defs/marc21/authorities/record.abs
etc/zebradb/marc_defs/marc21/biblios/record.abs
installer/data/mysql/fr-FR/2-Optionel/sample_news.sql
installer/data/mysql/updatedatabase.pl
koha-tmpl/intranet-tmpl/prog/en/css/login.css
koha-tmpl/intranet-tmpl/prog/en/css/staff-global.css
koha-tmpl/intranet-tmpl/prog/en/includes/checkouts-table-footer.inc
koha-tmpl/intranet-tmpl/prog/en/includes/header.inc
koha-tmpl/intranet-tmpl/prog/en/includes/members-menu.inc
koha-tmpl/intranet-tmpl/prog/en/js/basket.js
koha-tmpl/intranet-tmpl/prog/en/lib/calendar/calendar.js
koha-tmpl/intranet-tmpl/prog/en/modules/about.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tmpl [new file with mode: 0644]
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgetperiods.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqbudgets.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/admin/aqplan.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/auth.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/MARCdetail.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/catalogue/issuehistory.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/addbiblio.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/cataloguing/merge.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/circ/branchoverdues.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/circ/circulation.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/circ/returns.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/circ/waitingreserves.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/labels/search.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/members/moremember-print.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/members/readingrec.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/reserve/request.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/serials/checkexpiration.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/suggestion/suggestion.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/tags/review.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/tools/cleanborrowers.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/tools/holidays.tmpl
koha-tmpl/intranet-tmpl/prog/en/modules/tools/koha-news.tmpl
koha-tmpl/intranet-tmpl/prog/en/xslt/MARC21slim2intranetDetail.xsl
koha-tmpl/opac-tmpl/prog/en/lib/calendar/calendar.js
koha-tmpl/opac-tmpl/prog/en/modules/errors/400.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/errors/401.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/errors/402.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/errors/403.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/errors/404.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/errors/500.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/ilsdi.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/kohaerror.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-ISBDdetail.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-MARCdetail.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-account.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-addbybiblionumber.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-alert-subscribe.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-auth.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-authorities-home.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiesdetail.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-authoritiessearchresultlist.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-basket.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-browser.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-detail.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadcart.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-downloadshelf.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-full-serial-issues.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-messaging.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-passwd.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-privacy.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-readingrecord.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-reserve.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-results-grouped.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-results.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-review.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-search-history.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-sendbasketform.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-sendshelfform.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-serial-issues.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-shelves.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-showreviews.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-suggestions.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-tags.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-tags_subject.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-topissues.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-user.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-userdetails.tmpl
koha-tmpl/opac-tmpl/prog/en/modules/opac-userupdate.tmpl
kohaversion.pl
members/members-home.pl
members/readingrec.pl
misc/cronjobs/overdue_notices.pl
misc/translator/LangInstaller.pm
tools/export.pl

diff --git a/-- b/--
new file mode 100644 (file)
index 0000000..e69de29
index e5808b0..9315e55 100644 (file)
@@ -719,8 +719,8 @@ sub DelAuthority {
     my $dbh=C4::Context->dbh;
 
     ModZebra($authid,"recordDelete","authorityserver",GetAuthority($authid),undef);
-    $dbh->do("delete from auth_header where authid=$authid") ;
-
+    my $sth = prepare("DELETE FROM auth_header WHERE authid=?");
+    $sth->execute($authid);
 }
 
 sub ModAuthority {
index b3b4b72..712bd85 100644 (file)
@@ -33,6 +33,7 @@ BEGIN {
     require Exporter;
     @ISA    = qw(Exporter);
     @EXPORT = qw(
+        NormalizeString
         IsStringUTF8ish
         MarcToUTF8Record
         SetUTF8Flag
@@ -148,27 +149,28 @@ sub SetUTF8Flag{
 
 =head2 NormalizeString
 
-    my $normalized_string=NormalizeString($string);
+    my $normalized_string=NormalizeString($string,$nfd,$transform);
 
 Given a string
-
-nfc : If you want to set NFC and not NFD
+nfd : If you want to set NFD and not NFC
 transform : If you expect all the signs to be removed
+
 Sets the PERL UTF8 Flag on your initial data if need be
-and applies cleaning if required 
+and applies cleaning if required
 
-Returns a utf8 NFD normalized string
+Returns a utf8 NFC normalized string
 
 Sample code :
-    my $string=NormalizeString ("l'ornithoptère");
-    #results into ornithoptère in NFD form and sets UTF8 Flag
+   my $string=NormalizeString ("l'ornithoptère");
+   #results into ornithoptère in NFC form and sets UTF8 Flag
 
 =cut
 
+
 sub NormalizeString{
-       my ($string,$nfc,$transform)=@_;
+       my ($string,$nfd,$transform)=@_;
        utf8::decode($string) unless (utf8::is_utf8($string));
-       if ($nfc){
+       if ($nfd){
                $string= NFD($string);
        }
        else {
index ded0a5d..8fd25fd 100644 (file)
@@ -306,7 +306,7 @@ sub get_label_summary {
     my %params = @_;
     my $label_number = 0;
     my @label_summaries = ();
-    my $query = "     SELECT b.title, b.author, bi.itemtype, i.barcode, i.biblionumber
+    my $query = "     SELECT b.title, b.author, bi.itemtype, i.barcode, i.biblionumber, i.itype
                       FROM creator_batches AS c LEFT JOIN items AS i ON (c.item_number=i.itemnumber)
                       LEFT JOIN biblioitems AS bi ON (i.biblioitemnumber=bi.biblioitemnumber)
                       LEFT JOIN biblio AS b ON (bi.biblionumber=b.biblionumber)
@@ -329,7 +329,7 @@ sub get_label_summary {
         # should not know that it's part of a web app
         $record->{'title'} = '<a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=' . $record->{'biblionumber'} . '"> ' . $record->{'title'} . '</a>';
         $label_summary->{'_summary'} = $record->{'title'} . " | " . ($record->{'author'} ? $record->{'author'} : 'N/A');
-        $label_summary->{'_item_type'} = $record->{'itemtype'};
+        $label_summary->{'_item_type'} = C4::Context->preference("item-level_itypes") ? $record->{'itype'} : $record->{'itemtype'};
         $label_summary->{'_barcode'} = $record->{'barcode'};
         $label_summary->{'_item_number'} = $item->{'item_number'};
         $label_summary->{'_label_id'} = $item->{'label_id'};
index 22b2048..bd1c22f 100644 (file)
@@ -132,7 +132,7 @@ sub set_form_values {
             } ( 0..30 ); # FIXME: 30 is a magic number.
         }
         foreach my $transport ( @{$pref->{'transports'}} ) {
-            $option->{'transport-'.$transport} = 'checked="checked"';
+            $option->{'transport_'.$transport} = 'checked="checked"';
         }
         $option->{'digest'} = 'checked="checked"' if $pref->{'wants_digest'};
     }
index 0ea8b86..05df0c5 100644 (file)
@@ -442,18 +442,6 @@ sub ModItemFromMarc {
     }
     my $unlinked_item_subfields = _get_unlinked_item_subfields( $localitemmarc, $frameworkcode );
 
-    my $dbh = C4::Context->dbh;
-    my $frameworkcode = GetFrameworkCode( $biblionumber );
-       my ($itemtag,$itemsubfield)=GetMarcFromKohaField("items.itemnumber",$frameworkcode);
-       
-       my $localitemmarc=MARC::Record->new;
-       $localitemmarc->append_fields($item_marc->field($itemtag));
-    my $item = &TransformMarcToKoha( $dbh, $localitemmarc, $frameworkcode, 'items');
-    foreach my $item_field (keys %default_values_for_mod_from_marc) {
-        $item->{$item_field} = $default_values_for_mod_from_marc{$item_field} unless exists $item->{$item_field};
-    }
-    my $unlinked_item_subfields = _get_unlinked_item_subfields($localitemmarc, $frameworkcode);
-   
     return ModItem($item, $biblionumber, $itemnumber, $dbh, $frameworkcode, $unlinked_item_subfields); 
 }
 
index bc0f81b..2b39f11 100644 (file)
@@ -213,7 +213,7 @@ END_SQL
         $choices->{ $row->{'message_name'} }->{'message_name'}         = $row->{'message_name'};
         $choices->{ $row->{'message_name'} }->{'takes_days'}           = $row->{'takes_days'};
         $choices->{ $row->{'message_name'} }->{'has_digest'}           = 1 if $row->{'is_digest'};
-        $choices->{ $row->{'message_name'} }->{'transport-' . $row->{'message_transport_type'}} = ' ';
+        $choices->{ $row->{'message_name'} }->{'transport_' . $row->{'message_transport_type'}} = ' ';
     }
 
     my @return = values %$choices;
index 032ca93..adba979 100644 (file)
@@ -1176,12 +1176,14 @@ sub GetOverduesForBranch {
             borrowers.phone,
             borrowers.email,
                biblio.title,
+               biblio.author,
                biblio.biblionumber,
                issues.date_due,
                issues.returndate,
                issues.branchcode,
              branches.branchname,
                 items.barcode,
+                items.homebranch,
                 items.itemcallnumber,
                 items.location,
                 items.itemnumber,
index 5e2fa22..da0f4bd 100644 (file)
@@ -125,10 +125,11 @@ sub GetLateIssues {
             LEFT JOIN  biblio ON biblio.biblionumber = subscription.biblionumber
             LEFT JOIN  aqbooksellers ON subscription.aqbooksellerid = aqbooksellers.id
             WHERE      ((planneddate < now() AND serial.STATUS =1) OR serial.STATUS = 3)
-            AND        subscription.aqbooksellerid=$supplierid
+            AND        subscription.aqbooksellerid=?
             ORDER BY   title
         |;
         $sth = $dbh->prepare($query);
+        $sth->execute($supplierid);
     } else {
         my $query = qq|
             SELECT     name,title,planneddate,serialseq,serial.subscriptionid
@@ -140,8 +141,8 @@ sub GetLateIssues {
             ORDER BY   title
         |;
         $sth = $dbh->prepare($query);
+        $sth->execute;
     }
-    $sth->execute;
     my @issuelist;
     my $last_title;
     my $odd   = 0;
index 7844330..f1c5293 100644 (file)
@@ -129,9 +129,9 @@ sub XSLTParse4Display {
     my $xmlrecord = $record->as_xml(C4::Context->preference('marcflavour'));
     my $sysxml = "<sysprefs>\n";
     foreach my $syspref ( qw/OPACURLOpenInNewWindow DisplayOPACiconsXSLT URLLinkText viewISBD OPACBaseURL/ ) {
-        $sysxml .= "<syspref name=\"$syspref\">" .
-                   C4::Context->preference( $syspref ) .
-                   "</syspref>\n";
+        my $sp = C4::Context->preference( $syspref );
+        next unless defined($sp);
+        $sysxml .= "<syspref name=\"$syspref\">$sp</syspref>\n";
     }
     $sysxml .= "</sysprefs>\n";
     $xmlrecord =~ s/\<\/record\>/$itemsxml$sysxml\<\/record\>/;
index 84fc81e..6af057d 100755 (executable)
@@ -134,7 +134,14 @@ if ( $ordernumber eq '' and defined $params->{'breedingid'}){
 
     my $duplicatetitle;
 #look for duplicates
-    if (! (($biblionumber,$duplicatetitle) = FindDuplicate($marcrecord))){
+    ($biblionumber,$duplicatetitle) = FindDuplicate($marcrecord);
+    if($biblionumber && !$input->param('use_external_source')) {
+       #if duplicate record found and user did not decide yet, first warn user
+       #and let him choose between using new record or existing record
+       Load_Duplicate($duplicatetitle);
+       exit;
+    }
+    #from this point: add a new record
         if (C4::Context->preference("BiblioAddsAuthorities")){
             my ($countlinked,$countcreated)=BiblioAddAuthorities($marcrecord, $params->{'frameworkcode'});
         }
@@ -163,7 +170,6 @@ if ( $ordernumber eq '' and defined $params->{'breedingid'}){
             }
         }
         SetImportRecordStatus($params->{'breedingid'}, 'imported');
-    }
 }
 
 
@@ -471,3 +477,26 @@ sub MARCfindbreeding {
     return -1;
 }
 
+sub Load_Duplicate {
+  my ($duplicatetitle)= @_;
+  ($template, $loggedinuser, $cookie) = get_template_and_user(
+    {
+        template_name   => "acqui/neworderempty_duplicate.tmpl",
+        query           => $input,
+        type            => "intranet",
+        authnotrequired => 0,
+        flagsrequired   => { acquisition => 'order_manage' },
+#        debug           => 1,
+    }
+  );
+
+  $template->param(
+    biblionumber        => $biblionumber,
+    basketno            => $basketno,
+    booksellerid        => $basket->{'booksellerid'},
+    breedingid          => $params->{'breedingid'},
+    duplicatetitle      => $duplicatetitle,
+  );
+
+  output_html_with_http_headers $input, $cookie, $template->output;
+}
index 27c48e9..9c55df3 100755 (executable)
@@ -188,9 +188,10 @@ if ($op eq 'add_form') {
 # called by delete_confirm, used to effectively confirm deletion of data in DB
 } elsif ($op eq 'delete_confirmed') {
        unless (C4::Context->config('demo') eq 1) {
-               $dbh->do("delete from auth_tag_structure where tagfield='$searchfield' and authtypecode='$authtypecode'");
-               $dbh->do("delete from auth_subfield_structure where tagfield='$searchfield' and authtypecode='$authtypecode'");
-        # FIXME: Secuity vulnerability -- use placeholders, prepare and execute!
+               my $sth = $dbh->prepare("delete from auth_tag_structure where tagfield=? and authtypecode=?");
+               $sth->execute($searchfield,$authtypecode);
+               my $sth = $dbh->prepare("delete from auth_subfield_structure where tagfield=? and authtypecode=?");
+               $sth->execute($searchfield,$authtypecode);
        }
     print "Content-Type: text/html\n\n<META HTTP-EQUIV=Refresh CONTENT=\"0; URL=auth_tag_structure.pl?searchfield=".$input->param('tagfield')."&authtypecode=$authtypecode\">";
     exit;
index edf02a5..e4eae84 100755 (executable)
@@ -147,9 +147,6 @@ if ( $op eq "do_search" ) {
 
 }
 elsif ( $op eq "delete" ) {
-
-    &DelAuthority( $authid, 1 );
-
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
         {
             template_name   => "authorities/authorities-home.tmpl",
@@ -160,7 +157,7 @@ elsif ( $op eq "delete" ) {
             debug           => 1,
         }
     );
-
+    &DelAuthority( $authid, 1 );
 }
 else {
     ( $template, $loggedinuser, $cookie ) = get_template_and_user(
index 2dc7b1d..d73c5d9 100755 (executable)
@@ -227,7 +227,7 @@ for ( my $tabloop = 0 ; $tabloop <= 10 ; $tabloop++ ) {
             undef @subfields_data;
         }
     }
-    $template->param( $tabloop . "XX" => \@loop_data );
+    $template->param( "tab" . $tabloop . "XX" => \@loop_data );
 }
 
 # now, build item tab !
index d790c41..4f40b04 100755 (executable)
@@ -87,7 +87,7 @@ my $itemnumber;
 foreach my $item (@items){
     $item->{itemlostloop}= GetAuthorisedValues(GetAuthValCode('items.itemlost',$fw),$item->{itemlost}) if GetAuthValCode('items.itemlost',$fw);
     $item->{itemdamagedloop}= GetAuthorisedValues(GetAuthValCode('items.damaged',$fw),$item->{damaged}) if GetAuthValCode('items.damaged',$fw);
-    $item->{'collection'}              = $ccodes->{ $item->{ccode} };
+    $item->{'collection'}              = $ccodes->{ $item->{ccode} } if ($ccodes);
     $item->{'itype'}                   = $itemtypes->{ $item->{'itype'} }->{'description'};
     $item->{'replacementprice'}        = sprintf( "%.2f", $item->{'replacementprice'} );
     $item->{'datelastborrowed'}        = format_date( $item->{'datelastborrowed'} );
index d0011ba..d316833 100755 (executable)
@@ -79,6 +79,7 @@ my $results = $stylesheet->transform($source);
 my $newxmlrecord = $stylesheet->output_string($results);
 #warn $newxmlrecord;
 print "Content-type: text/html\n\n";
+utf8::encode($newxmlrecord);
 print $newxmlrecord;
 
 } else {
index f416cc7..da58166 100755 (executable)
@@ -2,6 +2,7 @@
 
 
 # Copyright 2000-2002 Katipo Communications
+# Copyright 2004-2010 BibLibre
 #
 # This file is part of Koha.
 #
@@ -932,8 +933,7 @@ if ( $op eq "addbiblio" ) {
         else {
             ( $biblionumber, $oldbibitemnum ) = AddBiblio( $record, $frameworkcode );
         }
-
-        if (($mode ne "popup" && !$is_a_modif) || $redirect eq "items"){
+        if ($mode ne "popup" && !$is_a_modif && $redirect eq "items"){
             print $input->redirect(
                 "/cgi-bin/koha/cataloguing/additem.pl?biblionumber=$biblionumber&frameworkcode=$frameworkcode"
             );
index c6f9daf..c5dd7d9 100755 (executable)
@@ -2,6 +2,7 @@
 
 
 # Copyright 2000-2002 Katipo Communications
+# Copyright 2004-2010 BibLibre
 #
 # This file is part of Koha.
 #
@@ -611,6 +612,7 @@ foreach my $tag ( keys %{$tagslib}){
         } 
   }
 }
+@loop_data = sort {$a->{subfield} cmp $b->{subfield} } @loop_data;
 
 # what's the next op ? it's what we are not in : an add if we're editing, otherwise, and edit.
 $template->param( title => $record->title() ) if ($record ne "-1");
index e0ab551..24414cc 100755 (executable)
@@ -48,7 +48,7 @@ my ($template, $loggedinuser, $cookie)
                  query => $query,
                  type => "intranet",
                  authnotrequired => 0,
-                 flagsrequired => {editcatalogue => 'edit_catalogue'},
+        flagsrequired   => { editcatalogue => 'edit_items' },
                  debug => 1,
                  });
 
index 905af94..5c1dcaf 100755 (executable)
@@ -27,6 +27,7 @@ use C4::Overdues;    # AddNotifyLine
 use C4::Biblio;
 use C4::Koha;
 use C4::Debug;
+use C4::Branch;
 
 =head1 branchoverdues.pl
 
@@ -103,21 +104,27 @@ my ($tag,$subfield) = GetMarcFromKohaField('items.location','');
 my $tagslib = &GetMarcStructure(1,'');
 if ($tagslib->{$tag}->{$subfield}->{authorised_value}) {
     my $values= GetAuthorisedValues($tagslib->{$tag}->{$subfield}->{authorised_value});
+    for (@$values) { $_->{selected} = 1 if $location eq $_->{authorised_value} }
     $template->param(locationsloop => $values);
 }
 # now display infos
 foreach my $num (@getoverdues) {
-
     my %overdueforbranch;
+    my $record = GetMarcBiblio($num->{biblionumber});
+    if ($record){
+        $overdueforbranch{'subtitle'} = GetRecordValue('subtitle',$record,'')->[0]->{subfield};
+    }
     $overdueforbranch{'date_due'}          = format_date( $num->{'date_due'} );
     $overdueforbranch{'title'}             = $num->{'title'};
     $overdueforbranch{'description'}       = $num->{'description'};
     $overdueforbranch{'barcode'}           = $num->{'barcode'};
     $overdueforbranch{'biblionumber'}      = $num->{'biblionumber'};
+    $overdueforbranch{'author'}            = $num->{'author'};
     $overdueforbranch{'borrowersurname'}   = $num->{'surname'};
     $overdueforbranch{'borrowerfirstname'} = $num->{'firstname'};
     $overdueforbranch{'borrowerphone'}     = $num->{'phone'};
     $overdueforbranch{'borroweremail'}     = $num->{'email'};
+    $overdueforbranch{'homebranch'}        = GetBranchName($num->{'homebranch'});
     $overdueforbranch{'itemcallnumber'}    = $num->{'itemcallnumber'};
     $overdueforbranch{'borrowernumber'}    = $num->{'borrowernumber'};
     $overdueforbranch{'itemnumber'}        = $num->{'itemnumber'};
index 2aac76a..c05277c 100755 (executable)
@@ -241,6 +241,13 @@ if ($barcode) {
         $input{duedate}        = $duedate;
         $input{return_overdue} = 1 if ($duedate and $duedate lt $today->output('iso'));
         push( @inputloop, \%input );
+
+        my ( $od, $issue, $fines ) = GetMemberIssuesAndFines( $borrower->{'borrowernumber'} );
+        if ($fines) {
+            $template->param( fines => sprintf("%.2f",$fines) );
+            $template->param( fineborrowernumber => $borrower->{'borrowernumber'} );
+        }
+
     }
     elsif ( !$messages->{'BadBarcode'} ) {
         $input{duedate}   = 0;
index e924bcf..0183f19 100755 (executable)
@@ -155,7 +155,8 @@ $template->param(
     overloop    => \@overloop,
     overcount   => $overcount,
     show_date   => format_date(C4::Dates->today('iso')),
-       dateformat  => C4::Context->preference("dateformat"),
+    dateformat  => C4::Context->preference("dateformat"),
+    ReservesMaxPickUpDelay => C4::Context->preference('ReservesMaxPickUpDelay')
 );
 
 output_html_with_http_headers $input, $cookie, $template->output;
index f3866d5..1affa37 100644 (file)
@@ -400,7 +400,7 @@ January 16 2009      Daniel Sweeney becomes the 75th committer to Koha      developer
 January 24 2009         KUDOS (Koha Users and Developers of Open Source) for those using the software, Meeting at ALA
 January 24 2009         KOHA Interest Group Meeting at ALA
 February 5 2009         Koha 3.0.1 beta released
-February 6 2009         J. David Bavousett becomes the 76th committer to Koha  developer
+February 6 2009         D Ruth Bavousett becomes the 76th committer to Koha    developer
 February 10 2009        Andrew Elwell becomes the 77th committer to Koha       developer
 February 13 2009        K's Helping Hand launched http://krishnanm.com/khh
 February 13-14 2009     Prashant Kulkarni and Krishnan Mani present Koha at Gnunify 09
index 7d40310..5baa5b2 100644 (file)
@@ -15,8 +15,8 @@ melm 001 Local-Number
 melm 942$a authtype:w,authtype:p
 
 # Personal Name
-melm 100 Personal-name:w,Personal-name:p,Personal-name:s,Heading:w,Heading:p,Heading:s
 melm 100$a Personal-name-heading:w,Personal-name-heading:p,Personal-name-heading:s,Personal-name:w,Personal-name:p,Heading:w,Heading:p,Heading:s,Heading-Main:w,Heading-Main:p,Heading-Main:s
+melm 100 Personal-name:w,Personal-name:p,Personal-name:s,Heading:w,Heading:p,Heading:s
 melm 400 Personal-name-see-from:w,Personal-name-see-from:p,Personal-name-see-from:s,See-from:w,See-from:p,See-from:s
 melm 500 Personal-name-see-also-from:w,Personal-name-see-also-from:p,Personal-name-see-also-from:s,See-also-from:w,See-also-from:p,See-also-from:s
 
index c43cad1..85eaedd 100755 (executable)
@@ -122,23 +122,23 @@ melm 400$a      Name-and-title
 melm 400$t      Author-title,Name-and-title,Title,Title-series
 melm 400$9      Koha-Auth-Number
 melm 400        Author,Author-name-personal,Name,Personal-name
-melm 410        Author,Corporate-name
 melm 410$a      Name-and-title
 melm 410$t      Author-title,Title,Title-series
 melm 410$9      Koha-Auth-Number
-melm 410        Author-name-corporate,Name
-melm 411        Author,Conference-name
+melm 410        Author,Corporate-name
+#melm 410        Author-name-corporate,Name
 melm 411$a      Name-and-title
 #melm 411$t     title,author,Author-title,Title-series
 melm 411$t      Author-title,Title-series
+melm 411        Author,Conference-name
 #melm 411       author,Author-name-corporate,Name
-melm 411        Author-name-corporate,Name
+#melm 411        Author-name-corporate,Name
 melm 440$a      Title-series:w,Title-series:p
 melm 440$9      Koha-Auth-Number
 melm 440        Title-series:w,Title-series:p,Title,Title-series
 melm 490$a      Title-series:w,Title-series:p
-melm 490        Title,Title-series
 melm 490$9      Koha-Auth-Number
+melm 490        Title,Title-series
 
 melm 500        Note:w,Note:p
 melm 502        Material-type
@@ -163,11 +163,10 @@ melm 610$a      Name-and-title
 melm 610$t      Name-and-title,Title
 melm 610$9      Koha-Auth-Number
 melm 610        Name,Subject,Corporate-name
-melm 611        Conference-name
 melm 611$a      Name-and-title
 melm 611$t      Name-and-title,Title
 melm 611$9      Koha-Auth-Number
-melm 611        Name,Subject
+melm 611        Conference-name,Name,Subject
 melm 630$n      Thematic-number
 melm 630$r      Music-key
 melm 630$9      Koha-Auth-Number
@@ -201,14 +200,12 @@ melm 700$r      Music-key
 #melm 700$t     author,Author-title,Name-and-title,Title,Title-uniform
 melm 700$t      Author-title,Name-and-title,Title,Title-uniform
 melm 700        Author,Author-name-corporate,Author-name-personal,Name,Editor,Personal-name
-melm 710        Author,Corporate-name
 #melm 710$t     author,Author-title,Name-and-title,Title,Title-uniform
 melm 710$t      Author-title,Name-and-title,Title,Title-uniform
 #melm 710$a     author,author:p,Name-and-title
 melm 710$a      Name-and-title
 melm 710$9      Koha-Auth-Number    
-#melm 710       author,Name
-melm 710        Author,Name
+melm 710        Author,Corporate-name,Name
 melm 711$a      Name-and-title
 #melm 711$t     author,Author-title,Title,Title-uniform
 melm 711$t      Author-title,Title,Title-uniform
@@ -220,6 +217,9 @@ melm 730$r      Music-key
 melm 730$9      Koha-Auth-Number
 melm 730        Title,Title-uniform
 melm 740        Title,Title-other-variant
+melm 751$a      Name-geographic
+melm 751$9      Koha-Auth-Number
+melm 751        Name-geographic
 melm 770$w      Record-control-number
 melm 772$w      Record-control-number
 melm 773$t      Host-item
@@ -231,16 +231,16 @@ melm 777$w      Record-control-number
 melm 780$t      Title
 melm 780$w      Record-control-number
 melm 780        Title,Title-former,Related-periodical
-melm 785        Related-periodical
 melm 785$w      Record-control-number
+melm 785        Related-periodical
 melm 787$w      Record-control-number
 
 melm 800$a      Name-and-title
 #melm 800$t     author,Author-title,Name-and-title,Title,Title-series
 melm 800$t      Author-title,Name-and-title,Title,Title-series
 melm 800$9      Koha-Auth-Number
-melm 800        Author,Author-name-personal,Name,Personal-name
 melm 800$w      Record-control-number
+melm 800        Author,Author-name-personal,Name,Personal-name
 melm 810$a      Name-and-title
 melm 810$t      Author-title,Name-and-title,Title,Title-series
 melm 810$w      Record-control-number
index 0f3d9c5..888a17a 100644 (file)
@@ -1,2 +1,2 @@
 SET NAMES utf8;
-INSERT INTO `opac_news` VALUES (1,'Bienvenue dans Koha !','Bienvenue dans Koha 3, la toute nouvelle version du système intégré de gestion de bibliothèque (SIGB) open source de référence. Développé initialement en Nouvelle Zélande et déployé pour la première fois en janvier 2000, Koha est un projet international soutenu par des sociétés de services en logiciels libres et par des bibliothécaires du monde entier.','koha','2008-01-14 03:25:58','2099-01-10',1),(2,'Et maintenant ?','Félicitations ! vous avez désormais une version opérationnelle de Koha. Et maintenant, que faire ?\r\n<ul>\r\n<li><a href=\"http://koha-community.org/documentation/\">lisez la documentation de Koha ;</a></li>\r\n<li><a href=\"http://wiki.koha-community.org\">lisez et participez au Wiki de Koha ;</a></li>\r\n<li><a href=\"http://koha-community.org/support/\">abonnez-vous aux listes de discussion ;</a></li>\r\n<li><a href=\"http://bugs.koha-community.org\">signalez des bugs ;</a></li>\r\n<li><a href=\"http://wiki.koha-community.org/wiki/Version_Control_Using_Git\">proposez des correctifs et des  améliorations ;</a></li>\r\n<li><a href=\"http://koha-community.org/support/\">discutez avec les utilisateurs et les développeurs de Koha.</a></li>\r\n</ul>\r\n','koha','2008-01-14 03:34:45','2099-01-10',2);
+INSERT INTO `opac_news` VALUES (1,'Bienvenue dans Koha !','Bienvenue dans Koha 3, la toute nouvelle version du système intégré de gestion de bibliothèque (SIGB) open source de référence. Développé initialement en Nouvelle Zélande et déployé pour la première fois en janvier 2000, Koha est un projet international soutenu par des sociétés de services en logiciels libres et par des bibliothécaires du monde entier.','koha','2008-01-14 03:25:58','2099-01-10',1),(2,'Et maintenant ?','Félicitations ! vous avez désormais une version opérationnelle de Koha. Et maintenant, que faire ?\r\n<ul>\r\n<li><a href=\"http://koha-community.org/documentation/\">lisez la documentation de Koha ;</a></li>\r\n<li><a href=\"http://wiki.koha-community.org\">lisez et participez au Wiki de Koha ;</a></li>\r\n<li><a href=\"http://koha-community.org/support/\">abonnez-vous aux listes de discussion ;</a></li>\r\n<li><a href=\"http://bugs.koha-community.org\">signalez des bugs ;</a></li>\r\n<li><a href=\"http://wiki.koha-community.org/doku.php?id=en:development:git_usage\">proposez des correctifs et des  améliorations ;</a></li>\r\n<li><a href=\"http://koha-community.org/support/\">discutez avec les utilisateurs et les développeurs de Koha.</a></li>\r\n</ul>\r\n','koha','2008-01-14 03:34:45','2099-01-10',2);
index 1a44092..31aa998 100755 (executable)
@@ -3987,15 +3987,15 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     SetVersion ($DBversion);
 }
 
-$DBversion = '3.03.00.XXX';
+$DBversion = '3.03.00.018';
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     $dbh->do( q|update language_descriptions set description = 'Nederlands' where lang = 'nl' and subtag = 'nl'|);
     $dbh->do( q|update language_descriptions set description = 'Dansk' where lang = 'da' and subtag = 'da'|);
-    print "Upgrade to $DBversion done (Correct lnaguage descriptions)\n";
+    print "Upgrade to $DBversion done (Correct language descriptions)\n";
     SetVersion ($DBversion);
 }
 
-$DBversion = '3.03.00.XXX';
+$DBversion = '3.03.00.019';
 if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
     # Fix bokmÃ¥l
     $dbh->do("UPDATE language_subtag_registry SET description = 'Norwegian bokm&#229;l' WHERE subtag = 'nb';");
index 88b8782..5ed2c64 100644 (file)
@@ -20,7 +20,7 @@ a:hover {
 }
 
 body   {
-       background: #f9fcfe;
+       background: #f5f5f5;
 }
 
 form, label input {
@@ -52,13 +52,29 @@ label {
 }
 
 #login #login_error {
-       background: #c00;
+       background: #D23F3F;
        border: 1px solid #a40000;
        color: #fff;
-       font-size: 16px;
+       font-size: 120%;
+       line-height: 140%;
        font-weight: bold;
+       margin: 1em 0;
        padding: .5em;
        text-align: center;
+       text-shadow: 0px 1px 1px #6C1010;
+       filter: dropshadow(color=#6C1010, offx=0, offy=1);
+       -moz-border-radius: 5px;
+       border-radius: 5px;
+}
+
+#login #login_error a:link,
+#login #login_error a:visited {
+       color : #FFC;
+}
+
+#login #login_error a:hover,
+#login #login_error a:active {
+       color : #FCFC4D;
 }
 
 #login h1 {
index b6d439d..66b092c 100644 (file)
@@ -237,11 +237,11 @@ table {
        border-right : 1px solid #BCBCBC;
 }
 
-table.invis{
-       border : white;
-}
-table.invis tr,table.invis td {
-       border : white;
+table.invis,
+table.invis tr,
+table.invis td,
+tr.highlight table.invis td {
+       border : none;
 }
 
 td, th {
@@ -304,7 +304,7 @@ tr.onissue td {
        background-color: #FFFFCC;
 }
 
-tr.highlight.onissue td {
+tr.odd.onissue td {
        background-color: #FFFFE1;
 }
 
@@ -1119,6 +1119,10 @@ div.first fieldset {
        margin : .4em;
        padding : .4em .4em .4em 25px;
  }
+
+ .dialog input[type="submit"] {
+       background : #FFF none;
+ }
  
 .dialog input.approve, td input.approve {
        background : #FFF url(../../img/approve.gif) no-repeat 4px center;
index 5d05b94..df1acbf 100644 (file)
@@ -14,7 +14,7 @@
                                 ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                                 button : "newduedate_button",
                                 disableFunc : validate1,
-                                dateStatusFunc : validate1,
+                                dateStatusFunc : validate1
                               }
                            );
                        //]]>
@@ -22,4 +22,4 @@
                        <p><label>Forgive fines on return: <input type="checkbox" name="exemptfine" value="1" /></label></p>
                </td>
        </tr>
-</tfoot>
\ No newline at end of file
+</tfoot>
index a7c1ab8..ea556c4 100644 (file)
@@ -64,7 +64,7 @@
             <span class="loggedinusername">
                 <!-- TMPL_VAR NAME="loggedinusername" -->
             </span>
-            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Log Out</a>) |
+            (<a href="/cgi-bin/koha/mainpage.pl?logout.x=1"<!-- TMPL_IF NAME="intranetbookbag" --> onclick="delBasket(true);"<!-- /TMPL_IF -->>Log Out</a>) |
         <!-- TMPL_ELSE -->
             You are not logged in |
         <!-- /TMPL_IF -->
index 513d415..6f796d1 100644 (file)
@@ -7,9 +7,9 @@
        <!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="intranetreadinghistory" --><!-- TMPL_IF NAME="readingrecordview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/members/readingrec.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Circulation History</a></li><!-- /TMPL_IF -->
        <!-- TMPL_IF NAME="CAN_user_parameters"--><!-- TMPL_IF NAME="logview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/tools/viewlog.pl?do_it=1&amp;modules=MEMBERS&amp;action=MODIFY&amp;object=<!-- TMPL_VAR NAME="borrowernumber" -->">Modification Log</a></li><!-- /TMPL_IF -->
-<!-- TMPL_IF NAME="EnhancedMessagingPreferences" -->
-          <!-- TMPL_IF NAME="messagingview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/members/messaging.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Messaging</a></li>
-        <!-- /TMPL_IF -->
-</ul>
-</div>
+    <!-- TMPL_IF NAME="EnhancedMessagingPreferences" -->
+    <!-- TMPL_IF NAME="messagingview" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/members/messaging.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Messaging</a></li>
+    <!-- /TMPL_IF -->
+       <!-- TMPL_IF NAME="sentnotices" --><li class="active"><!-- TMPL_ELSE --><li><!-- /TMPL_IF --><a href="/cgi-bin/koha/members/notices.pl?borrowernumber=<!-- TMPL_VAR NAME="borrowernumber" -->">Notices</a></li>
+</ul></div>
 <!-- /TMPL_IF -->
index 0ab6711..9946cf7 100644 (file)
@@ -299,10 +299,10 @@ function delRecord (n, s) {
 }
 
 
-function delBasket() {
-
-    var rep = false;
-    rep = confirm(MSG_CONFIRM_DEL_BASKET);
+function delBasket(rep) {
+    if (rep == undefined){
+        rep = confirm(MSG_CONFIRM_DEL_BASKET);
+    }
     if (rep) {
         delCookie(nameCookie);
         document.location = "about:blank";
index 028ad4a..bac31ab 100644 (file)
@@ -1200,7 +1200,7 @@ Calendar.prototype.callCloseHandler = function () {
        if (this.onClose) {
                this.onClose(this);
        }
-       this.hideShowCovered();
+       // this.hideShowCovered();
 };
 
 /** Removes the calendar object from the DOM tree and destroys it. */
@@ -1258,7 +1258,7 @@ Calendar.prototype.show = function () {
                Calendar.addEvent(document, "keypress", Calendar._keyEvent);
                Calendar.addEvent(document, "mousedown", Calendar._checkCalendar);
        }
-       this.hideShowCovered();
+       // this.hideShowCovered();
 };
 
 /**
@@ -1273,7 +1273,7 @@ Calendar.prototype.hide = function () {
        }
        this.element.style.display = "none";
        this.hidden = true;
-       this.hideShowCovered();
+       // this.hideShowCovered();
 };
 
 /**
@@ -1463,7 +1463,7 @@ Calendar.prototype.parseDate = function (str, fmt) {
        }
 };
 
-Calendar.prototype.hideShowCovered = function () {
+/* Calendar.prototype.hideShowCovered = function () {
        var self = this;
        Calendar.continuation_for_the_fucking_khtml_browser = function() {
                function getVisib(obj){
@@ -1523,7 +1523,7 @@ Calendar.prototype.hideShowCovered = function () {
                setTimeout("Calendar.continuation_for_the_fucking_khtml_browser()", 10);
        else
                Calendar.continuation_for_the_fucking_khtml_browser();
-};
+}; */
 
 /** Internal function; it displays the bar with the names of the weekday. */
 Calendar.prototype._displayWeekdays = function () {
index 6cc1c30..c7f8b4d 100644 (file)
                 <li>Al Banks</li>
                 <li>Daniel Banzli</li>
                 <li>Benedykt P. Barszcz (Polish for 2.0)</li>
-                <li>J. David Bavousett</li>
+                <li>D Ruth Bavousett</li>
                 <li>John Beppu</li>
                 <li>David Birmingham</li>
                 <li>Florian Bischof</li>
diff --git a/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tmpl b/koha-tmpl/intranet-tmpl/prog/en/modules/acqui/neworderempty_duplicate.tmpl
new file mode 100644 (file)
index 0000000..c85f40f
--- /dev/null
@@ -0,0 +1,43 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
+<title>Koha &rsaquo; Acquisitions &rsaquo; Basket <!-- TMPL_VAR NAME="basketno" --> &rsaquo; Duplicate warning</title>
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+
+<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/js/acq.js"></script>
+<script type="text/javascript" src="<!-- TMPL_VAR NAME='themelang' -->/js/additem.js"></script>
+<script type="text/javascript">
+</script>
+</head>
+<body>
+
+<!-- TMPL_INCLUDE NAME="header.inc" -->
+<!-- TMPL_INCLUDE NAME="acquisitions-search.inc" -->
+
+<div id="breadcrumbs"><a href="/cgi-bin/koha/mainpage.pl">Home</a> &rsaquo; <a href="/cgi-bin/koha/acqui/acqui-home.pl">Acquisitions</a> &rsaquo; <a href="/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->">Basket <!-- TMPL_VAR NAME="basketno" --></a> &rsaquo; Duplicate warning</div>
+
+<div id="doc3" class="yui-t2">
+
+<div id="bd">
+    <div id="yui-main">
+    <div class="yui-b">
+
+<h2>Duplicate warning</h2>
+
+<p>You selected a record from an external source that matches an existing record in your catalog!</p>
+<p>Click Use Existing if you do not want to create a duplicate record, but you want to add an order from the existing record in your catalog. Click Create New if you still want to create a new record by importing the external (duplicate) record. Click Cancel to return to the basket without making a new order.</p>
+<p>The existing catalog record can be viewed in a new window by clicking <a target="_blank" href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR NAME="duplicatetitle" --></a>
+
+<form action="/cgi-bin/koha/acqui/addorder.pl" method="post" id="Aform">
+    <fieldset class="action">
+        <input type="button" value="Use Existing" onclick="window.location='/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->'" />
+        <input type="button" value="Create New" onclick="window.location='/cgi-bin/koha/acqui/neworderempty.pl?booksellerid=<!-- TMPL_VAR NAME="booksellerid" -->&basketno=<!-- TMPL_VAR NAME="basketno" -->&breedingid=<!-- TMPL_VAR NAME="breedingid" -->&use_external_source=1'" />
+        <input type="button" value="Cancel" onclick="window.location='/cgi-bin/koha/acqui/basket.pl?basketno=<!-- TMPL_VAR NAME="basketno" -->'" />
+    </fieldset>
+</form>
+
+</div>
+</div>
+<div class="yui-b">
+<!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
+</div>
+</div>
+<!-- TMPL_INCLUDE NAME="intranet-bottom.inc" -->
index 523fd13..ff336a9 100644 (file)
         inputField     :    "budget_period_enddate",
         ifFormat         :    "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
         button         :    "openCalendarTo",
-        align          :    "Tl",
+        align          :    "Tl"
         });
     </script>
                                <div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
index 80d9156..39e341a 100644 (file)
         <input type="submit" class="submit" name="filter" value="Go" />
     </fieldset>
 </form><!-- /TMPL_IF -->
-
-</div>
-<div class="yui-b">
 <!-- TMPL_INCLUDE NAME="acquisitions-menu.inc" -->
 </div>
 </div>
index 46ab6d7..0472c5e 100644 (file)
@@ -190,10 +190,8 @@ YAHOO.util.Event.onAvailable("popmenu", function () {
                 <td width="50%">
             <!--/TMPL_IF -->
                     <!-- TMPL_VAR NAME="budget_act_remain"-->
-        <!-- TMPL_ELSE -->
-            <td width="50%">
-        <!-- /TMPL_IF -->
             </td>
+        <!-- /TMPL_IF -->
 
         <!-- TMPL_IF NAME="est_negative" -->
             <td width="50%" style="color: red;" id="budget_est_<!-- TMPL_VAR NAME="budget_id"-->">
index fe2cd96..becdfe2 100644 (file)
 <div id="login">
 <h1><a href="http://koha-community.org">Koha</a></h1>
 <!-- TMPL_IF NAME="nopermission" -->
-<div id="login_error"><strong>Error: </strong>Unauthorized user<a href="/cgi-bin/koha/mainpage.pl?logout.x=1">click to log out</a></div>
+<div id="login_error"><strong>Error:</strong> You do not have permission to access this page. <a href="/cgi-bin/koha/mainpage.pl?logout.x=1">Click to log out</a></div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="timed_out" -->
-<div id="login_error"><strong>Error: </strong>Session timed out, please log in again</div>
+<div id="login_error"><strong>Error: </strong>Session timed out.<br /> Please log in again</div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="different_ip" -->
-<div id="login_error"><strong>Error: </strong>IP address has changed, please log in again </div>
+<div id="login_error"><strong>Error: </strong>IP address has changed. Please log in again </div>
 <!-- /TMPL_IF -->
 
 <!-- TMPL_IF NAME="wrongip" -->
index 1e9c1a6..f9cc90d 100644 (file)
@@ -45,42 +45,42 @@ function Changefwk(FwkList) {
 
 <div id="bibliotabs" class="toptabs numbered">
        <ul>
-            <!-- TMPL_IF name="zeroXX" -->
+            <!-- TMPL_IF name="tab0XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab0XX">0</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="oneXX" -->
+            <!-- TMPL_IF name="tab1XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab1XX">1</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="twoXX" -->
+            <!-- TMPL_IF name="tab2XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab2XX">2</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="threeXX" -->
+            <!-- TMPL_IF name="tab3XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab3XX">3</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="fourXX" -->
+            <!-- TMPL_IF name="tab4XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab4XX">4</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="fiveXX" -->
+            <!-- TMPL_IF name="tab5XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab5XX">5</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="sixXX" -->
+            <!-- TMPL_IF name="tab6XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab6XX">6</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="sevenXX" -->
+            <!-- TMPL_IF name="tab7XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab7XX">7</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="eightXX" -->
+            <!-- TMPL_IF name="tab8XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab8XX">8</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="nineXX" -->
+            <!-- TMPL_IF name="tab9XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab9XX">9</a></li>
             <!-- /TMPL_IF -->
-            <!-- TMPL_IF name="tenXX" -->
+            <!-- TMPL_IF name="tab10XX" -->
                 <li><a href="/cgi-bin/koha/catalogue/MARCdetail.pl#tab10XX">Item(s)</a></li>
             <!-- /TMPL_IF -->
         </ul>
     <div id="tab0XX">
-        <!-- TMPL_LOOP NAME="zeroXX" -->
+        <!-- TMPL_LOOP NAME="tab0XX" -->
             <!-- 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="oneXX" -->
+        <!-- TMPL_LOOP NAME="tab1XX" -->
                 <!-- 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="twoXX" -->
+        <!-- TMPL_LOOP NAME="tab2XX" -->
                 <!-- 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="threeXX" -->
+        <!-- TMPL_LOOP NAME="tab3XX" -->
                 <!-- 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="fourXX" -->
+        <!-- TMPL_LOOP NAME="tab4XX" -->
                 <!-- 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="fiveXX" -->
+        <!-- TMPL_LOOP NAME="tab5XX" -->
                 <!-- 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="sixXX" -->
+        <!-- TMPL_LOOP NAME="tab6XX" -->
                 <!-- 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="sevenXX" -->
+        <!-- TMPL_LOOP NAME="tab7XX" -->
                 <!-- 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="eightXX" -->
+        <!-- TMPL_LOOP NAME="tab8XX" -->
                 <!-- 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="nineXX" -->
+        <!-- TMPL_LOOP NAME="tab9XX" -->
                 <!-- TMPL_IF name="tag" -->
                     <div class="tag">
                     <div class="tag_title">
@@ -379,7 +379,7 @@ function Changefwk(FwkList) {
         <!-- /TMPL_LOOP -->
     </div>
 
-     <!-- TMPL_IF name="tenXX" -->
+     <!-- TMPL_IF name="tab10XX" -->
     <div id="tab10XX">
         <table>
                 <tr>
index 13b0e07..5156341 100644 (file)
                     <!-- TMPL_ELSE -->
                         &nbsp;
                     <!-- /TMPL_IF --></td>
+                <td><!-- TMPL_IF NAME="issuedate" -->
+                        <!-- TMPL_VAR NAME="issuedate" -->
+                    <!-- TMPL_ELSE -->
+                        &nbsp;
+                    <!-- /TMPL_IF --></td>
                 <td><!-- TMPL_IF NAME="date_due" -->
                         <!-- TMPL_VAR NAME="date_due" -->
                     <!-- TMPL_ELSE -->
index b33f897..be98543 100644 (file)
         
         $('#header_search > ul').tabs().bind('show.ui-tabs', function(e, ui) { $('#header_search > div:not(.ui-tabs-hide)').find('input').eq(0).focus(); });
 
-function confirmnotdup(){
+function confirmnotdup(redirect){
        $("#confirm_not_duplicate").attr("value","1");
-       // alert(_("Not a duplicate confirmed. Please click on Add biblio to save the record"));
-       var checkform = $("#f");
-       Check(checkform);
+    $("#redirect").attr("value",redirect);
+       Check();
 }
 
 /**
  * 
  * 
  */
-function Check(dest){
+function Check(){
     var StrAlert = AreMandatoriesNotOk();
     if( ! StrAlert ){
         document.f.submit();
@@ -436,21 +435,14 @@ function CloneField(index) {
                             anchors[j].setAttribute('onclick',"CloneField('" + new_id + "')");
                         } else if (anchors[j].getAttribute('class') == 'buttonMinus') {
                             anchors[j].setAttribute('onclick',"UnCloneField('" + new_id + "')");
+                        } else if (anchors[j].getAttribute('class') == 'expandfield') {
+                            anchors[j].setAttribute('onclick',"ExpandField('" + new_id + "')");
                         }
                     }
                 }
                 catch(e){
                     // do nothig CloneButtonPlus doesn't exist.
                 }
-                // setting its 'Expand' property
-                var ExpandFieldA=0;
-                try {
-                    ExpandFieldA = divs[i].getElementsByTagName('a')[0];
-                    ExpandFieldA.setAttribute('onclick',"ExpandField('" + divs[i].parentNode.getAttribute('id') + "')");
-                }
-                catch(e){
-                    // do nothig if ButtonPlus & CloneButtonPlus don t exist.
-                }
 
             }
         }
@@ -656,12 +648,15 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
                     <div class="dialog alert">
                         <h4>Duplicate Record suspected</h4>
                         <p>Is this a duplicate of <a href="/cgi-bin/koha/catalogue/MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->" onclick="openWindow('../MARCdetail.pl?biblionumber=<!-- TMPL_VAR name="duplicatebiblionumber" -->&amp;popup=1', 'Duplicate biblio'; return false;)"><!-- TMPL_VAR name="duplicatetitle" --></a>?</p>
-                        <form action="/cgi-bin/koha/cataloguing/additem.pl" method="get">
-                            <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="duplicatebiblionumber" -->" />
-                            <input type="submit" class="edit" value="Yes: Edit existing items" />
-                        </form>
+                        <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" --><form action="/cgi-bin/koha/cataloguing/additem.pl" method="get">
+                                                    <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="duplicatebiblionumber" -->" />
+                                                    <input type="submit" class="edit" value="Yes: Edit existing items" />
+                                                </form><!-- TMPL_ELSE --><form action="/cgi-bin/koha/catalogue/detail.pl" method="get">
+                                                    <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="duplicatebiblionumber" -->" />
+                                                    <input type="submit" value="Yes: View existing items" />
+                                                </form><!-- /TMPL_IF -->
                         <form action="/cgi-bin/koha/cataloguing/addbiblio.pl" method="get">
-                            <input type="submit" class="save" onclick="confirmnotdup(); return false;" value="No: Save as New Record" />
+                        <!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" --><input type="button" class="save" onclick="confirmnotdup('items'); return false;" value="No: Save as New Record" /><!-- TMPL_ELSE --><input type="button" class="save" onclick="confirmnotdup('view'); return false;" value="No: Save as New Record" /><!-- /TMPL_IF -->
                         </form>
                     </div>
         <!-- /TMPL_IF -->
@@ -675,7 +670,7 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
     </script>
 <!--TMPL_ELSE-->
     <form method="post" name="f" id="f" action="/cgi-bin/koha/cataloguing/addbiblio.pl" onsubmit="return Check();">
-    <input type="hidden" value="" id="redirect" name="redirect" />
+    <input type="hidden" value="<!-- tmpl_if name="biblionumber" -->view<!-- tmpl_else -->items<!-- /tmpl_if -->" id="redirect" name="redirect" />
        <input type="hidden" value="0" id="confirm_not_duplicate" name="confirm_not_duplicate" />
 <!-- /TMPL_IF -->
        
@@ -692,26 +687,25 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
            yuiToolbar();
         });
 
-    var onOption = function () {
-        return Check();
-    }
-
     function redirect(dest){
         $("#redirect").attr("value",dest);
         return Check();
     }
+<!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" -->
+    var onOption = function () {
+        return Check();
+    }
 
     var savemenu = [
         { text: _("Save and view record"), value: 1, onclick: {fn:function(){redirect("view");}} },
         { text: _("Save and edit items"), value: 2, onclick: {fn:function(){redirect("items");}} }
     ];
-
+<!-- /TMPL_IF -->
 
        // YUI Toolbar Functions
 
        function yuiToolbar() {
-           // new YAHOO.widget.Button("addbiblio");
-
+<!-- TMPL_IF NAME="CAN_user_editcatalogue_edit_items" -->
         var savesplitmenu = new YAHOO.widget.Button({
             type: "split",
             label: _("Save"),
@@ -722,7 +716,15 @@ function unHideSubfield(index,labelindex) { // FIXME :: is it used ?
          });
 
         savesplitmenu.on("click", onOption); 
-
+<!-- TMPL_ELSE -->
+        new YAHOO.widget.Button({
+            id: "addbiblio",
+            type: "button",
+            label: _("Save"),
+            container: "savebutton",
+            onclick: {fn:function(){redirect("view");}}
+        });
+<!-- /TMPL_IF -->
                new YAHOO.widget.Button({
             id: "z3950search",
             type: "button",
index 2c46be8..b8c4869 100644 (file)
@@ -195,8 +195,8 @@ $(document).ready(function(){
     <fieldset class="rows">
        <legend>Merge reference</legend>
        <ol>
-       <li class="radio"><input type="radio" value="<!-- TMPL_VAR NAME="biblio1" -->" checked="checked" id="mergereference1" name="mergereference" /><label for="mergereference1"><!-- TMPL_VAR NAME="title1" --> (<!-- TMPL_VAR NAME="biblio1" -->)</label></li>
-       <li class="radio"><input type="radio" value="<!-- TMPL_VAR NAME="biblio2" -->" id="mergereference2" name="mergereference" /><label for="mergereference2"><!-- TMPL_VAR NAME="title2" --> (<!-- TMPL_VAR NAME="biblio2" -->)</label></li>
+       <li class="radio"><input type="radio" value="<!-- TMPL_VAR NAME="biblio1" -->" checked="checked" id="mergereference1" name="mergereference" /><label style="float:none" for="mergereference1"><!-- TMPL_VAR NAME="title1" --> (<!-- TMPL_VAR NAME="biblio1" -->)</label></li>
+       <li class="radio"><input type="radio" value="<!-- TMPL_VAR NAME="biblio2" -->" id="mergereference2" name="mergereference" /><label style="float:none" for="mergereference2"><!-- TMPL_VAR NAME="title2" --> (<!-- TMPL_VAR NAME="biblio2" -->)</label></li>
 </ol>
        <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblio1" -->" />
        <input type="hidden" name="biblionumber" value="<!-- TMPL_VAR name="biblio2" -->" />
index 8458208..fb14577 100644 (file)
 
 <h1>Circulation: Overdues at <!-- TMPL_VAR NAME="LoginBranchname" --></h1>
 
-<!-- selector of location -->
-<!-- TMPL_IF NAME="location" -->
-<h4>Location selected</h4>
-<form name="changelocation" action="branchoverdues.pl">
-    <ul>
-        <li>
-            You are working actually on the overdues for the location : <b><!-- TMPL_VAR NAME="location" --></b>
-    <input type="submit" name="changelocation" class="submit" value="change location" />
-        </li>
-    </ul>
-</form>
-<!-- TMPL_ELSE -->
 <form name="selectlocation" action="branchoverdues.pl" method="post">
-    <label for="location">Select a location: </label><select id="location" name="location">
-        <option value="">All locations</option>
+    <label for="location">Shelving location selected: </label><select id="location" name="location">
+        <option value="">All shelving locations</option>
         <!-- TMPL_LOOP NAME="locationsloop" -->
-            <option value="<!-- TMPL_VAR NAME="authorised_value" -->"><!-- TMPL_VAR NAME="lib" --></option>
+            <!-- TMPL_IF NAME="selected" --><option value="<!-- TMPL_VAR NAME="authorised_value" -->" selected="selected"><!-- TMPL_VAR NAME="lib" --></option><!-- TMPL_ELSE --><option value="<!-- TMPL_VAR NAME="authorised_value" -->"><!-- TMPL_VAR NAME="lib" --></option><!-- /TMPL_IF -->
         <!-- /TMPL_LOOP -->
     </select>
     <input type="submit" name="location" class="submit" value="OK" />
 </form>
 
-<!-- /TMPL_IF -->
     <!-- TMPL_IF name="overduesloop" -->
         <table style="width:100%;">
         <tr>
                         <!-- TMPL_VAR NAME="date_due" -->
                     </td>
                     <td>
-                    <!-- TMPL_INCLUDE NAME="biblio-default-view.inc" -->
-                            &nbsp; (<b><!-- TMPL_VAR NAME="description" --></b>)
+                    <!-- TMPL_INCLUDE NAME="biblio-default-view.inc" --><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_IF NAME="subtitle" --><!-- TMPL_VAR NAME="subtitle" --><!-- /TMPL_IF --></a> <!-- TMPL_IF NAME="author" --> by <!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
+
                             <br />Barcode : <!-- TMPL_VAR NAME="barcode" -->
                     </td>
                     <td>
-                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernumber"-->"><!-- TMPL_VAR NAME="borrowersurname" --> &nbsp; <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
+                        <a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernumber"-->"><!-- TMPL_VAR NAME="borrowersurname" -->, <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
                     <!-- TMPL_IF NAME="borroweremail" --><a href="mailto:<!-- TMPL_VAR NAME="borroweremail" -->?subject=Overdue: <!-- TMPL_VAR NAME="title" ESCAPE="html" -->">
                     <!-- TMPL_VAR NAME="borroweremail" --></a><!--/TMPL_IF-->
                     </td>
             <!-- /TMPL_LOOP -->
         </table>
     <!-- TMPL_ELSE -->
-        <div class="dialog message">There are no overdues for today.</div>
+        <div class="dialog message">There are no overdues for today<!-- TMPL_IF NAME="location" --> at the selected location<!-- /TMPL_IF -->.</div>
     <!-- /TMPL_IF -->
     <!-- TMPL_IF name="todayoverduesloop" -->
         <div id="branch_odues_today_odues">
index 2bdfc50..df78c54 100644 (file)
@@ -301,6 +301,11 @@ function refocus(calendar) {
 
         <!-- TMPL_IF NAME="UNKNOWN_BARCODE" -->
             <li>The barcode was not found <!-- TMPL_VAR NAME="barcode" --></li>
+           <!-- TMPL_IF NAME="fast_cataloging" -->
+               <!-- TMPL_IF NAME="CAN_user_editcatalogue_fast_cataloging" -->
+                    <li><a href="/cgi-bin/koha/cataloguing/addbiblio.pl?frameworkcode=FA">Fast cataloging</a></li>
+               <!-- /TMPL_IF -->
+           <!-- /TMPL_IF -->
         <!-- /TMPL_IF -->
 
         <!-- TMPL_IF NAME="NOT_FOR_LOAN" -->
index ba8d117..724a3e9 100644 (file)
@@ -58,6 +58,15 @@ function Dopop(link) {
        <div class="dialog message">This item is part of a Rotating Collection and needs to be Transferred to <!-- TMPL_VAR NAME="collectionBranch" --></div>
 <!-- /TMPL_IF -->
 
+<!-- Patron has fines -->
+<!-- TMPL_IF NAME="fines" -->
+    <div class="dialog alert">
+        <h3>Patron has outstanding fines of <!-- TMPL_VAR NAME="fines" -->.</h3>
+        <p><a href="/cgi-bin/koha/members/pay.pl?borrowernumber=<!-- TMPL_VAR NAME="fineborrowernumber" -->">Make payment</a>.</p>
+    </div>
+<!-- /TMPL_IF -->
+
+
 <!-- TMPL_IF NAME="wrongbranch" -->
 <div class="dialog alert"><h3>Cannot Check In</h3><p>This item must be checked in at its home library. <strong>NOT CHECKED IN</strong></p>
 </div>
index 6587457..e25c491 100644 (file)
@@ -116,6 +116,7 @@ $.tablesorter.addParser({
         <!-- /TMPL_IF -->
         </div>
         <div id="holdsover">
+                <p>Holds listed here have been awaiting pickup for more than <!-- TMPL_VAR NAME="ReservesMaxPickUpDelay" --> days.</p>
                 <!-- TMPL_IF NAME="overloop" -->
                <table id="holdso">
                <thead><tr>
@@ -130,7 +131,7 @@ $.tablesorter.addParser({
                         <td><p><!-- TMPL_VAR NAME="waitingdate" --></p></td>
                         <td><!-- TMPL_INCLUDE NAME="biblio-default-view.inc" --><!-- TMPL_VAR NAME="title" escape="html" --> <!-- TMPL_VAR NAME="subtitle" ESCAPE="html" -->
                         </a>
-                            &nbsp; (<b><!-- TMPL_VAR NAME="itemtype" --></b>)
+                            <!-- TMPL_UNLESS NAME="item_level_itypes" --><!-- TMPL_IF NAME="itemtype" -->&nbsp; (<b><!-- TMPL_VAR NAME="itemtype" --></b>)<!-- /TMPL_IF --><!-- /TMPL_UNLESS -->
                         <br />Barcode: <!-- TMPL_VAR NAME="barcode" -->
                     </td>
                     <td><a href="/cgi-bin/koha/members/moremember.pl?borrowernumber=<!--TMPL_VAR Name="borrowernum"-->"><!-- TMPL_VAR NAME="borrowername" -->, <!-- TMPL_VAR NAME="borrowerfirstname" --></a><br /><!-- TMPL_VAR NAME="borrowerphone" --><br />
index adcafbc..0187cf9 100644 (file)
@@ -114,7 +114,7 @@ to add to Batch <!-- TMPL_VAR NAME="batch_id" -->
         inputField     :    "dateto",
       ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
         button         :    "openCalendarTo",
-        align          :    "Tl",
+        align          :    "Tl"
     });
 </script>
 <div class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></div>
index e395e3f..a45b8ff 100644 (file)
@@ -12,7 +12,8 @@
 
 <ul><li><!-- TMPL_VAR NAME="address" --><br /><!-- TMPL_VAR NAME="address2" --></li><li><!-- TMPL_VAR NAME="city" -->, <!-- TMPL_VAR NAME="zipcode" --></li>
 <li><!-- TMPL_IF NAME="phone" --><!-- TMPL_VAR NAME="phone" --><!-- TMPL_ELSE -->(no phone number on file)<!-- /TMPL_IF --></li>
-<li><!-- TMPL_IF NAME="email" --><!-- TMPL_VAR NAME="email" --><!-- TMPL_ELSE -->(no email on file)<!-- /TMPL_IF --></li>
+<li><!-- TMPL_IF NAME="email" --><!-- TMPL_VAR NAME="email" --><!-- TMPL_ELSE -->(no primary email on file)<!-- /TMPL_IF --></li>
+<!-- TMPL_IF NAME="emailpro" --><li><!-- TMPL_VAR NAME="emailpro" --></li><!-- /TMPL_IF -->
 </ul>
 
 <!-- TMPL_IF NAME="issueloop" -->
index aa1bf22..6d65063 100644 (file)
@@ -1,6 +1,21 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" -->
 <title>Reading Record for <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --></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>
+<script type="text/javascript" src="<!-- TMPL_VAR name="themelang" -->/lib/jquery/plugins/jquery.tablesorter.pager.js"></script>
+<script type="text/javascript" id="js">$(document).ready(function() {
+       $.tablesorter.addParser({
+               id: 'articles',
+               is: function(s) {return false;  },
+               format: function(s) { return s.toLowerCase().replace(/^(the|an|a) /,''); },
+               type: 'text'
+       });
+       $.tablesorter.defaults.widgets = ['zebra'];
+       $("#table_readingrec").tablesorter({
+               sortList: [[8,1]],
+               headers: { 1: { sorter: 'articles' }}
+       }).tablesorterPager({container: $("#pagertable_readingrec"),positionFixed: false,size: 20});
+}); </script>
 </head>
 <body>
 <!-- TMPL_INCLUDE NAME="header.inc" -->
 <!-- TMPL_INCLUDE NAME="circ-toolbar.inc" -->
 <h1>Reading Record</h1>
 <form action="/cgi-bin/koha/members/readingrec.pl" method="get"><input type="hidden" name="borrowernumber" id="borrowernumber" value="<!-- TMPL_VAR NAME="borrowernumber" -->" /></form>
-<p><!-- TMPL_IF NAME="showfulllink" -->Showing All Items |
-       <a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;limit=50">Show Last 50 Items Only</a> <!-- TMPL_ELSE -->      Showing Last 50 Items | 
-       <a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;limit=full">Show All Items</a><!-- /TMPL_IF --></p>
-<table>
-<tr>
-    <th>
-        <a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;order=issuestimestamp&amp;limit=<!-- TMPL_VAR name="limit" -->">Date</a>
-    </th>
-       <th>
-               <a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;order=title&amp;limit=<!-- TMPL_VAR name="limit" -->">Title</a>
-       </th>
-       <th>
-               <a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;order=author&amp;limit=<!-- TMPL_VAR name="limit" -->">Author</a>
-       </th>
+
+<span id="pagertable_readingrec" class="pager">
+       <form class="formpager">&nbsp;<strong>page(s)</strong>&nbsp;:
+               <img src="<!-- TMPL_VAR name="interface" -->/prog/img/first.png" class="first"/>
+               <img src="<!-- TMPL_VAR name="interface" -->/prog/img/prev.png" class="prev"/>
+               <input type="text" size="5" class="pagedisplay"/>
+               <img src="<!-- TMPL_VAR name="interface" -->/prog/img/next.png" class="next"/>
+               <img src="<!-- TMPL_VAR name="interface" -->/prog/img/last.png" class="last"/>
+               , entries/page :
+               <select class="pagesize">
+                       <option value="10">10</option>
+                       <option selected="selected" value="20">20</option>
+                       <option value="30">30</option>
+                       <option value="40">40</option>
+                       <option value="50">50</option>
+                       <option value="100">100</option>
+               </select>
+       </form>
+</span>
+<table id="table_readingrec">
+<thead>
+    <th>Date</th>
+       <th>Title</th>
+       <th>Author</th>
        <th>Call No.</th>
        <th>Barcode</th>
        <th>Number of Renewals</th>
        <th>Checked out on</th>
        <th>Checked out from</th>
        <th>Date Due</th>
-       <th>
-               <a href="readingrec.pl?borrowernumber=<!-- TMPL_VAR name="borrowernumber" -->&amp;order=returndate%20DESC&amp;limit=<!-- TMPL_VAR name="limit" -->">Return Date</a>
-       </th>
-</tr>
+       <th>Return Date</th>
+</thead>
 <!-- TMPL_LOOP name="loop_reading" -->
-<!-- TMPL_UNLESS NAME="__odd__" -->
-    <!-- TMPL_IF NAME="returndate" --><tr class="highlight"><!-- TMPL_ELSE --><tr class="highlight onissue"><!-- /TMPL_IF -->
-<!-- TMPL_ELSE -->
     <!-- TMPL_IF NAME="returndate" --><tr><!-- TMPL_ELSE --><tr class="onissue"><!-- /TMPL_IF -->
-<!-- /TMPL_UNLESS -->
         <td>
             <!-- TMPL_VAR name="issuestimestamp" -->
         </td>
-        <td>
-            <a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->">
-                <!-- TMPL_VAR name="title" escape="html" -->
-            </a>
-        </td>
+        <td><a href="/cgi-bin/koha/catalogue/detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->"><!-- TMPL_VAR name="title" escape="html" --></a></td>
 
         <td><!-- TMPL_VAR name="author" --></td>
 
index 2004a7d..53ff7b7 100644 (file)
@@ -307,7 +307,7 @@ function checkMultiHold() {
                                ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                                button : "CalendarReserveDate",
                                disableFunc : validate1,
-                               dateStatusFunc : validate1,
+                               dateStatusFunc : validate1
                        }
                );
                //]]>
@@ -338,7 +338,7 @@ function checkMultiHold() {
                                ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                                button : "CalendarExpirationDate",
                                disableFunc : validate1,
-                               dateStatusFunc : validate1,
+                               dateStatusFunc : validate1
                        }
                );
                //]]>
@@ -639,7 +639,7 @@ function checkMultiHold() {
                 <!-- TMPL_IF name="found" -->
                 Item waiting at <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value="<!-- TMPL_VAR NAME="wbrcode" -->" />
             <!-- TMPL_ELSE -->
-                Waiting to be pulled
+                Waiting to be pulled <input type="hidden" name="pickup" value="<!-- TMPL_VAR NAME="wbrcode" -->" />
             <!-- /TMPL_IF -->
           <!-- TMPL_ELSE -->
             Item being transferred to <b> <!-- TMPL_VAR NAME="wbrname" --></b> <input type="hidden" name="pickup" value="<!-- TMPL_VAR NAME="wbrcode" -->" />
index f87aef1..a2f78ab 100644 (file)
@@ -60,7 +60,7 @@
                  {
                                        button : "openCalendar",
                      inputField : "date",
-                     ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+                     ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->"
                  }
                 );
             </script> <span class="required">Required</span>
index d1f32ce..0b4e351 100644 (file)
@@ -270,7 +270,7 @@ h4.collapse a { font-size : 80%; text-decoration: none; } fieldset.brief ol { di
                         <!--/TMPL_LOOP-->
                     <option value="other">Others...</option>
                     </select>   <span id="other_reason<!-- TMPL_VAR NAME="suggestiontype" -->">
-            <input type="text" size="31" id="select-other_reason<!-- TMPL_VAR NAME="suggestiontype" -->" name="other_reason<!-- TMPL_VAR NAME="suggestiontype" -->" value=_("please note your reason here...") /> <a href="#back<!-- TMPL_VAR NAME="suggestiontype" -->">Cancel</a>
+            <input type="text" size="31" id="select-other_reason<!-- TMPL_VAR NAME="suggestiontype" -->" name="other_reason<!-- TMPL_VAR NAME="suggestiontype" -->" value="please note your reason here..." /> <a href="#back<!-- TMPL_VAR NAME="suggestiontype" -->">Cancel</a>
         </span> <strong style="padding: 0 1em;">OR:</strong> <label for="<!-- TMPL_VAR NAME="suggestiontype" -->delete">Delete selected</label> <input type="checkbox" name="op" id="<!-- TMPL_VAR NAME="suggestiontype" -->delete" />
         </div>
         </div>
index a9ca6b1..3f8254d 100644 (file)
@@ -273,7 +273,7 @@ td input,td input[type="submit"] { font-size: 85%; padding: 1px; }
   <span id="terms_summary_status">&nbsp;</span>
   </fieldset>
   <fieldset class="brief">
-   <h4>Test Blacklist</h4>
+   <h4>Check lists</h4>
    <div class="description">Enter a word or phrase to check against approved/rejected lists: </div>
    <form method="post" action="/cgi-bin/koha/tags/review.pl">
    <input type="text" size="14" name="test" id="test" />
index 3259497..331ec2c 100644 (file)
@@ -64,7 +64,7 @@
                 Calendar.setup(
                  {
                      inputField : "date1",
-                     ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+                     ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->"
                  }
                 );
             </script> <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span></p>
@@ -76,7 +76,7 @@
                 Calendar.setup(
                  {
                      inputField : "date2",
-                     ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+                     ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->"
                  }
                 );
             </script> <span class="hint"><!-- TMPL_INCLUDE NAME="date-format.inc" --></span></p>
index 38b12dd..cc501b4 100644 (file)
@@ -6,8 +6,7 @@
 <script language="JavaScript" type="text/javascript">
 //<![CDATA[
 
-       var weekdays = new Array("Sundays", "Mondays", "Tuesdays",
-                       "Wednesdays", "Thursdays", "Fridays", "Saturdays");
+       var weekdays = new Array(_("Sundays"),_("Mondays"),_("Tuesdays"),_("Wednesdays"),_("Thursdays"),_("Fridays"),_("Saturdays"));
 
        function holidayOperation(formObject, opType) {
                var op = document.getElementsByName('operation');
index 342e51b..9ce264c 100644 (file)
@@ -74,7 +74,7 @@ Edit News Item<!-- TMPL_ELSE -->Add News Item<!-- /TMPL_IF --><!-- TMPL_ELSE -->
                     {
                         button : "timestampButton",
                         inputField : "timestamp",
-                        ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+                        ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->"
                     }
                     );
                 </script>
@@ -89,7 +89,7 @@ Edit News Item<!-- TMPL_ELSE -->Add News Item<!-- /TMPL_IF --><!-- TMPL_ELSE -->
                     {
                         button : "openCalendar",
                         inputField : "expirationdate",
-                        ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
+                        ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->"
                     }
                     );
                 </script>
index edaf280..952c41e 100644 (file)
             </h5>
         </xsl:if>
 
-        <xsl:choose>
-        <xsl:when test="marc:datafield[@tag=100] or marc:datafield[@tag=110] or marc:datafield[@tag=111] or marc:datafield[@tag=700] or marc:datafield[@tag=710] or marc:datafield[@tag=711]">
-        <h5 class="author">by
-        <xsl:for-each select="marc:datafield[@tag=100 or @tag=700]">
-        <a>
-        <xsl:choose>
-            <xsl:when test="marc:subfield[@code=9]">
-                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
-            <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=au:<xsl:value-of select="marc:subfield[@code='a']"/></xsl:attribute>
-            </xsl:otherwise>
-        </xsl:choose>
-        <xsl:call-template name="nameABCDQ"/></a>
-        <xsl:choose>
-        <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
-        </xsl:for-each>
-
-        <xsl:for-each select="marc:datafield[@tag=110 or @tag=710]">
-        <a>
-        <xsl:choose>
-            <xsl:when test="marc:subfield[@code=9]">
-                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
-            <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=au:<xsl:value-of select="marc:subfield[@code='a']"/></xsl:attribute>      
-            </xsl:otherwise>
-        </xsl:choose>
-        <xsl:call-template name="nameABCDN"/></a>
-        <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
-        </xsl:for-each>
-
-        <xsl:for-each select="marc:datafield[@tag=111 or @tag=711]">
-        <a>
-        <xsl:choose>
-            <xsl:when test="marc:subfield[@code=9]">
-                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
-            </xsl:when>
-            <xsl:otherwise>
-            <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=au:<xsl:value-of select="marc:subfield[@code='a']"/></xsl:attribute>
-            </xsl:otherwise>
-        </xsl:choose>
-        <xsl:call-template name="nameACDEQ"/></a>
-        <xsl:choose><xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise></xsl:choose>
-
-        </xsl:for-each>
-        </h5>
-        </xsl:when>
-        </xsl:choose>
+        <!-- Author Statement -->
+        <xsl:call-template name="showAuthor"><xsl:with-param name="authorfield" select="marc:datafield[@tag=100 or @tag=110 or @tag=111]"/></xsl:call-template>
+        <xsl:call-template name="showAuthor"><xsl:with-param name="authorfield" select="marc:datafield[@tag=700 or @tag=710 or @tag=711]"/></xsl:call-template>
 
    <xsl:if test="$materialTypeCode!=''">
         <span class="results_summary"><span class="label">Type: </span>
         <xsl:value-of select="substring($str,1,string-length($str)-1)"/>
     </xsl:template>
 
+    <xsl:template name="showAuthor">
+       <xsl:param name="authorfield"/>
+       <xsl:if test="count($authorfield)&gt;0">
+        <h5 class="author">
+        <xsl:for-each select="$authorfield">
+        <xsl:choose>
+          <xsl:when test="position()&gt;1"/>
+          <xsl:when test="@tag&lt;700">Author(s): </xsl:when>
+          <xsl:otherwise>Additional author(s): </xsl:otherwise>
+        </xsl:choose>
+        <a>
+        <xsl:choose>
+            <xsl:when test="marc:subfield[@code=9]">
+                <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=an:<xsl:value-of select="marc:subfield[@code=9]"/></xsl:attribute>
+            </xsl:when>
+            <xsl:otherwise>
+            <xsl:attribute name="href">/cgi-bin/koha/catalogue/search.pl?q=au:<xsl:value-of select="marc:subfield[@code='a']"/></xsl:attribute>
+            </xsl:otherwise>
+        </xsl:choose>
+       <xsl:choose>
+          <xsl:when test="@tag=100 or @tag=700"><xsl:call-template name="nameABCDQ"/></xsl:when>
+          <xsl:when test="@tag=110 or @tag=710"><xsl:call-template name="nameABCDN"/></xsl:when>
+          <xsl:when test="@tag=111 or @tag=711"><xsl:call-template name="nameACDEQ"/></xsl:when>
+       </xsl:choose>
+       <!-- add relator code too between brackets-->
+       <xsl:if test="marc:subfield[@code='4' or @code='e']">
+         <xsl:text>[</xsl:text>
+         <xsl:choose>
+           <xsl:when test="marc:subfield[@code=4]"><xsl:value-of select="marc:subfield[@code=4]"/></xsl:when>
+           <xsl:otherwise><xsl:value-of select="marc:subfield[@code='e']"/></xsl:otherwise>
+         </xsl:choose>
+         <xsl:text>]</xsl:text>
+       </xsl:if>
+       </a>
+        <xsl:choose>
+          <xsl:when test="position()=last()"><xsl:text>.</xsl:text></xsl:when><xsl:otherwise><xsl:text>; </xsl:text></xsl:otherwise>
+        </xsl:choose>
+        </xsl:for-each>
+        </h5>
+        </xsl:if>
+    </xsl:template>
+
 </xsl:stylesheet>
index 028ad4a..42dd9e3 100644 (file)
@@ -472,7 +472,7 @@ Calendar.calDragIt = function (ev) {
                posX = ev.pageX;
                posY = ev.pageY;
        }
-       cal.hideShowCovered();
+       // cal.hideShowCovered();
        var st = cal.element.style;
        st.left = (posX - cal.xOffs) + "px";
        st.top = (posY - cal.yOffs) + "px";
@@ -490,7 +490,7 @@ Calendar.calDragEnd = function (ev) {
                removeEvent(document, "mouseup", calDragEnd);
                tableMouseUp(ev);
        }
-       cal.hideShowCovered();
+       // cal.hideShowCovered();
 };
 
 Calendar.dayMouseDown = function(ev) {
@@ -1200,7 +1200,7 @@ Calendar.prototype.callCloseHandler = function () {
        if (this.onClose) {
                this.onClose(this);
        }
-       this.hideShowCovered();
+       // this.hideShowCovered();
 };
 
 /** Removes the calendar object from the DOM tree and destroys it. */
@@ -1258,7 +1258,7 @@ Calendar.prototype.show = function () {
                Calendar.addEvent(document, "keypress", Calendar._keyEvent);
                Calendar.addEvent(document, "mousedown", Calendar._checkCalendar);
        }
-       this.hideShowCovered();
+       // this.hideShowCovered();
 };
 
 /**
@@ -1273,7 +1273,7 @@ Calendar.prototype.hide = function () {
        }
        this.element.style.display = "none";
        this.hidden = true;
-       this.hideShowCovered();
+       // this.hideShowCovered();
 };
 
 /**
@@ -1463,7 +1463,7 @@ Calendar.prototype.parseDate = function (str, fmt) {
        }
 };
 
-Calendar.prototype.hideShowCovered = function () {
+/* Calendar.prototype.hideShowCovered = function () {
        var self = this;
        Calendar.continuation_for_the_fucking_khtml_browser = function() {
                function getVisib(obj){
@@ -1523,7 +1523,7 @@ Calendar.prototype.hideShowCovered = function () {
                setTimeout("Calendar.continuation_for_the_fucking_khtml_browser()", 10);
        else
                Calendar.continuation_for_the_fucking_khtml_browser();
-};
+}; */
 
 /** Internal function; it displays the bar with the names of the weekday. */
 Calendar.prototype._displayWeekdays = function () {
index e7ec2f2..08fb3c3 100644 (file)
@@ -22,7 +22,7 @@
 </div>
 <!-- TMPL_IF NAME="OpacNav" -->
 <div class="yui-b">
-<div class="container">
+<div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 </div>
 </div><!-- /TMPL_IF -->
index cd97560..4232a92 100644 (file)
@@ -23,7 +23,7 @@
 </div>
 <!-- TMPL_IF NAME="OpacNav" -->
 <div class="yui-b">
-<div class="container">
+<div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 </div>
 </div><!-- /TMPL_IF -->
index 0035266..cef17ff 100644 (file)
@@ -22,7 +22,7 @@
 </div>
 <!-- TMPL_IF NAME="OpacNav" -->
 <div class="yui-b">
-<div class="container">
+<div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 </div>
 </div><!-- /TMPL_IF -->
index f099511..f9ccf91 100644 (file)
@@ -22,7 +22,7 @@
 </div>
 <!-- TMPL_IF NAME="OpacNav" -->
 <div class="yui-b">
-<div class="container">
+<div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 </div>
 </div><!-- /TMPL_IF -->
index 0f7472e..027c32a 100644 (file)
@@ -22,7 +22,7 @@
 </div>
 <!-- TMPL_IF NAME="OpacNav" -->
 <div class="yui-b">
-<div class="container">
+<div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 </div>
 </div><!-- /TMPL_IF -->
index d45c5db..481b431 100644 (file)
@@ -22,7 +22,7 @@
 </div>
 <!-- TMPL_IF NAME="OpacNav" -->
 <div class="yui-b">
-<div class="container">
+<div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 </div>
 </div><!-- /TMPL_IF -->
index dfe1495..9ffb236 100644 (file)
          </div></div>
        </div>
        <!-- TMPL_IF NAME="OpacNav" -->
-       <div class="yui-b"><div class="container">
+       <div class="yui-b"><div id="leftmenus" class="container">
        <!--TMPL_INCLUDE NAME="navigation.inc" -->
        </div></div>
        <!-- /TMPL_IF -->
index 0fa7474..25f9325 100644 (file)
@@ -7,7 +7,7 @@
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 
 <div id="yui-g">
-<div class="container">
+<div id="kohaerrorcontainer" class="container">
 <div id="kohaerror">
 <div class="dialog message">
 <h3>An Error has Occurred</h3>
index 305dfce..b66870d 100644 (file)
@@ -33,7 +33,7 @@
     <div class="yui-b">
     <div id="opac-detail" class="yui-ge">
     <div class="yui-u first">
-    <div class="container">
+    <div id="userisbddetail" class="container">
     <div id="catalogue_detail_biblio">
        
      <h1 style="float:left;margin:0 1em 1em 0;">ISBD View</h1> <div id="views">
@@ -45,7 +45,7 @@
        </div>
        </div>
        <div class="yui-u">
-       <div class="container">
+       <div id="ulactioncontainer" class="container">
 <ul id="action">
 
 <!-- TMPL_UNLESS NAME="norequests" -->
index fba0c08..fad1371 100644 (file)
@@ -63,7 +63,7 @@ $(document).ready(function(){
     <div id="yui-main">
     <div class="yui-b"><div id="opac-detail" class="yui-ge">
     <div class="yui-u first">
-    <div class="container">
+    <div id="usermarcdetail" class="container">
     <div id="catalogue_detail_biblio">
 
     <h2 style="float:left;margin: 0 1em 1em 0;">MARC View</h2>
@@ -201,7 +201,7 @@ $(document).ready(function(){
     </div>
     </div>
     <div class="yui-u">
-    <div class="container">
+    <div id="ulactioncontainer" class="container">
 <ul id="action">
 
 <!-- TMPL_UNLESS NAME="norequests" -->
index 0b7f220..915a846 100644 (file)
@@ -8,7 +8,7 @@
 
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
-               <div class="container">
+               <div id="useraccount" class="container">
 <!--CONTENT-->
     <!-- TMPL_LOOP NAME="BORROWER_INFO" -->
         <h3><a href="/cgi-bin/koha/opac-user.pl"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->'s account</a> <img src="<!-- TMPL_VAR NAME="themelang" -->../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Fines and Charges</h3>
 </div>
 </div>
 <div class="yui-b">
-<div class="container">
+<div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
 </div>
 </div>
-<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
index f85d914..745d19d 100644 (file)
@@ -7,7 +7,7 @@
 </head>
 <body id="addtolist">
 <div id="custom-doc" class="yui-t7">
-<div class="container">
+<div id="useraddbybiblionumber" class="container">
 <!-- TMPL_IF NAME="authorized" -->
        <!-- TMPL_UNLESS NAME="newshelf" -->
                <!-- TMPL_IF NAME="multiple"-->
index 66d9db6..b8721d5 100644 (file)
@@ -8,7 +8,7 @@
 <div id="bd">
     <div id="yui-main">
     <div class="yui-b">
-<div class="container">    <!-- TMPL_IF name="typeissue" -->
+<div id="useralertsubscribe" class="container">    <!-- TMPL_IF name="typeissue" -->
         <h1 class="catalogue">Subscribe issue receive warning</h1>
             <form action="opac-alert-subscribe.pl" method="post">
                 <p>Do you want to receive an email when a new issue for this subscription arrives?</p>
index 9657c87..bef863d 100644 (file)
@@ -19,7 +19,7 @@
 <!-- TMPL_INCLUDE name="masthead.inc" -->
 
        <div id="yui-g">
-<div class="container">
+<div id="userauth" class="container">
 <div id="opac-auth">
 <!--CONTENT-->
 <!-- TMPL_IF NAME="opacuserlogin" -->
index f0b4cf7..91a1412 100644 (file)
@@ -8,7 +8,7 @@
 
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
-<div class="container">
+<div id="userauthhome" class="container">
 <form name="f" action="/cgi-bin/koha/opac-authorities-home.pl" method="get">
         <input type="hidden" name="op" value="do_search" />
         <input type="hidden" name="type" value="opac" />
@@ -74,7 +74,7 @@
 
 </div><!-- TMPL_IF NAME="OpacNav" -->
 <div class="yui-b">
-<div class="container">
+<div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 </div>
 </div><!-- /TMPL_IF -->
index 5f41371..def5362 100644 (file)
@@ -33,7 +33,7 @@ function showChildren(mynumber) {
 <!-- TMPL_INCLUDE name="masthead.inc" -->
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
-<div class="container">
+<div id="userauthdetails" class="container">
 
 <!-- TMPL_IF Name="displayhierarchy"-->
 
@@ -79,9 +79,9 @@ function showChildren(mynumber) {
 </div>
 <!-- TMPL_IF NAME="OpacNav" -->
 <div class="yui-b">
-<div class="container">
+<div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 </div>
 </div><!-- /TMPL_IF -->
 </div>
-<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
index a87f162..e0c7564 100644 (file)
@@ -8,7 +8,7 @@
 
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
-<div class="container">
+<div id="userauthsearchresults" class="container">
        <h1>Authority search results</h1>
        <div id="pages">
                        <!-- TMPL_IF name="displayprev" -->
@@ -85,7 +85,7 @@
 </div>
 <!-- TMPL_IF NAME="OpacNav" -->
 <div class="yui-b">
-<div class="container">
+<div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 </div>
 </div><!-- /TMPL_IF -->
index b64205b..288f338 100644 (file)
@@ -117,7 +117,7 @@ function tagAdded() {
 <body id="basket">
 
 <div id="doc" class="yui-t7">
-<div class="container">
+<div id="userbasket" class="container">
 <h1>Your Cart</h1>
 
 <!-- TMPL_UNLESS NAME="print_basket" -->
index dfb4884..1686bf8 100644 (file)
@@ -8,7 +8,7 @@
 
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
-<div class="container">
+<div id="userbrowser" class="container">
     <h1>Browse our catalogue</h1>
         <!-- TMPL_IF name="have_hierarchy" -->
         <ul>
@@ -48,7 +48,7 @@
 </div>
 <!-- TMPL_IF NAME="OpacNav" -->
 <div class="yui-b">
-<div class="container">
+<div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 </div>
 </div><!-- /TMPL_IF -->
index 5cd97dc..5241d19 100644 (file)
@@ -58,7 +58,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
     <div id="yui-main">
     <div class="yui-b"><div id="opac-detail-yui-ge" class="yui-ge">
     <div class="yui-u first">
-    <div class="container">
+    <div id="userdetail" class="container">
     <div id="catalogue_detail_biblio">
 
     <div id="bookcover">
@@ -306,7 +306,8 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 
     <!-- TMPL_IF NAME="BakerTaylorContentURL" -->
         <span class="results_summary">
-        <span class="label">Enhanced Content:</span><!-- TMPL_IF NAME="OPACURLOpenInNewWindow" --><a href="<!-- TMPL_VAR NAME="BakerTaylorContentURL" ESCAPE="HTML" -->" target="_blank">Content Cafe</a><!-- TMPL_ELSE --><a href="<!-- TMPL_VAR NAME="BakerTaylorContentURL" ESCAPE="HTML" -->">Content Cafe</a><!-- /TMPL_IF -->
+        <span class="label">Enhanced Content: </span> 
+        <!-- TMPL_IF NAME="OPACURLOpenInNewWindow" --><a href="<!-- TMPL_VAR NAME="BakerTaylorContentURL" ESCAPE="HTML" -->" target="_blank">Content Cafe</a><!-- TMPL_ELSE --><a href="<!-- TMPL_VAR NAME="BakerTaylorContentURL" ESCAPE="HTML" -->">Content Cafe</a><!-- /TMPL_IF -->
         </span>
     <!-- /TMPL_IF -->
 </div>
@@ -383,7 +384,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 <div id="holdings">
 <!-- TMPL_IF name="count" -->
     <!-- TMPL_IF name="lotsofitems" -->
-       <p>This record has many physical items. <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;viewallitems=1">Click here to view them all.</a></p>
+       <p>This record has many physical items. <a href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" -->&amp;viewallitems=1#holdings">Click here to view them all.</a></p>
     <!-- TMPL_ELSE -->
        <table id="holdingst">
            <thead><tr>
@@ -402,7 +403,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
            <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>
+               <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>
                <!-- TMPL_IF NAME="itemdata_enumchron" --><td><!-- TMPL_VAR NAME="enumchron" --></td><!-- /TMPL_IF -->
                <!-- TMPL_IF NAME="itemdata_uri" --><td><a href="<!-- TMPL_VAR NAME="uri" -->"><!-- TMPL_VAR NAME="uri" --></a></td><!-- /TMPL_IF -->
                <!-- TMPL_IF NAME="itemdata_copynumber" --><td><!-- TMPL_VAR NAME="copynumber" --></td><!-- /TMPL_IF -->
@@ -780,7 +781,7 @@ YAHOO.util.Event.onContentReady("furtherm", function () {
 </div>
 
 <div class="yui-u">
-<div class="container">
+<div id="ulactioncontainer" class="container">
 <ul id="action">
 
 <!-- TMPL_UNLESS NAME="norequests" -->
index 75adf24..8cb95da 100644 (file)
@@ -1,7 +1,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_IF NAME="LibraryNameTitle" --><!-- TMPL_VAR NAME="LibraryNameTitle" --><!-- TMPL_ELSE -->Koha Online<!-- /TMPL_IF --> Catalog &rsaquo; Download cart<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body id="opac-downloadcart" style="padding:1em;">
-<div class="container"><!-- TMPL_IF NAME="format" -->
+<div id="userdownloadcart" class="container"><!-- TMPL_IF NAME="format" -->
     <p>Your download should begin automatically.</p>
 <!-- TMPL_ELSE -->
 <form method="post" action="/cgi-bin/koha/opac-downloadcart.pl">
index 1398cd0..607f1d4 100644 (file)
@@ -7,7 +7,7 @@
 </script>
 </head>
 <body id="opac-downloadlist" style="padding:1em;">
-<div class="container"><!-- TMPL_IF NAME="format" -->
+<div id="userdownloadshelf" class="container"><!-- TMPL_IF NAME="format" -->
     <p>Your download should begin automatically.</p>
 <!-- TMPL_ELSE -->
 <form method="post" action="/cgi-bin/koha/opac-downloadshelf.pl">
index 9995cc5..76c731b 100644 (file)
@@ -212,7 +212,7 @@ function showlayer(numlayer){
 </div>
 </div>
 <div class="yui-b">
-<div class="container">
+<div id="searchfacetscontainer" class="container">
 <div id="search-facets">
 <form action="opac-serial-issues.pl" id="filterform">
     <h4>Refine your search</h4>
index aaaa16e..1793a86 100644 (file)
 </div>
 </div>
 <div class="yui-b">
-<div class="container">
+<div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
index c50cf5c..37d7512 100644 (file)
@@ -8,7 +8,7 @@
 
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
-       <div class="container">
+       <div id="userpasswd" class="container">
        <h3><a href="/cgi-bin/koha/opac-user.pl"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->'s account</a> <img src="<!-- TMPL_VAR NAME="themelang" -->l../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Change your Password </h3>
 
     <!-- TMPL_IF NAME= "Error_messages" -->
@@ -53,7 +53,7 @@
 </div>
 </div>
 <div class="yui-b">
-<div class="container">
+<div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
index 92c8973..4c9f0f8 100644 (file)
@@ -8,7 +8,7 @@
 
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
-       <div class="container">
+       <div id="userprivacy" class="container">
        <h3><a href="/cgi-bin/koha/opac-user.pl"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->'s account</a> <img src="<!-- TMPL_VAR NAME="themelang" -->l../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Privacy policy </h3>
 
     <!-- TMPL_IF name="deleted" -->
@@ -63,7 +63,7 @@
 </div>
 </div>
 <div class="yui-b">
-<div class="container">
+<div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
index 0b53ebd..a89c9a9 100644 (file)
@@ -20,7 +20,7 @@ $(document).ready(function(){
 
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
-<div class="container">
+<div id="userreadingrecord" class="container">
 <!--CONTENT-->
 <h3><a href="/cgi-bin/koha/opac-user.pl"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->'s account</a> <img src="<!-- TMPL_VAR NAME="themelang" -->../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Checkout History</h3>
 
@@ -94,7 +94,7 @@ You have never borrowed anything from this library.
 </div>
 </div>
 <div class="yui-b">
-<div class="container">
+<div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
index 802d79b..b727361 100644 (file)
                 ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
                 button : "CalendarReserveDate<!-- TMPL_VAR NAME="biblionumber" -->",
                 disableFunc : validate<!-- TMPL_VAR NAME="biblionumber" -->,
-                dateStatusFunc : validate<!-- TMPL_VAR NAME="biblionumber" -->,
+                dateStatusFunc : validate<!-- TMPL_VAR NAME="biblionumber" -->
               }
               );
               //]]>
           ifFormat : "<!-- TMPL_VAR NAME="DHTMLcalendar_dateformat" -->",
           button : "CalendarExpirationDate_<!-- TMPL_VAR NAME="biblionumber" -->",
           disableFunc : validate1,
-          dateStatusFunc : validate1,
+          dateStatusFunc : validate1
         }
       );
       //]]>
index 288392f..4920acb 100644 (file)
@@ -156,7 +156,9 @@ function highlightOn() {
                     <a href="/cgi-bin/koha/opac-search.pl?q=<!-- TMPL_VAR NAME="scan_use" escape="url" -->&quot;<!-- TMPL_VAR NAME="title" ESCAPE="url" -->&quot;"><!-- TMPL_VAR NAME="title" ESCAPE="html" --></a>
                 </td>
                 <td>
-                    <!-- TMPL_VAR NAME="subtitle" -->
+                    <!-- TMPL_LOOP NAME="subtitle" -->
+                      <!-- TMPL_VAR NAME="subfield" -->
+                    <!-- /TMPL_LOOP -->
                 </td>
             </tr>
             <!-- /TMPL_LOOP -->
@@ -208,11 +210,16 @@ function highlightOn() {
                         <!-- TMPL_VAR name="description" -->
                         <!-- /TMPL_IF -->
                     </td>
-                    <td><!-- TMPL_VAR NAME="result_number" -->. <!-- TMPL_IF name="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a>
+                    <td><!-- TMPL_VAR NAME="result_number" -->. <!-- TMPL_IF name="BiblioDefaultViewmarc" --><a class="title" href="/cgi-bin/koha/opac-MARCdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title"><!-- TMPL_VAR NAME="title" -->
                       <!-- TMPL_ELSE -->
-                      <!-- TMPL_IF name="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a>
-                      <!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title"><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="subtitle" --></a>
-                      <!-- /TMPL_IF --><!-- /TMPL_IF -->
+                      <!-- TMPL_IF name="BiblioDefaultViewisbd" --><a class="title" href="/cgi-bin/koha/opac-ISBDdetail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title"><!-- TMPL_VAR NAME="title" -->
+                      <!-- TMPL_ELSE --><a class="title" href="/cgi-bin/koha/opac-detail.pl?biblionumber=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->" title="View details for this title"><!-- TMPL_VAR NAME="title" -->
+                      <!-- /TMPL_IF -->
+                      <!-- TMPL_LOOP NAME="subtitle" -->
+                          <!-- TMPL_VAR NAME="subfield" -->
+                      <!-- /TMPL_LOOP -->
+                      </a>
+                      <!-- /TMPL_IF -->
                       <!-- TMPL_IF NAME="author" -->by <a href="/cgi-bin/koha/opac-search.pl?q=au:<!-- TMPL_VAR NAME="author" ESCAPE="URL" -->" title="Search for works by this author"><!-- TMPL_VAR NAME="author" --></a>
                       <!-- TMPL_ELSE -->&nbsp;<!-- /TMPL_IF -->
                                <p> <!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
index c53511e..d7aff2e 100644 (file)
@@ -235,7 +235,7 @@ $(document).ready(function(){
 
        <div id="yui-main">
        <div class="yui-b">
-       <div class="container">
+       <div id="userresults" class="container">
   <!-- TMPL_IF NAME="koha_spsuggest" -->
        Did you mean:
     <ul style="list-style: none;">
@@ -332,8 +332,10 @@ $(document).ready(function(){
             <!-- checkall, clearall are now needed for placehold -->
             <span class="checkall"></span>
                <span class="clearall"></span>
-            <a href="#" class="highlight_toggle" id="highlight_toggle_off">Unhighlight</a>
-            <a href="#" class="highlight_toggle" id="highlight_toggle_on">Highlight</a>
+            <!-- TMPL_IF NAME="OpacHighlightedWords" -->
+               <a href="#" class="highlight_toggle" id="highlight_toggle_off">Unhighlight</a>
+               <a href="#" class="highlight_toggle" id="highlight_toggle_on">Highlight</a>
+            <!-- /TMPL_IF -->
             <!-- TMPL_IF EXPR="opacbookbag || virtualshelves" -->
                <span class="addto"></span>
             <!-- /TMPL_IF -->
@@ -542,7 +544,7 @@ $(document).ready(function(){
 </div>
 </div>
         <!-- TMPL_IF NAME="opacfacets" -->
-<div class="yui-b"><div class="container">
+<div class="yui-b"><div id="facetcontainer" class="container">
         <!-- FACETS START -->
                <!-- TMPL_INCLUDE NAME="opac-facets.inc" -->
         <!-- FACETS END -->
index 573295e..bac63f6 100644 (file)
@@ -48,7 +48,7 @@
 </head>
 <body id="comment">
 <div id="custom-doc" class="yui-t7">
-<div class="container">
+<div id="userreview" class="container">
 <!-- TMPL_IF NAME="cgi_debug" --><div class="debug">CGI debug is on.</div><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="ERRORS" -->
        <div class="error">
index 1847017..3c370f0 100644 (file)
      </div>
 
 <!-- TMPL_IF NAME="OpacNav" -->
-<div class="yui-b"><div class="container">
+<div class="yui-b"><div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!--TMPL_INCLUDE NAME="usermenu.inc" -->
 </div></div>
 <!-- TMPL_ELSIF NAME="loggedinusername" -->
-<div class="yui-b"><div class="container">
+<div class="yui-b"><div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!--TMPL_INCLUDE NAME="usermenu.inc" -->
 </div></div>
index 4104682..9ebbd4e 100644 (file)
@@ -2,7 +2,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 </head>
 <body style="padding: 1em;" id="sendbasket">
-<div class="container"><!-- TMPL_IF NAME="email_add" -->
+<div id="usersendbasket" class="container"><!-- TMPL_IF NAME="email_add" -->
 
        <!-- TMPL_IF NAME="SENT" -->
                <h3>Message Sent</h3>
index b74bf82..182c2a3 100644 (file)
@@ -8,7 +8,7 @@
 </script>
 </head>
 <body style="padding: 1em;" id="sendshelf">
-<div class="container"><!-- TMPL_IF NAME="email" -->
+<div id="usersendshelfform" class="container"><!-- TMPL_IF NAME="email" -->
 
     <!-- TMPL_IF NAME="SENT" -->
         <h3>Message Sent</h3>
index 13a3487..5652020 100644 (file)
@@ -9,7 +9,7 @@
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
 
-<div class="container">
+<div id="userserialissues" class="container">
 <h2>Issues for a subscription</h2>
 <div id="views">
        <span class="view"><a id="Normalview" href="opac-detail.pl?biblionumber=<!-- TMPL_VAR name="biblionumber" -->" class="button">Normal View</a></span>
 </div>
                        <!-- TMPL_IF NAME="OpacNav" -->
                        <div class="yui-b">
-                       <div class="container">
+                       <div id="leftmenus" class="container">
                        <!--TMPL_INCLUDE NAME="navigation.inc" -->
                        </div>
                        </div><!-- /TMPL_IF -->
index 196baa1..1e1d2d5 100644 (file)
@@ -142,7 +142,7 @@ $(function() {
       <!-- TMPL_INCLUDE NAME="masthead.inc" -->
       <div id="yui-main">
         <div class="yui-b">
-          <div class="container">
+          <div id="usershelves" class="container">
           
             <!-- TMPL_IF NAME="paramsloop" -->
               <!-- TMPL_LOOP NAME="paramsloop" -->
@@ -594,7 +594,7 @@ $(function() {
       </div>
       <!-- TMPL_IF EXPR="OpacNav||loggedinusername" -->
         <div class="yui-b">
-          <div class="container">
+          <div is="leftmenus" class="container">
             <!-- TMPL_INCLUDE NAME="navigation.inc" -->
             <!-- TMPL_INCLUDE NAME="usermenu.inc" -->
           </div>
index 9f26814..b4daac5 100644 (file)
@@ -14,7 +14,7 @@ $(document).ready(function(){
    <div id="bd">
 <!-- TMPL_INCLUDE name="masthead.inc" -->
        <div id="yui-main">
-       <div class="yui-b"><div class="container">
+       <div class="yui-b"><div id="usershowreviews" class="container">
     <div id="recentcomments" class="searchresults">
 <h3>Recent comments</h3>
 <table>
@@ -89,7 +89,7 @@ $(document).ready(function(){
 </div>
 </div>
 <!-- TMPL_IF EXPR="OpacNav" -->
-<div class="yui-b"><div class="container">
+<div class="yui-b"><div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 </div></div>
 <!-- /TMPL_IF -->
index 483551b..ab1e811 100644 (file)
@@ -70,7 +70,7 @@ $.tablesorter.addParser({
 <!-- TMPL_INCLUDE name="masthead.inc" -->
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g">
-<div class="container">
+<div id="usersuggestions" class="container">
 <!-- TMPL_IF name="op_add" -->
     <h1>Enter a new purchase suggestion</h1>
 
@@ -198,7 +198,7 @@ $.tablesorter.addParser({
 </div>
 </div>
 <div class="yui-b">
-<div class="container">
+<div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
index 80dac79..dbfa67e 100644 (file)
@@ -56,7 +56,7 @@
 
 <div id="yui-main">
   <div class="yui-b"><div class="yui-g">
-       <div class="container">
+       <div id="usertags" class="container">
        <!-- TMPL_IF NAME="ERRORS" -->
        <!-- TMPL_LOOP NAME="ERRORS" -->
                <div class="dialog alert">There was a problem with this operation:
 </div>
 </div>
 <!-- TMPL_IF EXPR="OpacNav||loggedinusername" -->
-<div class="yui-b"><div class="container">
+<div class="yui-b"><div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!--TMPL_INCLUDE NAME="usermenu.inc" -->
 </div></div>
index b5f3ce5..1e0f65c 100644 (file)
@@ -33,7 +33,7 @@
          </div></div>
        </div>
        <!-- TMPL_IF NAME="OpacNav" -->
-       <div class="yui-b"><div class="container">
+       <div class="yui-b"><div id="leftmenus" class="container">
        <!--TMPL_INCLUDE NAME="navigation.inc" -->
        </div></div>
        <!-- /TMPL_IF -->
index c02e78d..183c483 100644 (file)
@@ -138,13 +138,13 @@ function Dopop(link) {
 </div>
 </div>
 <!-- TMPL_IF NAME="results_loop" -->
-<div class="yui-b"><div class="container">
+<div class="yui-b"><div id="usertopissues" class="container">
 <!-- TMPL_INCLUDE NAME="opac-topissues.inc" -->
 <!-- TMPL_IF NAME="OpacNav" --><!--TMPL_INCLUDE NAME="navigation.inc" --><!-- /TMPL_IF -->
 </div></div>
 <!-- TMPL_ELSE -->
 <!-- TMPL_IF NAME="OpacNav" -->
-<div class="yui-b"><div class="container">
+<div class="yui-b"><div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 </div></div>
 <!-- /TMPL_IF -->
index 331f678..08aac17 100644 (file)
@@ -427,7 +427,7 @@ $.tablesorter.addParser({
 </div>
 </div>
 <div class="yui-b">
-<div class="container">
+<div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
index 174b8bd..c8b5ff8 100644 (file)
@@ -78,10 +78,10 @@ Card Number:</th><td><!-- TMPL_VAR NAME="cardnumber" --></td></tr>
 </div>
 </div>
 <div class="yui-b">
-<div class="container">
+<div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
 </div>
 </div>
-<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
\ No newline at end of file
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
index f806754..477e0d6 100644 (file)
@@ -9,7 +9,7 @@
        <div id="yui-main">
        <div class="yui-b"><div class="yui-g" id="userupdate">
 
-<div class="container">
+<div id="userupdatecontainer" class="container">
 <!-- TMPL_LOOP name="BORROWER_INFO" -->
 <h3><a href="/cgi-bin/koha/opac-user.pl"><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->'s account</a> <img src="<!-- TMPL_VAR NAME="themelang" -->../../images/caret.gif" width="16" height="16" alt="&gt;" border="0" /> Your Personal Details</h3>
 
 </div>
 </div>
 <div class="yui-b">
-<div class="container">
+<div id="leftmenus" class="container">
 <!--TMPL_INCLUDE NAME="navigation.inc" -->
 <!-- TMPL_INCLUDE name="usermenu.inc" -->
 </div>
index e15f01b..2d02d0c 100644 (file)
@@ -16,7 +16,7 @@ the kohaversion is divided in 4 parts :
 use strict;
 
 sub kohaversion {
-    our $VERSION = '3.03.00.017';
+    our $VERSION = '3.03.00.019';
     # version needs to be set this way
     # so that it can be picked up by Makefile.PL
     # during install
index db8be4a..6cb60fa 100755 (executable)
@@ -1,5 +1,6 @@
 #!/usr/bin/perl
 
+# Parts Copyright Biblibre 2010
 # This file is part of Koha.
 #
 # Koha is free software; you can redistribute it and/or modify it under the
@@ -27,22 +28,10 @@ use C4::Branch;
 use C4::Category;
 
 my $query = new CGI;
-my $quicksearch = $query->param('quicksearch');
 my $branch = $query->param('branchcode');
-my ($template, $loggedinuser, $cookie);
 my $template_name;
 
-if($quicksearch){
-($template, $loggedinuser, $cookie)
-    = get_template_and_user({template_name => "members/member-quicksearch.tmpl",
-                 query => $query,
-                 type => "intranet",
-                 authnotrequired => 0,
-                 flagsrequired => {borrowers => 1},
-                 debug => 1,
-                 });
-} else {
-($template, $loggedinuser, $cookie)
+my ($template, $loggedinuser, $cookie)
     = get_template_and_user({template_name => "members/member.tmpl",
                  query => $query,
                  type => "intranet",
@@ -50,7 +39,6 @@ if($quicksearch){
                  flagsrequired => {borrowers => 1},
                  debug => 1,
                  });
-}
 
 my $branches = GetBranches;
 my @branchloop;
@@ -70,20 +58,24 @@ my $branchloop = (defined $branch?GetBranchesLoop($branch):GetBranchesLoop());
 if(scalar(@$branchloop) < 1){
     $no_add = 1;
     $template->param(no_branches => 1);
-} else {
+} 
+else {
     $template->param(branchloop=>\@$branchloop);
 }
 
 @categories=C4::Category->all;
-if(scalar(@categories) < 1){ $no_categories = 1; }
+if(scalar(@categories) < 1){ 
+    $no_categories = 1; 
+}
+
 if($no_categories && C4::Context->preference("AddPatronLists")=~/code/){
     $no_add = 1;
     $template->param(no_categories => 1);
-} else {
+} 
+else {
     $template->param(categories=>\@categories);
 }
 
-
 $template->param( 
         "AddPatronLists_".C4::Context->preference("AddPatronLists")=> "1",
         no_add => $no_add,
index bd6ca82..f7631db 100755 (executable)
@@ -50,21 +50,11 @@ if ($input->param('borrowernumber')) {
     $data = GetMember(borrowernumber => $borrowernumber);
 }
 
-my $order=$input->param('order') || 'date_due desc';
-my $limit=$input->param('limit');
-
-if ($limit){
-    if ($limit eq 'full'){
-               $limit=0;
-    }
-}
-else {
-  $limit=50;
-}
+my $order = 'date_due desc';
+my $limit = 0;
 my ( $issues ) = GetAllIssues($borrowernumber,$order,$limit);
 
-my ($template, $loggedinuser, $cookie)
-= get_template_and_user({template_name => "members/readingrec.tmpl",
+my ($template, $loggedinuser, $cookie)= get_template_and_user({template_name => "members/readingrec.tmpl",
                                query => $input,
                                type => "intranet",
                                authnotrequired => 0,
index 92bc786..671368e 100755 (executable)
@@ -112,9 +112,9 @@ directory. This can be downloaded or futher processed by library staff.
 
 comma separated list of fields that get substituted into templates in
 places of the E<lt>E<lt>items.contentE<gt>E<gt> placeholder. This
-defaults to issuedate,title,barcode,author
+defaults to due date,title,barcode,author
 
-Other possible values come from fields in the biblios, items, and
+Other possible values come from fields in the biblios, items and
 issues tables.
 
 =item B<-borcat>
@@ -255,7 +255,7 @@ my $csvfilename;
 my $htmlfilename;
 my $triggered = 0;
 my $listall = 0;
-my $itemscontent = join( ',', qw( issuedate title barcode author itemnumber ) );
+my $itemscontent = join( ',', qw( date_due title barcode author itemnumber ) );
 my @myborcat;
 my @myborcatout;
 
index 6b525e7..c38c53e 100644 (file)
@@ -131,7 +131,7 @@ sub add_prefs {
                     }
                 }
             }
-            elsif ( $element ) {
+            elsif ( $element && $pref_name ) {
                 $self->po_append( $self->{file} . "#$pref_name# $element", $comment );
             }
         }
@@ -173,7 +173,7 @@ sub update_tab_prefs {
                     }
                 }
             }
-            elsif ( $element ) {
+            elsif ( $element && $pref_name ) {
                 my $id = $self->{file} . "#$pref_name# $element";
                 my $text = $self->get_trans_text( $id );
                 $p->[$i] = $text if $text;
@@ -189,6 +189,8 @@ sub get_po_from_prefs {
     for my $file ( @{$self->{pref_files}} ) {
         my $pref = LoadFile( $self->{path_pref_en} . "/$file" );
         $self->{file} = $file;
+        # Entries for tab titles
+        $self->po_append( $self->{file}, $_ ) for keys %$pref;
         while ( my ($tab, $tab_content) = each %$pref ) {
             if ( ref($tab_content) eq 'ARRAY' ) {
                 $self->add_prefs( $tab, $tab_content );
@@ -254,6 +256,13 @@ sub install_prefs {
     for my $file ( @{$self->{pref_files}} ) {
         my $pref = LoadFile( $self->{path_pref_en} . "/$file" );
         $self->{file} = $file;
+        # First, keys are replaced (tab titles)
+        $pref = do {
+            my %pref = map { 
+                $self->get_trans_text( $self->{file} ) || $_ => $pref->{$_}
+            } keys %$pref;
+            \%pref;
+        };
         while ( my ($tab, $tab_content) = each %$pref ) {
             if ( ref($tab_content) eq 'ARRAY' ) {
                 $self->update_tab_prefs( $pref, $tab_content );
index a1e9a22..4d23d08 100755 (executable)
@@ -101,12 +101,12 @@ if ($op eq "export") {
     }
     
     if ( $start_callnumber ) {
-        $query .= " AND biblioitems.biblionumber = items.biblionumber AND itemcallnumber <= ? ";
+        $query .= " AND biblioitems.biblionumber = items.biblionumber AND itemcallnumber >= ? ";
         push @sql_params, $start_callnumber;
     }
     
     if ( $end_callnumber ) {
-        $query .= " AND biblioitems.biblionumber = items.biblionumber AND itemcallnumber >= ? ";
+        $query .= " AND biblioitems.biblionumber = items.biblionumber AND itemcallnumber <= ? ";
         push @sql_params, $end_callnumber;
     }
     if ( $start_accession ) {