From ffe4d31be56ddbe214e78e6b3c9c1edfd52b9c4f Mon Sep 17 00:00:00 2001
From: Dobrica Pavlinusic <dpavlin@rot13.org>
Date: Tue, 21 Apr 2009 23:17:21 +0000
Subject: [PATCH]  r1776@llin:  dpavlin | 2009-04-22 00:31:55 +0200  somewhat
 better design of results

git-svn-id: svn+ssh://mjesec/home/dpavlin/svn/webpac2/trunk@1135 07558da8-63fa-0310-ba24-9fe276d99e06
---
 vhost/style.css   | 13 ++++++++++++-
 vhost/webpac2.cgi | 19 ++++++++++++-------
 2 files changed, 24 insertions(+), 8 deletions(-)

diff --git a/vhost/style.css b/vhost/style.css
index 0608e54..081d18d 100644
--- a/vhost/style.css
+++ b/vhost/style.css
@@ -37,6 +37,10 @@ form input[name=search] {
 	float: left;
 }
 
+#results ol li {
+	margin-bottom: 1em;
+}
+
 pre {
 	border-top: 1px solid #888;
 	clear: left;
@@ -45,5 +49,12 @@ pre {
 
 .error {
 	background-color: #fcc;
-	font-color: 000;
+	color: 000;
+}
+
+.message {
+	background-color: #ffc;
+	color: #000;
+	padding: 0.5em;
+	margin: 0.5em;
 }
diff --git a/vhost/webpac2.cgi b/vhost/webpac2.cgi
index 3825fe2..f0f8215 100755
--- a/vhost/webpac2.cgi
+++ b/vhost/webpac2.cgi
@@ -12,7 +12,8 @@ use Search::Estraier;
 print header;
 
 sub dump_yaml {
-	print qq|<pre>|, YAML::Dump( @_ ), qq|</pre>|;
+	my $name = shift;
+	print qq|<pre># $name\n|, YAML::Dump( @_ ), qq|</pre>|;
 }
 
 my $path = $ENV{PATH_INFO};
@@ -51,7 +52,7 @@ print	end_form;
 
 if ( my $search = param('search') ) {
 
-	print qq|<div id="results">search: $search|;
+	print qq|<div id="results">|;
 
 	my $node = Search::Estraier::Node->new(
 		url => $config->{hyperestraier}->{masterurl} . '/node/' . $database,
@@ -64,9 +65,13 @@ if ( my $search = param('search') ) {
 
 	if ( ! $nres ) {
 		my $no_results = "No results for search '%s'";
-		printf qq|<div class="error">$no_results</a>|, $search;
+		printf qq|<div class="error">$no_results</div>|, $search;
 	} else {
-		print qq|<ul>|;
+		my $results = "Got %d results for search '%s'";
+		printf qq|<div class="message">$results</div>|, $nres->hits, $search;
+
+		print qq|<ol>|;
+
 		foreach my $i ( 1 .. $nres->doc_num ) {
 			my $rdoc = $nres->get_doc( $i - 1 );
 			print qq|<li>|;
@@ -74,12 +79,12 @@ if ( my $search = param('search') ) {
 				foreach @attr;
 			print qq|</li>\n|;
 		}
-		print qq|</ul>|;
+		print qq|</ol>|;
 	}
 	print qq|</div>|;
 }
 
-dump_yaml( $estraier );
-dump_yaml( $db );
+dump_yaml( 'estraier', $estraier );
+dump_yaml( 'db', $db );
 
 print	end_html;
-- 
2.20.1