Implement unfiltering.

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index ee4c0f967a838c8ef2ea4ed9f84b9dfcaf45a09d..b8b954f4be2880d6ac71825944ed3857775e2809 100644 (file)
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -253,15 +253,25 @@ sub handler {
                                        $eqspec .= ', ' . $e->{'lens'} if (defined($e->{'lens'}));
 
                                        my %newsettings = %defsettings;
-                                       $newsettings{'model'} = $e->{'model'};
-                                       $newsettings{'lens'} = defined($e->{'lens'}) ? $e->{'lens'} : '';
+
+                                       my $action;
+                                       if (defined($model) && defined($lens)) {
+                                               chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "unfilter"));
+                                               $newsettings{'model'} = undef;
+                                               $newsettings{'lens'} = undef;
+                                       } else {
+                                               chomp ($action = Sesse::pr0n::Templates::fetch_template($r, "filter"));
+                                               $newsettings{'model'} = $e->{'model'};
+                                               $newsettings{'lens'} = defined($e->{'lens'}) ? $e->{'lens'} : '';
+                                       }
+                                       
                                        my $url = "/$event/" . Sesse::pr0n::Common::get_query_string(\%newsettings, \%defsettings);
 
                                        # This isn't correct for all languages. Fix if we ever need to care. :-)
                                        if ($e->{'num'} == 1) {
-                                               Sesse::pr0n::Templates::print_template($r, "equipment-item-singular", { eqspec => $eqspec, filterurl => $url });
+                                               Sesse::pr0n::Templates::print_template($r, "equipment-item-singular", { eqspec => $eqspec, filterurl => $url, action => $action });
                                        } else {
-                                               Sesse::pr0n::Templates::print_template($r, "equipment-item", { eqspec => $eqspec, num => $e->{'num'}, filterurl => $url });
+                                               Sesse::pr0n::Templates::print_template($r, "equipment-item", { eqspec => $eqspec, num => $e->{'num'}, filterurl => $url, action => $action });
                                        }
                                }
                                Sesse::pr0n::Templates::print_template($r, "equipment-end");

diff --git a/templates/bilder.knatten.com/equipment-item b/templates/bilder.knatten.com/equipment-item
index 1ffac4bad015769424a3f6bcbbca8cdfe1f50971..307a5a8cc5754e4f77948687519f72e79a1f049b 100644 (file)
--- a/templates/bilder.knatten.com/equipment-item
+++ b/templates/bilder.knatten.com/equipment-item
@@ -1 +1 @@
-  <li>%EQSPEC% (%NUM% bilder) <span class="filter">(<a href="%FILTERURL%">filtrer</a>)</span></li>
+  <li>%EQSPEC% (%NUM% bilder) <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span></li>

diff --git a/templates/bilder.knatten.com/equipment-item-singular b/templates/bilder.knatten.com/equipment-item-singular
index 3911531aea6b840039b5a308b7a5d3acc3845328..747bc9ffac792acdfd428386c5912361b4eeffd0 100644 (file)
--- a/templates/bilder.knatten.com/equipment-item-singular
+++ b/templates/bilder.knatten.com/equipment-item-singular
@@ -1 +1 @@
-  <li>%EQSPEC% (ett bilde) <span class="filter">(<a href="%FILTERURL%">filtrer</a>)</span></li>
+  <li>%EQSPEC% (ett bilde) <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span></li>

diff --git a/templates/bilder.knatten.com/filter b/templates/bilder.knatten.com/filter
new file mode 100644 (file)
index 0000000..eb92ea7
--- /dev/null
+++ b/templates/bilder.knatten.com/filter
@@ -0,0 +1 @@
+filtrer

diff --git a/templates/bilder.knatten.com/unfilter b/templates/bilder.knatten.com/unfilter
new file mode 100644 (file)
index 0000000..ea84948
--- /dev/null
+++ b/templates/bilder.knatten.com/unfilter
@@ -0,0 +1 @@
+avfiltrer

diff --git a/templates/default/equipment-item b/templates/default/equipment-item
index f8ce70f63732120f4e83c417ff3e51bbc68cbd9f..861f5f9f96bb0a83a77a783bab4dd9a57d956575 100644 (file)
--- a/templates/default/equipment-item
+++ b/templates/default/equipment-item
@@ -1 +1 @@
-  <li>%EQSPEC% (%NUM% images) <span class="filter">(<a href="%FILTERURL%">filter</a>)</span></li>
+  <li>%EQSPEC% (%NUM% images) <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span></li>

diff --git a/templates/default/equipment-item-singular b/templates/default/equipment-item-singular
index e95d222a9140080aa168298c25e35d215fd995d3..d99d4af2737dd05ab6b44daf80ebe6f8762a9598 100644 (file)
--- a/templates/default/equipment-item-singular
+++ b/templates/default/equipment-item-singular
@@ -1 +1 @@
-  <li>%EQSPEC% (one image) <span class="filter">(<a href="%FILTERURL%">filter</a>)</span></li>
+  <li>%EQSPEC% (one image) <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span></li>

diff --git a/templates/default/filter b/templates/default/filter
new file mode 100644 (file)
index 0000000..76f654e
--- /dev/null
+++ b/templates/default/filter
@@ -0,0 +1 @@
+filter

diff --git a/templates/default/unfilter b/templates/default/unfilter
new file mode 100644 (file)
index 0000000..3f87e65
--- /dev/null
+++ b/templates/default/unfilter
@@ -0,0 +1 @@
+unfilter

diff --git a/templates/images.tg05.gathering.org/equipment-item b/templates/images.tg05.gathering.org/equipment-item
index f8ce70f63732120f4e83c417ff3e51bbc68cbd9f..861f5f9f96bb0a83a77a783bab4dd9a57d956575 100644 (file)
--- a/templates/images.tg05.gathering.org/equipment-item
+++ b/templates/images.tg05.gathering.org/equipment-item
@@ -1 +1 @@
-  <li>%EQSPEC% (%NUM% images) <span class="filter">(<a href="%FILTERURL%">filter</a>)</span></li>
+  <li>%EQSPEC% (%NUM% images) <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span></li>

diff --git a/templates/images.tg05.gathering.org/equipment-item-singular b/templates/images.tg05.gathering.org/equipment-item-singular
index e95d222a9140080aa168298c25e35d215fd995d3..d99d4af2737dd05ab6b44daf80ebe6f8762a9598 100644 (file)
--- a/templates/images.tg05.gathering.org/equipment-item-singular
+++ b/templates/images.tg05.gathering.org/equipment-item-singular
@@ -1 +1 @@
-  <li>%EQSPEC% (one image) <span class="filter">(<a href="%FILTERURL%">filter</a>)</span></li>
+  <li>%EQSPEC% (one image) <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span></li>

diff --git a/templates/images.tg05.gathering.org/filter b/templates/images.tg05.gathering.org/filter
new file mode 100644 (file)
index 0000000..76f654e
--- /dev/null
+++ b/templates/images.tg05.gathering.org/filter
@@ -0,0 +1 @@
+filter

diff --git a/templates/images.tg05.gathering.org/unfilter b/templates/images.tg05.gathering.org/unfilter
new file mode 100644 (file)
index 0000000..3f87e65
--- /dev/null
+++ b/templates/images.tg05.gathering.org/unfilter
@@ -0,0 +1 @@
+unfilter

diff --git a/templates/itk-bilder.samfundet.no/equipment-item b/templates/itk-bilder.samfundet.no/equipment-item
index 1ffac4bad015769424a3f6bcbbca8cdfe1f50971..307a5a8cc5754e4f77948687519f72e79a1f049b 100644 (file)
--- a/templates/itk-bilder.samfundet.no/equipment-item
+++ b/templates/itk-bilder.samfundet.no/equipment-item
@@ -1 +1 @@
-  <li>%EQSPEC% (%NUM% bilder) <span class="filter">(<a href="%FILTERURL%">filtrer</a>)</span></li>
+  <li>%EQSPEC% (%NUM% bilder) <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span></li>

diff --git a/templates/itk-bilder.samfundet.no/equipment-item-singular b/templates/itk-bilder.samfundet.no/equipment-item-singular
index 3911531aea6b840039b5a308b7a5d3acc3845328..747bc9ffac792acdfd428386c5912361b4eeffd0 100644 (file)
--- a/templates/itk-bilder.samfundet.no/equipment-item-singular
+++ b/templates/itk-bilder.samfundet.no/equipment-item-singular
@@ -1 +1 @@
-  <li>%EQSPEC% (ett bilde) <span class="filter">(<a href="%FILTERURL%">filtrer</a>)</span></li>
+  <li>%EQSPEC% (ett bilde) <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span></li>

diff --git a/templates/itk-bilder.samfundet.no/filter b/templates/itk-bilder.samfundet.no/filter
new file mode 100644 (file)
index 0000000..eb92ea7
--- /dev/null
+++ b/templates/itk-bilder.samfundet.no/filter
@@ -0,0 +1 @@
+filtrer

diff --git a/templates/itk-bilder.samfundet.no/unfilter b/templates/itk-bilder.samfundet.no/unfilter
new file mode 100644 (file)
index 0000000..ea84948
--- /dev/null
+++ b/templates/itk-bilder.samfundet.no/unfilter
@@ -0,0 +1 @@
+avfiltrer

diff --git a/templates/skoyen.bilder.knatten.com/equipment-item b/templates/skoyen.bilder.knatten.com/equipment-item
index 1ffac4bad015769424a3f6bcbbca8cdfe1f50971..307a5a8cc5754e4f77948687519f72e79a1f049b 100644 (file)
--- a/templates/skoyen.bilder.knatten.com/equipment-item
+++ b/templates/skoyen.bilder.knatten.com/equipment-item
@@ -1 +1 @@
-  <li>%EQSPEC% (%NUM% bilder) <span class="filter">(<a href="%FILTERURL%">filtrer</a>)</span></li>
+  <li>%EQSPEC% (%NUM% bilder) <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span></li>

diff --git a/templates/skoyen.bilder.knatten.com/equipment-item-singular b/templates/skoyen.bilder.knatten.com/equipment-item-singular
index 3911531aea6b840039b5a308b7a5d3acc3845328..747bc9ffac792acdfd428386c5912361b4eeffd0 100644 (file)
--- a/templates/skoyen.bilder.knatten.com/equipment-item-singular
+++ b/templates/skoyen.bilder.knatten.com/equipment-item-singular
@@ -1 +1 @@
-  <li>%EQSPEC% (ett bilde) <span class="filter">(<a href="%FILTERURL%">filtrer</a>)</span></li>
+  <li>%EQSPEC% (ett bilde) <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span></li>

diff --git a/templates/skoyen.bilder.knatten.com/filter b/templates/skoyen.bilder.knatten.com/filter
new file mode 100644 (file)
index 0000000..eb92ea7
--- /dev/null
+++ b/templates/skoyen.bilder.knatten.com/filter
@@ -0,0 +1 @@
+filtrer

diff --git a/templates/skoyen.bilder.knatten.com/unfilter b/templates/skoyen.bilder.knatten.com/unfilter
new file mode 100644 (file)
index 0000000..ea84948
--- /dev/null
+++ b/templates/skoyen.bilder.knatten.com/unfilter
@@ -0,0 +1 @@
+avfiltrer

diff --git a/templates/skoyen.bildereks.knatten.com/equipment-item b/templates/skoyen.bildereks.knatten.com/equipment-item
index 1ffac4bad015769424a3f6bcbbca8cdfe1f50971..307a5a8cc5754e4f77948687519f72e79a1f049b 100644 (file)
--- a/templates/skoyen.bildereks.knatten.com/equipment-item
+++ b/templates/skoyen.bildereks.knatten.com/equipment-item
@@ -1 +1 @@
-  <li>%EQSPEC% (%NUM% bilder) <span class="filter">(<a href="%FILTERURL%">filtrer</a>)</span></li>
+  <li>%EQSPEC% (%NUM% bilder) <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span></li>

diff --git a/templates/skoyen.bildereks.knatten.com/equipment-item-singular b/templates/skoyen.bildereks.knatten.com/equipment-item-singular
index 3911531aea6b840039b5a308b7a5d3acc3845328..747bc9ffac792acdfd428386c5912361b4eeffd0 100644 (file)
--- a/templates/skoyen.bildereks.knatten.com/equipment-item-singular
+++ b/templates/skoyen.bildereks.knatten.com/equipment-item-singular
@@ -1 +1 @@
-  <li>%EQSPEC% (ett bilde) <span class="filter">(<a href="%FILTERURL%">filtrer</a>)</span></li>
+  <li>%EQSPEC% (ett bilde) <span class="filter">(<a href="%FILTERURL%">%ACTION%</a>)</span></li>

diff --git a/templates/skoyen.bildereks.knatten.com/filter b/templates/skoyen.bildereks.knatten.com/filter
new file mode 100644 (file)
index 0000000..eb92ea7
--- /dev/null
+++ b/templates/skoyen.bildereks.knatten.com/filter
@@ -0,0 +1 @@
+filtrer

diff --git a/templates/skoyen.bildereks.knatten.com/unfilter b/templates/skoyen.bildereks.knatten.com/unfilter
new file mode 100644 (file)
index 0000000..ea84948
--- /dev/null
+++ b/templates/skoyen.bildereks.knatten.com/unfilter
@@ -0,0 +1 @@
+avfiltrer