From: Steinar H. Gunderson <sesse@debian.org>
Date: Wed, 11 Apr 2007 23:33:57 +0000 (+0200)
Subject: Add a "fullscreen from here" button.
X-Git-Url: https://git.sesse.net/?p=pr0n;a=commitdiff_plain;h=312aab3d35a5472261ade2926fa7fb75a303e798

Add a "fullscreen from here" button.
---

diff --git a/files/pr0n.css b/files/pr0n.css
index 4d4c6ba..21de8f7 100644
--- a/files/pr0n.css
+++ b/files/pr0n.css
@@ -17,3 +17,11 @@ h2.date {
 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 5a635d4..a00cadf 100644
--- 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'};
@@ -222,6 +223,7 @@ sub handler {
 				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'};
@@ -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");
+			
+				++$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'};
@@ -265,6 +269,7 @@ sub handler {
 				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'};
@@ -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");
+
+				++$img_num;
 			}
 			$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 });
+					print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
 					$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");
+				
+				++$img_num;
 			}
 			$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");
 }
+
+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;
 
diff --git a/templates/bilder.knatten.com/fullscreen-fromhere b/templates/bilder.knatten.com/fullscreen-fromhere
new file mode 100644
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
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
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
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
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
index 0000000..4518b1e
--- /dev/null
+++ b/templates/skoyen.bildereks.knatten.com/fullscreen-fromhere
@@ -0,0 +1 @@
+Fullskjerm herfra