]> www.average.org Git - mkgallery.git/blobdiff - mkgallery.pl
IE compatibility
[mkgallery.git] / mkgallery.pl
index 4334ef8afb3e95313fb5e977981fa353d7230194..fffb0301c6ca5bd2f21e4205ebdf6a3635fe46a7 100755 (executable)
@@ -1,12 +1,12 @@
 #!/usr/bin/perl
 
-# $Id$
+my $version='$Id$';
 
 # Recursively create image gallery index and slideshow wrappings.
-# Makes use of (slightly modified) "lightbox" Javascript/CSS as published
-# at http://www.huddletogether.com/projects/lightbox/
+# Makes use of modified "slideshow" javascript by Samuel Birch
+# http://www.phatfusion.net/slideshow/
 
-# Copyright (c) 2006 Eugene G. Crosser
+# Copyright (c) 2006-2008 Eugene G. Crosser
 
 #  This software is provided 'as-is', without any express or implied
 #  warranty.  In no event will the authors be held liable for any damages
@@ -29,7 +29,7 @@ package FsObj;
 use strict;
 use Carp;
 use POSIX qw/getcwd strftime/;
-use CGI qw/:html *table *Tr *center *div *Link/;
+use CGI qw/:html *table *Tr *td *center *div *Link/;
 use Image::Info qw/image_info dim/;
 use Term::ReadLine;
 use Getopt::Long;
@@ -43,7 +43,7 @@ my $haveimagick = eval { require Image::Magick; };
 my $haverssxml = eval { require XML::RSS; };
 { package XML::RSS; }          # to make perl compiler happy
 
-my @sizes = (160, 640);
+my @sizes = (160, 640, 1600);
 
 ######################################################################
 
@@ -74,21 +74,14 @@ if ($rssfile && ! $haverssxml) {
 my $term = new Term::ReadLine "Edit Title";
 
 FsObj->new(getcwd)->iterate;
-
-if ($rssobj) {
-       my $itemstodel = @{$rssobj->{'rss'}->{'items'}} - 15;
-       while ($itemstodel-- > 0) {
-               pop(@{$rssobj->{'rss'}->{'items'}})
-       }
-       $rssobj->{'rss'}->save($rssobj->{'file'});
-}
+if ($rssobj) { $rssobj->{'rss'}->save($rssobj->{'file'}); }
 
 sub help {
 
        print STDERR <<__END__;
 usage: $0 [options]
  --help:        print help message and exit
- --incpath:     do not try to find .include diretory upstream, use
+ --incpath:     do not try to find .gallery2 diretory upstream, use
                 specified path (absolute or relavive).  Use with causion.
  --debug:       print a lot of debugging info to stdout as you run
  --asktitle:    ask to edit album titles even if there are ".title" files
@@ -142,10 +135,10 @@ sub getinc {
        my $depth=20;           # arbitrary max depth
 
        if ($incpath) {
-               return $incpath."/.include";
+               return $incpath."/.gallery2";
        }
 
-       my $inc=".include";
+       my $inc=".gallery2";
        while ( ! -d $fullpath."/".$inc ) {
                $inc = "../".$inc;
                last unless ($depth-- > 0);
@@ -172,6 +165,11 @@ sub getrss {
                $rssobj->{'file'} = $rss;
                $rssobj->{'rss'} = new XML::RSS (version=>2);
                $rssobj->{'rss'}->parsefile($rss);
+               my $itemstodel = @{$rssobj->{'rss'}->{'items'}} - 15;
+               while ($itemstodel-- > 0) {
+                       pop(@{$rssobj->{'rss'}->{'items'}})
+               }
+               $rssobj->{'rss'}->save($rssobj->{'file'});
                return $rss;
        } else {
                print STDERR "There is no $rssfile in this or parent ".
@@ -397,9 +395,12 @@ sub makescaled {
                my $nfn = $dn.'/'.$nref;
                my $factor=$size/$max;
                if ($factor >= 1) {
-                       $self->{$size} = $name; # unscaled version will do
+                       $self->{$size}->{'url'} = $name; # unscaled version
+                       $self->{$size}->{'dim'} = [$w, $h];
                } else {
-                       $self->{$size} = $nref;
+                       $self->{$size}->{'url'} = $nref;
+                       $self->{$size}->{'dim'} = [int($w*$factor+.5),
+                                                       int($h*$factor+.5)];
                        if (isnewer($fn,$nfn)) {
                                doscaling($fn,$nfn,$factor,$w,$h);
                        }
@@ -452,7 +453,7 @@ sub makeaux {
        for my $refresh('static', 'slide') {
                my $fn = sprintf("%s/.html/%s-%s.html",$dn,$name,$refresh);
                if (isnewer($self->{-fullpath},$fn)) {
-                       my $imgsrc = '../'.$self->{$sizes[1]};
+                       my $imgsrc = '../'.$self->{$sizes[1]}->{'url'};
                        my $fwdref;
                        my $bakref;
                        if ($nref) {
@@ -488,27 +489,29 @@ sub makeaux {
                                        -head=>meta({-http_equiv=>'Refresh',
                                                -content=>"3; url=$fwdref"}),
                                        -style=>{-src=>$inc."gallery.css"},
-                                       ),"\n";
+                                       ),"\n",
+                                       comment("Created by ".$version),"\n";
                                                
                        } else {
                                print $F start_html(-title=>$title,
                                        -encoding=>"utf-8",
                                        -bgcolor=>"#808080",
                                        -style=>{-src=>$inc."gallery.css"},
-                                       ),"\n";
+                                       ),"\n",
+                                       comment("Created by ".$version),"\n";
                        }
-                       print $F start_center,"\n",
-                               h1($title),"\n",
-                               start_table({-class=>'navi'}),start_Tr,"\n",
+                       print $F start_table({-class=>'navi'}),start_Tr,"\n",
                                td(a({-href=>"../index.html"},"Index")),"\n",
                                td(a({-href=>$bakref},"&lt;&lt;Prev")),"\n",
                                td(a({-href=>$toggleref},$toggletext)),"\n",
                                td(a({-href=>$fwdref},"Next&gt;&gt;")),"\n",
+                               td({-class=>'title'},$title),"\n",
                                end_Tr,
                                end_table,"\n",
-                               table({-class=>'picframe'},
-                                       Tr(td(img({-src=>$imgsrc})))),"\n",
-                               end_center,"\n",
+                               center(table({-class=>'picframe'},
+                                       Tr(td(img({-src=>$imgsrc,
+                                                  -class=>'standalone',
+                                                  -alt=>$title}))))),"\n",
                                end_html,"\n";
                        close($F);
                }
@@ -525,13 +528,22 @@ sub makeaux {
                my $imgsrc = sprintf("../.%s/%s",$sizes[0],$name);
                print $F start_html(-title=>$title,
                                -encoding=>"utf-8",
-                               -style=>{-src=>$inc."gallery.css"},),"\n",
+                               -style=>{-src=>$inc."gallery.css"},
+                               -script=>[
+                                       {-src=>$inc."mootools.js"},
+                                       {-src=>$inc."urlparser.js"},
+                                       {-src=>$inc."infopage.js"},
+                               ]),"\n",
+                       comment("Created by ".$version),"\n",
                        start_center,"\n",
                        h1($title),"\n",
                        table({-class=>'ipage'},
-                               Tr(td(img({-src=>$imgsrc})),
+                               Tr(td(img({-src=>$imgsrc,
+                                          -class=>'thumbnail',
+                                          -alt=>$title})),
                                        td($self->infotable))),
-                       a({-href=>'../index.html'},'Index'),"\n",
+                       a({-href=>'../index.html',-class=>'conceal'},
+                               'Index'),"\n",
                        end_center,"\n",
                        end_html,"\n";
                close($F);
@@ -563,11 +575,20 @@ sub startindex {
        print $IND start_html(-title => $title,
                        -encoding=>"utf-8",
                        -head=>$rsslink,
-                       -style=>{-src=>[$inc."gallery.css",
-                                       $inc."lightbox.css"]},
-                       -script=>[{-code=>"var incPrefix='$inc';"},
+                       -style=>{-src=>$inc."gallery.css"},
+                       -script=>[
+                               {-src=>$inc."mootools.js"},
+                               {-src=>$inc."overlay.js"},
+                               {-src=>$inc."urlparser.js"},
+                               {-src=>$inc."multibox.js"},
+                               {-src=>$inc."showwin.js"},
+                               {-src=>$inc."controls.js"},
+                               {-src=>$inc."show.js"},
                                {-src=>$inc."gallery.js"},
-                               {-src=>$inc."lightbox.js"}]),
+                       ]),"\n",
+               comment("Created by ".$version),"\n",
+               start_div({-class => 'indexContainer',
+                               -id => 'indexContainer'}),
                a({-href=>"../index.html"},"UP"),"\n",
                start_center,"\n",
                h1($title),"\n",
@@ -578,7 +599,9 @@ sub endindex {
        my $self = shift;
        my $IND = $self->{-IND};
 
-       print $IND end_center,end_html,"\n";
+       print $IND end_center,end_div,
+       # "\n",'<script type="text/javascript">init_gallery();</script>',"\n",
+       end_html,"\n";
 
        close($IND) if ($IND);
        undef $self->{-IND};
@@ -627,9 +650,9 @@ sub startimglist {
        my $first = $self->{-firstimg}->{-base};
        my $slideref = sprintf(".html/%s-slide.html",$first);
 
-       print $IND h2("Images"),"\n",
-               a({-href=>$slideref},'Slideshow'),
-               "\n";
+       print $IND h2("Images ",
+               a({-href=>$slideref,-class=>'showStart',-rel=>'i'.$first},
+                       '&gt; slideshow')),"\n";
 }
 
 sub img_entry {
@@ -638,32 +661,44 @@ sub img_entry {
        my $name = $self->{-base};
        my $title = $self->{-info}->{'Comment'};
        $title = $name unless ($title);
-       my $thumb = $self->{$sizes[0]};
-       my $medium = $self->{$sizes[1]};
+       my $thumb = $self->{$sizes[0]}->{'url'};
        my $info = $self->{-info};
        my ($w, $h) = dim($info);
 
+       my $i=0+$self->{-parent}->{-numofimgs};
        $self->{-parent}->{-numofimgs}++;
-       print $IND start_div({-class=>'ibox',-id=>$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'}),"\n",
-               end_div,"\n",
-               $self->infotable,
-               end_div,"\n";
-
-       print $IND table({-class=>'slide'},Tr(td(
-               a({-href=>".html/$name-info.html",-title=>'Image Info',
-                       -onClick=>"return showIbox('$name');"},$title),
-               br,
-               a({-href=>$medium,-rel=>"lightbox",-title=>$title},
-                       img({-src=>$thumb})),
-               br,
-               a({-href=>$name,-title=>'Original Image'},"($w x $h)"),
-               br))),"\n";
+
+       print $IND a({-name=>$name}),"\n",
+               start_table({-class=>'slide'}),start_Tr,start_td,"\n",
+               div({-class=>'slidetitle'},
+                       "\n ",a({-href=>".html/$name-info.html",
+                               -title=>'Image Info: '.$name,
+                               -class=>'infoBox'},
+                               $title),"\n"),"\n",
+               div({-class=>'slideimage'},
+                       "\n ",a({-href=>".html/$name-static.html",
+                               -title=>$title,
+                               -class=>'showImage',
+                               -rel=>'i'.$name},
+                               img({-src=>$thumb,
+                                    -class=>'thumbnail',
+                                    -alt=>$title})),"\n"),"\n",
+               start_div({-class=>'varimages',-id=>'i'.$name,-title=>$title}),"\n";
+       foreach my $sz(@sizes) {
+               my $src=$self->{$sz}->{'url'};
+               my $w=$self->{$sz}->{'dim'}->[0];
+               my $h=$self->{$sz}->{'dim'}->[1];
+               print $IND "  ",a({-href=>$src,
+                       -class=>"conceal",
+                       -rel=>$w."x".$h,
+                       -title=>"Reduced to ".$w."x".$h},
+                       $w."x".$h)," \n";
+       }
+       print $IND "  ",a({-href=>$name,
+                               -rel=>$w."x".$h,
+                               -title=>'Original'},$w."x".$h),
+               "\n",end_div,"\n",
+               end_td,end_Tr,end_table,"\n";
 }
 
 sub endimglist {