From: Steinar H. Gunderson <sesse@debian.org>
Date: Wed, 25 Jul 2007 10:12:28 +0000 (+0200)
Subject: Start adding the filter links for the equipment list.
X-Git-Url: https://git.sesse.net/?p=pr0n;a=commitdiff_plain;h=760115f054691248910831fa69f14ec78c982f0d;ds=sidebyside

Start adding the filter links for the equipment list.
---

diff --git a/perl/Sesse/pr0n/Index.pm b/perl/Sesse/pr0n/Index.pm
index 8409c84..a5407d1 100644
--- a/perl/Sesse/pr0n/Index.pm
+++ b/perl/Sesse/pr0n/Index.pm
@@ -225,11 +225,16 @@ sub handler {
 					my $eqspec = $e->{'model'};
 					$eqspec .= ', ' . $e->{'lens'} if (defined($e->{'lens'}));
 
+					my %newsettings = %defsettings;
+					$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 });
+						Sesse::pr0n::Templates::print_template($r, "equipment-item-singular", { eqspec => $eqspec, filterurl => $url });
 					} else {
-						Sesse::pr0n::Templates::print_template($r, "equipment-item", { eqspec => $eqspec, num => $e->{'num'} });
+						Sesse::pr0n::Templates::print_template($r, "equipment-item", { eqspec => $eqspec, num => $e->{'num'}, filterurl => $url });
 					}
 				}
 				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 72ab8da..1ffac4b 100644
--- a/templates/bilder.knatten.com/equipment-item
+++ b/templates/bilder.knatten.com/equipment-item
@@ -1 +1 @@
-  <li>%EQSPEC% (%NUM% bilder)</li>
+  <li>%EQSPEC% (%NUM% bilder) <span class="filter">(<a href="%FILTERURL%">filtrer</a>)</span></li>
diff --git a/templates/bilder.knatten.com/equipment-item-singular b/templates/bilder.knatten.com/equipment-item-singular
index 51e6465..3911531 100644
--- a/templates/bilder.knatten.com/equipment-item-singular
+++ b/templates/bilder.knatten.com/equipment-item-singular
@@ -1 +1 @@
-  <li>%EQSPEC% (ett bilde)</li>
+  <li>%EQSPEC% (ett bilde) <span class="filter">(<a href="%FILTERURL%">filtrer</a>)</span></li>
diff --git a/templates/default/equipment-item b/templates/default/equipment-item
index 0e7e86d..f8ce70f 100644
--- a/templates/default/equipment-item
+++ b/templates/default/equipment-item
@@ -1 +1 @@
-  <li>%EQSPEC% (%NUM% images)</li>
+  <li>%EQSPEC% (%NUM% images) <span class="filter">(<a href="%FILTERURL%">filter</a>)</span></li>
diff --git a/templates/default/equipment-item-singular b/templates/default/equipment-item-singular
index b55a163..e95d222 100644
--- a/templates/default/equipment-item-singular
+++ b/templates/default/equipment-item-singular
@@ -1 +1 @@
-  <li>%EQSPEC% (one image)</li>
+  <li>%EQSPEC% (one image) <span class="filter">(<a href="%FILTERURL%">filter</a>)</span></li>
diff --git a/templates/images.tg05.gathering.org/equipment-item b/templates/images.tg05.gathering.org/equipment-item
index 0e7e86d..f8ce70f 100644
--- a/templates/images.tg05.gathering.org/equipment-item
+++ b/templates/images.tg05.gathering.org/equipment-item
@@ -1 +1 @@
-  <li>%EQSPEC% (%NUM% images)</li>
+  <li>%EQSPEC% (%NUM% images) <span class="filter">(<a href="%FILTERURL%">filter</a>)</span></li>
diff --git a/templates/images.tg05.gathering.org/equipment-item-singular b/templates/images.tg05.gathering.org/equipment-item-singular
index b55a163..e95d222 100644
--- a/templates/images.tg05.gathering.org/equipment-item-singular
+++ b/templates/images.tg05.gathering.org/equipment-item-singular
@@ -1 +1 @@
-  <li>%EQSPEC% (one image)</li>
+  <li>%EQSPEC% (one image) <span class="filter">(<a href="%FILTERURL%">filter</a>)</span></li>
diff --git a/templates/itk-bilder.samfundet.no/equipment-item b/templates/itk-bilder.samfundet.no/equipment-item
index 72ab8da..1ffac4b 100644
--- a/templates/itk-bilder.samfundet.no/equipment-item
+++ b/templates/itk-bilder.samfundet.no/equipment-item
@@ -1 +1 @@
-  <li>%EQSPEC% (%NUM% bilder)</li>
+  <li>%EQSPEC% (%NUM% bilder) <span class="filter">(<a href="%FILTERURL%">filtrer</a>)</span></li>
diff --git a/templates/itk-bilder.samfundet.no/equipment-item-singular b/templates/itk-bilder.samfundet.no/equipment-item-singular
index 51e6465..3911531 100644
--- a/templates/itk-bilder.samfundet.no/equipment-item-singular
+++ b/templates/itk-bilder.samfundet.no/equipment-item-singular
@@ -1 +1 @@
-  <li>%EQSPEC% (ett bilde)</li>
+  <li>%EQSPEC% (ett bilde) <span class="filter">(<a href="%FILTERURL%">filtrer</a>)</span></li>
diff --git a/templates/skoyen.bilder.knatten.com/equipment-item b/templates/skoyen.bilder.knatten.com/equipment-item
index 72ab8da..1ffac4b 100644
--- a/templates/skoyen.bilder.knatten.com/equipment-item
+++ b/templates/skoyen.bilder.knatten.com/equipment-item
@@ -1 +1 @@
-  <li>%EQSPEC% (%NUM% bilder)</li>
+  <li>%EQSPEC% (%NUM% bilder) <span class="filter">(<a href="%FILTERURL%">filtrer</a>)</span></li>
diff --git a/templates/skoyen.bilder.knatten.com/equipment-item-singular b/templates/skoyen.bilder.knatten.com/equipment-item-singular
index 51e6465..3911531 100644
--- a/templates/skoyen.bilder.knatten.com/equipment-item-singular
+++ b/templates/skoyen.bilder.knatten.com/equipment-item-singular
@@ -1 +1 @@
-  <li>%EQSPEC% (ett bilde)</li>
+  <li>%EQSPEC% (ett bilde) <span class="filter">(<a href="%FILTERURL%">filtrer</a>)</span></li>
diff --git a/templates/skoyen.bildereks.knatten.com/equipment-item b/templates/skoyen.bildereks.knatten.com/equipment-item
index 72ab8da..1ffac4b 100644
--- a/templates/skoyen.bildereks.knatten.com/equipment-item
+++ b/templates/skoyen.bildereks.knatten.com/equipment-item
@@ -1 +1 @@
-  <li>%EQSPEC% (%NUM% bilder)</li>
+  <li>%EQSPEC% (%NUM% bilder) <span class="filter">(<a href="%FILTERURL%">filtrer</a>)</span></li>
diff --git a/templates/skoyen.bildereks.knatten.com/equipment-item-singular b/templates/skoyen.bildereks.knatten.com/equipment-item-singular
index 51e6465..3911531 100644
--- a/templates/skoyen.bildereks.knatten.com/equipment-item-singular
+++ b/templates/skoyen.bildereks.knatten.com/equipment-item-singular
@@ -1 +1 @@
-  <li>%EQSPEC% (ett bilde)</li>
+  <li>%EQSPEC% (ett bilde) <span class="filter">(<a href="%FILTERURL%">filtrer</a>)</span></li>