X-Git-Url: http://www.average.org/gitweb/?p=mkgallery.git;a=blobdiff_plain;f=mkgallery.pl;h=7a4b681a5aacb29f8be85d668c839e4bd4761122;hp=70c00892396c19b89f6ee2f26889f9756f5b27de;hb=135674817b47747d9a3c343376fc3dea6da229ac;hpb=d7c0a397220f9f171f4fc677b96ea1f6655e7e02

diff --git a/mkgallery.pl b/mkgallery.pl
index 70c0089..7a4b681 100755
--- a/mkgallery.pl
+++ b/mkgallery.pl
@@ -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,30 +29,36 @@ package FsObj;
 use strict;
 use Carp;
 use POSIX qw/getcwd strftime/;
-use CGI qw/:html *table *Tr *center *div *Link/;
+use HTTP::Date;
+use CGI qw/:html *table *Tr *td *center *div *Link/;
 use Image::Info qw/image_info dim/;
 use Term::ReadLine;
 use Getopt::Long;
 use Encode;
-use encoding 'utf-8';
+use UUID;
+#use encoding 'utf-8';
 binmode(STDOUT, ":utf8");
 
 my $haveimagick = eval { require Image::Magick; };
 { package Image::Magick; }	# to make perl compiler happy
 
-my $haverssxml = eval { require XML::RSS; };
-{ package XML::RSS; }		# to make perl compiler happy
+my $havefeed = eval { require XML::FeedPP; };
+{ package XML::FeedPP; }	# to make perl compiler happy
 
-my @sizes = (160, 640);
+my $havegeoloc = eval { require Image::ExifTool::Location; };
+{ package Image::ExifTool::Location; }	# to make perl compiler happy
+
+my @sizes = (160, 640, 1600);
+my $incdir = ".gallery2";
 
 ######################################################################
 
 my $incpath;
-my $rssobj;
+my $feedobj;
 my $debug = 0;
 my $asktitle = 0;
 my $noasktitle = 0;
-my $rssfile = "";
+my $feed = "";
 
 charset("utf-8");
 
@@ -61,26 +67,22 @@ unless (GetOptions(
 		'incpath'=>\$incpath,
 		'asktitle'=>\$asktitle,
 		'noasktitle'=>\$noasktitle,
-		'rssfile=s'=>\$rssfile,
+		'feed=s'=>\$feed,
 		'debug'=>\$debug)) {
 	&help;
 }
 
-if ($rssfile && ! $haverssxml) {
-	print STDERR "You need to get XML::RSS from CPAN to use --rssfile\n";
+if ($feed && !$havefeed) {
+	print STDERR "You need to install XML::FeedPP to use --feed\n";
 	exit 1;
 }
 
 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 ($feedobj) {
+	$feedobj->{-feed}->pubDate(time);
+	$feedobj->{-feed}->to_file($feedobj->{-savepath});
 }
 
 sub help {
@@ -88,13 +90,17 @@ 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 directory 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
  --noasktitle:  don't ask to enter album titles even where ".title"
                 files are absent.  Use partial directory names as titles.
- --rssfile=...:	build RSS feed for newly added "albums", give name of rss file
+ --feed=...:	build Atom feed for newly added "albums",
+		enter filename, base URL, and optionally PuSH hub url,
+		separated by commas. (Note: PuSH obviously does not work
+		"out of the box" for static tree! You need a separate
+		"watcher" script to do the publishing for you.)
 __END__
 
 	exit 1;
@@ -108,14 +114,15 @@ sub new {
 		$class = ref($this);
 		my $parent = $this;
 		my $name = shift;
-		my $fullpath = $parent->{-fullpath}.'/'.$name;
 		$self = {
 				-parent=>$parent,
 				-root=>$parent->{-root},
+				-toppath=>$parent->{-toppath},
+				-depth=>$parent->{-depth}+1,
 				-base=>$name,
-				-fullpath=>$fullpath,
+				-fullpath=>$parent->{-fullpath}.'/'.$name,
+				-relpath=>$parent->{-relpath}.$name.'/',
 				-inc=>'../'.$parent->{-inc},
-				-rss=>'../'.$parent->{-rss},
 			};
 	} else {
 		$class = $this;
@@ -123,9 +130,9 @@ sub new {
 		$self = {
 				-root=>$root,
 				-fullpath=>$root,
-				-inc=>getinc($root),
-				-rss=>getrss($root),
 			};
+		# fill in -inc, -feed, -relpath
+		initpaths($self); # we are not blessed yet, so cheat.
 	}
 	bless $self, $class;
 	if ($debug) {
@@ -137,47 +144,102 @@ sub new {
 	return $self;
 }
 
-sub getinc {
-	my $fullpath=shift;	# this is not a method
+sub initpaths {
+	my $self=shift;		# this is not a method but we cheat
 	my $depth=20;		# arbitrary max depth
+	my $fullpath=$self->{-fullpath};
+	my $inc;
+	my $relpath;
 
 	if ($incpath) {
-		return $incpath."/.include";
-	}
-
-	my $inc=".include";
-	while ( ! -d $fullpath."/".$inc ) {
-		$inc = "../".$inc;
-		last unless ($depth-- > 0);
+		$inc = $incpath;
+		$inc .= '/' unless ($inc =~ m%/$%);
+	} else {
+		$inc="";
+		while ( ! -d $fullpath."/".$inc."/".$incdir ) {
+			$inc = "../".$inc;
+			last unless ($depth-- > 0);
+		}
 	}
 	if ($depth > 0) {
-		return $inc.'/';		# prefix with trailing slash
+		$self->{-inc} = $inc;
+		my $dp=0;
+		my $pos;
+		for ($pos=index($inc,'/');$pos>=0;
+					$pos=index($inc,'/',$pos+1)) {
+			$dp++;
+		}
+		$self->{-depth} = $dp;
+		for ($pos=length($fullpath);$dp>0 && $pos>0;
+					$pos=rindex($fullpath,'/',$pos-1)) {
+			$dp--;
+		}
+		my $relpath = substr($fullpath,$pos);
+		$relpath =~ s%^/%%;
+		$relpath .= '/' if ($relpath);
+		$self->{-relpath} = $relpath;
+		$self->{-toppath} = substr($fullpath,0,$pos);
+		#print "rel=$relpath, top=$self->{-toppath}, inc=$inc\n";
+		initfeed($self);
 	} else {
-		return 'NO-.INCLUDE-IN-PATH/';	# won't work anyway
+		$self->{-inc} = 'NO-.INCLUDE-IN-PATH/';	# won't work anyway
+		$self->{-feed} = '';
+		$self->{-relpath} = '';
+		$self->{-depth} = 0;
 	}
 }
 
-sub getrss {
-	my $fullpath=shift;	# this is not a method
-	my $depth=20;		# arbitrary max depth
+sub initfeed {
+	my $self=shift;		# this is not a method but we cheat
+	my $fullpath=$self->{-fullpath};
+	my $toppath=$self->{-toppath};
+	my $inc=$self->{-inc}.$incdir.'/';
+	my $conffile=$toppath.'/'.$incdir.'/feed.conf';
+	my $CONF;
+
+	if (! $incpath) {
+		if ($feed) {
+			if (open($CONF,">".$conffile)) {
+				print $CONF $feed,"\n";
+				close($CONF);
+			} else {
+				print STDERR "could not open $conffile: $!\n";
+			}
+		} else {
+			if (open($CONF,$conffile)) {
+				$feed=<$CONF>;
+				close($CONF);
+				chop $feed;
+			}
+		}
+	}
 
-	return "" unless $rssfile;
+	return unless ($feed);
 
-	my $rss=$rssfile;
-	while ( ! -f $fullpath."/".$rss ) {
-		$rss = "../".$rss;
-		last unless ($depth-- > 0);
-	}
-	if ($depth > 0) {
-		$rssobj->{'file'} = $rss;
-		$rssobj->{'rss'} = new XML::RSS (version=>2);
-		$rssobj->{'rss'}->parsefile($rss);
-		return $rss;
+	my ($feedfile, $feedbase, $feedhub) = split(',', $feed);
+	$feedbase .= '/' unless ($feedbase =~ /\/$/);
+	print "($feedfile, $feedbase, $feedhub)\n";
+
+	$feedobj->{-savepath} = $self->{-toppath}.'/'.$feedfile;
+	$feedobj->{-file} = $feedfile;
+	$feedobj->{-base} = $feedbase;
+	$feedobj->{-hub} = $feedhub;
+	if ( -f $feedobj->{-file} ) {
+		$feedobj->{-feed} = XML::FeedPP::Atom::Atom10->new(
+							$feedobj->{-file});
+		$feedobj->{-feed}->limit_item(15);
 	} else {
-		print STDERR "There is no $rssfile in this or parent ".
-			"directories, you must create one with mkgalrss.pl\n";
-		exit 1;
+		$feedobj->{-feed} = XML::FeedPP::Atom::Atom10->new;
+		$feedobj->{-feed}->title("Gallery");
+		$feedobj->{-feed}->description("generated by ".
+			"<a href=\"http://www.average.org/mkgallery/\">".
+			"mkgallery</a>");
+		$feedobj->{-feed}->link($feedbase);
+		#$feedobj->{-feed}->copyright("");
+		#$feedobj->{-feed}->language("en");
+		#$feedobj->{-feed}->image($url, $tit, $link, $desc, $w, $h);
 	}
+	$self->{-feed} = $feedobj->{-feed};
 }
 
 sub iterate {
@@ -294,6 +356,16 @@ sub isimg {
 	my $self = shift;
 	my $fullpath = $self->{-fullpath};
 	return 0 unless ( -f $fullpath );
+
+	if ($havegeoloc) {
+		my $exif = new Image::ExifTool;
+		$exif->ExtractInfo($fullpath);
+		my ($la,$lo) = $exif->GetLocation();
+		if ($la && $lo) {
+			$self->{-geoloc} = [$la,$lo];
+		}
+	}
+
 	my $info = image_info($fullpath);
 	if (my $error = $info->{error}) {
 		if (($error !~ "Unrecognized file format") &&
@@ -361,12 +433,13 @@ sub edittitle {
 	my $title;
 	my $T;
 	if (open($T,'<'.$fullpath.'/.title')) {
+		binmode($T, ":utf8");
 		$title = <$T>;
 		$title =~ s/[\r\n]*$//;
 		close($T);
 	}
 	if ($asktitle || (!$title && !$noasktitle)) {
-		my $prompt = $self->{-base};
+		my $prompt = $self->{-relpath};
 		$prompt = '/' unless ($prompt);
 		my $OUT = $term->OUT || \*STDOUT;
 		print $OUT "Enter title for $fullpath\n";
@@ -378,7 +451,7 @@ sub edittitle {
 		}
 	}
 	unless ($title) {
-		$title=substr($fullpath,length($self->{-root}));
+		$title=$self->{-relpath};
 	}
 	$self->{-title}=$title;
 	print "title in $fullpath is $title\n" if ($debug);
@@ -397,9 +470,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);
 			}
@@ -442,7 +518,7 @@ sub makeaux {
 	my $dn = $self->{-parent}->{-fullpath};
 	my $pref = $self->{-previmg}->{-base};
 	my $nref = $self->{-nextimg}->{-base};
-	my $inc = $self->{-inc};
+	my $inc = $self->{-inc}.$incdir.'/';
 	my $title = $self->{-info}->{'Comment'};
 	$title = $name unless ($title);
 
@@ -452,7 +528,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 +564,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);
 		}
@@ -522,16 +600,26 @@ sub makeaux {
 			warn "cannot open \"$fn\": $!";
 			return;
 		}
+		binmode($F, ":utf8");
 		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);
@@ -551,67 +639,105 @@ sub startindex {
 	binmode($IND, ":utf8");
 	$self->{-IND} = $IND;
 
-	my $inc = $self->{-inc};
+	my $inc = $self->{-inc}.$incdir.'/';
 	my $title = $self->{-title};
-	my $rsslink="";
-	if ($self->{-rss}) {
-		$rsslink=Link({-rel=>'alternate',
-				-type=>'application/rss+xml',
-				-title=>'RSS',
-				-href=>$self->{-rss}});
+	my $feedlink="";
+	if ($feedobj) {
+		$feedlink=Link({-rel=>'alternate',
+				-type=>'application/atom+xml',
+				-title=>'Gallery Feed',
+				-href=>$feedobj->{-base}.$feedobj->{-file}});
 	}
 	print $IND start_html(-title => $title,
 			-encoding=>"utf-8",
-			-head=>$rsslink,
-			-style=>{-src=>[$inc."gallery.css",
-					$inc."lightbox.css"],
-				-code=>"\
-.lbLoading {background: #fff url(".$inc."loading.gif) no-repeat center;}
-#lbPrevLink {background: transparent url(".$inc.
-					"prevlabel.gif) no-repeat 0% 15%;}
-#lbPrevLink:hover {background: transparent url(".$inc.
-					"prevlabel.gif) no-repeat 0% 15%;}
-#lbNextLink {background: transparent url(".$inc.
-					"nextlabel.gif) no-repeat 0% 15%;}
-#lbNextLink:hover {background: transparent url(".$inc.
-					"nextlabel.gif) no-repeat 0% 15%;}
-#lbCloseLink {background: transparent url(".$inc.
-					"closelabel.gif) no-repeat center;}
-.lightboxDesc {display: block;}"},
+			-head=>$feedlink,
+			-style=>[
+				{-src=>$inc."gallery.css"},
+				{-src=>$inc."custom.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"},
-				{-code=>"\
-var incPrefix='$inc';
-window.addEvent('domready',function(){
- Lightbox.init({descriptions: '.lightboxDesc', showControls: true});
-});"}
-			]),
-		a({-href=>"../index.html"},"UP"),"\n",
-		start_center,"\n",
-		h1($title),"\n",
+			]),"\n",
+		comment("Created by ".$version),"\n",
+		start_div({-class => 'indexContainer',
+				-id => 'indexContainer'}),
 		"\n";
+	my $EVL;
+	if (open($EVL,$self->{-toppath}.'/'.$incdir.'/header.pl')) {
+		my $prm;
+		while (<$EVL>) {
+			$prm .= $_;
+		}
+		close($EVL);
+		%_ = (
+			-version	=> $version,
+			-depth		=> $self->{-depth},
+			-title		=> $title,
+			-path		=> $self->{-fullpath},
+			-breadcrumbs	=> "breadcrumbs unimplemented",
+		);
+		print $IND eval $prm,"\n";
+	} else {
+		print STDERR "could not open ",
+			$self->{-toppath}.'/'.$incdir.'/header.pl',
+			" ($!), reverting to default header";
+		print $IND a({-href=>"../index.html"},"UP"),"\n",
+			h1({-class=>'title'},$title),"\n",
+	}
 }
 
 sub endindex {
 	my $self = shift;
 	my $IND = $self->{-IND};
 
-	print $IND end_center,end_html,"\n";
+	print $IND end_div;
+	my $EVL;
+	if (open($EVL,$self->{-toppath}.'/'.$incdir.'/footer.pl')) {
+		my $prm;
+		while (<$EVL>) {
+			$prm .= $_;
+		}
+		close($EVL);
+		%_ = (
+			-version	=> $version,
+			-depth		=> $self->{-depth},
+			-title		=> $self->{-title},
+			-breadcrumbs	=> "breadcrumbs unimplemented",
+		);
+		print $IND eval $prm,"\n";
+	} else {
+		print STDERR "could not open ",
+			$self->{-toppath}.'/'.$incdir.'/footer.pl',
+			" ($!), reverting to default empty footer";
+	}
+	print $IND end_html,"\n";
 
 	close($IND) if ($IND);
 	undef $self->{-IND};
-	if ($rssobj) {
-		my $rsstitle=sprintf "%s [%d images, %d subalbums]",
+	if ($feedobj) {
+		my $feedtitle=sprintf "%s [%d images, %d subalbums]",
 				$self->{-title},
 				$self->{-numofimgs},
 				$self->{-numofsubs};
-		my $rsslink=$rssobj->{'rss'}->channel('link')."index.html";
-		$rssobj->{'rss'}->add_item(
+		my $feedlink=$feedobj->{-feed}->link.
+			$self->{-relpath}."index.html";
+		my $uu;
+		my $us;
+		UUID::generate($uu);
+		UUID::unparse($uu, $us);
+		$feedobj->{-feed}->add_item(
 			title		=> $self->{-title},
-			link		=> $rsslink,
-			description	=> $rsstitle,
+			link		=> $feedlink,
+			description	=> $feedtitle,
+			pubDate		=> time,
+			guid		=> $us,
 		);
 	}
 }
@@ -620,7 +746,7 @@ sub startsublist {
 	my $self = shift;
 	my $IND = $self->{-IND};
 
-	print $IND h2("Albums"),"\n",start_table,"\n";
+	print $IND h2({-class=>"atitle"},"Albums"),"\n",start_table,"\n";
 }
 
 sub sub_entry {
@@ -647,9 +773,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({-class=>"ititle"},"Images ",
+		a({-href=>$slideref,-class=>'showStart',-rel=>'i'.$first},
+			'&gt; slideshow')),"\n";
 }
 
 sub img_entry {
@@ -658,41 +784,52 @@ 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 a({-name=>$name}),
-		table({-class=>'slide'},Tr(td(
-		div({-class=>"lightboxDesc $name"},
-			a({-href=>".html/$name-info.html",-title=>'Image Info',
-				-onClick=>"return showIbox('$name');"},
-				$title)),
-		a({-href=>".html/$name-static.html",-title=>$title,
-			-id=>$name,
-			-OnClick=>"Lightbox.show('$medium','$title');return false;"},
-			img({-src=>$thumb})),
-		br,
-		div({-style=>"display: none;"},
-			a({-href=>$thumb,-rel=>"lightbox[thm]",
-					-title=>'Thumb'},"Thm"),
-			a({-href=>$medium,-rel=>"lightbox[sml]",
-					-title=>'Small'},"Sml")),
-		a({-href=>$name,-title=>'Original'},"($w x $h)"),
-		br))),"\n";
+
+	print $IND a({-name=>$name}),"\n",
+		start_table({-class=>'slide'}),start_Tr,start_td,"\n";
+	print $IND div({-class=>'slidetitle'},
+			"\n ",a({-href=>".html/$name-info.html",
+				-title=>'Image Info: '.$name,
+				-class=>'infoBox'},
+				$title),"\n"),"\n",
+		start_div({-class=>'slideimage'});
+	if ($self->{-geoloc}) {
+		my ($la,$lo) = @{$self->{-geoloc}};
+		print $IND a({-href=>"http://maps.google.com/".
+						"?q=$la,$lo&ll=$la,$lo",
+				-title=>"$la,$lo",
+				-class=>'geoloc'},
+				div({-class=>'geoloc'},"")),"\n";
+	}
+	print $IND a({-href=>".html/$name-static.html",
+				-title=>$title,
+				-class=>'showImage',
+				-rel=>'i'.$name},
+				img({-src=>$thumb,
+				     -class=>'thumbnail',
+				     -alt=>$title})),"\n",end_div,
+		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 {