X-Git-Url: http://www.average.org/gitweb/?p=mkgallery.git;a=blobdiff_plain;f=mkgallery.pl;h=7efd5c4209209b42e03497f7b6ae9ee29e23bad2;hp=0a4988c067899577d46b7a934da5c67dbd4c7bd2;hb=c753aab96a7fc45d6d9f751e5b2cf76fc45a402b;hpb=0605e5404527fedc6da3fafbf8c7da1536aadd2c

diff --git a/mkgallery.pl b/mkgallery.pl
index 0a4988c..7efd5c4 100755
--- a/mkgallery.pl
+++ b/mkgallery.pl
@@ -74,13 +74,14 @@ if ($rssfile && ! $haverssxml) {
 my $term = new Term::ReadLine "Edit Title";
 
 FsObj->new(getcwd)->iterate;
+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
@@ -134,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);
@@ -638,25 +639,7 @@ sub startimglist {
 
 	print $IND h2("Images ",
 		a({-href=>$slideref,-class=>'showStart',-id=>$first},
-			'&gt; slideshow')),"\n",
-		start_div({-id=>"slideshowWindow",-class=>"slideshowWindow"}),
-		div({-id=>"slideshowContainer",
-			-class=>"slideshowContainer"},""),
-		start_div({-id=>"slideshowControls",
-			-class=>"slideshowControls"}),
-		a({-href=>"#",-onClick=>"show.previous();return false;"},
-			"Prev"),
-		a({-href=>"#",-onClick=>"show.play();return false;"},
-			"Play"),
-		a({-href=>"#",-onClick=>"show.stop();return false;"},
-			"Stop"),
-		a({-href=>"#",-onClick=>"show.next();return false;"},
-			"Next"),
-		a({-href=>"#",-onClick=>"showStop();return false;"},
-			"Exit"),
-		end_div,
-		end_div,
-		"\n";
+			'&gt; slideshow')),"\n";
 }
 
 sub img_entry {
@@ -685,14 +668,13 @@ sub img_entry {
 				-class=>'showImage',
 				-id=>$name},
 				img({-src=>$thumb})),"\n"),"\n",
-		start_div({-class=>'varimages',-id=>$name}),"\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 ".
-				(($sz == 640)?"slideshowThumbnail":""),
+			-class=>"conceal",
 			-title=>"Reduced to ".$w."x".$h},
 			$w."x".$h)," \n";
 	}