use page size functions from lightbox.js

[mkgallery.git] / mkgallery.pl

diff --git a/mkgallery.pl b/mkgallery.pl
index 2f6bc6e5ea0f95371fd5e6c3629a91f29b38069a..a6252e6403d4c9c7d50e3b5ab61bc02e66189d10 100755 (executable)
--- a/mkgallery.pl
+++ b/mkgallery.pl
@@ -29,7 +29,7 @@ package FsObj;
 use strict;
 use Carp;
 use POSIX qw/getcwd/;
-use CGI qw/:html *table *center *div/;
+use CGI qw/:html *table *Tr *center *div/;
 use Image::Info qw/image_info dim/;
 use Term::ReadLine;
 use Getopt::Long;
@@ -323,7 +323,7 @@ sub makeaux {
        # slideshow
        for my $refresh('static', 'slide') {
                my $fn = sprintf("%s/.html/%s-%s.html",$dn,$name,$refresh);
-               my $imgsrc = sprintf("../.%s/%s",$sizes[1],$name);
+               my $imgsrc = '../'.$self->{$sizes[1]};
                my $fwdref;
                my $bakref;
                if ($nref) {
@@ -365,13 +365,16 @@ sub makeaux {
                                ),"\n";
                }
                print $F start_center,"\n",
-                       h1($title),
-                       a({-href=>"../index.html"},"Index")," | ",
-                       a({-href=>$bakref},"<<Prev")," | ",
-                       a({-href=>$toggleref},$toggletext)," | ",
-                       a({-href=>$fwdref},"Next>>"),
-                       p,
-                       img({-src=>$imgsrc}),"\n",
+                       h1($title),"\n",
+                       start_table({-class=>'navi'}),start_Tr,"\n",
+                       td(a({-href=>"../index.html"},"Index")),"\n",
+                       td(a({-href=>$bakref},"<<Prev")),"\n",
+                       td(a({-href=>$toggleref},$toggletext)),"\n",
+                       td(a({-href=>$fwdref},"Next>>")),"\n",
+                       end_Tr,
+                       end_table,"\n",
+                       table({-class=>'picframe'},
+                               Tr(td(img({-src=>$imgsrc})))),"\n",
                        end_center,"\n",
                        end_html,"\n";
                close($F);
@@ -385,12 +388,12 @@ sub makeaux {
 
        # info html
        my $imgsrc = sprintf("../.%s/%s",$sizes[0],$name);
-       print $F start_html(-title=>$title,-bgcolor=>"#ffff80",
+       print $F start_html(-title=>$title,
                                -style=>{-src=>$inc."gallery.css"},),"\n",
                start_center,"\n",
                h1($title),"\n",
-               table(Tr(td(img({-src=>$imgsrc})),td($self->infotable))),
-               end_table,
+               table({-class=>'ipage'},Tr(td(img({-src=>$imgsrc})),td($self->infotable))),
+               a({-href=>'../index.html'},'Index'),"\n",
                end_center,"\n",
                end_html,"\n";
        close($F);
@@ -477,11 +480,13 @@ sub img_entry {
        my ($w, $h) = dim($info);
 
        print $IND start_div({-class=>'ibox',-id=>$name,
-                                       -OnClick=>"HideIbox('$name');"}),
+                               -OnClick=>"HideIbox('$name');"}),"\n",
+               start_div({-class=>'iboxtitle'}),
                span({-style=>'float: left;'},b("Info for $name")),
                span({-style=>'float: right;'},
                        a({-href=>"#",-OnClick=>"HideIbox('$name');"},"Close")),
-               br({-clear=>'all'}),
+               br({-clear=>'all'}),"\n",
+               end_div,"\n",
                $self->infotable,
                end_div,"\n";
 
@@ -522,7 +527,7 @@ sub infotable {
                'Model',
                'Software',
        );
-       $msg.=start_table."\n";
+       $msg.=start_table({-class=>'infotable'})."\n";
        foreach my $k(@infokeys) {
                $msg.=Tr(td($k.":"),td($info->{$k}))."\n" if ($info->{$k});
        }