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

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

index 43811aeba01dcedc62d8f69c93d73107a6047742..937e19ccf5dc60e0c9337dd05640e7d8f22d2194 100644 (file)
--- a/templates/playing.html
+++ b/templates/playing.html
@@ -24,7 +24,7 @@ USA
    <title>@if{@isplaying@}{@playing{@part:title@}@}{@label:playing.title@}@</title>
   </head>
   <body>
-@include{@label{menu}@}@
+@include{topbar}@
     <h1 class=title>@label:playing.title@</h1>
  
     @#{extra control buttons for the management page}@
@@ -91,23 +91,23 @@ USA
       enctype="multipart/form-data" accept-charset=utf-8>
      <span class=volume>
       @label:playing.volume@
-     <a class=imgbutton
+     @right{volume}{<a class=imgbutton
        href="@url@?action=volume&#38;delta=-@label:volume.resolution@&#38;back=@urlquote{@thisurl@?mgmt=true}@">
        <img class=button src="@label:images.down@"
         alt="@label:volume.reduce@" title="@label:volume.reduceverbose@">
-     </a>
+     </a>}{<img class=button src="@label:images.nodown@">}@
       @label:volume.left@ <input size=3 name=left type=text value="@volume:left@">
       @label:volume.right@ <input size=3 name=right type=text value="@volume:right@">
       <input name=nonce type=hidden value="@nonce@">
       <input name=back type=hidden value="@thisurl@?mgmt=true">
-     <button class=search name=action type=submit value=volume>
+     @right{volume}{<button class=search name=action type=submit value=volume>
        @label:volume.set@
-     </button>
-     <a class=imgbutton
+     </button>}@
+     @right{volume}{<a class=imgbutton
        href="@url@?action=volume&#38;delta=@label:volume.resolution@&#38;back=@urlquote{@thisurl@?mgmt=true}@">
        <img class=button src="@label:images.up@"
         alt="@label:volume.increase@" title="@label:volume.increaseverbose@">
-     </a>
+     </a>}{<img class=button src="@label:images.noup@">}@
      </form>
      </span>
     }@
@@ -138,12 +138,18 @@ USA
       <tr class=playing>
        <td class=when>@when@</td>
        <td class=who>@if{@eq{@who@}{}@}{@if{@eq{@state@}{random}@}{@label:playing.randomtrack@}{&nbsp;}@}{@who@}@</td>
-      <td class=artist><a class=directory
+      <td class=artist>@right{play}{<a class=directory
         href="@url@?action=choose&amp;directory=@urlquote{@dirname{@dirname{@part:path@}@}@}@"
-       title="@label:playing.artistverbose@">@part{short}{artist}@</a></td>
-      <td class=album><a class=directory
+       title="@label:playing.artistverbose@"
+       >@part{short}{artist}@</a>}{<span class=directory
+       title="@part{artist}@"
+       >@part{short}{artist}@</span>}@</td>
+      <td class=album>@right{play}{<a class=directory
         href="@url@?action=choose&amp;directory=@urlquote{@dirname{@part:path@}@}@"
-       title="@label:playing.albumverbose@">@part{short}{album}@</a></td>
+       title="@label:playing.albumverbose@"
+       >@part{short}{album}@</a>}{<span class=directory
+       title="@part{album}@"
+       >@part{short}{album}@</span>}@</td>
        <td class=title><span
         title="@part{title}@">@part{short}{title}@</span></td>
        <td class=length>@length@</td>
@@ -171,14 +177,18 @@ USA
       <tr class=@parity@>
        <td class=when>@when@</td>
        <td class=who>@if{@eq{@who@}{}@}{@if{@eq{@state@}{random}@}{@label:queue.randomtrack@}{&nbsp;}@}{@who@}@</td>
-      <td class=artist><a 
+      <td class=artist>@right{play}{<a class=directory
         title="@part{artist}@"
-       class=directory
-       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@dirname{@part:path@}@}@}@">@part{short}{artist}@</a></td>
-      <td class=album><a
+       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@dirname{@part:path@}@}@}@"
+       >@part{short}{artist}@</a>}{<span class=directory
+       title="@part{artist}@"
+       >@part{short}{artist}@</span>}@</td>
+      <td class=album>@right{play}{<a class=directory
+       title="@part{album}@"
+       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@part:path@}@}@"
+       >@part{short}{album}@</a>}{<span class=directory
         title="@part{album}@"
-       class=directory 
-       href="@url@?action=choose&amp;directory=@urlquote{@dirname{@part:path@}@}@">@part{short}{album}@</a></td>
+       >@part{short}{album}@}@</td>
        <td class=title><span
         title="@part{title}@">@part{short}{title}@</span></td>
        <td class=length>@length@</td>
@@ -250,7 +260,7 @@ USA
     </table>
  }@
  
-@include{@label{menu}@end}@
+@include{topbarend}@
   </body>
  </html>
  @@