X-Git-Url: http://www.average.org/gitweb/?p=mkgallery.git;a=blobdiff_plain;f=mkgallery.pl;h=70c00892396c19b89f6ee2f26889f9756f5b27de;hp=493fd5ac19561622d465a0692d9a66084461cc70;hb=7104bfdf4b25fc5bc8e8aaf9e65e6846a731bebc;hpb=a56e7b4b7a12b446702ab83217f070cd19680a1d

diff --git a/mkgallery.pl b/mkgallery.pl
index 493fd5a..70c0089 100755
--- a/mkgallery.pl
+++ b/mkgallery.pl
@@ -76,7 +76,11 @@ my $term = new Term::ReadLine "Edit Title";
 FsObj->new(getcwd)->iterate;
 
 if ($rssobj) {
-	$rssobj->save($rssfile);
+	my $itemstodel = @{$rssobj->{'rss'}->{'items'}} - 15;
+	while ($itemstodel-- > 0) {
+		pop(@{$rssobj->{'rss'}->{'items'}})
+	}
+	$rssobj->{'rss'}->save($rssobj->{'file'});
 }
 
 sub help {
@@ -165,8 +169,9 @@ 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);
 		return $rss;
 	} else {
 		print STDERR "There is no $rssfile in this or parent ".
@@ -559,10 +564,30 @@ sub startindex {
 			-encoding=>"utf-8",
 			-head=>$rsslink,
 			-style=>{-src=>[$inc."gallery.css",
-					$inc."lightbox.css"]},
-			-script=>[{-code=>"var incPrefix='$inc';"},
+					$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;}"},
+			-script=>[
+				{-src=>$inc."mootools.js"},
 				{-src=>$inc."gallery.js"},
-				{-src=>$inc."lightbox.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",
@@ -577,16 +602,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,
@@ -653,14 +675,23 @@ sub img_entry {
 		$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},
+	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,
-		a({-href=>$name,-title=>'Original Image'},"($w x $h)"),
+		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";
 }