X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FIndex.pm;h=ad3af8fc088d86ecdb71b290965024de91c60fe5;hp=5082486e996056142860ae70a0ec9410ef63e268;hb=921a0d5faf4ad62b53ad8217255f28f3aa1eeddb;hpb=736afd0147b66c93283d4033649891503187ec6a

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 5082486..ad3af8f 100644
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -48,7 +48,6 @@ sub handler {
 		start => 1,
 		num => 250,
 		all => 1,
-		infobox => 1,
 		rot => 0,
 		sel => 0,
 		fullscreen => 0,
@@ -71,7 +70,7 @@ sub handler {
 	
 	my %settings = %defsettings;
 
-	for my $s (qw(thumbxres thumbyres xres yres start num all infobox rot sel fullscreen model lens author)) {
+	for my $s (qw(thumbxres thumbyres xres yres start num all rot sel fullscreen model lens author)) {
 		my $val = $r->param($s);
 		if (defined($val) && $val =~ /^(\d+)$/) {
 			$settings{$s} = $val;
@@ -94,7 +93,6 @@ sub handler {
 	my $start = $settings{'start'};
 	my $num = $settings{'num'};
 	my $all = $settings{'all'};
-	my $infobox = $settings{'infobox'} ? '' : 'nobox/';
 	my $rot = $settings{'rot'};
 	my $sel = $settings{'sel'};
 	my $model = $settings{'model'};
@@ -202,8 +200,7 @@ sub handler {
 		Sesse::pr0n::Templates::print_template($r, $io, "fullscreen-footer", {
 			returnurl => $returnurl,
 			start => $settings{'start'} - 1,
-			sel => $settings{'sel'},
-			infobox => $infobox
+			sel => $settings{'sel'}
 		});
 	} else {
 		Sesse::pr0n::Common::header($r, $io, "$name [$event]");
@@ -215,8 +212,6 @@ sub handler {
 			Sesse::pr0n::Templates::print_template($r, $io, "overloadmode");
 		}
 
-		print_viewres($r, $io, $event, \%settings, \%defsettings);
-		print_infobox($r, $io, $event, \%settings, \%defsettings);
 		print_selected($r, $io, $event, \%settings, \%defsettings) if ($num_selected > 0);
 		print_fullscreen($r, $io, $event, \%settings, \%defsettings);
 		print_nextprev($r, $io, $event, $where, \%settings, \%defsettings);
@@ -345,12 +340,18 @@ sub handler {
 				$imgsz = " width=\"$width\" height=\"$height\"";
 			}
 
+			# Add fullscreen link.
+			my %fssettings = %settings;
+			$fssettings{'fullscreen'} = 1;
+			$fssettings{'start'} = $img_num;
+			my $fsquery = Sesse::pr0n::Common::get_query_string(\%fssettings, \%defsettings);
+
 			my $filename = $ref->{'filename'};
-			my $uri = $infobox . $filename;
+			my $uri = $filename;
 			if (defined($xres) && defined($yres) && $xres != -1 && $xres != -2) {
-				$uri = "${xres}x$yres/$infobox$filename";
+				$uri = "${xres}x$yres/$filename";
 			} elsif (defined($xres) && $xres == -1) {
-				$uri = "original/$infobox$filename";
+				$uri = "original/$filename";
 			}
 			
 			my $prefix = "";
@@ -363,7 +364,7 @@ sub handler {
 			} else {
 				$io->print("     ");
 			}
-			$io->print("<a href=\"$prefix$uri\"><img src=\"$prefix${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");
+			$io->print("<a href=\"$prefix$uri\" onclick=\"location.href='$prefix$fsquery';return false;\"><img src=\"$prefix${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");
 		
 			if ($rot == 1) {
 				$io->print("      90 <input type=\"checkbox\" name=\"rot-" .
@@ -444,48 +445,6 @@ sub print_changes {
 	$io->print("    </p>\n");
 }
 
-sub print_viewres {
-	my ($r, $io, $event, $settings, $defsettings) = @_;
-	my @alternatives = qw(320x256 512x384 640x480 800x600 1024x768 1152x864 1280x960 1400x1050 1600x1200 1920x1440 2048x1536 2304x1728);
-	chomp (my $unlimited = Sesse::pr0n::Templates::fetch_template($r, 'viewres-unlimited'));
-	chomp (my $original = Sesse::pr0n::Templates::fetch_template($r, 'viewres-original'));
-	push @alternatives, [ $unlimited, -2, -2 ];
-	push @alternatives, [ $original, -1, -1 ];
-
-	print_changes($r, $io, $event, 'viewres', $settings, $defsettings,
-		      'xres', 'yres', \@alternatives);
-}
-
-sub print_infobox {
-	my ($r, $io, $event, $settings, $defsettings) = @_;
-
-	chomp (my $title = Sesse::pr0n::Templates::fetch_template($r, 'infobox'));
-	chomp (my $on = Sesse::pr0n::Templates::fetch_template($r, 'infobox-on'));
-	chomp (my $off = Sesse::pr0n::Templates::fetch_template($r, 'infobox-off'));
-
-        $io->print("    <p>$title:\n");
-
-	my %newsettings = %$settings;
-
-	if ($settings->{'infobox'} == 1) {
-		$io->print($on);
-	} else {
-		$newsettings{'infobox'} = 1;
-		Sesse::pr0n::Common::print_link($io, $on, "/$event/", \%newsettings, $defsettings);
-	}
-
-	$io->print(' ');
-
-	if ($settings->{'infobox'} == 0) {
-		$io->print($off);
-	} else {
-		$newsettings{'infobox'} = 0;
-		Sesse::pr0n::Common::print_link($io, $off, "/$event/", \%newsettings, $defsettings);
-	}
-	
-	$io->print('</p>');
-}
-
 sub print_nextprev {
 	my ($r, $io, $event, $where, $settings, $defsettings) = @_;
 	my $start = $settings->{'start'};