make url.static work as described, and adjust cgi setup details

[disorder] / templates / choose.html
diff --git a/templates/choose.html b/templates/choose.html

index 0475be68643be5a5daf343d0886b2b6348d106f6..cfd0b4bd3a6aef0d6e9c38e23bf336fb106a9d5e 100644 (file)
--- a/templates/choose.html
+++ b/templates/choose.html
@@ -24,13 +24,13 @@ USA
    <title>@label:choose.title@</title>
   </head>
   <body>
-@include{@label{menu}@}@
+@include{topbar}@
     <h1 class=title>@label:choose.title@</h1>
  
     @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,30 +54,34 @@ USA
      </p>
      @choose{files}{
      <p class=file>
-     <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@">
-      @transform{@file@}{track}{display}@
-     </a>
+    @right{prefs}{<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@"
+     title="@label:choose.play@">@transform{@file@}{track}{display}@</a>
       @if{@eq{@trackstate{@file@}@}{playing}@}{[<b>playing</b>]}@
       @if{@eq{@trackstate{@file@}@}{queued}@}{[<b>queued</b>]}@
      </p>
      }@
     </div>
     <p class=allfiles>
-    <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@}@">
+    @right{prefs}{<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@}@">
       @label:choose.playall@
      </a>
     </p>
     }@
  
-@include{@label{menu}@end}@
+@include{topbarend}@
   </body>
  </html>
  @@
@@ -89,4 +93,3 @@ sgml-indent-step:1
  sgml-indent-data:t
  End:
  -->
-<!-- arch-tag:f62f829c03df666f4587b87b08c5e3bf -->