r1790@llin: dpavlin | 2009-04-22 16:27:21 +0200

 refactor pager markup into ul

git-svn-id: svn+ssh://mjesec/home/dpavlin/svn/webpac2/trunk@1141 07558da8-63fa-0310-ba24-9fe276d99e06

diff --git a/vhost/style.css b/vhost/style.css
index ab5e874..28ca7c6 100644 (file)
--- a/vhost/style.css
+++ b/vhost/style.css
@@ -39,23 +39,27 @@ form input[name=search] {
        float: left;
 }
 
+#results ol {
+       float: left;
+       margin: 1em;
+}
+
 #results ol li {
        clear: left;
        margin-bottom: 1em;
 }
 
-#results .pager {
-       clear: left;
-       float: left;
-       width: 100%;
-       text-align: center;
+ul.pager {
        background: #eee;
+       padding: 0.5em;
+       margin: 0;
+       clear: both;
 }
 
-#results .pager a,
-#results .pager span {
+ul.pager li {
+       list-style: none;
+       display: inline;
        width: 3em;
-       float: left;
 }
 
 .pager .current_page {
@@ -66,17 +70,10 @@ form input[name=search] {
        color: #888;
 }
 
-#results ol {
-       float: left;
-       margin-top: 1em;
-       margin-bottom: 1em;
-}
-
 pre {
        border-top: 1px solid #888;
        clear: left;
        background-color: #eee;
-       display: none;
 }
 
 .error {

diff --git a/vhost/webpac2.cgi b/vhost/webpac2.cgi
index d1047da..d9d3adc 100755 (executable)
--- a/vhost/webpac2.cgi
+++ b/vhost/webpac2.cgi
@@ -13,16 +13,17 @@ use Data::Dump qw/dump/;
 
 my $range_around = 5;
 my $entries_per_page = 30;
+my $debug = param('debug');
 
 print header;
 
 sub dump_yaml {
        my $name = shift;
-       print qq|<pre># $name\n|, YAML::Dump( @_ ), qq|</pre>|;
+       print qq|<pre># $name\n|, YAML::Dump( @_ ), qq|</pre>| if $debug;
 }
 
 sub show_pager {
-       my ($pager,$coderef) = @_;
+       my ($pager) = @_;
 
        my @show_pages;
        my $after_current = 0;
@@ -46,18 +47,27 @@ sub show_pager {
 
        my ( $prev, $next ) = ( '&lt;&lt;', '&gt;&gt;' );
 
+       sub li_a_href {
+               my ( $page, $label, $attr ) = @_;
+               param( 'current_page', $page );
+               my $url = self_url( -query => 1 );
+               $attr ||= '';
+               $label ||= $page;
+               qq|<li$attr><a href="$url" title="$page">$label</a></li>|;
+       }
+
        return
-                 $pager->previous_page ? $coderef->( $pager->previous_page, $prev ) : qq|<span class=skip>$prev</span>|
-               , join( ' ', map {
+                 $pager->previous_page ? li_a_href( $pager->previous_page, $prev ) : qq|<li class=skip>$prev</li>|
+               , ( map {
                        if ( $_ == $pager->current_page ) {
-                               qq|<span class=current_page>$_</span>|;
+                               qq|<li class=current_page>$_</li>|;
                        } elsif ( $_ eq '' ) {
-                               qq|<span class=skip>...</span>|;
+                               qq|<li class=skip>...</li>|;
                        } else {
-                               $coderef->( $_ );
+                               li_a_href( $_ );
                        }
                } @show_pages )
-               , $pager->next_page ? $coderef->( $pager->next_page, $next ) : qq|<span class=skip>$next</span>|
+               , $pager->next_page ? li_a_href( $pager->next_page, $next ) : qq|<li class=skip>$next</li>|
                ;
                
 }
@@ -135,28 +145,20 @@ if ( my $search = param('search') ) {
 
        if ( ! $nres ) {
                my $no_results = "No results for search '%s'";
-               printf qq|<div class="error">$no_results</div>|, $search;
+               printf qq|<div class="error">$no_results</div>\n\n|, $search;
        } else {
 
                my $results = "%d results for search '%s' showing results %d - %d on page %d";
-               printf qq|<div class="message">$results</div>|, $nres->hits, $search, $pager->first, $pager->last, $pager->current_page;
-
-               my $pager_html =
-                       join(' ', show_pager( $pager,
-                               sub {
-                                       my ($page,$label) = @_;
-                                       param( 'current_page', $page );
-                                       my $url = self_url( -query => 1 );
-                                       $label = $page unless defined $label;
-                                       qq|<a href="$url">$label</a>|;
-                               }
-                       ))
-               ;
+               printf qq|<div class="message">$results</div>\n\n|, $nres->hits, $search, $pager->first, $pager->last, $pager->current_page;
+
+               dump_yaml( 'pager html', show_pager( $pager ));
+
+               my $pager_html = join("\n", show_pager( $pager ));
 
-               print qq|<div class="pager top">$pager_html</div>| if $pager_html;
+               print qq|<ul class="pager">$pager_html</ul>\n\n| if $pager_html;
 
                my $start = $pager->first;
-               print qq|<ol start=$start>|;
+               print qq|<ol start=$start>\n|;
 
                foreach my $i ( 1 .. $nres->doc_num ) {
                        my $rdoc = $nres->get_doc( $i - 1 );
@@ -175,9 +177,9 @@ if ( my $search = param('search') ) {
                        }
                        print qq|</li>\n|;
                }
-               print qq|</ol>|;
+               print qq|</ol>\n\n|;
 
-               print qq|<div class="pager bottom">$pager_html</div>| if $pager_html;
+               print qq|<ul class="pager bottom">$pager_html</ul>\n\n| if $pager_html;
        }
        print qq|</div>|;