Remove the non-fullscreen selection mode; it's rather obsolete with the

[pr0n] / perl / Sesse / pr0n / Index.pm

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 5a635d4c190aac8a5fff7e9fc3a05c1ae4aa25b8..819d5af71e262f14ca0647d316aa0b745d321f37 100644 (file)
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -206,12 +206,13 @@ sub handler {
 
                my $toclose = 0;
                my $lastupl = "";
+               my $img_num = $start;
                
                # Print out all thumbnails
                if ($rot == 1) {
                        $r->print("    <form method=\"post\" action=\"/rotate\">\n");
                        $r->print("      <input type=\"hidden\" name=\"event\" value=\"$event\" />\n");
-               
+       
                        while (my $ref = $q->fetchrow_hashref()) {
                                my $imgsz = "";
                                my $takenby = $ref->{'takenby'};
@@ -221,7 +222,10 @@ sub handler {
 
                                if ($takenby ne $lastupl) {
                                        $lastupl = $takenby;
+                                       $r->print("    <h2>");
                                        Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
+                                       print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
+                                       $r->print("</h2>\n");
                                }
                                if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
                                        my $width = $ref->{'width'};
@@ -248,48 +252,11 @@ sub handler {
                                        $ref->{'id'} . "-270\" />\n");
                                $r->print("      &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;" .
                                        "&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;Del <input type=\"checkbox\" name=\"del-" . $ref->{'id'} . "\" /></p>\n");
+                       
+                               ++$img_num;
                        }
                        $r->print("      <input type=\"submit\" value=\"Rotate\" />\n");
                        $r->print("    </form>\n");
-               } elsif ($sel == 1) {
-                       $r->print("    <form method=\"post\" action=\"/select\">\n");
-                       $r->print("      <input type=\"hidden\" name=\"event\" value=\"$event\" />\n");
-               
-                       while (my $ref = $q->fetchrow_hashref()) {
-                               my $imgsz = "";
-                               my $takenby = $ref->{'takenby'};
-                               if (defined($ref->{'day'})) {
-                                        $takenby .= ", " . $ref->{'day'};
-                               }
-
-                               if ($takenby ne $lastupl) {
-                                       $lastupl = $takenby;
-                                       Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
-                               }
-                               if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
-                                       my $width = $ref->{'width'};
-                                       my $height = $ref->{'height'};
-                                               
-                                       ($width, $height) = Sesse::pr0n::Common::scale_aspect($width, $height, $thumbxres, $thumbyres);
-                                       $imgsz = " width=\"$width\" height=\"$height\"";
-                               }
-
-                               my $filename = $ref->{'filename'};
-                               my $uri = $infobox . $filename;
-                               if (defined($xres) && defined($yres) && $xres != -1) {
-                                       $uri = "${xres}x$yres/$infobox$filename";
-                               } elsif (defined($xres) && $xres == -1) {
-                                       $uri = "original/$infobox$filename";
-                               }
-
-                               my $selected = $ref->{'selected'} ? ' checked="checked"' : '';
-
-                               $r->print("    <p><a href=\"$uri\"><img src=\"${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");
-                               $r->print("      <input type=\"checkbox\" name=\"sel-" .
-                                       $ref->{'id'} . "\"$selected /></p>\n");
-                       }
-                       $r->print("      <input type=\"submit\" value=\"Select\" />\n");
-                       $r->print("    </form>\n");
                } else {
                        while (my $ref = $q->fetchrow_hashref()) {
                                my $imgsz = "";
@@ -301,8 +268,11 @@ sub handler {
                                if ($takenby ne $lastupl) {
                                        $r->print("    </p>\n\n") if ($lastupl ne "");
                                        $lastupl = $takenby;
+                                       $r->print("    <h2>");
                                        Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
-                                       $r->print("    <p>\n");
+                                       print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
+                                       $r->print("</h2>\n");
+                                       $r->print("    <p class=\"photos\">\n");
                                }
                                if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
                                        my $width = $ref->{'width'};
@@ -321,6 +291,8 @@ sub handler {
                                }
                                
                                $r->print("      <a href=\"$uri\"><img src=\"${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");
+                               
+                               ++$img_num;
                        }
                        $r->print("    </p>\n");
                }
@@ -568,6 +540,20 @@ sub print_fullscreen {
        Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings);
        $r->print("</p>\n");
 }
+
+sub print_fullscreen_fromhere {
+       my ($r, $event, $settings, $defsettings, $start) = @_;
+
+       chomp (my $title = Sesse::pr0n::Templates::fetch_template($r, 'fullscreen-fromhere'));
+
+       my %newsettings = %$settings;
+       $newsettings{'fullscreen'} = 1;
+       $newsettings{'start'} = $start;
+
+        $r->print("    <p class=\"fsfromhere\">");
+       Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings);
+       $r->print("</p>\n");
+}
        
 1;