r1788@llin: dpavlin | 2009-04-22 15:20:47 +0200

 more work on design of pager

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

diff --git a/vhost/style.css b/vhost/style.css
index 317c462..ab5e874 100644 (file)
--- a/vhost/style.css
+++ b/vhost/style.css
@@ -30,6 +30,8 @@ form input[name=search] {
 #results {
        clear: left;
        float: left;
+       margin: 1em;
+       border: 1px solid #eee;
 }
 
 #results label {
@@ -44,7 +46,10 @@ form input[name=search] {
 
 #results .pager {
        clear: left;
+       float: left;
+       width: 100%;
        text-align: center;
+       background: #eee;
 }
 
 #results .pager a,
@@ -61,10 +66,17 @@ 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 {
@@ -76,5 +88,4 @@ pre {
        background-color: #ffc;
        color: #000;
        padding: 0.5em;
-       margin: 0.5em;
 }

diff --git a/vhost/webpac2.cgi b/vhost/webpac2.cgi
index 045297f..d1047da 100755 (executable)
--- a/vhost/webpac2.cgi
+++ b/vhost/webpac2.cgi
@@ -40,14 +40,14 @@ sub show_pager {
                push @show_pages, ( $pager->current_page + 1 .. $pager->current_page + $after_current + $range_around, '', $pager->last_page );
        }
 
-       dump_yaml( 'show_pages', \@show_pages );
+#      dump_yaml( 'show_pages', \@show_pages );
 
        return '' unless $#show_pages;
 
        my ( $prev, $next ) = ( '<<', '>>' );
 
        return
-                 $pager->previous_page ? $coderef->( $pager->previous_page, $prev ) : $prev
+                 $pager->previous_page ? $coderef->( $pager->previous_page, $prev ) : qq|<span class=skip>$prev</span>|
                , join( ' ', map {
                        if ( $_ == $pager->current_page ) {
                                qq|<span class=current_page>$_</span>|;
@@ -57,7 +57,7 @@ sub show_pager {
                                $coderef->( $_ );
                        }
                } @show_pages )
-               , $pager->next_page ? $coderef->( $pager->next_page, $next ) : $next
+               , $pager->next_page ? $coderef->( $pager->next_page, $next ) : qq|<span class=skip>$next</span>|
                ;
                
 }
@@ -130,6 +130,7 @@ if ( my $search = param('search') ) {
        my $nres = $node->search( $cond, 0 );
        $pager->total_entries( $nres->hits );
 
+
        dump_yaml( 'cond', $cond );
 
        if ( ! $nres ) {
@@ -137,11 +138,10 @@ if ( my $search = param('search') ) {
                printf qq|<div class="error">$no_results</div>|, $search;
        } else {
 
-               my $results = "Got %d results for search '%s'";
-               printf qq|<div class="message">$results</div>|, $nres->hits, $search;
+               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;
 
-               print
-                       qq|<div class=pager>|,
+               my $pager_html =
                        join(' ', show_pager( $pager,
                                sub {
                                        my ($page,$label) = @_;
@@ -150,10 +150,11 @@ if ( my $search = param('search') ) {
                                        $label = $page unless defined $label;
                                        qq|<a href="$url">$label</a>|;
                                }
-                       )),
-                       qq|</div>|
+                       ))
                ;
 
+               print qq|<div class="pager top">$pager_html</div>| if $pager_html;
+
                my $start = $pager->first;
                print qq|<ol start=$start>|;
 
@@ -175,6 +176,8 @@ if ( my $search = param('search') ) {
                        print qq|</li>\n|;
                }
                print qq|</ol>|;
+
+               print qq|<div class="pager bottom">$pager_html</div>| if $pager_html;
        }
        print qq|</div>|;