Move the filter link to a slightly more logical, but uglier place.

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 9aa05fceb6f632b31e2d8a687c3b52bfc6e631cf..ef8bb543d0b205aba78ea44add76c035ff606649 100644 (file)
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -328,8 +328,9 @@ sub handler {
                while (my $ref = $q->fetchrow_hashref()) {
                        my $imgsz = "";
                        my $takenby = $ref->{'takenby'};
                while (my $ref = $q->fetchrow_hashref()) {
                        my $imgsz = "";
                        my $takenby = $ref->{'takenby'};

+                       my $day = '';

                        if (defined($ref->{'day'})) {
                        if (defined($ref->{'day'})) {

-                                $takenby .= ", " . $ref->{'day'};
+                               $day = ", " . $ref->{'day'};

                        }
 
                        if ($takenby ne $lastupl) {
                        }
 
                        if ($takenby ne $lastupl) {


@@ -350,7 +351,7 @@ sub handler {
                                my $url = "/$event/" . Sesse::pr0n::Common::get_query_string(\%newsettings, \%defsettings);
                                
                                $r->print("    <h2>");
                                my $url = "/$event/" . Sesse::pr0n::Common::get_query_string(\%newsettings, \%defsettings);
                                
                                $r->print("    <h2>");

-                               Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl, action => $action, filterurl => $url });
+                               Sesse::pr0n::Templates::print_template($r, "submittedby", { author => $lastupl, action => $action, filterurl => $url, date => $day });

                                print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
                                $r->print("</h2>\n");
 
                                print_fullscreen_fromhere($r, $event, \%settings, \%defsettings, $img_num);
                                $r->print("</h2>\n");
 

diff --git a/templates/bilder.knatten.com/submittedby b/templates/bilder.knatten.com/submittedby
index 0322a28cbd5d3c961b9d208709f7bb0704ffbe2a..dee660ddeeb897e2ea5c35a1b86fcfb963cd4b04 100644 (file)
--- a/templates/bilder.knatten.com/submittedby
+++ b/templates/bilder.knatten.com/submittedby
@@ -1 +1 @@
-Tatt av: %AUTHOR% <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span>
+Tatt av: %AUTHOR% <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span>%DATE%

diff --git a/templates/default/submittedby b/templates/default/submittedby
index 9f20f32935c98691507718d1346608cbbd0f83a1..d1481f8dc2a39b9206ba5b98d12ab16e82a4d82a 100644 (file)
--- a/templates/default/submittedby
+++ b/templates/default/submittedby
@@ -1 +1 @@
-Taken by: %AUTHOR% <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span>
+Taken by: %AUTHOR% <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span>%DATE%

diff --git a/templates/images.tg05.gathering.org/submittedby b/templates/images.tg05.gathering.org/submittedby
index 9f20f32935c98691507718d1346608cbbd0f83a1..d1481f8dc2a39b9206ba5b98d12ab16e82a4d82a 100644 (file)
--- a/templates/images.tg05.gathering.org/submittedby
+++ b/templates/images.tg05.gathering.org/submittedby
@@ -1 +1 @@
-Taken by: %AUTHOR% <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span>
+Taken by: %AUTHOR% <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span>%DATE%

diff --git a/templates/itk-bilder.samfundet.no/submittedby b/templates/itk-bilder.samfundet.no/submittedby
index 0322a28cbd5d3c961b9d208709f7bb0704ffbe2a..dee660ddeeb897e2ea5c35a1b86fcfb963cd4b04 100644 (file)
--- a/templates/itk-bilder.samfundet.no/submittedby
+++ b/templates/itk-bilder.samfundet.no/submittedby
@@ -1 +1 @@
-Tatt av: %AUTHOR% <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span>
+Tatt av: %AUTHOR% <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span>%DATE%

diff --git a/templates/skoyen.bilder.knatten.com/submittedby b/templates/skoyen.bilder.knatten.com/submittedby
index 0322a28cbd5d3c961b9d208709f7bb0704ffbe2a..dee660ddeeb897e2ea5c35a1b86fcfb963cd4b04 100644 (file)
--- a/templates/skoyen.bilder.knatten.com/submittedby
+++ b/templates/skoyen.bilder.knatten.com/submittedby
@@ -1 +1 @@
-Tatt av: %AUTHOR% <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span>
+Tatt av: %AUTHOR% <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span>%DATE%

diff --git a/templates/skoyen.bildereks.knatten.com/submittedby b/templates/skoyen.bildereks.knatten.com/submittedby
index 0322a28cbd5d3c961b9d208709f7bb0704ffbe2a..dee660ddeeb897e2ea5c35a1b86fcfb963cd4b04 100644 (file)
--- a/templates/skoyen.bildereks.knatten.com/submittedby
+++ b/templates/skoyen.bildereks.knatten.com/submittedby
@@ -1 +1 @@
-Tatt av: %AUTHOR% <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span>
+Tatt av: %AUTHOR% <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span>%DATE%