From 8225550ca2912c8f6861c0bda6affe975eb26c9a Mon Sep 17 00:00:00 2001
From: hdl <hdl>
Date: Tue, 4 Oct 2005 09:40:26 +0000
Subject: [PATCH] Bug Fixing : Order by title wouldn't work any longer...
 Display volume and volumeddesc in Intranet. Modifying Common-style.css in
 order to have a "prety display in resultlist.

---
 C4/SearchMarc.pm                               |  2 +-
 .../default/en/includes/common-style.css       |  3 ++-
 .../default/en/search.marc/result.tmpl         | 18 +++++++++++-------
 3 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/C4/SearchMarc.pm b/C4/SearchMarc.pm
index a4fb7f1475..15dbb5d237 100644
--- a/C4/SearchMarc.pm
+++ b/C4/SearchMarc.pm
@@ -279,7 +279,7 @@ sub catalogsearch {
 	my ($sql_tables, $sql_where1, $sql_where2) = create_request($dbh,\@normal_tags, \@normal_and_or, \@normal_operator, \@normal_value);
 
 	$sql_where1 .= "and TO_DAYS( NOW( ) ) - TO_DAYS( marc_biblio.datecreated ) <$desc_or_asc" if $orderby =~ "biblio.timestamp";
-	$desc_or_asc="DESC" if $orderby="biblio.timestamp";
+	$desc_or_asc="DESC" if $orderby eq "biblio.timestamp";
 # 	$offset=0 if $orderby eq "biblio.timestamp";
 	my $sth;
 	if ($sql_where2) {
diff --git a/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css b/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css
index 9b4fc9ff6c..ef1f9c6c43 100644
--- a/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css
+++ b/koha-tmpl/intranet-tmpl/default/en/includes/common-style.css
@@ -135,6 +135,7 @@ td.numberhilighted {
 	border-right : 1px solid Black;
 }
 
+
 h1 {
 	color:#000000;
 	background-color:#DDDDDD;
@@ -272,7 +273,7 @@ a.resultnumber:hover {
 
 a.resultlist {
 	font-weight : bold;
-	display : block;
+/*	display : block;*/
 	padding-left : 5px;
 }
 
diff --git a/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl b/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl
index e5148ede93..80c558a946 100644
--- a/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/search.marc/result.tmpl
@@ -24,13 +24,17 @@
 							<!-- TMPL_IF name="MARC_ON" -->
 								<a class="transparent resultlist" href="/cgi-bin/koha/MARCdetail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>
 							<!-- TMPL_ELSE -->
-								<a class="transparent resultlist" href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a>				<!-- /TMPL_IF -->
-						<p><!-- TMPL_VAR NAME="author" -->
-						<!-- TMPL_IF NAME="publishercode" -->- <!-- TMPL_VAR NAME="publishercode" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF NAME="place" --> ; <!-- TMPL_VAR NAME="place" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF NAME="pages" --> - <!-- TMPL_VAR NAME="pages" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF NAME="notes" --> : <!-- TMPL_VAR NAME="notes" --><!-- /TMPL_IF -->
-						<!-- TMPL_IF NAME="size" --> ; <!-- TMPL_VAR NAME="size" --><!-- /TMPL_IF -->
+								<a class="transparent resultlist" href="/cgi-bin/koha/detail.pl?bib=<!-- TMPL_VAR NAME="biblionumber" ESCAPE="URL" -->"><!-- TMPL_VAR NAME="title" --></a><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="volume" --> vol <!-- TMPL_VAR name="volume" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="volumeddesc" --> : <!-- TMPL_VAR name="volumeddesc" --> <!-- /TMPL_IF -->
+						<!-- TMPL_IF name="number" --> part <!-- TMPL_VAR name="number" --><!-- /TMPL_IF -->
+					<p><!-- TMPL_VAR NAME="author" -->
+						<!-- TMPL_IF name="publicationyear" --> - <!-- TMPL_VAR name="publicationyear" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="publishercode" -->- <!-- TMPL_VAR name="publishercode" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="place" --> ; <!-- TMPL_VAR name="place" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="pages" --> - <!-- TMPL_VAR name="pages" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="notes" --> : <!-- TMPL_VAR name="notes" --><!-- /TMPL_IF -->
+						<!-- TMPL_IF name="size" --> ; <!-- TMPL_VAR name="size" --><!-- /TMPL_IF -->
 					</p>
 				</td>
 				<td align="center" <!-- TMPL_IF NAME="even" --> class="hilighted"<!-- /TMPL_IF -->>