Add a "fullscreen from here" button.

diff --git a/files/pr0n.css b/files/pr0n.css
index 4d4c6ba032d7e4e7f7f81888d2b055dca6ce6c7d..21de8f7b424368071400719bcfc0986c07fc338a 100644 (file)
--- a/files/pr0n.css
+++ b/files/pr0n.css
@@ -17,3 +17,11 @@ h2.date {
 img {
        border: 1px solid black;
 }
 img {
        border: 1px solid black;
 }

+h2 {
+       display: inline;
+}
+.fsfromhere {
+       font-size: smaller;
+       display: inline;
+       margin-left: 1em;
+}

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 5a635d4c190aac8a5fff7e9fc3a05c1ae4aa25b8..a00cadf8e23dba933ab70d1869f2ee81a2350353 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 $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");
                
                # 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'};
                        while (my $ref = $q->fetchrow_hashref()) {
                                my $imgsz = "";
                                my $takenby = $ref->{'takenby'};


@@ -222,6 +223,7 @@ sub handler {
                                if ($takenby ne $lastupl) {
                                        $lastupl = $takenby;
                                        Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
                                if ($takenby ne $lastupl) {
                                        $lastupl = $takenby;
                                        Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });

+                                       print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);

                                }
                                if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
                                        my $width = $ref->{'width'};
                                }
                                if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
                                        my $width = $ref->{'width'};


@@ -248,13 +250,15 @@ 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");
                                        $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");
                        }
                        $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'};
                        while (my $ref = $q->fetchrow_hashref()) {
                                my $imgsz = "";
                                my $takenby = $ref->{'takenby'};


@@ -265,6 +269,7 @@ sub handler {
                                if ($takenby ne $lastupl) {
                                        $lastupl = $takenby;
                                        Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
                                if ($takenby ne $lastupl) {
                                        $lastupl = $takenby;
                                        Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });

+                                       print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);

                                }
                                if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
                                        my $width = $ref->{'width'};
                                }
                                if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
                                        my $width = $ref->{'width'};


@@ -287,6 +292,8 @@ sub handler {
                                $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("    <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");

+
+                               ++$img_num;

                        }
                        $r->print("      <input type=\"submit\" value=\"Select\" />\n");
                        $r->print("    </form>\n");
                        }
                        $r->print("      <input type=\"submit\" value=\"Select\" />\n");
                        $r->print("    </form>\n");


@@ -302,6 +309,7 @@ sub handler {
                                        $r->print("    </p>\n\n") if ($lastupl ne "");
                                        $lastupl = $takenby;
                                        Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });
                                        $r->print("    </p>\n\n") if ($lastupl ne "");
                                        $lastupl = $takenby;
                                        Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl });

+                                       print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);

                                        $r->print("    <p>\n");
                                }
                                if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {
                                        $r->print("    <p>\n");
                                }
                                if ($ref->{'width'} != -1 && $ref->{'height'} != -1) {


@@ -321,6 +329,8 @@ sub handler {
                                }
                                
                                $r->print("      <a href=\"$uri\"><img src=\"${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");
                                }
                                
                                $r->print("      <a href=\"$uri\"><img src=\"${thumbxres}x${thumbyres}/$filename\" alt=\"\"$imgsz /></a>\n");

+                               
+                               ++$img_num;

                        }
                        $r->print("    </p>\n");
                }
                        }
                        $r->print("    </p>\n");
                }


@@ -568,6 +578,20 @@ sub print_fullscreen {
        Sesse::pr0n::Common::print_link($r, $title, "/$event/", \%newsettings, $defsettings);
        $r->print("</p>\n");
 }
        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;
 
        
 1;
 

diff --git a/templates/bilder.knatten.com/fullscreen-fromhere b/templates/bilder.knatten.com/fullscreen-fromhere
new file mode 100644 (file)
index 0000000..4518b1e
--- /dev/null
+++ b/templates/bilder.knatten.com/fullscreen-fromhere
@@ -0,0 +1 @@
+Fullskjerm herfra

diff --git a/templates/default/fullscreen-fromhere b/templates/default/fullscreen-fromhere
new file mode 100644 (file)
index 0000000..00df872
--- /dev/null
+++ b/templates/default/fullscreen-fromhere
@@ -0,0 +1 @@
+Fullscreen from here

diff --git a/templates/images.tg05.gathering.org/fullscreen-fromhere b/templates/images.tg05.gathering.org/fullscreen-fromhere
new file mode 100644 (file)
index 0000000..00df872
--- /dev/null
+++ b/templates/images.tg05.gathering.org/fullscreen-fromhere
@@ -0,0 +1 @@
+Fullscreen from here

diff --git a/templates/itk-bilder.samfundet.no/fullscreen-fromhere b/templates/itk-bilder.samfundet.no/fullscreen-fromhere
new file mode 100644 (file)
index 0000000..4518b1e
--- /dev/null
+++ b/templates/itk-bilder.samfundet.no/fullscreen-fromhere
@@ -0,0 +1 @@
+Fullskjerm herfra

diff --git a/templates/skoyen.bilder.knatten.com/fullscreen-fromhere b/templates/skoyen.bilder.knatten.com/fullscreen-fromhere
new file mode 100644 (file)
index 0000000..4518b1e
--- /dev/null
+++ b/templates/skoyen.bilder.knatten.com/fullscreen-fromhere
@@ -0,0 +1 @@
+Fullskjerm herfra

diff --git a/templates/skoyen.bildereks.knatten.com/fullscreen-fromhere b/templates/skoyen.bildereks.knatten.com/fullscreen-fromhere
new file mode 100644 (file)
index 0000000..4518b1e
--- /dev/null
+++ b/templates/skoyen.bildereks.knatten.com/fullscreen-fromhere
@@ -0,0 +1 @@
+Fullskjerm herfra