From 812ba6cd9cb619012c5a3032eb06dadd7ee68b74 Mon Sep 17 00:00:00 2001 From: Joshua Ferraro Date: Wed, 8 Aug 2007 16:29:43 -0500 Subject: [PATCH] working on virtual shelves cleanup, partially finished Signed-off-by: Chris Cormack --- C4/{BookShelves.pm => VirtualShelves.pm} | 0 .../bookshelves/addbookbybiblionumber.tmpl | 0 ...ookshelves.inc => menu-virtualshelves.inc} | 0 .../addbybiblionumber.tmpl} | 0 .../shelves.tmpl | 0 .../unido/en/includes/3-column-endr.inc | 0 ...umber.tmpl => opac-addbybiblionumber.tmpl} | 0 ...lionumber.pl => opac-addbybiblionumber.pl} | 0 t/{BookShelves.t => VirtualShelves.t} | 0 .../addbybiblionumber.pl | 22 +++++++++---------- {bookshelves => virtualshelves}/shelves.pl | 0 11 files changed, 11 insertions(+), 11 deletions(-) rename C4/{BookShelves.pm => VirtualShelves.pm} (100%) delete mode 100644 koha-tmpl/intranet-tmpl/default/zh-TW/bookshelves/addbookbybiblionumber.tmpl rename koha-tmpl/intranet-tmpl/prog/en/includes/{menu-bookshelves.inc => menu-virtualshelves.inc} (100%) rename koha-tmpl/intranet-tmpl/prog/en/{bookshelves/addbookbybiblionumber.tmpl => virtualshelves/addbybiblionumber.tmpl} (100%) rename koha-tmpl/intranet-tmpl/prog/en/{bookshelves => virtualshelves}/shelves.tmpl (100%) delete mode 100644 koha-tmpl/intranet-tmpl/unido/en/includes/3-column-endr.inc rename koha-tmpl/opac-tmpl/prog/en/{opac-addbookbybiblionumber.tmpl => opac-addbybiblionumber.tmpl} (100%) rename opac/{opac-addbookbybiblionumber.pl => opac-addbybiblionumber.pl} (100%) rename t/{BookShelves.t => VirtualShelves.t} (100%) rename bookshelves/addbookbybiblionumber.pl => virtualshelves/addbybiblionumber.pl (88%) rename {bookshelves => virtualshelves}/shelves.pl (100%) diff --git a/C4/BookShelves.pm b/C4/VirtualShelves.pm similarity index 100% rename from C4/BookShelves.pm rename to C4/VirtualShelves.pm diff --git a/koha-tmpl/intranet-tmpl/default/zh-TW/bookshelves/addbookbybiblionumber.tmpl b/koha-tmpl/intranet-tmpl/default/zh-TW/bookshelves/addbookbybiblionumber.tmpl deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/koha-tmpl/intranet-tmpl/prog/en/includes/menu-bookshelves.inc b/koha-tmpl/intranet-tmpl/prog/en/includes/menu-virtualshelves.inc similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/includes/menu-bookshelves.inc rename to koha-tmpl/intranet-tmpl/prog/en/includes/menu-virtualshelves.inc diff --git a/koha-tmpl/intranet-tmpl/prog/en/bookshelves/addbookbybiblionumber.tmpl b/koha-tmpl/intranet-tmpl/prog/en/virtualshelves/addbybiblionumber.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/bookshelves/addbookbybiblionumber.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/virtualshelves/addbybiblionumber.tmpl diff --git a/koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl b/koha-tmpl/intranet-tmpl/prog/en/virtualshelves/shelves.tmpl similarity index 100% rename from koha-tmpl/intranet-tmpl/prog/en/bookshelves/shelves.tmpl rename to koha-tmpl/intranet-tmpl/prog/en/virtualshelves/shelves.tmpl diff --git a/koha-tmpl/intranet-tmpl/unido/en/includes/3-column-endr.inc b/koha-tmpl/intranet-tmpl/unido/en/includes/3-column-endr.inc deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl b/koha-tmpl/opac-tmpl/prog/en/opac-addbybiblionumber.tmpl similarity index 100% rename from koha-tmpl/opac-tmpl/prog/en/opac-addbookbybiblionumber.tmpl rename to koha-tmpl/opac-tmpl/prog/en/opac-addbybiblionumber.tmpl diff --git a/opac/opac-addbookbybiblionumber.pl b/opac/opac-addbybiblionumber.pl similarity index 100% rename from opac/opac-addbookbybiblionumber.pl rename to opac/opac-addbybiblionumber.pl diff --git a/t/BookShelves.t b/t/VirtualShelves.t similarity index 100% rename from t/BookShelves.t rename to t/VirtualShelves.t diff --git a/bookshelves/addbookbybiblionumber.pl b/virtualshelves/addbybiblionumber.pl similarity index 88% rename from bookshelves/addbookbybiblionumber.pl rename to virtualshelves/addbybiblionumber.pl index 787a13b7fa..112ecece84 100755 --- a/bookshelves/addbookbybiblionumber.pl +++ b/virtualshelves/addbybiblionumber.pl @@ -1,6 +1,6 @@ #!/usr/bin/perl -#script to provide bookshelf management +#script to provide virtual shelf management # # # Copyright 2000-2002 Katipo Communications @@ -24,11 +24,11 @@ =head1 NAME - addbookbybiblionumber.pl + addvirtualbybiblionumber.pl =head1 DESCRIPTION - This script allow to add a book in a virtual shelf from a biblionumber. + This script allow to add a virtual in a virtual shelf from a biblionumber. =head1 CGI PARAMETERS @@ -40,9 +40,9 @@ =item shelfnumber - the shelfnumber where to add the book. + the shelfnumber where to add the virtual. -=item newbookshelf +=item newvirtualshelf if this parameter exists, then it must be equals to the name of the shelf to add. @@ -71,18 +71,18 @@ use warnings; my $query = new CGI; my $biblionumber = $query->param('biblionumber'); my $shelfnumber = $query->param('shelfnumber'); -my $newbookshelf = $query->param('newbookshelf'); +my $newvirtualshelf = $query->param('newvirtualshelf'); my $category = $query->param('category'); my ($template, $loggedinuser, $cookie) -= get_template_and_user({template_name => "bookshelves/addbookbybiblionumber.tmpl", += get_template_and_user({template_name => "virtualshelves/addvirtualbybiblionumber.tmpl", query => $query, type => "intranet", authnotrequired => 0, flagsrequired => {catalogue => 1}, }); -$shelfnumber = AddShelf($newbookshelf,$loggedinuser,$category) if $newbookshelf; +$shelfnumber = AddShelf($newvirtualshelf,$loggedinuser,$category) if $newvirtualshelf; if ($shelfnumber || ($shelfnumber == -1)) { # the shelf already exist. &AddToShelfFromBiblio($biblionumber, $shelfnumber); @@ -99,7 +99,7 @@ if ($shelfnumber || ($shelfnumber == -1)) { # the shelf already exist. $shelvesloop{$element} = $shelflist->{$element}->{'shelfname'}; } - my $CGIbookshelves=CGI::scrolling_list( + my $CGIvirtualshelves=CGI::scrolling_list( -name => 'shelfnumber', -values => \@shelvesloop, -labels => \%shelvesloop, @@ -111,7 +111,7 @@ if ($shelfnumber || ($shelfnumber == -1)) { # the shelf already exist. biblionumber => $biblionumber, title => $biblios[0]->{'title'}, author => $biblios[0]->{'author'}, - CGIbookshelves => $CGIbookshelves, + CGIvirtualshelves => $CGIvirtualshelves, intranetcolorstylesheet => C4::Context->preference("intranetcolorstylesheet"), intranetstylesheet => C4::Context->preference("intranetstylesheet"), IntranetNav => C4::Context->preference("IntranetNav"), @@ -148,7 +148,7 @@ if ($shelfnumber || ($shelfnumber == -1)) { # the shelf already exist. # theses scripts don't need to use C4::Search. # # Revision 1.4.2.3 2006/10/30 09:48:19 tipaul -# samll bugfix to create a bookshelf correctly +# samll bugfix to create a virtualshelf correctly # # Revision 1.4.2.2 2006/08/30 16:13:54 toins # correct an error in the "if condition". diff --git a/bookshelves/shelves.pl b/virtualshelves/shelves.pl similarity index 100% rename from bookshelves/shelves.pl rename to virtualshelves/shelves.pl -- 2.39.5