X-Git-Url: http://www.average.org/gitweb/?p=mkgallery.git;a=blobdiff_plain;f=mkgallery.pl;h=7857f4373490290a2fb0bd4a9423b40a55923cb1;hp=493fd5ac19561622d465a0692d9a66084461cc70;hb=2b0323392913d7822459e273f666de8d1992b5cb;hpb=a56e7b4b7a12b446702ab83217f070cd19680a1d

diff --git a/mkgallery.pl b/mkgallery.pl
index 493fd5a..7857f43 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,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,17 +74,14 @@ if ($rssfile && ! $haverssxml) {
 my $term = new Term::ReadLine "Edit Title";
 
 FsObj->new(getcwd)->iterate;
-
-if ($rssobj) {
-	$rssobj->save($rssfile);
-}
+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
@@ -138,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);
@@ -165,8 +162,14 @@ sub getrss {
 		last unless ($depth-- > 0);
 	}
 	if ($depth > 0) {
-		$rssobj = new XML::RSS (version=>2);
-		$rssobj->parsefile($rss);
+		$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 ".
@@ -392,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);
 			}
@@ -447,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) {
@@ -483,27 +489,27 @@ 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}))))),"\n",
 				end_html,"\n";
 			close($F);
 		}
@@ -520,13 +526,20 @@ 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})),
 					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);
@@ -558,11 +571,17 @@ 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."slideshow.js"},
 				{-src=>$inc."gallery.js"},
-				{-src=>$inc."lightbox.js"}]),
+				{-code=>"var incPrefix='$inc';"}
+			]),"\n",
+		comment("Created by ".$version),"\n",
 		a({-href=>"../index.html"},"UP"),"\n",
 		start_center,"\n",
 		h1($title),"\n",
@@ -577,16 +596,13 @@ sub endindex {
 
 	close($IND) if ($IND);
 	undef $self->{-IND};
-	print STDERR "title=",$self->{-title},
-		", numofsubs=",$self->{-numofsubs},
-		", numofimgs=",$self->{-numofimgs},"\n";
 	if ($rssobj) {
 		my $rsstitle=sprintf "%s [%d images, %d subalbums]",
 				$self->{-title},
 				$self->{-numofimgs},
 				$self->{-numofsubs};
-		my $rsslink=$rssobj->channel('link')."index.html";
-		$rssobj->add_item(
+		my $rsslink=$rssobj->{'rss'}->channel('link')."index.html";
+		$rssobj->{'rss'}->add_item(
 			title		=> $self->{-title},
 			link		=> $rsslink,
 			description	=> $rsstitle,
@@ -625,9 +641,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',-id=>$first},
+			'&gt; slideshow')),"\n";
 }
 
 sub img_entry {
@@ -636,32 +652,40 @@ 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',-id=>$name},
+			"\n ",a({-href=>".html/$name-info.html",
+				-title=>'Image Info: '.$name,
+				-class=>'infoBox'},
+				$title),"\n"),"\n",
+		div({-class=>'slideimage',-id=>$name},
+			"\n ",a({-href=>".html/$name-static.html",
+				-title=>$title,
+				-class=>'showImage',
+				-id=>$name},
+				img({-src=>$thumb})),"\n"),"\n",
+		start_div({-class=>'varimages',-id=>$name,-name=>$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",
+			-title=>"Reduced to ".$w."x".$h},
+			$w."x".$h)," \n";
+	}
+	print $IND "  ",a({-href=>$name,
+				-title=>'Original'},$w."x".$h),
+		"\n",end_div,"\n",
+		end_td,end_Tr,end_table,"\n";
 }
 
 sub endimglist {