X-Git-Url: http://www.average.org/gitweb/?p=mkgallery.git;a=blobdiff_plain;f=mkgallery.pl;h=1c5fd98d0f4592353585307ccec7fc2a27a824a3;hp=123c58d9ae7d01e56f6f73cb4484ee46a8a63d70;hb=e1409ccb8e6b656b691b97f9741c1313d0a30558;hpb=224aa7103c52952fe867c36d3cb4f7217f4fbc4c

diff --git a/mkgallery.pl b/mkgallery.pl
index 123c58d..1c5fd98 100755
--- a/mkgallery.pl
+++ b/mkgallery.pl
@@ -75,14 +75,6 @@ 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'});
-}
-
 sub help {
 
 	print STDERR <<__END__;
@@ -172,6 +164,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 ".
@@ -565,18 +562,15 @@ sub startindex {
 	print $IND start_html(-title => $title,
 			-encoding=>"utf-8",
 			-head=>$rsslink,
-			-style=>{-src=>[$inc."gallery.css"],
-				-code=>
-".loading {background: url(".$inc."loading.gif) center no-repeat;}"
-			},
+			-style=>{-src=>$inc."gallery.css"},
 			-script=>[
 				{-src=>$inc."mootools.js"},
+				{-src=>$inc."overlay.js"},
 				{-src=>$inc."urlparser.js"},
-				{-src=>$inc."gallery.js"},
+				{-src=>$inc."multibox.js"},
 				{-src=>$inc."slideshow.js"},
-				{-code=>"\
-var incPrefix='$inc';window.addEvent('domready',init_gallery);\
-				"}
+				{-src=>$inc."gallery.js"},
+				{-code=>"var incPrefix='$inc';"}
 			]),
 		a({-href=>"../index.html"},"UP"),"\n",
 		start_center,"\n",
@@ -673,23 +667,13 @@ sub img_entry {
 
 	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=>$i}),"\n",
 		start_table({-class=>'slide'}),start_Tr,start_td,"\n",
 		div({-class=>'slidetitle',-id=>$name},
 			a({-href=>".html/$name-info.html",
 				-title=>'Image Info',
-				-onClick=>"return showIbox('$name');"},
+				-class=>'infoBox'},
 				$title)),"\n",
 		div({-class=>'slideimage',-id=>$name},
 			a({-href=>".html/$name-static.html",-title=>$title,