[Koha-cvs] koha C4/Search.pm koha-tmpl/opac-tmpl/npl/en/op... [dev_week]

Joshua Ferraro jmf at kados.org
Thu Aug 10 00:59:31 CEST 2006


CVSROOT:	/sources/koha
Module name:	koha
Branch:		dev_week
Changes by:	Joshua Ferraro <kados>	06/08/09 22:59:31

Modified files:
	C4             : Search.pm 
	koha-tmpl/opac-tmpl/npl/en: opac-results.tmpl 
	koha-tmpl/opac-tmpl/npl/en/includes: masthead.inc navigation.inc 
	                                     opac-colors.css 
	                                     opac-layout.css 
	opac           : opac-zoomsearch.pl 

Log message:
	Complete re-write of faceted results. Cut it down to about 40 lines of code,
	and (hopefully) optimized the looping through each record. Now, to add a
	new facet, you just add some lines in the hash:
			{
	        link_value => 'branch_facets',        
			label_value => 'Branches',        
			tags => ['952',],        
			subfield => 'b',        
			expanded => '1',        
			},
	
	This lends itself to eventually storing this data in a table or two in the
	db ... something that we can do as the data structure matures.
	
	Still a bit of cleanup to do, but it's currently much better than the
	previous system.
	
	(this commit also includes some template changes that owen's been working
	on ... more on that later)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/koha/C4/Search.pm?cvsroot=koha&only_with_tag=dev_week&r1=1.99.2.11.2.19&r2=1.99.2.11.2.20
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/opac-results.tmpl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.9&r2=1.1.2.10
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.8.2.7&r2=1.1.2.8.2.8
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc?cvsroot=koha&only_with_tag=dev_week&r1=1.2.2.4.2.11&r2=1.2.2.4.2.12
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.css?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.3&r2=1.1.2.3.2.1
http://cvs.savannah.gnu.org/viewcvs/koha/koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.4.2.4&r2=1.1.2.4.2.5
http://cvs.savannah.gnu.org/viewcvs/koha/opac/opac-zoomsearch.pl?cvsroot=koha&only_with_tag=dev_week&r1=1.1.2.20&r2=1.1.2.21

Patches:
Index: C4/Search.pm
===================================================================
RCS file: /sources/koha/koha/C4/Search.pm,v
retrieving revision 1.99.2.11.2.19
retrieving revision 1.99.2.11.2.20
diff -u -b -r1.99.2.11.2.19 -r1.99.2.11.2.20
--- C4/Search.pm	8 Aug 2006 13:33:43 -0000	1.99.2.11.2.19
+++ C4/Search.pm	9 Aug 2006 22:59:30 -0000	1.99.2.11.2.20
@@ -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.19 $' =~ /\d+/g;
+$VERSION = do { my @v = '$Revision: 1.99.2.11.2.20 $' =~ /\d+/g;
           shift(@v) . "." . join("_", map {sprintf "%03d", $_ } @v); };
 
 =head1 NAME
@@ -4152,11 +4152,38 @@
     if ($then_sort_by) {
         $result->sort("yaz", "$then_sort_by")
     }
+	### New Facets Stuff
+	my $facets_counter = ();
+	my $facets_info = ();
+	my $facets = [ {
+		link_value => 'topic_facet',
+		label_value => 'Subject - Topic',
+		tags => ['650', '651',],
+		subfield => 'a',
+		},
+		{
+        link_value => 'author_facet',
+        label_value => 'Authors',
+        tags => ['100','700',],
+        subfield => 'a',
+		},
+		{
+        link_value => 'series_facet',
+        label_value => 'Series',
+        tags => ['440','490',],
+        subfield => 'a',
+        },
+		{
+        link_value => 'branch_facets',
+        label_value => 'Branches',
+        tags => ['952',],
+        subfield => 'b',
+		expanded => '1',
+        },
+	];
+
     #### INITIALIZE SOME VARS USED CREATE THE FACETED RESULTS
 	my @facets_loop; # stores the ref to array of hashes for template
-	my ($subject_facets, $series_facets, $author_facets);
-	my (%subject_facets_counter, %series_facets_counter, %author_facets_counter);
-	my (%branch_facets_counter, %language_limits_counter, %content_limits_counter, %format_limits_counter, %audience_limits_counter);
 	#### LOOP THROUGH THE RESULTS	
     $numresults = 0 | $result->size() if  ($result);
     for ( my $i=$startfrom; $i<(($startfrom+$num<=$numresults) ? ($startfrom+$num):$numresults) ; $i++){
@@ -4182,161 +4209,57 @@
             ##### BUILD FACETS AND LIMITS ####
 			my $facet_record = MARC::Record->new_from_usmarc($rec->raw());
 
-			# Define Holdings Limits
-			my @holdings_fields = $facet_record->field('952');
-			my $holdings_code;
-			foreach my $holdingsfield (@holdings_fields) {
-				my @fields = $holdingsfield->subfields();
-				foreach my $subfield(@fields) {
+			for (my $i=0;$i<=@$facets;$i++) {
+					if ($facets->[$i]) {
+						my @fields;
+						for my $tag (@{$facets->[$i]->{'tags'}}) {	
+							push @fields, $facet_record->field($tag);
+						}
+						for my $field (@fields) {
+							my @subfields = $field->subfields();
+							for my $subfield (@subfields) {
 					my ($code,$data) = @$subfield;
-					if ($code eq 'b') { # homebranch
-						$branch_facets_counter{$data}++;
+								if ($code eq $facets->[$i]->{'subfield'}) {
+									$facets_counter->{ $facets->[$i]->{'link_value'} }->{ $data }++;
 					}
 				}
 			}
-            # Define Subject Facets
-            my @subject_fields = $facet_record->field('650');
-            my $subject_term;
-            foreach my $subjectfield (@subject_fields) {
-                my @fields = $subjectfield->subfields();
-                foreach my $subfield (@fields) {
-                    my ($code,$data) = @$subfield;
-                    if ($code eq 'a') {
-                        $subject_facets_counter{$data}++;
-                    }
+						$facets_info->{ $facets->[$i]->{'link_value'} }->{ 'label_value' } = $facets->[$i]->{'label_value'};
+						$facets_info->{ $facets->[$i]->{'link_value'} }->{ 'expanded' } = $facets->[$i]->{'expanded'};
                 }
             }
 
-			# Define Series Facets
-			my @series_fields = $facet_record->field('440');
-			push @series_fields, $facet_record->field('490');
-			my $series_title;
-			foreach my $seriesfield (@series_fields) {
-				my @fields = $seriesfield->subfields();
-				foreach my $subfield (@fields) {
-					my ($code,$data) = @$subfield;
-					if ($code eq 'a') {
-						$series_facets_counter{$data}++;
-					}
-				}
-			}
-			# Define Author Facets
-            my @author_fields = $facet_record->field('100');
-			push @author_fields,  $facet_record->field('700');
-            my $author;
-            foreach my $authorfield (@author_fields) {
-                my @fields = $authorfield->subfields();
-                foreach my $subfield (@fields) {
-                    my ($code,$data) = @$subfield;
-                    if ($code eq 'a') {
-                        $author_facets_counter{$data}++;
-                    }
-                }
-            }
         }
     }
 	# BUILD FACETS
+	for my $link_value ( sort { $facets_counter->{$b} <=> $facets_counter->{$a} } keys %$facets_counter) { 
 	my $expandable;
-
-    # Build branch facets
-	use C4::Koha;
-	my $branch = getbranches;
-	my $number_of_branch_facets;
-    my @branch_facets_array;
-    my $expand_branch;
-    foreach my $value (sort { $branch_facets_counter{$b} <=> $branch_facets_counter{$a} } keys %branch_facets_counter) {
-        my $linkvalue = $value;
-        my $captionvalue = $branch->{$value}->{'branchname'};
-        my $count = $branch_facets_counter{$value};
-		$linkvalue =~ s/\'/\\\'/g;
-        $captionvalue =~ s/\'/&apos;/g;
-            push @branch_facets_array , (
-            {count => $count,label => $captionvalue,link =>"/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;ccl_query=$query and branch=&quot;$linkvalue&quot;"}
-            );
-    }
-    if (($number_of_branch_facets > 6) && ($expand_branch)) {
-        $expandable = 1;    }
-    else {
-        undef $expandable;
-    }
-    push @facets_loop, ( {type => 'Branches',typeid => 'branch_facet',facets => \@branch_facets_array, expandable => $expandable,expand => $expand_branch} );
-
-    # Build subject facets
-	my $number_of_subject_facets;
-	my @subject_facets_array;
-	my $expand_subjects;
-	$expand_subjects = 'su' unless ($expanded_facet eq 'su');
-    foreach my $value (sort { $subject_facets_counter{$b} <=> $subject_facets_counter{$a} } keys %subject_facets_counter) {
-		$number_of_subject_facets++;
-        my $linkvalue = $value;
-        my $captionvalue = $value;
-        my $count = $subject_facets_counter{$value};
-        $linkvalue =~ s/\'/\\\'/g;
-        $captionvalue =~ s/\'/&apos;/g;
-		if (($number_of_subject_facets < 6) || (!$expand_subjects)) {
-			push @subject_facets_array , (
-			{count => $count,label => $captionvalue,link =>"/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;ccl_query=su=&quot;$linkvalue&quot;"}
+		my $number_of_facets;
+		my @this_facets_array;
+		for my $one_facet (sort { $facets_counter->{ $link_value }->{$b} <=> $facets_counter->{ $link_value }->{$a} } keys %{$facets_counter->{ $link_value }} ) {
+			$number_of_facets++;
+			if (($number_of_facets < 6) || ($expanded_facet eq $link_value) || ($facets_info->{ $link_value }->{ 'expanded'})) {
+				my $facet_linkvalue = $one_facet;
+				push @this_facets_array , 
+				( { facet_count => $facets_counter->{ $link_value }->{ $one_facet }, 
+					facet_labelvalue => $one_facet, 
+					facet_linkvalue => $facet_linkvalue
+					},
 			);
 		}
     }
-	if (($number_of_subject_facets > 6) && ($expand_subjects)) {
-		$expandable = 1;
+		unless ($facets_info->{ $link_value }->{ 'expanded'}) {
+			$expandable=1 if (($number_of_facets > 6) && ($expanded_facet ne $link_value));
 	}
-	else {
-		undef $expandable;
+		push @facets_loop, 
+		( {	link_value => $link_value,
+			label_value  => $facets_info->{ $link_value }->{ 'label_value' },
+			facets => \@this_facets_array,
+			expandable => $expandable,
+			expand => $link_value,
 	}
-	push @facets_loop, ( {type => 'Subjects',typeid => 'subject_facet',facets => \@subject_facets_array, expandable => $expandable,expand => $expand_subjects} );
-
-	# Build series facets
-	my $number_of_series_facets;
-	my @series_facets_array;
-	my $expand_series;
-	$expand_series = 'series' unless ($expanded_facet eq 'series');
-	foreach my $value (sort { $series_facets_counter{$b} <=> $series_facets_counter{$a} } keys %series_facets_counter) {
-		$number_of_series_facets++;
-		my $linkvalue = $value;
-		my $captionvalue = $value;
-		my $count = $series_facets_counter{$value};
-		$linkvalue =~ s/\'/\\\'/g;
-		$captionvalue =~ s/\'/&apos;/g;
-		if (($number_of_series_facets < 6) || (!$expand_series)) {
-			push @series_facets_array , (
-            {count => $count,label => $captionvalue,link =>"/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;ccl_query=$query and series=&quot;$linkvalue&quot;"}
 			);
 		}
-	}
-    if (($number_of_series_facets > 6) && ($expand_series)) {
-		$expandable = 1;
-	}
-	else {
-		undef $expandable;
-	}
-    push @facets_loop, ( {type => 'Series',typeid => 'series_facet',facets => \@series_facets_array, expandable => $expandable,expand => $expand_series} );
-
-    # Build author facets
-	my $number_of_author_facets;
-	my @author_facets_array;
-	my $expand_authors;
-	$expand_authors = 'au' unless ($expanded_facet eq 'au');
-    foreach my $value (sort { $author_facets_counter{$b} <=> $author_facets_counter{$a} } keys %author_facets_counter) {
-		$number_of_author_facets++;
-        my $linkvalue = $value;
-		my $captionvalue = $value;
-		my $count = $author_facets_counter{$value};
-        $linkvalue =~ s/\'/\\\'/g;
-		$captionvalue =~ s/\'/&apos;/g;
-		if (($number_of_author_facets < 6) || (!$expand_authors)) {
-			push @author_facets_array , (
-            {count => $count,label => $captionvalue,link =>"/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;ccl_query=$query and au=&quot;$linkvalue&quot;"}
-        	);
-		}
-    }
-    if (($number_of_author_facets > 6) && ($expand_authors)) {
-	        $expandable = 1;    
-	}    else {
-	        undef $expandable;    
-	}
-    push @facets_loop, ( {type => 'Authors', typeid => 'author_facet',facets => \@author_facets_array, expandable => $expandable, expand => $expand_authors} );
 
 	return(undef,$numresults,\@facets_loop, at results);
 }

Index: koha-tmpl/opac-tmpl/npl/en/opac-results.tmpl
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/Attic/opac-results.tmpl,v
retrieving revision 1.1.2.9
retrieving revision 1.1.2.10
diff -u -b -r1.1.2.9 -r1.1.2.10
--- koha-tmpl/opac-tmpl/npl/en/opac-results.tmpl	28 Jul 2006 01:45:34 -0000	1.1.2.9
+++ koha-tmpl/opac-tmpl/npl/en/opac-results.tmpl	9 Aug 2006 22:59:30 -0000	1.1.2.10
@@ -2,7 +2,7 @@
 <!-- TMPL_INCLUDE NAME="doc-head-close.inc" -->
 <!--TMPL_INCLUDE NAME="masthead.inc" -->
 <!-- TMPL_INCLUDE NAME="navigation.inc" -->
-<div id="main">
+<div id="main" class="searchresults">
 <!-- TMPL_IF NAME="koha_spsuggest" --><div style="font-size: 12px;">Did you mean: <ul style="list-style: none;"><!-- TMPL_LOOP NAME="SPELL_SUGGEST" --> <li><a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;ccl_query=<!-- TMPL_VAR NAME="spsuggestion" -->"><!-- TMPL_VAR NAME="spsuggestion" --></a></li><!-- /TMPL_LOOP --></ul></div><!-- /TMPL_IF -->
 <!-- TMPL_IF NAME="total" -->
 <!-- TMPL_ELSE -->
@@ -49,6 +49,7 @@
 </form>
 
 <form action="opac-searchresults.pl" method="get" name="myform">
+
 <table>
 	<tr>
 		<th>Term/Phrase</th>
@@ -68,8 +69,18 @@
 </form>
 <!-- TMPL_ELSE -->
 
-<form style="float:right;" action="/cgi-bin/koha/opac-zoomsearch.pl" method="get">
-	<input type="hidden" name="op" value="get_results" />
+<form action="/cgi-bin/koha/opac-zoomsearch.pl" method="get" name="myform">
+
+<!-- TMPL_IF NAME="searchdesc" --><h3><!-- TMPL_IF name="total" --><strong>&ldquo;<!-- TMPL_VAR NAME="searchdesc" -->&rdquo;</strong> returned <!-- TMPL_VAR NAME="total" --> results<!-- TMPL_IF NAME="related" --> (related searches: <!-- TMPL_LOOP NAME="related" --><!-- TMPL_VAR NAME="related_search" --><!-- /TMPL_LOOP -->)<!-- /TMPL_IF -->. <a href="http://a9.com/-/opensearch/search/B0007WF826/<!-- TMPL_VAR NAME='searchdesc' -->?count=10&amp;startPage=1"><img title="RSS Feed for search <!-- TMPL_VAR NAME='searchdesc' -->" alt="RSS Feed for search <!-- TMPL_VAR NAME='searchdesc' -->" src="<!-- TMPL_VAR NAME=themelang>/images/feed-icon-16x16.png" border="0" /></a>
+<!-- TMPL_ELSE -->
+<strong>&ldquo;<!-- TMPL_VAR NAME="searchdesc" -->&rdquo;</strong>
+<!-- TMPL_VAR NAME="search_error" --> 
+<!-- /TMPL_IF --></h3><!-- /TMPL_IF -->
+
+<!-- TMPL_IF NAME="opacbookbag" -->
+<input type="submit" class="icon addchecked" value="Add Checked Items to Book Bag" onclick="addMultiple(); return false;" /> <input type="reset" value="Clear All" class="icon clearall" /><!-- /TMPL_IF -->
+
+<input type="hidden" name="op" value="get_results" />
 	<!-- TMPL_IF NAME="pqf_query" -->
     <input type="hidden" name="pqf_query" value="<!-- TMPL_VAR NAME="pqf_query" escape="html" -->" />
 	<!-- /TMPL_IF -->
@@ -88,10 +99,7 @@
 
         </select>
         <input type="submit" value="Sort" class="submit" />
-</form>
 
-<!-- TMPL_IF NAME="opacbookbag" --><form action="opac-searchresults.pl" method="get" name="myform">
-<input type="submit" class="icon addchecked" value="Add Checked Items to Book Bag" onclick="addMultiple(); return false;"/> <input type="reset" value="Clear All" class="icon clearall"/><!-- /TMPL_IF -->
 
 	<table>
 		<tr>

Index: koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc,v
retrieving revision 1.1.2.8.2.7
retrieving revision 1.1.2.8.2.8
diff -u -b -r1.1.2.8.2.7 -r1.1.2.8.2.8
--- koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc	25 Jul 2006 15:12:02 -0000	1.1.2.8.2.7
+++ koha-tmpl/opac-tmpl/npl/en/includes/masthead.inc	9 Aug 2006 22:59:30 -0000	1.1.2.8.2.8
@@ -1,6 +1,6 @@
 <div id="masthead">
 
-<h4><a style="text-decoration:none; border:0; " href="/cgi-bin/koha/opac-main.pl"><!-- TMPL_IF NAME="opacsmallimage" --><img style="border:0;" alt="<!-- TMPL_VAR NAME="LibraryName" -->" title= "<!-- TMPL_VAR NAME="LibraryName" -->" src="<!-- TMPL_VAR NAME="opacsmallimage" -->" /></a><!-- /TMPL_IF --></h4>
+<h2 id="libraryname"><!-- TMPL_VAR NAME="LibraryName" --></h2>
 <div class="menu">
 
 <form name="searchform" method="get" action="/cgi-bin/koha/opac-zoomsearch.pl" id="searchform">
@@ -20,18 +20,12 @@
         <option value="acqdate=">Acquisition Date</option>
         <option value="callnum=">Call Number</option>
 </select>
-<input type="text" name="ccl_query" style="width: 320px;"/>
-<input type="submit" value="Go" class="submit" /></p>
+<input type="text" name="ccl_query" style="width: 30%;"/>
+<input type="submit" value="Search" class="submit" /></p>
 </form></div>
 
 <div id="members">
-	<ul>
-		<!-- TMPL_IF NAME="loggedinusername" --><li>Logged in as <span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></li><!-- TMPL_ELSE --><li style="list-style:none;"><a class="card" href="/cgi-bin/koha/opac-user.pl">Log in to access<br /> cardholder features</a></li><!-- /TMPL_IF -->
-		<!--TMPL_IF NAME="virtualshelves" --><li><a href="/cgi-bin/koha/opac-shelves.pl">My Virtual Shelves</a></li><!-- /TMPL_IF -->
-		<li><a href="/cgi-bin/koha/opac-user.pl">My Account</a></li>
-		<!-- TMPL_IF NAME="opacbookbag" --> <li><a href="/cgi-bin/koha/opac-basket.pl" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections">Book Bag<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a></li><!-- /TMPL_IF -->
-		<!-- TMPL_IF NAME="loggedinusername" --><li><a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></li><!-- /TMPL_IF -->
+	<ul><!-- TMPL_IF NAME="loggedinusername" --><li><span class="members">Logged in as <span class="loggedinusername"><!-- TMPL_LOOP NAME="USER_INFO" --><!-- TMPL_VAR NAME="title" --> <!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" --><!-- /TMPL_LOOP --></span></span></li><!-- TMPL_ELSE --><li><a class="card" href="/cgi-bin/koha/opac-user.pl">Log in to access<br /> cardholder features</a></li><!-- /TMPL_IF --><!--TMPL_IF NAME="virtualshelves" --><li><a href="/cgi-bin/koha/opac-shelves.pl">My Virtual Shelves</a></li><!-- /TMPL_IF --><!-- TMPL_IF NAME="loggedinusername" --><li><a href="/cgi-bin/koha/opac-user.pl">My Account</a></li><!-- /TMPL_IF --><!-- TMPL_IF NAME="opacbookbag" --><li><a href="/cgi-bin/koha/opac-basket.pl" onclick="openBasket(); return false;" title="A &quot;shopping cart&quot; for your selections">Book Bag<span id="basket"><script language="javascript" type="text/javascript">if(basketcount){ document.write(basketcount) };</script></span></a></li><!-- /TMPL_IF --><!-- TMPL_IF NAME="loggedinusername" --><li><a class="logout" href="/cgi-bin/koha/opac-logout.pl">Log Out</a></li><!-- /TMPL_IF -->
 	</ul>	
 </div>
-<br class="clear" />
 </div>

Index: koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc,v
retrieving revision 1.2.2.4.2.11
retrieving revision 1.2.2.4.2.12
diff -u -b -r1.2.2.4.2.11 -r1.2.2.4.2.12
--- koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc	7 Aug 2006 19:56:50 -0000	1.2.2.4.2.11
+++ koha-tmpl/opac-tmpl/npl/en/includes/navigation.inc	9 Aug 2006 22:59:30 -0000	1.2.2.4.2.12
@@ -1,33 +1,16 @@
-<div id="mesg">
-<!-- TMPL_IF NAME="searchdesc" -->
-
-<ul style="list-style:none; margin : 0 0% 0% 1%; padding: 0 0 2px 0 ; font-family : Arial, Geneva, Helvetica, sans-serif; font-size : .75em; " >
-<li>
-
-<!-- TMPL_IF name=total -->
-<a style="border:0; text-decoration:none;" href="http://a9.com/-/opensearch/search/B0007WF826/<!-- TMPL_VAR NAME='searchdesc' -->?count=10&amp;startPage=1"><img style="border:0;" title="RSS Feed for search <!-- TMPL_VAR NAME='searchdesc' -->" alt="RSS Feed for search <!-- TMPL_VAR NAME='searchdesc' -->" src="<!-- TMPL_VAR NAME=themelang>/images/feed-icon-16x16.png"/></a>
-<span style="color:#FEEDDB; font-weight: bold;">&ldquo;<!-- TMPL_VAR NAME="searchdesc" -->&rdquo;</span> returned <span><!-- TMPL_VAR NAME="total" --></span> results<!-- TMPL_IF NAME="related" --> (related searches: <!-- TMPL_LOOP NAME="related" --><!-- TMPL_VAR NAME="related_search" --><!-- /TMPL_LOOP -->)<!-- /TMPL_IF -->.</li>
-<!-- TMPL_ELSE -->
-<span style="color:#FEEDDB; font-weight: bold;">&ldquo;<!-- TMPL_VAR NAME="searchdesc" -->&rdquo;</span>
-<!-- TMPL_VAR NAME="search_error" --> 
-<!-- /TMPL_IF -->
-</ul>
-<!-- /TMPL_IF -->
-
-</div>
-
-<div style="overflow: auto;" id="nav">
+<div id="nav">
 <!-- TMPL_VAR NAME="OpacNav" -->
+
 <!-- TMPL_IF NAME="opacfacets" -->
-<ul>
+<h6>Refine Your Search</h6>
+<ul id="facets">
 <!-- TMPL_LOOP NAME="facets_loop" -->
-<li id=<!-- TMPL_VAR NAME=typeid -->><!-- TMPL_VAR NAME=type --></li>
-<li><ul>
+<li id="<!-- TMPL_VAR NAME="link_value" -->"><!-- TMPL_VAR NAME="label_value" --><ul>
 	<!-- TMPL_LOOP NAME="facets" -->
-		<li><a href="<!-- TMPL_VAR NAME=link -->"><!-- TMPL_VAR NAME="label" --></a>(<!-- TMPL_VAR NAME="count" -->)</li>
+		<li><a href="<!-- TMPL_VAR NAME="facet_linkvalue" -->"><!-- TMPL_VAR NAME="facet_labelvalue" --></a> (<!-- TMPL_VAR NAME="facet_count" -->)</li>
 	<!-- /TMPL_LOOP -->
 <!-- TMPL_IF NAME="expandable" -->
-	<li><a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;ccl_query=<!-- TMPL_VAR NAME=searchdesc -->&expand=<!-- TMPL_VAR NAME=expand -->#<!-- TMPL_VAR NAME=typeid -->">-->Show More</a></li>
+	<li class="showmore"><a href="/cgi-bin/koha/opac-zoomsearch.pl?op=get_results&amp;ccl_query=<!-- TMPL_VAR NAME="searchdesc" -->&amp;expand=<!-- TMPL_VAR NAME="expand" -->#<!-- TMPL_VAR NAME="typeid" -->">Show More</a></li>
 <!-- /TMPL_IF -->
 </ul></li>
 <!-- /TMPL_LOOP -->

Index: koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/opac-colors.css,v
retrieving revision 1.1.2.3
retrieving revision 1.1.2.3.2.1
diff -u -b -r1.1.2.3 -r1.1.2.3.2.1
--- koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.css	28 Apr 2006 18:46:30 -0000	1.1.2.3
+++ koha-tmpl/opac-tmpl/npl/en/includes/opac-colors.css	9 Aug 2006 22:59:30 -0000	1.1.2.3.2.1
@@ -1,225 +1,253 @@
 /* COLORS, BACKGROUNDS, AND BORDERS */
 
 a {
-	color : #006699;
+	color: #006699;
 }
 
-a:active {
-	color : #990033;
+a:link.current {
+	background-color: transparent;
+	color: #3366CC;
+}
+
+a:link.nav {
+	background-color: #EFF1DC;
+	border: 1px solid #CCCC99;
+	color: #3366CC;
 }
 
 a:visited {
-	color : #006699;
+	color: #006699;
 }
 
-a:hover {
-	color : #990033;
+a:visited.current {
+	background-color: transparent;
+	color: #3366CC;
 }
 
-a:link.current {
-	background-color : transparent;
-	color : #3366CC;
+a:visited.nav {
+	background-color: #EFF1DC;
+	border: 1px solid #CCCC99;
+	color: #3366CC;
 }
 
-a:hover.current {
-	background-color : #CCFF00;
-	color : #CC3333;
+a:hover {
+	color: #990033;
 }
 
-a:visited.current {
-	background-color : transparent;
-	color : #3366CC;
+a:hover.current {
+	background-color: #CCFF00;
+	color: #CC3333;
 }
 
-a:active.current {
-	background-color : #99CC00;
-	color : #FFFF99;
+a:hover.nav {
+	background-color: #FFFFCC;
+	border: 1px solid #CCCC99;
+	color: #CC3333;
 }
 
-a:link.nav {
-	background-color : #EFF1DC;
-	border : 1px solid #CCCC99;
-	color : #3366CC;
+a:active {
+	color: #990033;
 }
 
-a:hover.nav {
-	background-color : #FFFFCC;
-	border : 1px solid #CCCC99;
-	color : #CC3333;
+a:active.current {
+	background-color: #99CC00;
+	color: #FFFF99;
 }
 
 a:active.nav {
-	background-color : #FFFFCC;
-	border : 1px solid #CCCC99;
-	color : #D25500;
+	background-color: #FFFFCC;
+	border: 1px solid #CCCC99;
+	color: #D25500;
 }
 
-a:visited.nav {
-	background-color : #EFF1DC;
-	border : 1px solid #CCCC99;
-	color : #3366CC;
+body {
+	background-color: #FFFFFF;
 }
 
-.menu a:link.logout {
-	background-color : #FFDD75;
-	color : Black;
+caption {
+	color: #000066;
 }
 
-.menu a:active.logout {
-	background-color : #FFDD75;
-	color : Black;	
+div.error h3 {
+	color: #990000;
 }
 
-
-.menu a:visited.logout {
-	background-color : #FFDD75;
-	color : Black;
+div.form, div.details {
+	background-color: #FFFFFF;
 }
 
-.menu a:hover.logout {
-	background-color : #FFCC33;
-	color : Black;
+div.tab {
+	background-color: transparent;
 }
 
-body {
-	background-color : #FFFFFF;
+div.tab p {
+	border-bottom: 1px solid #FFFFFF;
+	border-top: 1px solid #D8DEB8;
 }
 
-caption {
-	color : #000066;
+div.tabbloc {
+	background-color: transparent;
 }
 
-div.form, div.details {
-	background-color : #FFFFFF;
+em.new {
+	color: #CC3333;
 }
 
 h1,h2,h3,h4,h5,h6 {
-	color : #000066;
+	color: #000066;
 }
 
 h1.logo {
-	color : #D3DFAD;
+	color: #D3DFAD;
 }
 
-p.error, div.error {
-	background-color : #FFFFCC;
-	border : 1px dashed #cc6600;
+input.icon {
+	background-color: #6699CC;
+	color: #FFFFCC;
 }
 
-div.error h3 {
-	color : #990000;
+p.error, div.error {
+	background-color: #FFFFCC;
+	border: 1px dashed #CC6600;
 }
 
 table {
-	background-color : #ffffff;
+	background-color: #FFFFFF;
 }
 
 td {
-	border-bottom : 1px solid #DDDDDD;
-	border-right : 1px solid #DDDDDD;
+	border-bottom: 1px solid #DDDDDD;
+	border-right: 1px solid #DDDDDD;
+}
+
+td.input, div.form td, div.details td {
+	border-bottom: 1px solid #CCCCCC;
+	border-left: 0;
+	border-right: 0;
+	color: #000000;
+}
+
+td.label {
+	border-bottom: 1px solid #CCCCCC;
+	border-left: 1px solid #CCCCCC;
+	color: #000088;
+}
+
+td.label, div.form th, div.details th {
+	background-color: #FFFFFF;
+	border-bottom: 1px solid #CCCCCC;
+	border-left: 1px solid #CCCCCC;
+	border-right: 0;
+	border-top: 0;
+	color: #000088;
+}
+
+td.overdue {
+	color: #CC0000;
+}
+
+td:last-child {
+	border-bottom: 1px solid #CCCCCC;
+	border-right: 0 solid #CCCCCC;
 }
 
 th {
-	background-color : #EFF1DC;
-	border-bottom : 1px solid #CCCCCC;
-	border-right : 1px solid #CCCCCC;
+	background-color: #EFF1DC;
+	border-bottom: 1px solid #CCCCCC;
+	border-right: 1px solid #CCCCCC;
+}
+
+th:last-child {
+	background-color: #EFF1DC;
+	border-bottom: 1px solid #CCCCCC;
+	border-right: 0 solid #CCCCCC;
 }
 
 th[scope="row"] {
-	background-color : #E7E7CA;
+	background-color: #E7E7CA;
+}
+
+tr.highlight {
+	background-color: #F8F8EB;
 }
 
 tr.highlight th[scope="row"] {
-	background-color : #EEEEEE;
+	background-color: #EEEEEE;
 }
 
-th:last-child {
-	background-color : #EFF1DC;
-	border-bottom : 1px solid #CCCCCC;
-	border-right : 0 solid #CCCCCC;
+tr.overdue td {
+	background-color: #FEA7A7;
+/* Tabs */
+ul.link-tabs {
 }
 
-td.input, div.form td, div.details td {
-	border-bottom : 1px solid #CCCCCC;
-	border-left : 0;
-	border-right : 0;
-	color : #000000;
+ul.link-tabs li {
 }
 
-td.label, div.form th, div.details th {
-	background-color : #FFF;
-	border-bottom : 1px solid #CCCCCC;
-	border-left : 1px solid #CCCCCC;
-	border-right : 0;
-	border-top : 0;
-	color : #000088;
+ul.link-tabs li a {
+	border-left: 1px solid #FFFFE3;
+	border-right: 1px solid #666600;
+	border-top: 1px solid #FFFFE3;
 }
 
-td.label {
-	border-bottom : 1px solid #CCCCCC;
-	border-left : 1px solid #CCCCCC;
-	color : #000088;
+ul.link-tabs li.off a {
+	background-color: #D8DEB8;
+	border-bottom: 1px solid #CCCC99;
 }
 
-td:last-child {
-	border-bottom : 1px solid #CCCCCC;
-	border-right : 0 solid #CCCCCC;
+ul.link-tabs li.off a:hover {
+	background-color: #FFFFEC;
+	border-left: 1px solid #BEBF84;
+	border-right: 2px solid #333333;
+	border-top: 1px solid #BEBF84;
 }
 
-tr.highlight {
-	background-color : #F8F8EB;
+ul.link-tabs li.on a {
+	background-color: #FFFFCC;
+	border-bottom: 1px solid #FFFFCC;
+}
 }
 
 .content-block {
-	background-color : #FFFFFF;
+	background-color: #FFFFFF;
 }
 
 .current {
-	background-color : #FFFFFF;
-	color : #3366CC;
+	background-color: #FFFFFF;
+	color: #3366CC;
+}
+
+.detail-sidebar {
+	background-color: #EEEEEB;
 }
 
 .further {
-	color: #CCCC99;
+	background-color: #EEEEEB;
 	border: 2px solid #DDDED3;
-	background-color : #EEEEEB;
+	color: #CCCC99;
 }
 
 .further h4 {
-	background-color : #D8DEB8;
+	background-color: #D8DEB8;
 }
 
 .further li {
-	border-bottom : 1px solid #DDDED3;
-	}
-
-.detail-sidebar {
-	background-color : #EEEEEB;
+	border-bottom: 1px solid #DDDED3;
 }
 
-.operations li a, .operations li a:visited {
-	border: 2px solid #D8DEB8;
-	color: #FFFFCC;
-	background-color : #6699CC;
-}
-
-.operations li a:hover {
-	color: #FFFF99;
-	background-color: #0099FF;
+.issued {
+	color: #999999;
 }
 
-.operations li a:active {
-	color: #FFFF99;
-	background-color: #0099FF;
+.labelsubfield {
 }
 
 .loggedin {
-	color : #D8DEB8;
+	color: #D8DEB8;
 }
 
-.marctag {
-	color : #000000;
-	background-color : #E7E7CA;
+.loggedinusername {
+	color: #666666;
 }
 
 .marcsubfieldletter {
@@ -230,210 +258,231 @@
 	background-color: #EFF1DC;
 }
 
-.subfield {
-	background-color: #EFF1DC;
+.marctag {
+	background-color: #E7E7CA;
+	color: #000000;
 }
 
-.subfieldvalue {
-	background-color : #FFFFFF;
+.MARCtag {
+	background-color: #EEEEEE;
+	color: #000066; /* style for tag definition (700 - Statement of responsability) */
 }
 
 .menu {
-	color : #000000;
+	color: #000000;
 }
 
-#members a {
-	text-decoration : none;
+.menu a:link, #members a:link {
+	color: #0099CC;
 }
 
-.menu a:link, #members a:link {
-	color : #0099CC;
+.menu a:link.logout {
+	background-color: #FFDD75;
+	color: #000000;
 }
 
 .menu a:visited, #members a:visited {
-	color : #0099CC;
+	color: #0099CC;
+}
+
+.menu a:visited.logout {
+	background-color: #FFDD75;
+	color: #000000;
 }
 
 .menu a:hover, #members a:hover {
-	color : #990000;
+	color: #990000;
 }
 
-.menu a:active, #members a:active {
-	color : #990000;
+.menu a:hover.logout {
+	background-color: #FFCC33;
+	color: #000000;
 }
 
-.opac-detail {
-	background-color : #FFFFCC;
+.menu a:active, #members a:active {
+	color: #990000;
 }
 
-em.new {
-	color : #CC3333;
+.menu a:active.logout {
+	background-color: #FFDD75;
+	color: #000000;
 }
 
 .note {
-	background-color : #EEEEEB;
-	border-left : 1px solid #DDDED3;
-	border-top : 1px solid #DDDED3;
-	border-right : 1px solid #DDDED3;
-	border-bottom : 1px solid #DDDED3;
-}
-.opac-detail dd {
-	border-bottom : 1px solid #E7E7CA;
-	color : #000000;
+	background-color: #EEEEEB;
+	border-bottom: 1px solid #DDDED3;
+	border-left: 1px solid #DDDED3;
+	border-right: 1px solid #DDDED3;
+	border-top: 1px solid #DDDED3;
 }
 
-.submit {
-	background-color : #6699CC;
-	color : #FFFFCC;
+.opac-detail {
+	background-color: #FFFFCC;
 }
 
-input.icon {
-	background-color : #6699CC;
-	color : #FFFFCC;
+.opac-detail dd {
+	border-bottom: 1px solid #E7E7CA;
+	color: #000000;
 }
 
-#footer {
-	border-top : 1px solid #EEEEEE;
+.operations li a, .operations li a:visited {
+	background-color: #6699CC;
+	border: 2px solid #D8DEB8;
+	color: #FFFFCC;
 }
 
-#main {
-	background-color : transparent;
-	border-right  : 1px solid #EEEEEE;
+.operations li a:hover {
+	background-color: #0099FF;
+	color: #FFFF99;
 }
 
-#window {
-	background-color : #E7E7CA;
-	border-left : 1px solid #CCCC99;
+.operations li a:active {
+	background-color: #0099FF;
+	color: #FFFF99;
 }
 
-#masthead {
-	background-color : White;
-	border-bottom : 1px solid #EEEEEE;
+.sidebar-box {
+	border: 1px dashed #CCCCCC;
 }
 
-#nav {
-	background-color : #EFF1DC;
+.subfield {
+	background-color: #EFF1DC;
 }
 
-#nav ul li {
-	background-color : #EFF1DC; /*width : 100%;*/
-	border-bottom : 1px solid #CCCC99;
-	border-left : 0 solid #FFFFCC;
-	border-right : 0 solid #006699;
-	border-top : 0 solid #FFFFCC;
+.subfieldvalue {
+	background-color: #FFFFFF;
 }
 
-#nav ul li+li {
-	border-bottom : 1px solid #CCCC99;
-	border-left : 0 solid #FFFFCC;
-	border-right : 0 solid #006699;
+.submit {
+	background-color: #6699CC;
+	color: #FFFFCC;
 }
 
-#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;
+#footer {
+	border-top: 1px solid #EEEEEE;
 }
 
-#nav li ul li a {
-	color: Blue;
+/* Amazon CSS Stuff */
+#itemReviews dt {
+	border-bottom: 1px solid #DDDDDD;
 }
 
-#nav li ul li a:link {
-	color: #359;
+#main {
+	background-color: transparent;/*
+	border-right: 1px solid #EEEEEE;*/
 }
 
-#nav li ul li a:visited {
-	color: #359;
+#masthead {
+	background-color: #FFFFFF;/*
+	border-bottom: 1px solid #EEEEEE;*/
 }
 
-#nav li ul li a:hover {
-	color: #CC3333;
+#members {
+	background-image : url(navBarBgDef.gif);
+	background-repeat: repeat-x;
+	border-top: 1px solid #9999CC;
+	border-bottom : 1px solid #9999CC;
+	background-color: #AFBCCF;
+	color: #000066;
 }
 
-#results, .results {
-	color : #000066;
+#members ul li a:link, #members ul li a:visited, #members ul li a:hover, #members ul li a:active, #members span.members {
+	background-image : url(navBarBg.gif);
+	background-repeat: repeat-x;
+	border-left: 1px solid #9999CC;
+	color: #006699;
 }
 
-#sidebar {
-	background-color : #F8F8EB;
-	border : 1px dashed #666666;
+#members ul li:last-child {
+	border-right : 1px solid #9999CC;
 }
 
-#sidebar h3 {
-	color : #000066;
+#members ul li a:hover {
+	background-image : url(navBarBgHover.gif);
+	background-repeat: repeat-x;
 }
 
-#sidebar .submit {
-	background-color : #6699CC;
-	color : #FFFFCC;
+#members a {
+	text-decoration: none;
 }
 
-#search-sidebar {
-	background-color : #F8F8EB;
+#members a.logout:link, #members a.logout:visited, #members a.logout:hover, #members a.logout:active {
+	background-image : url(navBarBgLogout.gif);
+	background-repeat: repeat-x;
+	color: #000000;
 }
 
-.sidebar-box {
-	border : 1px dashed #cccccc;
+#members a:hover.logout {
+	background-image : url(navBarBgLogoutHover.gif);
+	background-repeat: repeat-x;
+	color: #000000;
 }
 
-.issued {
-	color : #999999;
+#nav {
+	background-color: #EFF1DC;
 }
 
-tr.overdue td {
-	background-color : #fea7a7;
+#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;
 }
 
-td.overdue {
-	color : #cc0000;
+#nav li ul li a {
+	color: #0000FF;
 }
 
+#nav li ul li a:link {
+	color: #335599;
+}
 	
-#members {
-	background-color : transparent;
-	border : 0px dashed #666666;
-	color : #000066;
-	}
-
-#members a.logout {
-	background-color : #FFDD75;
-	color : Black;
+#nav li ul li a:visited {
+	color: #335599;
 }
 
-#members a:hover.logout {
-	background-color : #FFCC33;
+#nav li ul li a:hover {
+	color: #CC3333;
 }
 
-.loggedinusername {
-	color : #666666;
+#nav ul li {
+	background-color: #EFF1DC; /*width : 100%;*/
+	border-bottom: 1px solid #CCCC99;
+	border-left: 0 solid #FFFFCC;
+	border-right: 0 solid #006699;
+	border-top: 0 solid #FFFFCC;
 }
 
-/* Amazon CSS Stuff */
+#nav ul li+li {
+	border-bottom: 1px solid #CCCC99;
+	border-left: 0 solid #FFFFCC;
+	border-right: 0 solid #006699;
+}
 
-#itemReviews dt {
-        border-bottom: 1px solid #ddd;
+#results, .results {
+	color: #000066;
 }
 
-div.tabbloc {
-	background-color:transparent;
+#search-sidebar {
+	background-color: #F8F8EB;
 }
 
-div.tab {
-	background-color:transparent;
+#sidebar {
+	background-color: #F8F8EB;
+	border: 1px dashed #666666;
 }
 
-div.tab p {
-	border-top: 1px solid #D8DEB8;
-	border-bottom: 1px solid White;
+#sidebar .submit {
+	background-color: #6699CC;
+	color: #FFFFCC;
 }
 
-.MARCtag { /* style for tag definition (700 - Statement of responsability) */
-	color:#000066;
-	background-color:#EEEEEE;
+#sidebar h3 {
+	color: #000066;
 }
 
-.labelsubfield { /* style for each subfield (like : a Publication year), just before the biblio subfield */
+#window {
+	background-color: #E7E7CA;
+	border-left: 1px solid #CCCC99;
 }
\ No newline at end of file

Index: koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css
===================================================================
RCS file: /sources/koha/koha/koha-tmpl/opac-tmpl/npl/en/includes/Attic/opac-layout.css,v
retrieving revision 1.1.2.4.2.4
retrieving revision 1.1.2.4.2.5
diff -u -b -r1.1.2.4.2.4 -r1.1.2.4.2.5
--- koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css	23 Jul 2006 18:02:09 -0000	1.1.2.4.2.4
+++ koha-tmpl/opac-tmpl/npl/en/includes/opac-layout.css	9 Aug 2006 22:59:30 -0000	1.1.2.4.2.5
@@ -1,798 +1,713 @@
 a {
-	font-weight : bold;
+	font-weight: bold;
 }
 
 a:link.current {
-	font-size : 12px;
-	font-weight : bold;
-	padding : 1px 5px 1px 5px;
-	text-decoration : none;
+	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:link.nav {
+	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;
+	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:visited.nav {
+	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.current {
+	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;
+	font-weight: bold;
+	padding: 1px 5px 1px 5px;
+	text-decoration: none;
+}
+
+a:active.current {
+	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;
+	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;
+a.help {
+	padding: 3px;
+	text-decoration: none;
 }
 
 a.title {
-	font-size : 110%;
-	font-style : normal;
-	font-weight : bold;
+	font-style: normal;
+	font-weight: bold;
 }
 
-th a {
-	font-weight : bold;
-	font-size: 150%;
-	text-decoration: none;
+body {
+	font-family: Verdana, Arial, Geneva, Helvetica, sans-serif;
+	font-size: 73%;
+	margin: 0;
+	padding: 0;
 }
 
-.menu a:link.logout {
-	font-weight : bold;
-	padding : 3px 15px 3px 15px;
-	text-decoration : none;
+caption {
+	font-family: Arial, Geneva, Helvetica, sans-serif;
+	font-weight: bold;
+	margin: 0;
+	padding: 5px 0 3px 0;
+	text-align: left;
 }
 
-.menu a:active.logout {
-	font-weight : bold;
-	padding : 3px 15px 3px 15px;
-	text-decoration : none;
+div.bookcover {
+	float: right;
 }
 
+div.details table, div.details td, div.details th {
+	border: 0;
+	border-bottom: 1px solid #DDDDDD;
+}
 
-.menu a:visited.logout {
-	font-weight : bold;
-	padding : 3px 15px 3px 15px;
-	text-decoration : none;
+div.details td.details {
+	text-align: left;
 }
 
-.menu a:hover.logout {
-	font-weight : bold;
-	padding : 3px 15px 3px 15px;
-	text-decoration : none;
+div.details ul {
+	list-style-type: circle;
+	margin-left: 0;
+	text-align: left;
 }
 
-body {
-	font-family : Verdana, Arial, Geneva, Helvetica, sans-serif;
-	margin : 0;
-	padding : 0;
+div.error {
+	padding: 3px 10px 3px 10px;
+	width: 75%;
 }
 
-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.error li {
+	margin-bottom: .5em;
 }
 
 div.form, div.details {
-	margin : 0 auto;
-	padding : 5px;
-	width : 95%;
+	margin: 0 auto;
+	padding: 0 0 0 6px;
 }
 
-div.details ul {
-	margin-left : 0;
-	text-align : left;
-	list-style-type: circle;
+div.notes {
+	text-align: left;
 }
 
-div.table {
-	width : 95%;
+div.sidebar-box+div.sidebar-box {
+	margin-top: 5px;
 }
 
-form {
-	display : inline;
-	margin : 0;
-	padding : 0;
+div.tab {
+	display: block;
+	float: left;
+	margin-right: 0px;
+	width: 100%;
 }
 
-h1,h2,h3,h4,h5,h6 {
-	font-family : arial, geneva, helvetica, sans-serif;
-	margin : 0;
+div.tab p {
+	margin: 0;
+	padding: 3px 0;
 }
 
-h1 {
-	font-size : 150%;
-	padding : 5px 0 3px 0;
+div.tab p.MARCtag {
+	clear: both;
+	font-weight: bold; /* style for tag definition (700 - Statement of responsability) */
+	margin: 0;
+	padding: 2px;
 }
 
-h1.logo {
-	display : inline;
-	margin : 10px 0 0 10px;
+div.tab table {
+	width: 100%;
 }
 
-h1.title {
-	font-style : italic;
-	padding : 5px 0 3px 0;
+div.tabbloc {
+	font-family: Arial, Helvetica, sans-serif;
 }
 
-h2 {
-	font-size : 130%;
-	padding : 5px 0 3px 0;
+div.table {
+	width: 95%;
 }
 
-h3 {
-	font-size : 120%;
-	padding : 5px 0 3px 0;
+em.new {
+	font-style: normal;
+	font-weight: bold;
 }
 
-h3+p {
-	margin : .4em 0 .4em 0;
+form {
+	display: inline;
+	margin: 0;
+	padding: 0;
 }
 
-p+h3 {
-	margin-top : .6em;
+h1 {
+	font-size: 1.8em;
+	padding: 5px 0 3px 0;
 }
 
-h3.author {
-	padding : 0 0 3px 15px;
+h1,h2,h3,h4,h5,h6 {
+	font-family: arial, geneva, helvetica, sans-serif;
+	margin: 0;
 }
 
-h4 {
-	padding : 5px 0 3px 0;
+h1.logo {
+	display: inline;
+	margin: 10px 0 0 10px;
 }
 
-h5 {
-	font-size : 100%;
-	margin : 0;
-	padding : 10px 0 2px 0;
+h1.title {
+	font-style: italic;
+	padding: 5px 0 3px 0;
 }
 
-p+h5 {
-	padding : 3px 0 2px 0;
-	margin : 0;
+h2 {
+	font-size: 1.6em;
+	padding: 5px 0 3px 0;
 }
 
-h5+p {
-	padding-top : 0;
-	margin-top : 0;
+h2#libraryname {
+	padding-left : 5px;
 }
 
-.inline {
-	display : inline;
+h3 {
+	font-size: 1.4em;
+	padding: 5px 0 3px 0;
 }
 
-p {
-	padding : 0 10px 0 10px;
+h3.author {
+	padding: 0 0 3px 15px;
 }
 
-p.error, div.error {
-	font-size : 1.05em;
-	font-weight : normal;
-	margin : auto;
-	padding : 5px 20px 5px 20px;
+h3+p {
+	margin: .4em 0 .4em 0;
 }
 
-div.error {
-	font-size : .9em;
-	padding : 3px 10px 3px 10px;
-	width : 75%;
+h4 {
+	font-size: 1.3em;
+	padding: 5px 0 3px 0;
 }
 
-p.error+p.error, div.error+div.error {
-	margin-top : 5px;
+h5 {
+	font-size: 1.2em;
+	margin: 0;
+	padding: 10px 0 2px 0;
 }
 
-div.error li {
-	margin-bottom : .5em;
+h5+p {
+	margin-top: 0;
+	padding-top: 0;
 }
 
-table {
-	border-collapse : collapse;
-	margin : 5px 0 5px 0;
-	padding : 0;
+h6 {
+	font-size: 1.1em;
 }
 
-td {
-	font-size : .80em;
-	padding : 5px 5px 5px 5px;
+input, select, th, td {
+	font-size: 1em;
 }
 
-td:last-child {
-	font-size : .80em;
-	padding : 5px 5px 5px 5px;
+input.add, a.add {
+	background-image: url(../images/add.gif);
 }
 
-th {
-	font-size : .80em;
-	font-weight : bold;
-	padding : 5px 5px 5px 5px;
+input.addchecked, a.addchecked {
+	background-image: url(../images/addtobasket.gif);
 }
 
-th:last-child {
-	font-size : .80em;
-	font-weight : bold;
-	padding : 5px 5px 5px 5px;
+input.back, a.back {
+	background-image: url(../images/back.gif);
 }
 
-th[scope="row"] {
-	font-size : 60%;
-	font-weight : normal;
-	text-align : right;
+input.brief, a.brief {
+	background-image: url(../images/brief.gif);
 }
 
-td.input, div.form td, div.details td {
-	border-left : 0;
-	border-right : 0;
-	padding : 2px 2px 2px 4px;
-	text-align : right;
+input.cart, a.cart {
+	background-image: url(../images/basket.gif);
 }
 
-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;
+input.clearall, a.clearall {
+	background-image: url(../images/clearbasket.gif);
 }
 
-div.details td.details {
-	text-align : left;
+input.close, a.close {
+	background-image: url(../images/close.gif);
 }
 
-td.label {
-	font-weight : bold;
-	line-height : 1.5em;
-	padding : 4px;
+input.delete, a.delete {
+	background-image: url(../images/delete.gif);
 }
 
-.rejected {
-	text-decoration: line-through;
+input.detail, a.detail {
+	background-image: url(../images/detail.gif);
 }
 
-.selected {
-	text-decoration: none;
+input.edit, a.edit {
+	background-image: url(../images/edit.gif);
 }
 
-.content-block {
-	margin : 5px;
-	padding : 5px;
-	width : 90%;
+input.icon {
+	background-position: left;
+	background-repeat: no-repeat;
+	font-family: Verdana, Arial, Geneva, Helvetica, sans-serif;
+	font-weight: bold;
+	padding: 2px 2px 2px 22px;
 }
 
-.count {
-	font-size : .7em;
-	font-weight : normal;
+input.isbd, a.isbd {
+	background-image: url(../images/isbd.gif);
 }
 
-.current {
-	font-size : 12px;
-	font-weight : bold;
-	padding : 1px 5px 1px 5px;
-	text-decoration : none;
+input.print, a.print {
+	background-image: url(../images/print2.gif);
 }
 
-.ex {
-	font-family : "Courier New", Courier, monospace;
+input.remove, a.remove {
+	background-image: url(../images/remove.gif);
 }
 
-div.bookcover {
-	float: right;
+input.reserve, a.reserve {
+	background-image: url(../images/placereserve.gif);
 }
 
-.further {
-	float: right;
-	font-size : 80%;
-	margin : 5px;
-	width : 30%;
+input.send, a.send {
+	background-image: url(../images/send.gif);
 }
 
-.further h4 {
-	padding : 2px;
+input.shelf, a.shelf {
+	background-image: url(../images/addtoshelf.gif);
 }
 
-.further ul, .further li  {
-	margin : 0 0 0 .5em;
-	padding : 0;
+input.trash, a.trash {
+	background-image: url(../images/trash.gif);
 }
 
-.further li {
-	padding : 2px 0;
-	}
-
-.detail-sidebar {
-	float: right;
-	padding: 5px;
-	margin-left : 15px;
-	text-align: center;
-	width : 35%;
+p {
+	padding: 0 10px 0 10px;
 }
 
-.detail-sidebar .further {
-	float: none;
-	text-align: left;
-	width : 90%;
+p.error, div.error {
+	font-weight: normal;
+	margin: auto;
+	padding: 5px 20px 5px 20px;
 }
 
-.operations {
-	font-size: 90%;
-	text-align: center;
-	margin-top: 7px;
-	padding-left: 10px;
-	width: 100%;
+p.error+p.error, div.error+div.error {
+	margin-top: 5px;
 }
 
-.operations ul {
-	margin: 0;
-	padding : 0;
-	width: 90%;
+p+h3 {
+	margin-top: .6em;
 }
 
-.operations li {
-	list-style-type: none;
+p+h5 {
 	margin: 0;
-	padding-bottom : 2px;
+	padding: 3px 0 2px 0;
 }
 
-.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;
+span.print {
+	font-size: .7em;
+	font-weight: normal;
+	padding-left: .7em;
 }
 
-.operations li a:active {
-	border-style: inset;
+table {
+	border-collapse: collapse;
+	margin: 5px 0 5px 0;
+	padding: 0;
 }
 
-.item-details {
-	display : block;
-	margin : 0 0 0 25px;
+td {
+	padding: 3px;
 }
 
-.loggedin {
-	font-weight : bold;
+td.input, div.form td, div.details td {
+	border-left: 0;
+	border-right: 0;
+	padding: 2px 2px 2px 4px;
+	text-align: right;
 }
-/*
-.marctag {
-	font-family : Arial, Geneva, sans-serif;
-	margin : 1px;
-	padding : 3px;
+
+td.label {
+	font-weight: bold;
+	line-height: 1.5em;
+	padding: 4px;
 }
 
-.marcsubfieldletter {
-	font-family : Arial, Geneva, sans-serif;
-	padding : 3px;
+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;
 }
 
-.marcsubfieldname {
-	font-family : Arial, Geneva, sans-serif;
-	font-size: 70%;
-	padding : 3px;
-	width: 18%;
+td.search-options select {
 }
 
-.subfield {
-	font-family : Arial, Geneva, sans-serif;
-	padding : 3px;
+td:last-child {
+	padding: 3px;
 }
 
-.subfieldvalue {
-	font-family : Arial, Geneva, sans-serif;
-	font-weight : bold;
-	padding : 3px;
-}*/
+th {
+	font-weight: bold;
+	padding: 2px;
+}
 
-.menu {
-	margin-bottom : 5px;
-	margin-left : 15px;
-	margin-right : 10px;
+th a {
+	font-weight: bold;
+	text-decoration: none;
 }
 
-#members a {
-	text-decoration : none;
+th:last-child {
+	font-weight: bold;
+	padding: 2px;
 }
 
-.menu a:link, #members a:link {
-	padding : 2px;
+th[scope="row"] {
+	font-weight: normal;
+	text-align: right;
 }
 
-.menu a:visited, #members a:visited {
-	padding : 2px;
+ul#facets {
+	margin: 3px;
 }
 
-.menu a:hover, #members a:hover {
-	padding : 2px;
+ul#facets li {
+	font-weight: bold;
+	text-align: left;
 }
 
-.menu a:active, #members a:active {
-	padding : 2px;
+ul#facets ul li {
+	border: 0;
+	font-size: .95em;
+	font-weight: normal;
+	padding: 2px;
+	text-align: left;
 }
 
-#members a.card {
-	display : block;
-	padding-left : 39px;
-	background-image: url(../images/card.gif);	
-	background-position: left;
-	background-repeat: no-repeat;
+ul#facets ul li a {
+	font-weight: normal;
+	text-decoration: underline;
 }
 
-.menu input {
-	font-size : 80%;
+ul#facets ul li.showmore {
+	text-align: center;
 }
 
-.menu label {
-	font-weight : bold;
+ul#facets ul li.showmore a {
+	font-weight: bold;
+	text-decoration: none;
 }
 
-.menu p {
-	margin : 0;
-	padding : 0;
+/* Tabs */
+ul.link-tabs {
+	list-style-type: none;
+	margin: 9px 0 -2px 5px;
+	padding: 0;
 }
 
-.menu p+p {
-	margin-top : 5px;
+ul.link-tabs li {
+	display: inline;
+	padding: 0px;
 }
 
-.opac-detail {
-	padding : 4px;
+ul.link-tabs li a {
+	font-weight: bold;
+	padding: 2px 4px 2px 4px;
+	text-decoration: none;
 }
 
-em.new {
-	font-weight : bold;
-	font-style : normal;
+ul.link-tabs li#power_formButton a, ul.link-tabs li#proximity_formButton a {
+	padding: 2px 4px 3px 4px;
 }
 
-.login-note {
-	width : 35%;
+ul.link-tabs li.off a {
 }
 
-.note {
-	font-size : 12px;
-	margin : 10px auto;
-	padding : 4px 4px 4px 4px;
-	width : 35%;
+ul.link-tabs li.off a:hover {
+	padding: 2px 3px 2px 4px;
 }
 
-div.notes {
-	text-align: left;
+ul.link-tabs li.on a {
 }
 
-.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;
+.clear {
+	clear: both;
+	line-height: .1em;
 }
 
-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;	
+.content-block {
+	margin: 5px;
+	padding: 5px;
+	width: 90%;
 }
 
-input.add, a.add {
-	background-image: url(../images/add.gif);
+.count {
+	font-weight: normal;
 }
 
-input.back, a.back {
-	background-image: url(../images/back.gif);
+.current {
+	font-weight: bold;
+	padding: 1px 5px 1px 5px;
+	text-decoration: none;
 }
 
-input.cart, a.cart {
-	background-image: url(../images/basket.gif);
+.detail-sidebar {
+	float: right;
+	margin : 0 0 0 15px;
+	padding: 5px;
+	text-align: center;
+	width: 35%;
 }
 
-input.print, a.print {
-	background-image: url(../images/print2.gif);
+.detail-sidebar .further {
+	float: none;
+	text-align: left;
+	width: 90%;
 }
 
-input.detail, a.detail {
-	background-image: url(../images/detail.gif);
+.ex {
+	font-family: "Courier New", Courier, monospace;
 }
 
-input.brief, a.brief {
-	background-image: url(../images/brief.gif);
+.further {
+	float: right;
+	margin: 5px;
+	width: 30%;
 }
 
-input.send, a.send {
-	background-image: url(../images/send.gif);
+.further h4 {
+	padding: 2px;
 }
 
-input.trash, a.trash {
-	background-image: url(../images/trash.gif);
+.further li {
+	padding: 2px 0;
 }
 
-input.close, a.close {
-	background-image: url(../images/close.gif);
+.further ul, .further li {
+	margin: 0 0 0 .5em;
+	padding: 0;
 }
 
-input.addchecked, a.addchecked {
-	background-image: url(../images/addtobasket.gif);
+.inline {
+	display: inline;
 }
 
-input.clearall, a.clearall {
-	background-image: url(../images/clearbasket.gif);
+.item-details {
+	display: block;
+	margin: 0 0 0 25px;
 }
 
-input.isbd, a.isbd {
-	background-image: url(../images/isbd.gif);
+.labelsubfield {
+	clear: both; /* style for each subfield (like : a Publication year), just before the biblio subfield */
+	float: left;
+	font-weight: bold;
+	margin-left: 30px;
+	width: 12em;
 }
 
-input.shelf, a.shelf {
-	background-image: url(../images/addtoshelf.gif);
+.left {
+	float: left;
 }
 
-input.reserve, a.reserve {
-	background-image: url(../images/placereserve.gif);
+.loggedin {
+	font-weight: bold;
 }
 
-input.remove, a.remove {
-	background-image: url(../images/remove.gif);
+.login-note {
+	width: 35%;
 }
 
-input.delete, a.delete {
-	background-image: url(../images/delete.gif);
+.menu {
+	margin-bottom: 5px;
+	margin-left: 15px;
+	margin-right: 10px;
 }
 
-input.edit, a.edit {
-	background-image: url(../images/edit.gif);
+.menu a.logout {
+	font-weight: bold;
+	padding: 3px 15px 3px 15px;
+	text-decoration: none;
 }
 
-.left {
-	float : left;
+.menu a:link, #members a:link {
+	padding: 2px;
 }
 
-.right {
-	float : right;
+.menu a:visited, #members a:visited {
+	padding: 2px;
 }
 
-.title {
-	font-style : italic;
-	font-weight : bold;
+.menu a:hover, #members a:hover {
+	padding: 2px;
 }
 
-#footer {
-	clear : both;
-	padding: 10px;
-	text-align: center;
+.menu a:active, #members a:active {
+	padding: 2px;
 }
 
-#main {
-	margin-left : 20%;
-	margin-right : 2%;
-	margin-top : 0;
-	padding : 5px;
-	position : relative;
+.menu input {
 }
 
-#window {
-	margin-left : 2%;
-	margin-right : 2%;
-	margin-top : 2%;
-	padding : 10px;
+.menu label {
+	font-weight: bold;
 }
 
-#window div.menu {
-	margin : 0;
+.menu p {
+	margin: 0;
+	padding: 0;
 }
 
-#window .class {
-	display : block;
-	font-weight : bold;
-	padding : 0 0 5px 3px;
+.menu p+p {
+	margin-top: 5px;
 }
 
-#masthead {
-	margin : 0 0 0 5px;
+.note {
+	margin: 10px auto;
+	padding: 4px 4px 4px 4px;
+	width: 35%;
 }
 
-#nav {
-	float : left;
-	margin : 0 0% 0% 1%;
-	padding : 0;
-	width : 18%;
+.opac-detail {
+	padding: 4px;
 }
 
-#nav a {
-	font-family : Arial, Geneva, Helvetica, sans-serif;
-	font-size : 1.1em;
-	font-weight : bold;
-	text-decoration : none;
+.opac-detail dd {
+	display: block;
+	line-height: 1.5em;
+	padding: 4px;
+	text-align: right;
 }
 
-#nav ul {
-	margin : 0;
-	padding : 0;
+.operations {
+	margin-top: 7px;
+	padding-left: 10px;
+	text-align: center;
+	width: 100%;
 }
 
-#nav ul li {
-	font-family : Arial, Geneva, Helvetica, sans-serif;
-	font-size : .75em;
-	list-style : none;
-	margin : 0;
-	padding : 3px;
-	text-align : right;
+.operations li {
+	list-style-type: none;
+	margin: 0;
+	padding-bottom: 2px;
 }
 
-#nav ul li+li {
-	margin : 0;
+.operations li a, .operations li a:visited {
+	background-position: top left;
+	background-repeat: no-repeat;
+	border-style: outset;
+	display: block;
+	padding: 3px 3px 3px 26px;
+	text-decoration: none;
 }
 
-#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;
+.operations li a:active {
+	border-style: inset;
 }
 
-#nav li ul li a {
-	font-family : Arial, Geneva, Helvetica, sans-serif;
-	font-size : .99em;
-	font-weight : bold;
-	text-decoration : none;
+.operations ul {
+	margin: 0;
+	padding: 0;
+	width: 90%;
 }
 
-#results, .results {
-	font-family : Verdana, Arial, Geneva, Helvetica, sans-serif;
-	font-size : 80%;
-	margin : 0;
-	padding : 7px 0 10px 0;
+.overdue {
+	font-weight: bold;
 }
 
-#sidebar {
-	width : 20%;
-	margin : 20px;
-	padding : 5px;
-	float : right;
-	font-size : 80%;
+.rejected {
+	text-decoration: line-through;
 }
 
-#sidebar h3 {
-	font-family : Arial, Geneva, Helvetica, sans-serif;
-	font-size : 110%;
-	margin : 0;
-	padding : 5px 0 1px 0;
+.right {
+	float: right;
 }
 
-#sidebar .submit {
-	font-family : Verdana, Arial, Geneva, Helvetica, sans-serif;
-	font-size : 80%;
-	font-weight : bold;
-	padding : 2px;
+.search-main {
+	float: left;
+	width: 65%;
 }
 
-#search-sidebar {
-	width : 30%;
-	margin : 10px;
-	padding : 3px;
-	float : right;
-	font-size : 80%;
+.searchresults input, .searchresults label, .searchresults select {
+	font-size: .8em;
 }
 
-.search-main {
-	width : 65%;
-	float: left;
+.selected {
+	text-decoration: none;
 }
 
 .sidebar-box {
-	margin-bottom : 0;
-}
-
-div.sidebar-box+div.sidebar-box {
-	margin-top : 5px;
+	margin-bottom: 0;
 }
 
 .sidebar-box h3, .sidebar-box h4 {
-	margin-left : 10px;
+	margin-left: 10px;
 }
 
-#search-sidebar .sidebar-box label {
-	display : block;
-	text-align : left;
+.sidebar-box p {
+	margin: 3px 10px;
+	padding: 0;
 }
 
-.sidebar-box p {
-	margin : 3px 10px;
-	padding : 0;
+.submit {
+	font-family: Verdana, Arial, Geneva, Helvetica, sans-serif;
+	font-weight: bold;
+	padding: 2px;
 }
 
-.overdue {
-	font-weight : bold;
+.term {
+	font-weight: bold;
 }
 
-span.print {
-	font-size : .7em;
-	font-weight : normal;
-	padding-left : .7em;
-	}
+.thumbnail {
+	border: 0;
+	float: left;
+	margin: 0 5px 5px 0;
+}
 	
-#members {
-	font-size : .85em;
-	font-weight : bold;
-	position : absolute;
-	top : 0;
-	right : 0;
-	}
+.title {
+	font-style: italic;
+	font-weight: bold;
+}
 	
-#members ul {
-	margin : 0;
-	padding : .3em .3em .3em 1.5em;
+#footer {
+	clear: both;
+	padding: 10px;
+	text-align: center;
 }
 
-#members a.logout {
-	font-weight : bold;
-	padding : 0 .3em 0 .3em;
-	text-decoration : none;
+#itemReviews {
+	margin: 0 auto;
+	padding: 5px;
+	width: 95%;
 }
 
-.clear {
-	clear : both;
-	line-height : .1em;
+#itemReviews dl {
+	display: block;
 }
 
-#itemReviews {
-	font-size : .9em;
-	margin : 0 auto;
-	padding : 5px;
-	width : 95%;
+#itemReviews dt {
+	width: 8em;
 }
 
 #itemReviews h4 {
@@ -802,141 +717,239 @@
 
 #itemReviews p {
         text-align: left;
- }
+}
  
-#itemReviews dl {
-        display: block ;
+#loose_form label, #keyword_form label, #precise_form label, #cql_form label, #advanced label, #cql label, #power label, #proximity label {
+	font-weight: bold;
+	text-align: right;
 }
 
-#itemReviews dt {
-        width: 8em;
+#loose_form, #keyword_form, #precise_form, #cql_form, #advanced, #cql, #power, #proximity {
+	margin: 5px;
+	width: 96%;
 }
 
-#starMT {
-        position:relative;
-        height: 25px;
-        width: 100px;
-        margin: 0 3px 0 30px;
-        padding:0;
-        background: url(../images/emptystars.png) top left no-repeat;
+#main {
+	margin-left: 20%;
+	margin-right: 0;
+	padding: 0;
+	position: relative;
 }
-#starFull {
-        height: 25px;
-        margin: 0 ; padding: 0;
-        background: url(../images/bluestars.png) top left no-repeat;
+
+#masthead {
+	margin: 0;
+	padding: 0;
 }
 
-div.tabbloc {
-	font-family: Arial, Helvetica, sans-serif;
-	font-size: 80%;
+#members {
+	font-weight: bold;
+	padding: 4px 0 4px 0;
 }
 
-div.tab {
+#members a.card {
+	background-image: url(../images/card.gif);
+	background-position: left;
+	background-repeat: no-repeat;
 	display: block;
-	float:left;
-	margin-right:0px;
-	width:100%;
+	padding-left: 39px;
 }
 
-div.tab p {
-	margin : 0;
-	padding : 3px 0;
+#members a.logout {
+	font-weight: bold;
+	padding: 0 .3em 0 .3em;
+	text-decoration: none;
 }
 
-div.tab table {
-	width : 100%;
+#members li {
+	display: inline;
+	list-style: none;
+	margin: 0;
 }
 
-div.tab p.MARCtag { /* style for tag definition (700 - Statement of responsability) */
-	font-weight:bold;
-	clear : both;
-	margin : 0;
-	padding : 2px;
+#members ul li a:link, #members ul li a:visited, #members ul li a:hover, #members ul li a:active, #members span.members {
+	padding : 4px;
 }
 
-
-.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;
+#members ul li:last-child {
 }
 
-/* Tabs */
+#members ul li a:hover {\
+}
 
-ul.link-tabs {
-	list-style-type : none;
-	margin: 9px 0 -2px 5px;
-	padding : 0;
+#members ul {
+	margin: 0;
+	padding: 0;
+	text-align: right;
 }
 
-ul.link-tabs li {
-	display: inline;
-	padding: 0px;
+#nav {
+	float: left;
+	margin: 0;
+	padding: 0;
+	width: 20%;
 }
 
-ul.link-tabs li a {
-	font-size : 95%;
-	font-weight : bold;
-	padding: 2px 4px 2px 4px;
+#nav a {
+	font-family: Arial, Geneva, Helvetica, sans-serif;
+	font-weight: bold;
 	text-decoration: none;
 }
 
-ul.link-tabs li.on a {
+#nav h6 {
+	padding: 3px;
 }
 
-ul.link-tabs li.off a {
+#nav li ul li {
+	font-family: Arial, Geneva, Helvetica, sans-serif;
+	list-style: none;
+	margin: 0;
+	padding: 5px 3px 5px 3px;
+	text-align: right;
 }
 
-ul.link-tabs li.off a:hover {
-	padding: 2px 3px 2px 4px;
+#nav li ul li a {
+	font-family: Arial, Geneva, Helvetica, sans-serif;
+	font-weight: bold;
+	text-decoration: none;
 }
 
-#loose_form label, #keyword_form label, #precise_form label, #cql_form label, #advanced label, #cql label, #power label, #proximity label {
-	font-size: 90%;
-	font-weight : bold;
+#nav ul {
+	margin: 0;
+	padding: 0;
+}
+
+#nav ul li {
+	font-family: Arial, Geneva, Helvetica, sans-serif;
+	list-style: none;
+	margin: 0;
+	padding: 3px 8px 3px 3px;
 	text-align: right;
 }
 
-#loose_form, #keyword_form, #precise_form, #cql_form, #advanced, #cql, #power, #proximity {
-	margin: 5px;
-	width : 96%;
+#nav ul li+li {
+	margin: 0;
+}
+
+#power_formButton, #proximity_formButton {
+}
+
+#results, .results {
+	font-family: Verdana, Arial, Geneva, Helvetica, sans-serif;
+	margin: 0;
+	padding: 7px 0 10px 0;
 }
 
 #search-footer {
 	margin: auto;
-	text-align : center;
+	text-align: center;
 }
 
 #search-footer a {
 	margin: 3px 5px 3px 5px;
-	text-decoration: none;
 	padding: 2px 5px;
+	text-decoration: none;
 }
 
-td.search-options select {
-	font-size : 80%;
+#searchform input.submit {
+	font-size: .8em;
+}
+
+#search-sidebar {
+	float: right;
+	margin: 10px;
+	padding: 3px;
+	width: 30%;
+}
+
+#search-sidebar .sidebar-box label {
+	display: block;
+	text-align: left;
+}
+
+#sidebar {
+	float: right;
+	margin: 20px;
+	padding: 5px;
+	width: 20%;
+}
+
+#sidebar .submit {
+	font-family: Verdana, Arial, Geneva, Helvetica, sans-serif;
+	font-weight: bold;
+	padding: 2px;
+}
+
+#sidebar h3 {
+	font-family: Arial, Geneva, Helvetica, sans-serif;
+	margin: 0;
+	padding: 5px 0 1px 0;
 }
 
 #sort {
-	margin : .3em;
+	margin: .3em;
 }
 
 #sort, #sort select, #sort input {
-	font-size: 80%;
 }
 
-a.help {
-	font-size : 80%;
-	padding : 3px;
-	text-decoration : none;
+#starFull {
+	background: url(../images/bluestars.png) top left no-repeat;
+	height: 25px;
+	margin: 0;
+	padding: 0;
 }
 
-#power_formButton, #proximity_formButton {
-	font-size : 75%;
+#starMT {
+	background: url(../images/emptystars.png) top left no-repeat;
+	height: 25px;
+	margin: 0 3px 0 30px;
+	padding: 0;
+	position: relative;
+	width: 100px;
 }
 
-ul.link-tabs li#power_formButton a, ul.link-tabs li#proximity_formButton a {
-	padding: 2px 4px 3px 4px;
+#window {
+	margin-left: 2%;
+	margin-right: 2%;
+	margin-top: 2%;
+	padding: 10px;
+}
+
+#window .class {
+	display: block;
+	font-weight: bold;
+	padding: 0 0 5px 3px;
+}
+
+#window div.menu {
+	margin: 0;
+}
+
+/*
+.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;
+	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;
 }
+*/

Index: opac/opac-zoomsearch.pl
===================================================================
RCS file: /sources/koha/koha/opac/Attic/opac-zoomsearch.pl,v
retrieving revision 1.1.2.20
retrieving revision 1.1.2.21
diff -u -b -r1.1.2.20 -r1.1.2.21
--- opac/opac-zoomsearch.pl	7 Aug 2006 19:56:50 -0000	1.1.2.20
+++ opac/opac-zoomsearch.pl	9 Aug 2006 22:59:31 -0000	1.1.2.21
@@ -176,8 +176,6 @@
 	$template->param(FORMINPUTS => \@forminputs);
 	#$template->param(pqf_query => $pqf_query);
 	$template->param(ccl_query => $ccl_query);
-	$searchdesc =~ s/\'/&apos;/g;
-	$searchdesc =~ s/\"/&quot;/g;
 	$template->param(searchdesc => $searchdesc );
 	$template->param(results_per_page =>  $number_of_results );
 	$template->param(SEARCH_RESULTS => \@newresults);





More information about the Koha-cvs mailing list