From: rjk@greenend.org.uk <>
Date: Sun, 8 Jul 2007 13:21:58 +0000 (+0100)
Subject: Merge from MDW's branch:
X-Git-Tag: debian-1_5_99dev8~286
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/b415c101ac12d0e0ffe8b497bdff5390fa90d7fe?ds=sidebyside

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.
---

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@}{}@}{
    <p class=directoryname>@navigate{@arg:directory@}{/<a
    class=directory
-   href="@url@/?action=choose&#38;directory=@urlquote{@fullname@}@&#38;nonce=@nonce@">@basename@</a>}@:</p>
+   href="@url@?action=choose&#38;directory=@urlquote{@fullname@}@&#38;nonce=@nonce@">@basename@</a>}@:</p>
    }@
 
    @if{@isdirectories@}{
@@ -40,7 +40,7 @@ USA
     </p>
     @choose{directories}{
     <p class=directory>
-     <a class=directory href="@url@/?action=choose&#38;directory=@urlquote{@file@}@&#38;nonce=@nonce@">
+     <a class=directory href="@url@?action=choose&#38;directory=@urlquote{@file@}@&#38;nonce=@nonce@">
       @transform{@file@}{dir}{display}@
      </a>
     </p>
@@ -54,11 +54,11 @@ USA
     </p>
     @choose{files}{
     <p class=file>
-     <a class=imgprefs href="@url@/?action=prefs&#38;0_file=@urlquote{@resolve{@file@}@}@&#38;nonce=@nonce@">
+     <a class=imgprefs href="@url@?action=prefs&#38;0_file=@urlquote{@resolve{@file@}@}@&#38;nonce=@nonce@">
       <img class=button src="@label:images.edit@"
       title="@label:choose.prefsverbose@" alt="@label:choose.prefs@">
      </a>
-     <a class=file href="@url@/?action=play&#38;file=@urlquote{@file@}@&#38;back=@urlquote{@thisurl@}@&#38;nonce=@nonce@">
+     <a class=file href="@url@?action=play&#38;file=@urlquote{@file@}@&#38;back=@urlquote{@thisurl@}@&#38;nonce=@nonce@">
       @transform{@file@}{track}{display}@
      </a>
      @if{@eq{@trackstate{@file@}@}{playing}@}{[<b>playing</b>]}@
@@ -67,11 +67,11 @@ USA
     }@
    </div>
    <p class=allfiles>
-    <a class=imgprefs href="@url@/?action=prefs&#38;directory=@urlquote{@arg:directory@}@&#38;nonce=@nonce@&#38;back=@urlquote{@thisurl@}@">
+    <a class=imgprefs href="@url@?action=prefs&#38;directory=@urlquote{@arg:directory@}@&#38;nonce=@nonce@&#38;back=@urlquote{@thisurl@}@">
       <img class=button src="@label:images.edit@"
       title="@label:choose.allprefsverbose@" alt="@label:choose.allprefs@">
     </a>
-    <a class=allfiles href="@url@/?action=play&#38;directory=@urlquote{@arg:directory@}@&#38;nonce=@nonce@&#38;back=@urlquote{@thisurl@}@">
+    <a class=allfiles href="@url@?action=play&#38;directory=@urlquote{@arg:directory@}@&#38;nonce=@nonce@&#38;back=@urlquote{@thisurl@}@">
      @label:choose.playall@
     </a>
    </p>
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}{
       <div class="search_title">
        <p class="search_title">Title:
-	<a href="@url@/?action=play&#38;file=@urlquote{@file@}@&#38;back=@urlquote{@thisurl@}@&#38;nonce=@nonce@">@part:title@</a>
+	<a href="@url@?action=play&#38;file=@urlquote{@file@}@&#38;back=@urlquote{@thisurl@}@&#38;nonce=@nonce@">@part:title@</a>
 	@if{@eq{@trackstate{@file@}@}{playing}@}{[<b>playing</b>]}@
 	@if{@eq{@trackstate{@file@}@}{queued}@}{[<b>queued</b>]}@
        </p>