From 190d05b00eb3775b3405eb800421c53eb089daa9 Mon Sep 17 00:00:00 2001
From: tipaul <tipaul>
Date: Mon, 8 Aug 2005 09:11:54 +0000
Subject: [PATCH] minor (graphic) changes in log viewer

---
 C4/Log.pm                                     |  5 +++-
 .../default/en/parameters/viewlog.tmpl        | 24 +++++++------------
 2 files changed, 12 insertions(+), 17 deletions(-)

diff --git a/C4/Log.pm b/C4/Log.pm
index 5d9ba936fa..9e5f76cfba 100644
--- a/C4/Log.pm
+++ b/C4/Log.pm
@@ -22,6 +22,7 @@ package C4::Log; #assumes C4/Log
 
 use strict;
 use C4::Context;
+use C4::Date;
 
 require Exporter;
 
@@ -164,7 +165,7 @@ sub displaylog{
 			}
 		}
 	}
-	warn "displaylog :".$strsth;
+# 	warn "displaylog :".$strsth;
 	if ($strsth){
 		my $sth=$dbh->prepare($strsth);
 		$sth->execute;
@@ -173,6 +174,8 @@ sub displaylog{
 		my $hilighted=1;
 		while (my $data = $sth->fetchrow_hashref){
 			$data->{hilighted} = ($hilighted>0);
+			$data->{info} =~ s/\n/<br\/>/g;
+			$data->{day} = format_date($data->{timestamp});
 			push @results, $data;
 			$count++;
 			$hilighted = -$hilighted;
diff --git a/koha-tmpl/intranet-tmpl/default/en/parameters/viewlog.tmpl b/koha-tmpl/intranet-tmpl/default/en/parameters/viewlog.tmpl
index 1bd00a809d..d6b9714eac 100644
--- a/koha-tmpl/intranet-tmpl/default/en/parameters/viewlog.tmpl
+++ b/koha-tmpl/intranet-tmpl/default/en/parameters/viewlog.tmpl
@@ -1,4 +1,4 @@
-<!-- TMPL_INCLUDE NAME="reportswcal-top.inc" -->
+<!-- TMPL_INCLUDE NAME="parameters-top.inc" -->
 <div id="mainbloc" >
 
 <!-- TMPL_IF NAME="do_it" -->
@@ -7,7 +7,7 @@ function Dopop(link) {
 	newin=window.open(link,'width=500,height=400,toolbar=false,scrollbars=yes');
 }
 </script>
-		<h1 class="parameters">Koha : LogView for <!-- TMPL_VAR NAME="modulename"--> </h1>
+		<h1 class="parameters">Koha : Hisory view for <!-- TMPL_VAR NAME="modulename"--> </h1>
 		<!-- TMPL_IF NAME="loopfilter"-->
 			<p>Filtered on</p>
 			<!-- TMPL_LOOP NAME="loopfilter" -->
@@ -18,37 +18,29 @@ function Dopop(link) {
 		<table border="1">
 			<!-- TMPL_IF NAME="catalogue" -->
 				<tr >
-							<th class="parameters">Timestamp
+							<th class="parameters">Modified on
 							</th>
-							<th class="parameters">Firstname
+							<th class="parameters">Title
 							</th>
-							<th class="parameters">Surname
+							<th class="parameters">Librarian
 							</th>
 							<th class="parameters">Action
 							</th>
 							<th class="parameters">Info
 							</th>
-							<th class="parameters">Title
-							</th>
-							<th class="parameters">Author
-							</th>
 				</tr>
 				<!-- TMPL_LOOP NAME="looprow" -->
 					<!-- TMPL_IF NAME="hilighted" --><tr class="higlighted"><!-- TMPL_ELSE --><tr><!-- /TMPL_IF -->
-						<td><!-- TMPL_IF NAME="timestamp" --><!-- TMPL_VAR NAME="timestamp" --><!-- /TMPL_IF -->
+						<td><!-- TMPL_VAR NAME="day" --><br/>(<!-- TMPL_VAR NAME="timestamp" -->)
 						</td>
-						<td><!-- TMPL_IF NAME="firstname" --><!-- TMPL_VAR NAME="firstname" --><!-- /TMPL_IF -->
+						<td><!-- TMPL_VAR NAME="title" -->, <!-- TMPL_VAR NAME="author" -->
 						</td>
-						<td><!-- TMPL_IF NAME="surname" --><!-- TMPL_VAR NAME="surname" --><!-- /TMPL_IF -->
+						<td><!-- TMPL_VAR NAME="firstname" --> <!-- TMPL_VAR NAME="surname" -->
 						</td>
 						<td><!-- TMPL_IF NAME="action" --><!-- TMPL_VAR NAME="action" --><!-- /TMPL_IF -->
 						</td>
 						<td><!-- TMPL_IF NAME="info" --><!-- TMPL_VAR NAME="info" --><!-- /TMPL_IF -->
 						</td>
-						<td><!-- TMPL_IF NAME="title" --><!-- TMPL_VAR NAME="title" --><!-- /TMPL_IF -->
-						</td>
-						<td><!-- TMPL_IF NAME="author" --><!-- TMPL_VAR NAME="author" --><!-- /TMPL_IF -->
-						</td>
 					</tr>
 				<!-- /TMPL_LOOP -->
 				<!-- /TMPL_IF -->
-- 
2.39.5