[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Koha-cvs] koha ./catalogue-home.pl C4/Biblio.pm C4/Contex... [dev_week]
|
From: |
Joshua Ferraro |
|
Subject: |
[Koha-cvs] koha ./catalogue-home.pl C4/Biblio.pm C4/Contex... [dev_week] |
|
Date: |
Fri, 02 Jun 2006 23:11:24 +0000 |
CVSROOT: /sources/koha
Module name: koha
Branch: dev_week
Changes by: Joshua Ferraro <address@hidden> 06/06/02 23:11:24
Modified files:
. : catalogue-home.pl
C4 : Biblio.pm Context.pm Search.pm
koha-tmpl/intranet-tmpl/npl/en/catalogue: catalogue-home.tmpl
koha-tmpl/intranet-tmpl/npl/en/includes: doc-head-close-cat.inc
koha-tmpl/opac-tmpl/npl/en: opac-MARCdetail.tmpl
koha-tmpl/opac-tmpl/npl/en/includes: opac-colors.npl.css
opac-layout.css
Log message:
Committing my working dev_week. It's been tested only with
searching, and there's quite a lot of config stuff to set up
beforehand. As things get closer to a release, we'll be making
some scripts to do it for us
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/koha/catalogue-home.pl.diff?only_with_tag=dev_week&tr1=1.11.2.3.2.4&tr2=1.11.2.3.2.5&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/C4/Biblio.pm.diff?only_with_tag=dev_week&tr1=1.115.2.51.2.11&tr2=1.115.2.51.2.12&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/C4/Context.pm.diff?only_with_tag=dev_week&tr1=1.18.2.5.2.5&tr2=1.18.2.5.2.6&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/C4/Search.pm.diff?only_with_tag=dev_week&tr1=1.99.2.11.2.2&tr2=1.99.2.11.2.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/catalogue-home.tmpl.diff?only_with_tag=dev_week&tr1=1.3.4.3&tr2=1.3.4.4&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-cat.inc.diff?only_with_tag=dev_week&tr1=1.1.2.2&tr2=1.1.2.3&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl.diff?only_with_tag=dev_week&tr1=1.1.2.8&tr2=1.1.2.8.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.npl.css.diff?only_with_tag=dev_week&tr1=1.1.2.1&tr2=1.1.2.1.2.1&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css.diff?only_with_tag=dev_week&tr1=1.1.2.4&tr2=1.1.2.4.2.1&r1=text&r2=text
Patches:
Index: koha/C4/Biblio.pm
diff -u koha/C4/Biblio.pm:1.115.2.51.2.11 koha/C4/Biblio.pm:1.115.2.51.2.12
--- koha/C4/Biblio.pm:1.115.2.51.2.11 Sun May 28 18:49:12 2006
+++ koha/C4/Biblio.pm Fri Jun 2 23:11:23 2006
@@ -2777,6 +2777,7 @@
sub zebraop{
###Accepts a $server variable thus we can use it for biblios authorities or
other zebra dbs
my ($dbh,$biblionumber,$op,$server)address@hidden;
+warn "SERVER:".$server;
my @Zconnbiblio;
my $tried=0;
my $recon=0;
@@ -2913,8 +2914,14 @@
=cut
-# $Id: Biblio.pm,v 1.115.2.51.2.11 2006/05/28 18:49:12 tgarip1957 Exp $
+# $Id: Biblio.pm,v 1.115.2.51.2.12 2006/06/02 23:11:23 kados Exp $
# $Log: Biblio.pm,v $
+# Revision 1.115.2.51.2.12 2006/06/02 23:11:23 kados
+# Committing my working dev_week. It's been tested only with
+# searching, and there's quite a lot of config stuff to set up
+# beforehand. As things get closer to a release, we'll be making
+# some scripts to do it for us
+#
# Revision 1.115.2.51.2.11 2006/05/28 18:49:12 tgarip1957
# This is an unusual commit. The main purpose is a working model of Zebra on a
modified rel2_2.
# Any questions regarding these commits should be asked to Joshua Ferraro
unless you are Joshua whom I'll report to
Index: koha/C4/Context.pm
diff -u koha/C4/Context.pm:1.18.2.5.2.5 koha/C4/Context.pm:1.18.2.5.2.6
--- koha/C4/Context.pm:1.18.2.5.2.5 Sun May 28 18:49:12 2006
+++ koha/C4/Context.pm Fri Jun 2 23:11:24 2006
@@ -15,7 +15,7 @@
# Koha; if not, write to the Free Software Foundation, Inc., 59 Temple Place,
# Suite 330, Boston, MA 02111-1307 USA
-# $Id: Context.pm,v 1.18.2.5.2.5 2006/05/28 18:49:12 tgarip1957 Exp $
+# $Id: Context.pm,v 1.18.2.5.2.6 2006/06/02 23:11:24 kados Exp $
package C4::Context;
use strict;
use DBI;
@@ -25,7 +25,7 @@
qw($context),
qw(@context_stack);
-$VERSION = do { my @v = '$Revision: 1.18.2.5.2.5 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.18.2.5.2.6 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
=head1 NAME
@@ -45,8 +45,8 @@
=head1 DESCRIPTION
When a Koha script runs, it makes use of a certain number of things:
-configuration settings in F</etc/koha.conf>, a connection to the Koha
-database, and so forth. These things make up the I<context> in which
+configuration settings in F</etc/koha.xml>, a connection to the Koha
+databases, and so forth. These things make up the I<context> in which
the script runs.
This module takes care of setting up the context for a script:
@@ -66,7 +66,7 @@
the C<&set_context> and C<&restore_context> functions, below.
By default, C4::Context reads the configuration from
-F</etc/koha.conf>. This may be overridden by setting the C<$KOHA_CONF>
+F</etc/koha.xml>. This may be overridden by setting the C<$KOHA_CONF>
environment variable to the pathname of a configuration file to use.
=head1 METHODS
@@ -91,7 +91,7 @@
# Zconn
# A connection object for the Zebra server
-use constant CONFIG_FNAME => "/etc2/koha.xml";
+use constant CONFIG_FNAME => "/etc/koha.xml";
# Default config file, if none is specified
$context = undef; # Initially, no context is set
@@ -156,11 +156,11 @@
=item new
$context = new C4::Context;
- $context = new C4::Context("/path/to/koha.conf");
+ $context = new C4::Context("/path/to/koha.xml");
Allocates a new context. Initializes the context from the specified
file, which defaults to either the file given by the C<$KOHA_CONF>
-environment variable, or F</etc/koha.conf>.
+environment variable, or F</etc/koha.xml>.
C<&new> does not set this context as the new default context; for
that, use C<&set_context>.
@@ -394,26 +394,25 @@
=cut
sub Zconn {
- my $self = shift;
-my $server=shift;
+ my $self = shift;
+ my $server=shift;
my $Zconn;
- if (defined($context->{"Zconn"})) {
- $Zconn = $context->{"Zconn"};
- return $context->{"Zconn"};
+ if (defined($context->{"Zconn"})) {
+ $Zconn = $context->{"Zconn"};
+ return $context->{"Zconn"};
} else {
$context->{"Zconn"} = &new_Zconn($server);
return $context->{"Zconn"};
- }
+ }
}
sub Zconnauth {
- my $self = shift;
-my $server=shift;
+ my $self = shift;
+ my $server="biblioserver"; #shift;
my $Zconnauth;
##We destroy each connection made so create a new one
- $context->{"Zconnauth"} = &new_Zconnauth($server);
- return $context->{"Zconnauth"};
-
+ $context->{"Zconnauth"} = &new_Zconnauth($server);
+ return $context->{"Zconnauth"};
}
@@ -431,47 +430,47 @@
my $tried==0;
my $Zconn;
my ($tcp,$host,$port)=split /:/,$context->{"listen"}->{$server}->{"content"};
-
retry:
eval {
$Zconn=new
ZOOM::Connection($context->config("hostname"),$port,databaseName=>$context->{"config"}->{$server},
preferredRecordSyntax => "USmarc",elementSetName=> "F");
+ $Zconn->option(cqlfile => "/koha/etc/pqf.properties");
};
if ($@){
###Uncomment the lines below if you want to automatically restart your zebra
if its stop
###The system call is for Windows it should be changed to unix deamon starting
for Unix platforms
- if (address@hidden>code==10000 && $tried==0){ ##No connection
try restarting Zebra
- $tried==1;
- my $res=system('sc start "Z39.50 Server"
>c:/zebraserver/error.log');
- goto "retry";
- }else{
- warn "Error ", address@hidden>code(), ": ",
address@hidden>message(), "\n";
- $Zconn="error";
- return $Zconn;
- }
+ # if (address@hidden>code==10000 && $tried==0){ ##No connection
try restarting Zebra
+ # $tried==1;
+ # my $res=system('sc start "Z39.50 Server"
>/koha/log/zebra-error.log');
+ # goto "retry";
+ # }else{
+ # warn "Error ", address@hidden>code(), ": ",
address@hidden>message(), "\n";
+ # $Zconn="error";
+ # return $Zconn;
+ # }
}
return $Zconn;
}
## Zebra handler with write permission
sub new_Zconnauth {
-use ZOOM;
-my $server=shift;
-my $tried==0;
-my $Zconnauth;
-my ($tcp,$host,$port)=split /:/,$context->{"listen"}->{$server}->{"content"};
-my $o = new ZOOM::Options();
-$o->option(async => 1);
-$o->option(preferredRecordSyntax => "usmarc");
-$o->option(elementSetName => "F");
-$o->option(user=>$context->{"config"}->{"zebrauser"});
-$o->option(password=>$context->{"config"}->{"zebrapass"});
-$o->option(databaseName=>$context->{"config"}->{$server});
-retry:
+ use ZOOM;
+ my $server=shift;
+ my $tried==0;
+ my $Zconnauth;
+ my ($tcp,$host,$port)=split
/:/,$context->{"listen"}->{$server}->{"content"};
+ my $o = new ZOOM::Options();
+ $o->option(async => 1);
+ $o->option(preferredRecordSyntax => "usmarc");
+ $o->option(elementSetName => "F");
+ $o->option(user=>$context->{"config"}->{"zebrauser"});
+ $o->option(password=>$context->{"config"}->{"zebrapass"});
+ $o->option(databaseName=>$context->{"config"}->{$server});
- $Zconnauth=create ZOOM::Connection($o);
+retry:
- $Zconnauth->connect($context->config("hostname"),$port );
+ $Zconnauth=create ZOOM::Connection($o);
+ $Zconnauth->connect($context->config("hostname"),$port);
return $Zconnauth;
}
@@ -813,6 +812,12 @@
=cut
# $Log: Context.pm,v $
+# Revision 1.18.2.5.2.6 2006/06/02 23:11:24 kados
+# Committing my working dev_week. It's been tested only with
+# searching, and there's quite a lot of config stuff to set up
+# beforehand. As things get closer to a release, we'll be making
+# some scripts to do it for us
+#
# Revision 1.18.2.5.2.5 2006/05/28 18:49:12 tgarip1957
# This is an unusual commit. The main purpose is a working model of Zebra on a
modified rel2_2.
# Any questions regarding these commits should be asked to Joshua Ferraro
unless you are Joshua whom I'll report to
Index: koha/C4/Search.pm
diff -u koha/C4/Search.pm:1.99.2.11.2.2 koha/C4/Search.pm:1.99.2.11.2.3
--- koha/C4/Search.pm:1.99.2.11.2.2 Sun May 28 18:49:12 2006
+++ koha/C4/Search.pm Fri Jun 2 23:11:24 2006
@@ -35,7 +35,7 @@
use vars qw($VERSION @ISA @EXPORT @EXPORT_OK %EXPORT_TAGS);
# set the version for version checking
-$VERSION = do { my @v = '$Revision: 1.99.2.11.2.2 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.99.2.11.2.3 $' =~ /\d+/g;
shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
=head1 NAME
@@ -679,6 +679,7 @@
#warn "$query,@params,";
$count_query = $query;
+ warn "QUERY:".$count_query;
#execute the query and returns just the results between $num and $num +
$offset
my $limit = $num + $offset;
my $startfrom = $offset;
@@ -853,6 +854,14 @@
if ($search->{'itemnumber'} ne '' || $search->{'isbn'} ne ''||
$search->{'biblionumber'} ne ''|| $search->{'authnumber'} ne ''){
($count,@results) = CatSearch4('precise',$search,$num,$offset);
+ } elsif ($search->{'cql'} ne ''){
+ if ($search->{'rpn'} ne '') {
+ warn "RPN ON";
+ ($count,@results) =
CatSearch4('rpn',$search,$num,$offset);
+ } else {
+ warn "RPN".$search->{'rpn'};
+ ($count,@results) = CatSearch4('cql',$search,$num,$offset);
+ }
} elsif ($search->{'keyword'} ne ''){
($count,@results) = CatSearch4('keyword',$search,$num,$offset);
} elsif ($search->{'recently_items'} ne '') {
@@ -878,7 +887,23 @@
my $marcdata;
my $toggle;
my $even=1;
+ my $cql;
+ my $rpn;
+ my $cql_query;
# 1) do a search by barcode or isbn
+ if ($type eq 'cql') {
+ $cql=1;
+ $cql_query = $search->{'cql'};
+ while( my ($k, $v) = each %$search ) {
+ warn "key: $k, value: $v.\n";
+ }
+ warn "QUERY:".$query;
+ }
+ if ($type eq 'rpn') {
+ $rpn=1;
+ $cql=1;
+ $cql_query = $search->{'cql'}; #but it's really a rpn query
FIXME
+ }
if ($type eq 'precise') {
if ($search->{'itemnumber'} ne '') {
@@ -931,7 +956,7 @@
#search by itemtypes
if ($search->{'class'} ne '') {
$query= "address@hidden ".$query;
- $query .= " address@hidden 1=4
\"".$search->{'class'}."\"";
+ $query .= " address@hidden 1=1031
\"".$search->{'class'}."\"";
push @params, $search->{'class'};
}
#search by callnumber
@@ -983,7 +1008,7 @@
push @params, $keys;
if ($search->{'class'} ne '') {
$query= "address@hidden ".$query;
- $query .= " address@hidden 1=4
\"".$search->{'class'}."\"";
+ $query .= " address@hidden 1=1031
\"".$search->{'class'}."\"";
}
@@ -1020,6 +1045,8 @@
} elsif ($search->{'field_name1'} eq 'subject') {
$condition1.=" address@hidden 1=21 ".$attr."
\"".$search->{'field_value1'}."\" ";
+ } elsif ($search->{'field_name1'} eq 'series') {
+ $condition1.="
address@hidden 1=5 ".$attr." \"".$search->{'field_value1'}."\" ";
} elsif ($search->{'field_name1'} eq 'publisher') {
$condition1.= " address@hidden 1=1018 ".$attr."
\"".$search->{'field_value1'}."\" ";
@@ -1094,6 +1121,18 @@
$query = " address@hidden
".$query;
$condition2.= " address@hidden
1=21 ".$attr2." \"".$search->{'field_value2'}."\" ";
}
+ } elsif ($search->{'field_name2'} eq 'series') {
+ if ($search->{'op1'} eq 'and') {
+ $query = " address@hidden
".$query;
+ $condition2.= " address@hidden
1=5 ".$attr2." \"".$search->{'field_value2'}."\" ";
+
+ } elsif ($search->{'op1'} eq 'or') {
+ $query = " address@hidden
".$query;
+ $condition2.= " address@hidden
1=5 ".$attr2." \"".$search->{'field_value2'}."\" ";
+ } else {
+ $query = " address@hidden
".$query;
+ $condition2.= " address@hidden
1=5 ".$attr2." \"".$search->{'field_value2'}."\" ";
+ }
} elsif ($search->{'field_name2'} eq 'callno') {
if ($search->{'op1'} eq 'and') {
$query = " address@hidden
".$query;
@@ -1182,6 +1221,18 @@
$query = " address@hidden
".$query;
$condition3.= " address@hidden
1=21 ".$attr3." \"".$search->{'field_value3'}."\" ";
}
+ } elsif ($search->{'field_name3'} eq 'series') {
+ if ($search->{'op2'} eq 'and') {
+ $query = " address@hidden
".$query;
+ $condition3.= " address@hidden
1=5 ".$attr3." \"".$search->{'field_value3'}."\" ";
+
+ } elsif ($search->{'op2'} eq 'or') {
+ $query = " address@hidden
".$query;
+ $condition3.= " address@hidden
1=5 ".$attr3." \"".$search->{'field_value3'}."\" ";
+ } else {
+ $query = " address@hidden
".$query;
+ $condition3.= " address@hidden
1=5 ".$attr3." \"".$search->{'field_value3'}."\" ";
+ }
} elsif ($search->{'field_name3'} eq 'callno') {
if ($search->{'op2'} eq 'and') {
$query = " address@hidden
".$query;
@@ -1214,7 +1265,7 @@
#search by class
if ($search->{'class'} ne '') {
$query= "address@hidden ".$query;
- $query .= " address@hidden 1=4
\"".$search->{'class'}."\"";
+ $query .= " address@hidden 1=1031
\"".$search->{'class'}."\"";
push @params, $search->{'class'};
}
#search by branch
@@ -1240,8 +1291,18 @@
}
-
- $count_query = $query;
+ if ($cql) {
+ warn "STILL CQL";
+ $count_query = $cql_query;
+ $query=1;
+ } else {
+ $count_query = $query;
+ }
+ warn "QUERY_AFTER".$count_query;
+ if ($search->{'order'}) {
+ $query.=" ".$search->{'order'};
+ $query=" address@hidden address@hidden ".$query;
+ }
#warn $query;
#execute the query and returns just the results between $num and $num +
$offset
my $limit = $num + $offset;
@@ -1253,11 +1314,21 @@
}
#$oConnection->option(preferredRecordSyntax => "XML");
my $oResult;
-my $newq= new ZOOM::Query::PQF($query);
-my $order=$search->{'order'};
-if ($order){
-$newq->sortby("$order");
+my $newq;
+if ($cql) {
+ warn "CQLISH:".$cql_query;
+ if ($rpn) {
+ $newq= new ZOOM::Query::PQF($cql_query);
+ } else {
+ $newq = new ZOOM::Query::CQL2RPN($cql_query,$oConnection);
+ }
+} else {
+ $newq= new ZOOM::Query::PQF($query);
}
+#my $order=$search->{'order'};
+#if ($order){
+#$newq->sortby("$order");
+#}
eval {
$oResult= $oConnection->search($newq);
};
Index: koha/catalogue-home.pl
diff -u koha/catalogue-home.pl:1.11.2.3.2.4 koha/catalogue-home.pl:1.11.2.3.2.5
--- koha/catalogue-home.pl:1.11.2.3.2.4 Sun May 28 20:08:49 2006
+++ koha/catalogue-home.pl Fri Jun 2 23:11:23 2006
@@ -22,7 +22,7 @@
my ($template, $borrowernumber, $cookie);
# get all the common search variables,
-my @fields = ('keyword', 'itemnumber', 'isbn','biblionumber', 'class',
'branch', 'range', 'recently_items', 'ttype',
+my @fields = ('keyword', 'cql', 'itemnumber', 'isbn','biblionumber', 'class',
'branch', 'range', 'recently_items', 'ttype',
'field_name1', 'field_name2', 'field_name3', 'field_value1',
'field_value2', 'field_value3',
'op1', 'op2', 'ttype1', 'ttype2', 'ttype3',
'atype1','atype2','atype3','date_from',
'date_to','stack','callno','authtype','authnumber','number_to_display','zoom','order','format');
@@ -116,7 +116,10 @@
}
}
if ($zoom eq "1"){
-
+warn "SEARCH";
+while( my ($k, $v) = each %search ) {
+ warn "key: $k, value: $v.\n";
+ }
($count, @results) =catalogsearch4(\%search,$number_of_results,$startfrom);
}else{
Index: koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/catalogue-home.tmpl
diff -u
koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/catalogue-home.tmpl:1.3.4.3
koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/catalogue-home.tmpl:1.3.4.4
--- koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/catalogue-home.tmpl:1.3.4.3
Sun May 28 18:49:12 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/catalogue/catalogue-home.tmpl Fri Jun
2 23:11:24 2006
@@ -10,6 +10,10 @@
<table align ="center" background="<!-- TMPL_VAR NAME="themelang"
-->/images/background-mem.gif">
<tr>
+ <td align ="center">
+ <input id="searchType4" type="button"
value="Google-esque" onclick="changeSearch4()" <!-- TMPL_IF name="cql_search"
-->class="searchtypeselected"<!-- TMPL_ELSE -->class="searchtype"<!-- /TMPL_IF
-->>
+ </td>
+
<td align ="center">
<input id="searchType3" type="button" value="Advanced Search"
onclick="changeSearch3()" <!-- TMPL_IF name="loose_search"
-->class="searchtypeselected"<!-- TMPL_ELSE -->class="searchtype"<!-- /TMPL_IF
-->>
</td>
@@ -112,7 +116,14 @@
</table>
</form>
-
+<form name="cql_form" id="cql_form" action="/cgi-bin/koha/catalogue-home.pl"
method='bost' <!-- TMPL_IF name="cql_search" -->style="display:inline;"<!--
TMPL_ELSE-->style="display:none;"<!-- /TMPL_IF -->>
+ <input type="hidden" name="op" value="do_search">
+ <input type="hidden" name="search_type" value="cql">
+ <input type="hidden" name="startfrom" value="0">
+ <input type="hidden" name="zoom" value="1">
+ <input type="hidden" name="number_to_display" value="10">
+ <input type="text" size="25" name="cql" value="<!-- TMPL_VAR
name="cql" -->" >
+</form>
<form onSubmit="return checkLooseSearch()" name="loose_form" id="loose_form"
action="/cgi-bin/koha/catalogue-home.pl" method='post' <!-- TMPL_IF
name="loose_search" -->style="display:inline;"<!-- TMPL_ELSE
-->style="display:none;"<!-- /TMPL_IF -->>
<input type="hidden" name="op" value="do_search">
Index: koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-cat.inc
diff -u
koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-cat.inc:1.1.2.2
koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-cat.inc:1.1.2.3
--- koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-cat.inc:1.1.2.2
Tue May 9 19:41:00 2006
+++ koha/koha-tmpl/intranet-tmpl/npl/en/includes/doc-head-close-cat.inc Fri Jun
2 23:11:24 2006
@@ -77,6 +77,12 @@
// document.getElementById('loose_form').reset();
document.getElementById('loose_form').style.display =
'inline';
}
+ function changeSearch4() {
+ resetButtonsColors();
+
document.getElementById('searchType4').style.backgroundColor='yellow';
+ hideSearchsTypes();
+
document.getElementById('cql_form').style.display='inline';
+ }
function checkKeywordSearch() {
if (document.keyword_form.keyword.value == '') {
Index: koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.npl.css
diff -u /dev/null
koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.npl.css:1.1.2.1.2.1
--- /dev/null Fri Jun 2 23:11:24 2006
+++ koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.npl.css Fri Jun
2 23:11:24 2006
@@ -0,0 +1,474 @@
+/* COLORS, BACKGROUNDS, AND BORDERS */
+
+a {
+ color : #006699;
+}
+
+a b {
+ color : #000099;
+}
+
+a:active {
+ color : #990033;
+}
+
+a:visited {
+ color : #006699;
+}
+
+a:hover {
+ color : #990033;
+}
+
+a:link.current {
+ background-color : transparent;
+ color : #3366CC;
+}
+
+a:hover.current {
+ background-color : #CCFF00;
+ color : #CC3333;
+}
+
+a:visited.current {
+ background-color : transparent;
+ color : #3366CC;
+}
+
+a:active.current {
+ background-color : #99CC00;
+ color : #FFFF99;
+}
+
+a:link.nav {
+ background-color : #FFFFCC;
+ color : #3366CC;
+}
+
+a:hover.nav {
+ background-color : #CCFF00;
+ color : #CC3333;
+}
+
+a:active.nav {
+ background-color : #99CC00;
+ color : #FFFF99;
+}
+
+a:visited.nav {
+ background-color : #FFFFCC;
+ color : #3366CC;
+}
+
+.menu a:link.logout {
+ background-color : #FFDD75;
+ color : Black;
+}
+
+.menu a:active.logout {
+ background-color : #FFDD75;
+ color : Black;
+}
+
+
+.menu a:visited.logout {
+ background-color : #FFDD75;
+ color : Black;
+}
+
+.menu a:hover.logout {
+ background-color : #FFCC33;
+ color : Black;
+}
+
+body {
+ background-color : #339999;
+}
+
+caption {
+ color : #000066;
+}
+
+div.form, div.details {
+ background-color : #FFFFCC;
+}
+
+h1,h2,h3,h4,h5,h6 {
+ color : #000066;
+}
+
+
+h1.logo {
+ color : #D3DFAD;
+}
+
+p.error, div.error {
+ background-color : #FFFFCC;
+ border : 1px dashed #cc6600;
+}
+
+div.error h3 {
+ color : #990000;
+}
+
+table {
+ background-color : #FFFFCC;
+ border-collapse : collapse;
+}
+
+td {
+ border-bottom : 1px solid #E7E7CA;
+ border-right : 1px solid #E7E7CA;
+}
+
+th {
+ background-color : #D8DEB8;
+ border-bottom : 1px solid #000000;
+ border-right : 1px solid #000000;
+}
+
+th:last-child {
+ background-color : #D8DEB8;
+ border-bottom : 1px solid #000000;
+ border-right : 0;
+}
+
+th[scope="row"] {
+ background-color : #E7E7CA;
+}
+
+tr.highlight th[scope="row"] {
+ background-color : #EFF1DC;
+}
+
+td.input, div.form td, div.details td {
+ border-bottom : 1px solid #E7E7CA;
+ border-left : 0;
+ border-right : 0;
+ color : #000000;
+}
+
+td.label, div.form th, div.details th {
+ background-color : #FFC;
+ border-bottom : 1px solid #E7E7CA;
+ border-left : 1px solid #E7E7CA;
+ color : #000088;
+}
+
+td.label {
+ border-bottom : 1px solid #E7E7CA;
+ border-left : 1px solid #E7E7CA;
+ color : #000088;
+}
+
+td:last-child {
+ border-bottom : 1px solid #E7E7CA;
+ border-right : 0 solid #E7E7CA;
+}
+
+tr.highlight {
+ background-color : #FFFFFF;
+}
+
+.content-block {
+ background-color : #FFFFCC;
+}
+
+.current {
+ background-color : #FFFFFF;
+ color : #3366CC;
+}
+
+
+.further {
+ color: #CCCC99;
+ border: 2px solid #D8DEB8;
+ background-color : #E7E7CA;
+}
+
+.further h4 {
+ background-color : #D8DEB8;
+}
+
+.further li {
+ border-bottom : 1px solid #CCCC99;
+ }
+
+.detail-sidebar {
+ background-color : #E7E7CA;
+}
+
+.operations li a, .operations li a:visited {
+ border: 2px solid #D8DEB8;
+ color: #E7E7CA;
+ background-color : #CC6600;
+}
+
+.operations li a:hover {
+ color: #FFFFCC;
+ background-color: #FF9933;
+}
+
+.operations li a:active {
+ color : #FFFFCC;
+ background-color: #FF9933;
+}
+
+.loggedin {
+ color : #D8DEB8;
+}
+
+.marctag {
+ color : #000000;
+ background-color : #E7E7CA;
+}
+
+.marcsubfieldletter {
+ background-color: #EFF1DC;
+}
+
+.marcsubfieldname {
+ background-color: #FFFFCC;
+}
+
+.subfield {
+ background-color: #FFFFCC;
+}
+
+.subfieldvalue {
+ background-color : #FFFFFF;
+}
+
+.menu {
+ color : #CCCC99;
+}
+
+.menu a:link, #members a:link {
+ color : #CCFF66;
+}
+
+.menu a:visited, #members a:visited {
+ color : #CCFF66;
+}
+
+.menu a:hover, #members a:hover {
+ color : #FFFFCC;
+}
+
+.menu a:active, #members a:active {
+ color : #FFFFCC;
+}
+
+.opac-detail {
+ background-color : #FFFFCC;
+}
+
+em.new {
+ color : #CC3333;
+}
+
+.note {
+ background-color : #E7E7CA;
+ border-left : 1px solid #FFFFCC;
+ border-top : 1px solid #FFFFCC;
+ border-right : 1px solid #999900;
+ border-bottom : 1px solid #999900;
+}
+
+.opac-detail dd {
+ border-bottom : 1px solid #E7E7CA;
+ color : #000000;
+}
+
+.submit {
+ background-color : #CC6600;
+ color : #FEEDDB;
+}
+
+input.icon {
+ background-color : #CC6600;
+ color : #FEEDDB;
+}
+
+#footer {
+ border-top : 1px solid #000000;
+}
+
+#main {
+ background-color : #CCCC99;
+ border-left : 1px solid #CCCC99;
+}
+
+#window {
+ background-color : #CCCC99;
+ border-left : 1px solid #CCCC99;
+}
+
+#masthead {
+ background-color : #339999;
+}
+
+#nav {
+ background-color : #CCCC99;
+}
+
+#nav ul li {
+ background-color : #D8DEB8; /*width : 100%;*/
+ border-bottom : 1px solid #CCCC99;
+ border-left : 0 solid #FFFFCC;
+ border-right : 0 solid #006699;
+ border-top : 0 solid #FFFFCC;
+}
+
+#nav ul li+li {
+ border-bottom : 1px solid #CCCC99;
+ border-left : 0 solid #FFFFCC;
+ border-right : 0 solid #006699;
+}
+
+#nav li ul li {
+ background-color : #E7E7CA;
+ border-bottom : 1px solid #D8DEB8;
+ border-left : 0 solid #FFFFCC;
+ border-right : 0 solid #006699;
+ border-top : 0 solid #FFFFCC;
+}
+
+#nav li ul li a {
+ color: Blue;
+}
+
+#nav li ul li a:link {
+ color: #359;
+}
+
+#nav li ul li a:visited {
+ color: #359;
+}
+
+#nav li ul li a:hover {
+ color: #CC3333;
+}
+
+#results, .results {
+ color : #000066;
+}
+
+#sidebar {
+ background-color : #EFF1DC;
+ border : 1px dashed #CCCC99;
+}
+
+#sidebar h3 {
+ color : #000066;
+}
+
+#sidebar .submit {
+ background-color : #CC6600;
+ color : #FEEDDB;
+}
+
+#search-sidebar {
+ background-color : #FFFFCC;
+}
+
+.sidebar-box {
+ border : 1px dashed #CCCC99;
+}
+
+.issued {
+ color : #999999;
+}
+
+.overdue {
+ color : #cc0000;
+}
+
+#members {
+ background-color : #339999;
+ border : 0px dashed #666666;
+ color : #000066;
+ }
+
+#members a.logout {
+ background-color : #FFDD75;
+ color : Black;
+}
+
+#members a:hover.logout {
+ background-color : #FFCC33;
+}
+
+.loggedinusername {
+ color : #D8DEB8;
+}
+
+#itemReviews dt {
+ border-bottom: 1px solid #ddd;
+}
+
+div.tabbloc {
+ background-color:transparent;
+}
+
+div.tab {
+ background-color:White;
+}
+
+div.tab p {
+ border-top: 1px solid #D8DEB8;
+ border-bottom: 1px solid White;
+}
+
+.MARCtag { /* style for tag definition (700 - Statement of responsability) */
+ color:#000066;
+ background-color:#FFFFE3;
+}
+
+.labelsubfield { /* style for each subfield (like : a Publication year), just
before the biblio subfield */
+}
+
+/* Tabs */
+
+ul.link-tabs {
+}
+
+ul.link-tabs li {
+}
+
+ul.link-tabs li a {
+ border-top: 1px solid #FFFFE3;
+ border-left : 1px solid #FFFFE3;
+ border-right : 1px solid #666600;
+}
+
+ul.link-tabs li.on a {
+ background-color: #FFFFCC;
+ border-bottom: 1px solid #FFFFCC;
+}
+
+ul.link-tabs li.off a {
+ background-color: #D8DEB8;
+ border-bottom: 1px solid #CCCC99;
+}
+
+ul.link-tabs li.off a:hover {
+ background-color: #FFFFEC;
+ border-top: 1px solid #BEBF84;
+ border-left : 1px solid #BEBF84;
+ border-right : 2px solid #333333;
+}
+
+#loose_form label, #keyword_form label, #precise_form label, #cql_form label {
+ color : #000066;
+}
+
+#loose_form, #keyword_form, #precise_form, #cql_form {
+}
+
+#search-footer {
+}
+
+#search-footer a {
+ background-color: #D8DEB8;
+}
\ No newline at end of file
Index: koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css
diff -u /dev/null
koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css:1.1.2.4.2.1
--- /dev/null Fri Jun 2 23:11:24 2006
+++ koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css Fri Jun 2
23:11:24 2006
@@ -0,0 +1,887 @@
+a {
+ font-weight : bold;
+}
+
+a:link.current {
+ font-size : 12px;
+ font-weight : bold;
+ padding : 1px 5px 1px 5px;
+ text-decoration : none;
+}
+
+a:hover.current {
+ font-size : 12px;
+ font-weight : bold;
+ padding : 1px 5px 1px 5px;
+ text-decoration : none;
+}
+
+a:visited.current {
+ font-size : 12px;
+ font-weight : bold;
+ padding : 1px 5px 1px 5px;
+ text-decoration : none;
+}
+
+a:active.current {
+ font-size : 12px;
+ font-weight : bold;
+ padding : 1px 5px 1px 5px;
+ text-decoration : none;
+}
+
+a:link.nav {
+ font-size : 12px;
+ font-weight : bold;
+ padding : 1px 5px 1px 5px;
+ text-decoration : none;
+}
+
+a:hover.nav {
+ font-size : 12px;
+ font-weight : bold;
+ padding : 1px 5px 1px 5px;
+ text-decoration : none;
+}
+
+a:active.nav {
+ font-size : 12px;
+ font-weight : bold;
+ padding : 1px 5px 1px 5px;
+ text-decoration : none;
+}
+
+a:visited.nav {
+ font-size : 12px;
+ font-weight : bold;
+ padding : 1px 5px 1px 5px;
+ text-decoration : none;
+}
+
+.menu a:link.logout {
+ font-weight : bold;
+ padding : 3px 15px 3px 15px;
+ text-decoration : none;
+}
+
+.menu a:active.logout {
+ font-weight : bold;
+ padding : 3px 15px 3px 15px;
+ text-decoration : none;
+}
+
+
+.menu a:visited.logout {
+ font-weight : bold;
+ padding : 3px 15px 3px 15px;
+ text-decoration : none;
+}
+
+.menu a:hover.logout {
+ font-weight : bold;
+ padding : 3px 15px 3px 15px;
+ text-decoration : none;
+}
+
+body {
+ font-family : Verdana, Arial, Geneva, Helvetica, sans-serif;
+ margin : 0;
+ padding : 0;
+}
+
+caption {
+ font-family : Arial, Geneva, Helvetica, sans-serif;
+ font-size : 140%;
+ font-weight : bold;
+ margin : 0;
+ padding : 5px 0 3px 0;
+ text-align : left;
+}
+
+div.form, div.details {
+ margin : 0 auto;
+ padding : 5px;
+ width : 95%;
+}
+
+div.details ul {
+ margin-left : 0;
+ text-align : left;
+ list-style-type: circle;
+}
+
+div.table {
+ width : 95%;
+}
+
+form {
+ display : inline;
+ margin : 0;
+ padding : 0;
+}
+
+h1,h2,h3,h4,h5,h6 {
+ font-family : arial, geneva, helvetica, sans-serif;
+ margin : 0;
+}
+
+h1 {
+ font-size : 150%;
+ padding : 5px 0 3px 0;
+}
+
+h1.logo {
+ display : inline;
+ margin : 10px 0 0 10px;
+}
+
+h1.title {
+ font-style : italic;
+ padding : 5px 0 3px 0;
+}
+
+h2 {
+ font-size : 130%;
+ padding : 5px 0 3px 0;
+}
+
+h3 {
+ font-size : 120%;
+ padding : 5px 0 3px 0;
+}
+
+h3+p {
+ margin : .4em 0 .4em 0;
+}
+
+p+h3 {
+ margin-top : .6em;
+}
+
+h3.author {
+ padding : 0 0 3px 15px;
+}
+
+h4 {
+ padding : 5px 0 3px 0;
+}
+
+h5 {
+ font-size : 100%;
+ margin : 0;
+ padding : 10px 0 2px 0;
+}
+
+p+h5 {
+ padding : 3px 0 2px 0;
+ margin : 0;
+}
+
+h5+p {
+ padding-top : 0;
+ margin-top : 0;
+}
+
+.inline {
+ display : inline;
+}
+
+p {
+ padding : 0 10px 0 10px;
+}
+
+p.error, div.error {
+ font-size : 1.05em;
+ font-weight : normal;
+ margin : auto;
+ padding : 5px 20px 5px 20px;
+}
+
+div.error {
+ font-size : .9em;
+ padding : 3px 10px 3px 10px;
+ width : 75%;
+}
+
+p.error+p.error, div.error+div.error {
+ margin-top : 5px;
+}
+
+div.error li {
+ margin-bottom : .5em;
+}
+
+table {
+ border-collapse : collapse;
+ margin : 5px 0 5px 0;
+ padding : 0;
+}
+
+td {
+ font-size : .90em;
+ padding : 5px 5px 5px 5px;
+}
+
+th {
+ font-size : 12px;
+ font-weight : bold;
+ padding : 5px 5px 5px 5px;
+}
+
+th:last-child {
+ font-size : 14px;
+ font-weight : bold;
+ padding : 5px 5px 5px 5px;
+}
+
+th[scope="row"] {
+ font-size : 60%;
+ font-weight : normal;
+ text-align : right;
+}
+
+td.input, div.form td, div.details td {
+ border-left : 0;
+ border-right : 0;
+ padding : 2px 2px 2px 4px;
+ text-align : right;
+}
+
+td.label, div.form th, div.details th {
+ border-right : 0;
+ border-top : 0;
+ font-weight : bold;
+ padding : 2px 2px 2px 4px;
+ text-align : left;
+ vertical-align : top;
+}
+
+div.details td.details {
+ text-align : left;
+}
+
+td.label {
+ font-weight : bold;
+ line-height : 1.5em;
+ padding : 4px;
+}
+
+td:last-child {
+ font-size : 12px;
+ padding : 5px 5px 5px 5px;
+}
+
+.rejected {
+ text-decoration: line-through;
+}
+
+.selected {
+ text-decoration: none;
+}
+
+.content-block {
+ margin : 15px;
+ padding : 5px;
+ width : 90%;
+}
+
+.count {
+ font-size : .7em;
+ font-weight : normal;
+}
+
+.current {
+ font-size : 12px;
+ font-weight : bold;
+ padding : 1px 5px 1px 5px;
+ text-decoration : none;
+}
+
+.ex {
+ font-family : "Courier New", Courier, monospace;
+}
+
+div.bookcover {
+ float: right;
+}
+
+.further {
+ float: right;
+ font-size : 80%;
+ margin : 5px;
+ width : 30%;
+}
+
+.further h4 {
+ padding : 2px;
+}
+
+.further ul, .further li {
+ margin : 0 0 0 .5em;
+ padding : 0;
+}
+
+.further li {
+ padding : 2px 0;
+ }
+
+.detail-sidebar {
+ float: right;
+ padding: 5px;
+ margin-left : 15px;
+ text-align: center;
+ width : 35%;
+}
+
+.detail-sidebar .further {
+ float: none;
+ text-align: left;
+ width : 90%;
+}
+
+.operations {
+ font-size: 90%;
+ text-align: center;
+ margin-top: 7px;
+ padding-left: 10px;
+ width: 100%;
+}
+
+.operations ul {
+ margin: 0;
+ padding : 0;
+ width: 90%;
+}
+
+.operations li {
+ list-style-type: none;
+ margin: 0;
+ padding-bottom : 2px;
+}
+
+.operations li a, .operations li a:visited {
+ border-style: outset;
+ display: block;
+ background-repeat : no-repeat;
+ background-position : top left;
+ padding: 3px 3px 3px 26px;
+ text-decoration: none;
+}
+
+.operations li a:active {
+ border-style: inset;
+}
+
+.item-details {
+ display : block;
+ margin : 0 0 0 25px;
+}
+
+.loggedin {
+ font-weight : bold;
+}
+/*
+.marctag {
+ font-family : Arial, Geneva, sans-serif;
+ margin : 1px;
+ padding : 3px;
+}
+
+.marcsubfieldletter {
+ font-family : Arial, Geneva, sans-serif;
+ padding : 3px;
+}
+
+.marcsubfieldname {
+ font-family : Arial, Geneva, sans-serif;
+ font-size: 70%;
+ padding : 3px;
+ width: 18%;
+}
+
+.subfield {
+ font-family : Arial, Geneva, sans-serif;
+ padding : 3px;
+}
+
+.subfieldvalue {
+ font-family : Arial, Geneva, sans-serif;
+ font-weight : bold;
+ padding : 3px;
+}*/
+
+.menu {
+ margin-bottom : 5px;
+ margin-left : 15px;
+ margin-right : 10px;
+}
+
+#members a {
+ text-decoration : none;
+}
+
+.menu a:link, #members a:link {
+ padding : 2px;
+}
+
+.menu a:visited, #members a:visited {
+ padding : 2px;
+}
+
+.menu a:hover, #members a:hover {
+ padding : 2px;
+}
+
+.menu a:active, #members a:active {
+ padding : 2px;
+}
+
+#members a.card {
+ display : block;
+ padding-left : 39px;
+ background-image: url(../images/card.gif);
+ background-position: left;
+ background-repeat: no-repeat;
+}
+
+.menu input {
+ font-size : 80%;
+}
+
+.menu label {
+ font-weight : bold;
+}
+
+.menu p {
+ margin : 0;
+ padding : 0;
+}
+
+.menu p+p {
+ margin-top : 5px;
+}
+
+.opac-detail {
+ padding : 4px;
+}
+
+em.new {
+ font-weight : bold;
+ font-style : normal;
+}
+
+.login-note {
+ width : 35%;
+}
+
+.note {
+ font-size : 12px;
+ margin : 10px auto;
+ padding : 4px 4px 4px 4px;
+ width : 35%;
+}
+
+div.notes {
+ text-align: left;
+}
+
+.opac-detail dd {
+ display : block;
+ line-height : 1.5em;
+ padding : 4px;
+ text-align : right;
+}
+
+.submit {
+ font-family : Verdana, Arial, Geneva, Helvetica, sans-serif;
+ font-size : small;
+ font-weight : bold;
+ padding : 2px;
+}
+
+.thumbnail {
+ float : left;
+ margin : 0 5px 5px 0;
+ border : 0;
+}
+
+input.icon {
+ background-position: left;
+ background-repeat: no-repeat;
+ font-family : Verdana, Arial, Geneva, Helvetica, sans-serif;
+ font-size : small;
+ font-weight : bold;
+ padding : 2px 2px 2px 22px;
+}
+
+input.add, a.add {
+ background-image: url(../images/add.gif);
+}
+
+input.back, a.back {
+ background-image: url(../images/back.gif);
+}
+
+input.cart, a.cart {
+ background-image: url(../images/basket.gif);
+}
+
+input.print, a.print {
+ background-image: url(../images/print2.gif);
+}
+
+input.detail, a.detail {
+ background-image: url(../images/detail.gif);
+}
+
+input.brief, a.brief {
+ background-image: url(../images/brief.gif);
+}
+
+input.send, a.send {
+ background-image: url(../images/send.gif);
+}
+
+input.trash, a.trash {
+ background-image: url(../images/trash.gif);
+}
+
+input.close, a.close {
+ background-image: url(../images/close.gif);
+}
+
+input.addchecked, a.addchecked {
+ background-image: url(../images/addtobasket.gif);
+}
+
+input.clearall, a.clearall {
+ background-image: url(../images/clearbasket.gif);
+}
+
+input.isbd, a.isbd {
+ background-image: url(../images/isbd.gif);
+}
+
+input.shelf, a.shelf {
+ background-image: url(../images/addtoshelf.gif);
+}
+
+input.reserve, a.reserve {
+ background-image: url(../images/placereserve.gif);
+}
+
+input.remove, a.remove {
+ background-image: url(../images/remove.gif);
+}
+
+input.delete, a.delete {
+ background-image: url(../images/delete.gif);
+}
+
+input.edit, a.edit {
+ background-image: url(../images/edit.gif);
+}
+
+.left {
+ float : left;
+}
+
+.right {
+ float : right;
+}
+
+.title {
+ font-style : italic;
+ font-weight : bold;
+}
+
+#footer {
+ clear : both;
+ padding: 10px;
+ text-align: center;
+}
+
+#main {
+ margin-left : 20%;
+ margin-right : 2%;
+ margin-top : 0;
+ padding : 5px;
+ position : relative;
+}
+
+#window {
+ margin-left : 2%;
+ margin-right : 2%;
+ margin-top : 2%;
+ padding : 10px;
+}
+
+#window div.menu {
+ margin : 0;
+}
+
+#window .class {
+ display : block;
+ font-weight : bold;
+ padding : 0 0 5px 3px;
+}
+
+#masthead {
+ margin : 0 0 0 5px;
+}
+
+#nav {
+ float : left;
+ margin : 0 0% 0% 1%;
+ padding : 0;
+ width : 18%;
+}
+
+#nav a {
+ font-family : Arial, Geneva, Helvetica, sans-serif;
+ font-size : 1.1em;
+ font-weight : bold;
+ text-decoration : none;
+}
+
+#nav ul {
+ margin : 0;
+ padding : 0;
+}
+
+#nav ul li {
+ font-family : Arial, Geneva, Helvetica, sans-serif;
+ font-size : .75em;
+ list-style : none;
+ margin : 0;
+ padding : 3px;
+ text-align : right;
+}
+
+#nav ul li+li {
+ margin : 0;
+}
+
+#nav li ul li {
+ font-family : Arial, Geneva, Helvetica, sans-serif;
+ font-size : 1.1em;
+ list-style : none;
+ margin : 0;
+ padding : 5px 3px 5px 3px;
+ text-align : right;
+}
+
+#nav li ul li a {
+ font-family : Arial, Geneva, Helvetica, sans-serif;
+ font-size : .99em;
+ font-weight : bold;
+ text-decoration : none;
+}
+
+#results, .results {
+ font-family : Verdana, Arial, Geneva, Helvetica, sans-serif;
+ font-size : 80%;
+ margin : 0;
+ padding : 7px 0 10px 0;
+}
+
+#sidebar {
+ width : 20%;
+ margin : 20px;
+ padding : 5px;
+ float : right;
+ font-size : 80%;
+}
+
+#sidebar h3 {
+ font-family : Arial, Geneva, Helvetica, sans-serif;
+ font-size : 110%;
+ margin : 0;
+ padding : 5px 0 1px 0;
+}
+
+#sidebar .submit {
+ font-family : Verdana, Arial, Geneva, Helvetica, sans-serif;
+ font-size : 80%;
+ font-weight : bold;
+ padding : 2px;
+}
+
+#search-sidebar {
+ width : 33%;
+ margin : 10px;
+ padding : 3px;
+ float : right;
+ font-size : 80%;
+}
+
+.sidebar-box {
+ margin-bottom : 0;
+}
+
+div.sidebar-box+div.sidebar-box {
+ margin-top : 5px;
+}
+
+.sidebar-box h3, .sidebar-box h4 {
+ margin-left : 10px;
+}
+
+.sidebar-box label {
+ display : block;
+}
+
+.sidebar-box p {
+ margin : 3px 10px;
+ padding : 0;
+}
+
+.overdue {
+ font-weight : bold;
+}
+
+span.print {
+ font-size : .7em;
+ font-weight : normal;
+ padding-left : .7em;
+ }
+
+#members {
+ font-size : .85em;
+ font-weight : bold;
+ position : absolute;
+ top : 0;
+ right : 0;
+ }
+
+#members ul {
+ margin : 0;
+ padding : .3em .3em .3em 1.5em;
+}
+
+#members a.logout {
+ font-weight : bold;
+ padding : 0 .3em 0 .3em;
+ text-decoration : none;
+}
+
+.clear {
+ clear : both;
+ line-height : .1em;
+}
+#itemReviews h4 {
+ display: inline;
+ margin-right: 15px;
+}
+#itemReviews p {
+ text-align: left;
+ }
+#itemReviews dl {
+ display: block ;
+}
+#itemReviews dt {
+ width: 8em;
+}
+
+#starMT {
+ position:relative;
+ height: 25px;
+ width: 100px;
+ margin: 0 3px 0 30px;
+ padding:0;
+ background: url(../images/emptystars.png) top left no-repeat;
+}
+#starFull {
+ height: 25px;
+ margin: 0 ; padding: 0;
+ background: url(../images/bluestars.png) top left no-repeat;
+}
+
+div.tabbloc {
+ font-family: Arial, Helvetica, sans-serif;
+ font-size: 80%;
+}
+
+div.tab {
+ display: block;
+ float:left;
+ margin-right:0px;
+ width:100%;
+}
+
+div.tab p {
+ margin : 0;
+ padding : 3px 0;
+}
+
+div.tab table {
+ width : 100%;
+}
+
+div.tab p.MARCtag { /* style for tag definition (700 - Statement of
responsability) */
+ font-weight:bold;
+ clear : both;
+ margin : 0;
+ padding : 2px;
+}
+
+
+.labelsubfield { /* style for each subfield (like : a Publication year), just
before the biblio subfield */
+ clear : both;
+ font-weight : bold;
+ float:left;
+ width: 12em;
+ margin-left:30px;
+}
+
+/* Tabs */
+
+ul.link-tabs {
+ list-style-type : none;
+ margin: 10px 10px -2px 0;
+ padding : 0;
+}
+
+ul.link-tabs li {
+ display: inline;
+ padding: 5px;
+}
+
+ul.link-tabs li a {
+ font-size : 95%;
+ font-weight : bold;
+ padding: 2px 4px 2px 4px;
+ text-decoration: none;
+}
+
+ul.link-tabs li.on a {
+}
+
+ul.link-tabs li.off a {
+}
+
+ul.link-tabs li.off a:hover {
+ padding: 2px 3px 2px 4px;
+}
+
+#loose_form label, #keyword_form label, #precise_form label, #cql_form label {
+ font-size: 90%;
+ font-weight : bold;
+ text-align: right;
+}
+
+#loose_form, #keyword_form, #precise_form, #cql_form {
+ margin: 5px;
+ width : 96%;
+}
+
+#search-footer {
+ margin: auto;
+ text-align : center;
+}
+
+#search-footer a {
+ margin: 3px 5px 3px 5px;
+ text-decoration: none;
+ padding: 2px 5px;
+}
\ No newline at end of file
Index: koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl
diff -u /dev/null
koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl:1.1.2.8.2.1
--- /dev/null Fri Jun 2 23:11:24 2006
+++ koha/koha-tmpl/opac-tmpl/npl/en/opac-MARCdetail.tmpl Fri Jun 2
23:11:24 2006
@@ -0,0 +1,279 @@
+<!-- TMPL_INCLUDE NAME="doc-head-open.inc" --><!-- TMPL_VAR NAME="LibraryName"
--> Catalog -- MARC Details for Record No. <!-- TMPL_VAR name="biblionumber" -->
+<!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
+<!--TMPL_INCLUDE NAME="masthead.inc" -->
+<!--TMPL_INCLUDE NAME="navigation.inc" -->
+
+<div id="main">
+<h2>MARC View</h2>
+<!-- TMPL_UNLESS NAME="norequests" --><!-- TMPL_IF NAME="opacuserlogin" -->
+ <form action="/cgi-bin/koha/opac-reserve.pl" method="post" class="inline">
+ <input type="submit" name="submit" VALUE="Place Reserve" class="icon
reserve" />
+ <input type="hidden" name="bib" value="<!-- TMPL_VAR NAME="biblionumber"
-->" />
+ </form><!-- /TMPL_IF -->
+<!-- /TMPL_UNLESS -->
+<!-- Hide from NPL --><form class="inline" action="opac-ISBDdetail.pl"
method="get"><input type="hidden" name="bib" value="<!-- TMPL_VAR
name="biblionumber" -->" /><input type="submit" class="icon isbd" value="ISBD"
/></form><!-- /Hide from NPL -->
+
+<form class="inline" action="opac-detail.pl" method="get"><input type="hidden"
name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input type="submit"
class="icon brief" value="Normal View" /></form>
+
+<form class="inline" action="opac-detailprint.pl" method="get"><input
type="hidden" name="bib" value="<!-- TMPL_VAR name="biblionumber" -->" /><input
type="submit" class="icon print" value="Print"
onclick="Dopop('opac-detailprint.pl?bib=<!-- TMPL_VAR name="biblionumber"
-->'); return false;"/></form>
+
+<!-- TMPL_IF name="virtualshelves" --><form class="inline"
action="/cgi-bin/koha/opac-addbookbybiblionumber.pl" method="get"><input
type="hidden" name="biblionumber" value="<!-- TMPL_VAR NAME="biblionumber" -->"
/><input type="submit" class="icon shelf" value="Add to My Virtual Shelf"
onclick="Dopop('opac-addbookbybiblionumber.pl?biblionumber=<!-- TMPL_VAR
NAME="biblionumber" -->'); return false;" /></form><!-- /TMPL_IF -->
+<!-- TMPL_IF name="opacbookbag" -->
+<form class="inline"><input type="submit" class="icon cart"
onclick="addRecord('<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->');
return false;" value="Add to Book Bag" /></form><!-- /TMPL_IF -->
+
+<div class="tabbloc">
+ <div name="0XX" id="0XX" class="tab" style="visibility:visible">
+ <!-- TMPL_LOOP name="0XX" -->
+ <!-- TMPL_IF name="tag" -->
+ <p class="MARCtag">
+ <!-- TMPL_VAR name="tag" -->
+ </p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_LOOP name="subfield" -->
+ <p>
+ <label class="labelsubfield">
+ <!-- TMPL_UNLESS name="hide_marc"
--><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+ <!-- TMPL_VAR name="marc_lib"
-->
+ </label>
+ <!-- TMPL_VAR name="marc_value" -->
+ <!-- TMPL_IF name="link" -->
+ <a
href="opac-search.pl?op=do_search&marclist=<!-- TMPL_VAR NAME="link"
-->&operator==&type=intranet&value=<!-- TMPL_VAR NAME="marc_value"
ESCAPE=URL -->">?</a>
+ <!-- /TMPL_IF --><br class="clear" />
+ </p>
+ <!-- /TMPL_LOOP -->
+ <!-- /TMPL_LOOP -->
+ </div>
+
+ <div name="1XX" id="1XX" class="tab">
+ <!-- TMPL_LOOP name="1XX" -->
+ <!-- TMPL_IF name="tag" -->
+ <p class="MARCtag">
+ <!-- TMPL_VAR name="tag" -->
+ </p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_LOOP name="subfield" -->
+ <p>
+ <label class="labelsubfield">
+ <!-- TMPL_UNLESS name="hide_marc"
--><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+ <!-- TMPL_VAR name="marc_lib"
-->
+ </label>
+ <!-- TMPL_VAR name="marc_value" -->
+ <!-- TMPL_IF name="link" -->
+ <a
href="opac-search.pl?op=do_search&marclist=<!-- TMPL_VAR NAME="link"
-->&operator==&type=intranet&value=<!-- TMPL_VAR NAME="marc_value"
ESCAPE=URL -->" title="Search on <!-- TMPL_VAR name="marc_value" -->">?</a>
+ <!-- /TMPL_IF --><br class="clear" />
+ </p>
+ <!-- /TMPL_LOOP -->
+ <!-- /TMPL_LOOP -->
+ </div>
+
+ <div name="2XX" id="2XX" class="tab">
+ <!-- TMPL_LOOP name="2XX" -->
+ <!-- TMPL_IF name="tag" -->
+ <p class="MARCtag">
+ <!-- TMPL_VAR name="tag" -->
+ </p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_LOOP name="subfield" -->
+ <p>
+ <label class="labelsubfield">
+ <!-- TMPL_UNLESS name="hide_marc"
--><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+ <!-- TMPL_VAR name="marc_lib"
-->
+ </label>
+ <!-- TMPL_VAR name="marc_value" -->
+ <!-- TMPL_IF name="link" -->
+ <a
href="opac-search.pl?op=do_search&marclist=<!-- TMPL_VAR NAME="link"
-->&operator==&type=intranet&value=<!-- TMPL_VAR NAME="marc_value"
ESCAPE=URL -->" title="Search on <!-- TMPL_VAR name="marc_value" -->">?</a>
+ <!-- /TMPL_IF --><br class="clear" />
+ </p>
+ <!-- /TMPL_LOOP -->
+ <!-- /TMPL_LOOP -->
+ </div>
+
+ <div name="3XX" id="3XX" class="tab">
+ <!-- TMPL_LOOP name="3XX" -->
+ <!-- TMPL_IF name="tag" -->
+ <p class="MARCtag">
+ <!-- TMPL_VAR name="tag" -->
+ </p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_LOOP name="subfield" -->
+ <p>
+ <label class="labelsubfield">
+ <!-- TMPL_UNLESS name="hide_marc"
--><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+ <!-- TMPL_VAR name="marc_lib"
-->
+ </label>
+ <!-- TMPL_VAR name="marc_value" -->
+ <!-- TMPL_IF name="link" -->
+ <a
href="opac-search.pl?op=do_search&marclist=<!-- TMPL_VAR NAME="link"
-->&operator==&type=intranet&value=<!-- TMPL_VAR NAME="marc_value"
ESCAPE=URL -->" title="Search on <!-- TMPL_VAR name="marc_value" -->">?</a>
+ <!-- /TMPL_IF --><br class="clear" />
+ </p>
+ <!-- /TMPL_LOOP -->
+ <!-- /TMPL_LOOP -->
+ </div>
+
+ <div name="4XX" id="4XX" class="tab">
+ <!-- TMPL_LOOP name="4XX" -->
+ <!-- TMPL_IF name="tag" -->
+ <p class="MARCtag">
+ <!-- TMPL_VAR name="tag" -->
+ </p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_LOOP name="subfield" -->
+ <p>
+ <label class="labelsubfield">
+ <!-- TMPL_UNLESS name="hide_marc"
--><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+ <!-- TMPL_VAR name="marc_lib"
-->
+ </label>
+ <!-- TMPL_VAR name="marc_value" -->
+ <!-- TMPL_IF name="link" -->
+ <a
href="opac-search.pl?op=do_search&marclist=<!-- TMPL_VAR NAME="link"
-->&operator==&type=intranet&value=<!-- TMPL_VAR NAME="marc_value"
ESCAPE=URL -->" title="Search on <!-- TMPL_VAR name="marc_value" -->">?</a>
+ <!-- /TMPL_IF --><br class="clear" />
+ </p>
+ <!-- /TMPL_LOOP -->
+ <!-- /TMPL_LOOP -->
+ </div>
+
+ <div name="5XX" id="5XX" class="tab">
+ <!-- TMPL_LOOP name="5XX" -->
+ <!-- TMPL_IF name="tag" -->
+ <p class="MARCtag">
+ <!-- TMPL_VAR name="tag" -->
+ </p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_LOOP name="subfield" -->
+ <p>
+ <label class="labelsubfield">
+ <!-- TMPL_UNLESS name="hide_marc"
--><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+ <!-- TMPL_VAR name="marc_lib"
-->
+ </label>
+ <!-- TMPL_VAR name="marc_value" -->
+ <!-- TMPL_IF name="link" -->
+ <a
href="opac-search.pl?op=do_search&marclist=<!-- TMPL_VAR NAME="link"
-->&operator==&type=intranet&value=<!-- TMPL_VAR NAME="marc_value"
ESCAPE=URL -->" title="Search on <!-- TMPL_VAR name="marc_value" -->"></a>
+ <!-- /TMPL_IF --><br class="clear" />
+ </p>
+ <!-- /TMPL_LOOP -->
+ <!-- /TMPL_LOOP -->
+ </div>
+
+ <div name="6XX" id="6XX" class="tab">
+ <!-- TMPL_LOOP name="6XX" -->
+ <!-- TMPL_IF name="tag" -->
+ <p class="MARCtag">
+ <!-- TMPL_VAR name="tag" -->
+ </p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_LOOP name="subfield" -->
+ <p>
+ <label class="labelsubfield">
+ <!-- TMPL_UNLESS name="hide_marc"
--><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+ <!-- TMPL_VAR name="marc_lib"
-->
+ </label>
+ <!-- TMPL_VAR name="marc_value" -->
+ <!-- TMPL_IF name="link" -->
+ <a
href="opac-search.pl?op=do_search&marclist=<!-- TMPL_VAR NAME="link"
-->&operator==&type=intranet&value=<!-- TMPL_VAR NAME="marc_value"
ESCAPE=URL -->" title="Search on <!-- TMPL_VAR name="marc_value" -->">?</a>
+ <!-- /TMPL_IF --><br class="clear" />
+ </p>
+ <!-- /TMPL_LOOP -->
+ <!-- /TMPL_LOOP -->
+ </div>
+
+ <div name="7XX" id="7XX" class="tab">
+ <!-- TMPL_LOOP name="7XX" -->
+ <!-- TMPL_IF name="tag" -->
+ <p class="MARCtag">
+ <!-- TMPL_VAR name="tag" -->
+ </p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_LOOP name="subfield" -->
+ <p>
+ <label class="labelsubfield">
+ <!-- TMPL_UNLESS name="hide_marc"
--><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+ <!-- TMPL_VAR name="marc_lib"
-->
+ </label>
+ <!-- TMPL_VAR name="marc_value" -->
+ <!-- TMPL_IF name="link" -->
+ <a
href="opac-search.pl?op=do_search&marclist=<!-- TMPL_VAR NAME="link"
-->&operator==&type=intranet&value=<!-- TMPL_VAR NAME="marc_value"
ESCAPE=URL -->" title="Search on <!-- TMPL_VAR name="marc_value" -->">?</a>
+ <!-- /TMPL_IF --><br class="clear" />
+ </p>
+ <!-- /TMPL_LOOP -->
+ <!-- /TMPL_LOOP -->
+ </div>
+
+ <div name="8XX" id="8XX" class="tab">
+ <!-- TMPL_LOOP name="8XX" -->
+ <!-- TMPL_IF name="tag" -->
+ <p class="MARCtag">
+ <!-- TMPL_VAR name="tag" -->
+ </p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_LOOP name="subfield" -->
+ <p>
+ <label class="labelsubfield">
+ <!-- TMPL_UNLESS name="hide_marc"
--><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+ <!-- TMPL_VAR name="marc_lib"
-->
+ </label>
+ <!-- TMPL_VAR name="marc_value" -->
+ <!-- TMPL_IF name="link" -->
+ <a
href="opac-search.pl?op=do_search&marclist=<!-- TMPL_VAR NAME="link"
-->&operator==&type=intranet&value=<!-- TMPL_VAR NAME="marc_value"
ESCAPE=URL -->" title="Search on <!-- TMPL_VAR name="marc_value" -->">?</a>
+ <!-- /TMPL_IF --><br class="clear" />
+ </p>
+ <!-- /TMPL_LOOP -->
+ <!-- /TMPL_LOOP -->
+ </div>
+
+ <div name="9XX" id="9XX" class="tab">
+ <!-- TMPL_LOOP name="9XX" -->
+ <!-- TMPL_IF name="tag" -->
+ <p class="MARCtag">
+ <!-- TMPL_VAR name="tag" -->
+ </p>
+ <!-- /TMPL_IF -->
+ <!-- TMPL_LOOP name="subfield" -->
+ <p>
+ <label class="labelsubfield">
+ <!-- TMPL_UNLESS name="hide_marc"
--><!-- TMPL_VAR NAME="marc_subfield" --><!-- /TMPL_UNLESS -->
+ <!-- TMPL_VAR name="marc_lib"
-->
+ </label>
+ <!-- TMPL_VAR name="marc_value" -->
+ <!-- TMPL_IF name="link" -->
+ <a
href="opac-search.pl?op=do_search&marclist=<!-- TMPL_VAR NAME="link"
-->&operator==&type=intranet&value=<!-- TMPL_VAR NAME="marc_value"
ESCAPE=URL -->"title="Search on <!-- TMPL_VAR name="marc_value" -->">?</a>
+ <!-- /TMPL_IF --><br class="clear" />
+ </p>
+ <!-- /TMPL_LOOP -->
+ <!-- /TMPL_LOOP -->
+ </div>
+
+ <div name="10XX" id="10XX" class="tab">
+ <h2>Items</h2>
+ <table>
+ <tr>
+ <!-- TMPL_LOOP name="item_header_loop"
-->
+ <th>
+ <!-- TMPL_VAR
name="header_value" -->
+ </th>
+ <!-- /TMPL_LOOP -->
+ </tr>
+ <!-- TMPL_LOOP name="item_loop" -->
+ <tr>
+ <!-- TMPL_VAR name="item_value"
-->
+ </tr>
+ <!-- /TMPL_LOOP -->
+ </table>
+ </div>
+ <br class="clear" />
+</div>
+<script language="JavaScript" type="text/javascript">
+function active(numlayer)
+{
+ for (i=0; i <= 10 ; i++ ) {
+ ong = i+"XX";
+ link = "link"+i;
+ if (numlayer==i) {
+ document.getElementById(ong).style.visibility="visible";
+ } else {
+ document.getElementById(ong).style.visibility="hidden";
+ }
+ }
+}
+</script>
+
+<!-- TMPL_INCLUDE NAME="opac-bottom.inc" -->
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Koha-cvs] koha ./catalogue-home.pl C4/Biblio.pm C4/Contex... [dev_week],
Joshua Ferraro <=