koha-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[Koha-cvs] CVS: koha/opac opac-addbookbybiblionumber.pl,1.1,1.2 opac-bas


From: Paul POULAIN
Subject: [Koha-cvs] CVS: koha/opac opac-addbookbybiblionumber.pl,1.1,1.2 opac-basket.pl,1.4,1.5 opac-detail.pl,1.17,1.18 opac-ISBDdetail.pl,1.6,1.7 opac-MARCdetail.pl,1.5,1.6 opac-readingrecord.pl,1.6,1.7 opac-reserve.pl,1.23,1.24 opac-search.pl,1.23,1.24 opac-searchresults.pl,1.16,1.17 opac-sendbasket.pl,1.4,1.5 opac-serial-issues.pl,1.2,1.3 opac-shelves.pl,1.6,1.7 opac-sidebar.pl,1.4,1.5 opac-suggestions.pl,1.3,1.4 opac-userdetails.pl,1.8,1.9 opac-user.pl,1.15,1.16
Date: Wed, 04 May 2005 02:02:45 -0700

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

Modified Files:
        opac-addbookbybiblionumber.pl opac-basket.pl opac-detail.pl 
        opac-ISBDdetail.pl opac-MARCdetail.pl opac-readingrecord.pl 
        opac-reserve.pl opac-search.pl opac-searchresults.pl 
        opac-sendbasket.pl opac-serial-issues.pl opac-shelves.pl 
        opac-sidebar.pl opac-suggestions.pl opac-userdetails.pl 
        opac-user.pl 
Log Message:
synch'ing 2.2 and head

Index: opac-addbookbybiblionumber.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-addbookbybiblionumber.pl,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -r1.1 -r1.2
*** opac-addbookbybiblionumber.pl       3 Jan 2005 11:09:59 -0000       1.1
--- opac-addbookbybiblionumber.pl       4 May 2005 09:02:38 -0000       1.2
***************
*** 44,48 ****
                                                        query => $query,
                                                        type => "opac",
!                                                       authnotrequired => 0,
                                                });
  
--- 44,48 ----
                                                        query => $query,
                                                        type => "opac",
!                                                       authnotrequired => 1,
                                                });
  
***************
*** 76,79 ****
--- 76,82 ----
                                                author => 
$biblios[0]->{'author'},
                                                CGIbookshelves => 
$CGIbookshelves,
+                                               LibraryName => 
C4::Context->preference("LibraryName"),
+                                               suggestion => 
C4::Context->preference("suggestion"),
+                                               virtualshelves => 
C4::Context->preference("virtualshelves"),
                                                );
  
***************
*** 81,84 ****
--- 84,98 ----
  }
  # $Log$
+ # Revision 1.2  2005/05/04 09:02:38  tipaul
+ # synch'ing 2.2 and head
+ #
+ # Revision 1.1.2.2  2005/03/25 17:04:27  tipaul
+ # adding virtual shelves & suggestions button to the top
+ #
+ # Revision 1.1.2.1  2005/03/10 08:44:43  tipaul
+ # bugfix in baskets :
+ # * The user does not need to have to have librarian rights to use virtual 
shelves
+ # * error when adding a biblio to an existing basket
+ #
  # Revision 1.1  2005/01/03 11:09:59  tipaul
  # *** empty log message ***

Index: opac-basket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-basket.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-basket.pl      25 Jan 2005 21:40:38 -0000      1.4
--- opac-basket.pl      4 May 2005 09:02:38 -0000       1.5
***************
*** 35,38 ****
--- 35,39 ----
        my $dat                                   = &bibdata($biblionumber);
        my ($authorcount, $addauthor)             = &addauthor($biblionumber);
+       my @items                                 = &ItemInfo(undef, 
$biblionumber, 'opac');
  
        $dat->{'additional'}=$addauthor->[0]->{'author'};
***************
*** 45,55 ****
        $num++;
        $dat->{'biblionumber'} = $biblionumber;
!       
        push (@results, $dat);
  }
  
  my address@hidden;
  
! $template->param(BIBLIO_RESULTS => $resultsarray);
  
  output_html_with_http_headers $query, $cookie, $template->output;
--- 46,61 ----
        $num++;
        $dat->{'biblionumber'} = $biblionumber;
!       $dat->{ITEM_RESULTS} = address@hidden;
        push (@results, $dat);
  }
  
  my address@hidden;
+ # my address@hidden;
  
! $template->param(BIBLIO_RESULTS => $resultsarray,
!                            LibraryName => 
C4::Context->preference("LibraryName"),
!                               suggestion => 
C4::Context->preference("suggestion"),
!                               virtualshelves => 
C4::Context->preference("virtualshelves"),
! );
  
  output_html_with_http_headers $query, $cookie, $template->output;

Index: opac-detail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-detail.pl,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -r1.17 -r1.18
*** opac-detail.pl      1 Mar 2005 13:41:32 -0000       1.17
--- opac-detail.pl      4 May 2005 09:02:38 -0000       1.18
***************
*** 72,75 ****
--- 72,78 ----
                                SITE_RESULTS => $sitearray,
                                subscriptionsnumber => $subscriptionsnumber,
+                            LibraryName => 
C4::Context->preference("LibraryName"),
+                               suggestion => 
C4::Context->preference("suggestion"),
+                               virtualshelves => 
C4::Context->preference("virtualshelves"),
  );
    ## Amazon.com stuff
***************
*** 105,106 ****
--- 108,111 ----
  output_html_with_http_headers $query, $cookie, $template->output;
  
+ output_html_with_http_headers $query, $cookie, $template->output;
+ 

Index: opac-ISBDdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-ISBDdetail.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** opac-ISBDdetail.pl  1 Mar 2005 13:41:32 -0000       1.6
--- opac-ISBDdetail.pl  4 May 2005 09:02:38 -0000       1.7
***************
*** 79,82 ****
--- 79,86 ----
                             debug => 1,
                             });
+ $template->param(LibraryName => C4::Context->preference("LibraryName"),
+                               suggestion => 
C4::Context->preference("suggestion"),
+                               virtualshelves => 
C4::Context->preference("virtualshelves"),
+ );
  
  my $ISBD = C4::Context->preference('ISBD');
***************
*** 89,93 ****
        my $blocres;
        foreach my $isbdfield (split /#/,$bloc) {
-       warn "ISBDFIELD : $isbdfield";
  #             $isbdfield= /(.?.?.?)/;
                $isbdfield =~ /(\d\d\d)\|(.*)\|(.*)\|(.*)/;
--- 93,96 ----

Index: opac-MARCdetail.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-MARCdetail.pl,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -r1.5 -r1.6
*** opac-MARCdetail.pl  1 Mar 2005 13:41:32 -0000       1.5
--- opac-MARCdetail.pl  4 May 2005 09:02:38 -0000       1.6
***************
*** 68,72 ****
  $biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless 
$biblionumber;
  my $itemtype = &MARCfind_frameworkcode($dbh,$bibid);
! my $tagslib = &MARCgettagslib($dbh,1,$itemtype);
  
  my $record =MARCgetbiblio($dbh,$bibid);
--- 68,72 ----
  $biblionumber = &MARCfind_oldbiblionumber_from_MARCbibid($dbh,$bibid) unless 
$biblionumber;
  my $itemtype = &MARCfind_frameworkcode($dbh,$bibid);
! my $tagslib = &MARCgettagslib($dbh,0,$itemtype);
  
  my $record =MARCgetbiblio($dbh,$bibid);
***************
*** 79,82 ****
--- 79,86 ----
                             debug => 1,
                             });
+ $template->param(LibraryName => C4::Context->preference("LibraryName"),
+                               suggestion => 
C4::Context->preference("suggestion"),
+                               virtualshelves => 
C4::Context->preference("virtualshelves"),
+ );
  
  # fill arrays
***************
*** 88,119 ****
        my @fields = $record->fields();
        my @loop_data =();
!       foreach my $field (@fields) {
!                       my @subfields_data;
                # if tag <10, there's no subfield, use the "@" trick
!               if ($field->tag()<10) {
!                       next if ($tagslib->{$field->tag()}->{'@'}->{tab}  ne 
$tabloop);
!                       next if ($tagslib->{$field->tag()}->{'@'}->{hidden});
                        my %subfield_data;
!                       
$subfield_data{marc_lib}=$tagslib->{$field->tag()}->{'@'}->{lib};
!                       $subfield_data{marc_value}=$field->data();
                        $subfield_data{marc_subfield}='@';
!                       $subfield_data{marc_tag}=$field->tag();
                        push(@subfields_data, \%subfield_data);
                } else {
!                       my @subf=$field->subfields;
        # loop through each subfield
                        for my $i (0..$#subf) {
                                $subf[$i][0] = "@" unless $subf[$i][0];
!                               next if 
($tagslib->{$field->tag()}->{$subf[$i][0]}->{tab}  ne $tabloop);
!                               next if 
($tagslib->{$field->tag()}->{$subf[$i][0]}->{hidden});
                                my %subfield_data;
!                               
$subfield_data{marc_lib}=$tagslib->{$field->tag()}->{$subf[$i][0]}->{lib};
!                               if 
($tagslib->{$field->tag()}->{$subf[$i][0]}->{isurl}) {
                                        $subfield_data{marc_value}="<a 
href=\"$subf[$i][1]\">$subf[$i][1]</a>";
                                } else {
!                                       
$subfield_data{marc_value}=get_authorised_value_desc($field->tag(), 
$subf[$i][0], $subf[$i][1], '', $dbh);
                                }
                                $subfield_data{marc_subfield}=$subf[$i][0];
!                               $subfield_data{marc_tag}=$field->tag();
                                push(@subfields_data, \%subfield_data);
                        }
--- 92,129 ----
        my @fields = $record->fields();
        my @loop_data =();
! #     foreach my $field (@fields) {
!       my @subfields_data;
!       for (my $x_i=0;$x_i<=$#fields;$x_i++) {
! #             warn "$tabloop => $x_i";
                # if tag <10, there's no subfield, use the "@" trick
!               if ($fields[$x_i]->tag()<10) {
!                       next if ($tagslib->{$fields[$x_i]->tag()}->{'@'}->{tab} 
 ne $tabloop);
!                       next if 
($tagslib->{$fields[$x_i]->tag()}->{'@'}->{hidden});
                        my %subfield_data;
!                       
$subfield_data{marc_lib}=$tagslib->{$fields[$x_i]->tag()}->{'@'}->{lib};
!                       $subfield_data{marc_value}=$fields[$x_i]->data();
                        $subfield_data{marc_subfield}='@';
!                       $subfield_data{marc_tag}=$fields[$x_i]->tag();
                        push(@subfields_data, \%subfield_data);
                } else {
!                       my @subf=$fields[$x_i]->subfields;
        # loop through each subfield
                        for my $i (0..$#subf) {
                                $subf[$i][0] = "@" unless $subf[$i][0];
!                               next if 
($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{tab}  ne $tabloop);
!                               next if 
($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{hidden});
                                my %subfield_data;
!                               
$subfield_data{marc_lib}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{lib};
!                               
$subfield_data{link}=$tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{link};
!                               if 
($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{isurl}) {
                                        $subfield_data{marc_value}="<a 
href=\"$subf[$i][1]\">$subf[$i][1]</a>";
                                } else {
!                                       if 
($tagslib->{$fields[$x_i]->tag()}->{$subf[$i][0]}->{authtypecode}) {
!                                               
$subfield_data{authority}=$fields[$x_i]->subfield(9);
!                                       }
!                                       
$subfield_data{marc_value}=get_authorised_value_desc($fields[$x_i]->tag(), 
$subf[$i][0], $subf[$i][1], '', $dbh);
                                }
                                $subfield_data{marc_subfield}=$subf[$i][0];
!                               $subfield_data{marc_tag}=$fields[$x_i]->tag();
                                push(@subfields_data, \%subfield_data);
                        }
***************
*** 121,127 ****
                if ($#subfields_data>=0) {
                        my %tag_data;
!                       $tag_data{tag}=$field->tag().' -'. 
$tagslib->{$field->tag()}->{lib};
!                       $tag_data{subfield} = address@hidden;
                        push (@loop_data, \%tag_data);
                }
        }
--- 131,143 ----
                if ($#subfields_data>=0) {
                        my %tag_data;
!                       if ($fields[$x_i]->tag() eq $fields[$x_i-1]->tag()) {
!                               $tag_data{tag}="";
!                       } else {
!                               $tag_data{tag}=$fields[$x_i]->tag().' -'. 
$tagslib->{$fields[$x_i]->tag()}->{lib};
!                       }
!                       my @tmp = @subfields_data;
!                       $tag_data{subfield} = address@hidden;
                        push (@loop_data, \%tag_data);
+                       undef @subfields_data;
                }
        }

Index: opac-readingrecord.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-readingrecord.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** opac-readingrecord.pl       8 Jan 2004 18:25:31 -0000       1.6
--- opac-readingrecord.pl       4 May 2005 09:02:38 -0000       1.7
***************
*** 52,55 ****
--- 52,57 ----
  $template->param(READING_RECORD => $issues,
                             LibraryName => 
C4::Context->preference("LibraryName"),
+                               suggestion => 
C4::Context->preference("suggestion"),
+                               virtualshelves => 
C4::Context->preference("virtualshelves"),
  );
  

Index: opac-reserve.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-reserve.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** opac-reserve.pl     1 Mar 2005 13:41:32 -0000       1.23
--- opac-reserve.pl     4 May 2005 09:02:38 -0000       1.24
***************
*** 171,174 ****
--- 171,176 ----
  $template->param(totalwidth => 2*$width-1,
                             LibraryName => 
C4::Context->preference("LibraryName"),
+                               suggestion => 
C4::Context->preference("suggestion"),
+                               virtualshelves => 
C4::Context->preference("virtualshelves"),
  );
  

Index: opac-search.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-search.pl,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -r1.23 -r1.24
*** opac-search.pl      18 Apr 2005 17:11:28 -0000      1.23
--- opac-search.pl      4 May 2005 09:02:38 -0000       1.24
***************
*** 55,59 ****
        my $orderby = $query->param('orderby');
        my $desc_or_asc = $query->param('desc_or_asc');
- 
        # builds tag and subfield arrays
        my @tags;
--- 55,58 ----
***************
*** 74,79 ****
        my ($results,$total) = catalogsearch($dbh, 
address@hidden,address@hidden,
                                                                                
address@hidden, address@hidden, address@hidden,
!                                                                               
$startfrom*$resultsperpage, $resultsperpage,$orderby, $desc_or_asc);
! 
        ($template, $loggedinuser, $cookie)
                = get_template_and_user({template_name => 
"opac-searchresults.tmpl",
--- 73,87 ----
        my ($results,$total) = catalogsearch($dbh, 
address@hidden,address@hidden,
                                                                                
address@hidden, address@hidden, address@hidden,
!                                                                               
$startfrom*$resultsperpage, $resultsperpage,$orderby,$desc_or_asc);
!       if ($total ==1) {
!       if (C4::Context->preference("BiblioDefaultView") eq "normal") {
!            print 
$query->redirect("/cgi-bin/koha/opac-detail.pl?bib="address@hidden>{biblionumber});
!       } elsif (C4::Context->preference("BiblioDefaultView") eq "MARC") {
!            print 
$query->redirect("/cgi-bin/koha/MARCdetail.pl?bib="address@hidden>{biblionumber});
!       } else {
!            print 
$query->redirect("/cgi-bin/koha/ISBDdetail.pl?bib="address@hidden>{biblionumber});
!       }
!       exit;
!       }
        ($template, $loggedinuser, $cookie)
                = get_template_and_user({template_name => 
"opac-searchresults.tmpl",
***************
*** 263,266 ****
--- 271,276 ----
                                                        searchdesc=> 
$searchdesc,
                                                        $defaultview => 1,
+                                                       suggestion => 
C4::Context->preference("suggestion"),
+                                                       virtualshelves => 
C4::Context->preference("virtualshelves"),
                                                        );
  
***************
*** 312,315 ****
--- 322,327 ----
                                        CGIitemtype => $CGIitemtype,
                                        CGIbranch => $CGIbranch,
+                                       suggestion => 
C4::Context->preference("suggestion"),
+                                       virtualshelves => 
C4::Context->preference("virtualshelves"),
        );
  }

Index: opac-searchresults.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-searchresults.pl,v
retrieving revision 1.16
retrieving revision 1.17
diff -C2 -r1.16 -r1.17
*** opac-searchresults.pl       10 May 2004 09:25:24 -0000      1.16
--- opac-searchresults.pl       4 May 2005 09:02:38 -0000       1.17
***************
*** 124,127 ****
--- 124,129 ----
  $template->param(numbers => $numbers,
                             LibraryName => 
C4::Context->preference("LibraryName"),
+                               suggestion => 
C4::Context->preference("suggestion"),
+                               virtualshelves => 
C4::Context->preference("virtualshelves"),
  );
  

Index: opac-sendbasket.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sendbasket.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-sendbasket.pl  7 Dec 2004 10:10:41 -0000       1.4
--- opac-sendbasket.pl  4 May 2005 09:02:38 -0000       1.5
***************
*** 42,46 ****
        my @bibs = split(/\//, $bib_list);
        my @results;
! 
        foreach my $biblionumber (@bibs) {
                $template2->param(biblionumber => $biblionumber);
--- 42,46 ----
        my @bibs = split(/\//, $bib_list);
        my @results;
!       my $iso2709;
        foreach my $biblionumber (@bibs) {
                $template2->param(biblionumber => $biblionumber);
***************
*** 48,51 ****
--- 48,52 ----
                my $dat = &bibdata($biblionumber);
                my ($authorcount, $addauthor) = &addauthor($biblionumber);
+               my @items                     = &ItemInfo(undef, $biblionumber, 
'opac');
  
                $dat->{'additional'}=$addauthor->[0]->{'author'};
***************
*** 55,59 ****
  
                $dat->{'biblionumber'} = $biblionumber;
!               
                push (@results, $dat);
        }
--- 56,63 ----
  
                $dat->{'biblionumber'} = $biblionumber;
!               $dat->{ITEM_RESULTS} = address@hidden;
!               my $record = MARCgetbiblio($dbh,$bibid);
!               $iso2709 .= $record->as_usmarc();
! 
                push (@results, $dat);
        }
***************
*** 98,101 ****
--- 102,106 ----
  END_OF_BODY
  
+ $mail{PJ} = $iso2709;
  #     $mail{body} = <<END_OF_BODY;
  #$boundary
***************
*** 130,134 ****
  else {
        $template->param(bib_list => $bib_list);
!       $template->param(url => "/cgi-bin/koha/opac-sendbasket.pl");
        output_html_with_http_headers $query, $cookie, $template->output;
  }
--- 135,142 ----
  else {
        $template->param(bib_list => $bib_list);
!       $template->param(url => "/cgi-bin/koha/opac-sendbasket.pl",
!       suggestion => C4::Context->preference("suggestion"),
!       virtualshelves => C4::Context->preference("virtualshelves"),
!       );
        output_html_with_http_headers $query, $cookie, $template->output;
  }

Index: opac-serial-issues.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-serial-issues.pl,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -r1.2 -r1.3
*** opac-serial-issues.pl       1 Mar 2005 13:41:32 -0000       1.2
--- opac-serial-issues.pl       4 May 2005 09:02:38 -0000       1.3
***************
*** 35,57 ****
        biblionumber => $query->param('biblionumber'),
        subscription_LOOP => $subscriptions
! #     startdate => format_date($subscription->{startdate}),
! #     periodicity => $subscription->{periodicity},
! #     dow => $subscription->{dow},
! #     numberlength => $subscription->{numberlength},
! #     weeklength => $subscription->{weeklength},
! #     monthlength => $subscription->{monthlength},
! #     opacnote => $subscription->{opacnote},
! #     numberingmethod => $subscription->{numberingmethod},
! #     arrivalplanified => $subscription->{arrivalplanified},
! #     status => $subscription->{status},
! #     biblionumber => $subscription->{biblionumber},
! #     bibliotitle => $subscription->{bibliotitle},
! #     notes => $subscription->{notes},
! #     subscriptionid => $subscription->{subscriptionid}
        );
- # $template->param(
- #                     "periodicity$subscription->{periodicity}" => 1,
- #                     "arrival$subscription->{dow}" => 1,
- #                     );
  
  output_html_with_http_headers $query, $cookie, $template->output;
--- 35,41 ----
        biblionumber => $query->param('biblionumber'),
        subscription_LOOP => $subscriptions
!       suggestion => C4::Context->preference("suggestion"),
!       virtualshelves => C4::Context->preference("virtualshelves"),
        );
  
  output_html_with_http_headers $query, $cookie, $template->output;

Index: opac-shelves.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-shelves.pl,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -r1.6 -r1.7
*** opac-shelves.pl     1 Mar 2005 13:41:32 -0000       1.6
--- opac-shelves.pl     4 May 2005 09:02:38 -0000       1.7
***************
*** 34,37 ****
--- 34,38 ----
  my $env;
  my $query = new CGI;
+ 
  my ($template, $loggedinuser, $cookie)
      = get_template_and_user({template_name => "opac-shelves.tmpl",
***************
*** 58,61 ****
--- 59,64 ----
  
  $template->param({    loggedinuser => $loggedinuser,
+                                       suggestion => 
C4::Context->preference("suggestion"),
+                                       virtualshelves => 
C4::Context->preference("virtualshelves"),
                                });
  SWITCH: {
***************
*** 170,174 ****
                $line{'author'}=$item->{'author'};
                $line{'classification'}=$item->{'classification'};              
!               $line{'itemtype'}=$item->{'itemtype'};                          
                $line{biblionumber} = $item->{biblionumber};
                push(@itemsloop, \%line);
--- 173,177 ----
                $line{'author'}=$item->{'author'};
                $line{'classification'}=$item->{'classification'};              
!               $line{'itemtype'}=$item->{'itemtype'};          
                $line{biblionumber} = $item->{biblionumber};
                push(@itemsloop, \%line);
***************
*** 184,196 ****
  #
  # $Log$
! # Revision 1.6  2005/03/01 13:41:32  tipaul
! # merging 2.2 branch with head. Sorry for not making it before, many many 
commits done here
  #
! # Revision 1.5  2005/01/27 17:27:11  oleonard
  # Taking table cell background color information out of the script and moving 
it into the template (requires update to opac-shelves.tmpl)
  #
! # Revision 1.4  2005/01/13 20:41:07  oleonard
  # Adding call number and item type to list of returned variables
  #
  # Revision 1.3  2005/01/03 11:09:34  tipaul
  # synch'ing virtual shelves management in opac with the librarian one, that 
has more features
--- 187,208 ----
  #
  # $Log$
! # Revision 1.7  2005/05/04 09:02:38  tipaul
! # synch'ing 2.2 and head
! #
! # Revision 1.3.2.4  2005/03/25 17:04:28  tipaul
! # adding virtual shelves & suggestions button to the top
  #
! # Revision 1.3.2.3  2005/01/27 17:18:28  oleonard
  # Taking table cell background color information out of the script and moving 
it into the template (requires update to opac-shelves.tmpl)
  #
! # Revision 1.3.2.2  2005/01/11 20:18:29  oleonard
  # Adding call number and item type to list of returned variables
  #
+ # Revision 1.3.2.1  2005/01/11 16:33:57  tipaul
+ # fix for http://bugs.koha.org/cgi-bin/bugzilla/show_bug.cgi?id=811 :
+ # The OPAC requires uses to log in to view virtual shelves, and it requires a 
user
+ # with librarian privileges.  Virtual shelves should be viewable by all users,
+ # logged in or not, and editable by all logged-in users in good standing.
+ #
  # Revision 1.3  2005/01/03 11:09:34  tipaul
  # synch'ing virtual shelves management in opac with the librarian one, that 
has more features

Index: opac-sidebar.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-sidebar.pl,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -r1.4 -r1.5
*** opac-sidebar.pl     2 Feb 2003 07:18:38 -0000       1.4
--- opac-sidebar.pl     4 May 2005 09:02:38 -0000       1.5
***************
*** 27,31 ****
  
  my $self_url = $query->url(-absolute => 1);
! $template->param(url => $self_url);
  
  output_html_with_http_headers $query, $cookie, $template->output;
--- 27,34 ----
  
  my $self_url = $query->url(-absolute => 1);
! $template->param(url => $self_url,
!                               suggestion => 
C4::Context->preference("suggestion"),
!                               virtualshelves => 
C4::Context->preference("virtualshelves"),
! );
  
  output_html_with_http_headers $query, $cookie, $template->output;

Index: opac-suggestions.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-suggestions.pl,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -r1.3 -r1.4
*** opac-suggestions.pl 12 Aug 2004 14:50:29 -0000      1.3
--- opac-suggestions.pl 4 May 2005 09:02:38 -0000       1.4
***************
*** 62,65 ****
--- 62,67 ----
                                suggestedbyme => $suggestedbyme,
                                "op_$op" => 1,
+                               suggestion => 
C4::Context->preference("suggestion"),
+                               virtualshelves => 
C4::Context->preference("virtualshelves"),
  );
  output_html_with_http_headers $input, $cookie, $template->output;

Index: opac-userdetails.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-userdetails.pl,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -r1.8 -r1.9
*** opac-userdetails.pl 13 Jul 2004 20:16:22 -0000      1.8
--- opac-userdetails.pl 4 May 2005 09:02:38 -0000       1.9
***************
*** 33,36 ****
--- 33,38 ----
  $template->param($borr);
  $template->param(LibraryName => C4::Context->preference("LibraryName")
+                                       suggestion => 
C4::Context->preference("suggestion"),
+                                       virtualshelves => 
C4::Context->preference("virtualshelves"),
        );
  

Index: opac-user.pl
===================================================================
RCS file: /cvsroot/koha/koha/opac/opac-user.pl,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -r1.15 -r1.16
*** opac-user.pl        19 Jan 2005 21:18:06 -0000      1.15
--- opac-user.pl        4 May 2005 09:02:38 -0000       1.16
***************
*** 138,141 ****
--- 138,143 ----
  $template->param(waiting_count => $wcount,
                             LibraryName => 
C4::Context->preference("LibraryName"),
+                                       suggestion => 
C4::Context->preference("suggestion"),
+                                       virtualshelves => 
C4::Context->preference("virtualshelves"),
  );
  




reply via email to

[Prev in Thread] Current Thread [Next in Thread]