From b415c101ac12d0e0ffe8b497bdff5390fa90d7fe Mon Sep 17 00:00:00 2001
Message-Id:
From: Mark Wooding
Date: Sun, 8 Jul 2007 14:21:58 +0100
Subject: [PATCH] Merge from MDW's branch: revno: 10 committer:
mdw@distorted.org.uk branch nick: disorder timestamp: Wed 2007-06-27
09:38:12 +0100 message: templates: Kill slash bogus @url@/? entries
in templates.
Organization: Straylight/Edgeware
From: rjk@greenend.org.uk <>
---
templates/choose.html | 12 ++++++------
templates/search.html | 2 +-
2 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/templates/choose.html b/templates/choose.html
index 8ee2ef3..03744f7 100644
--- a/templates/choose.html
+++ b/templates/choose.html
@@ -30,7 +30,7 @@ USA
@if{@ne{@arg:directory@}{}@}{
@navigate{@arg:directory@}{/@basename@}@:
+ href="@url@?action=choose&directory=@urlquote{@fullname@}@&nonce=@nonce@">@basename@}@:
}@
@if{@isdirectories@}{
@@ -40,7 +40,7 @@ USA
@choose{directories}{
-
+
@transform{@file@}{dir}{display}@
@@ -54,11 +54,11 @@ USA
@choose{files}{
-
+
-
+
@transform{@file@}{track}{display}@
@if{@eq{@trackstate{@file@}@}{playing}@}{[playing]}@
@@ -67,11 +67,11 @@ USA
}@
-
+
-
+
@label:choose.playall@
diff --git a/templates/search.html b/templates/search.html
index f4a7ece..42d1bc5 100644
--- a/templates/search.html
+++ b/templates/search.html
@@ -51,7 +51,7 @@ USA
@search{title}{
Title:
- @part:title@
+ @part:title@
@if{@eq{@trackstate{@file@}@}{playing}@}{[playing]}@
@if{@eq{@trackstate{@file@}@}{queued}@}{[queued]}@
--
[mdw]