X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/938d815790a53407a3113b183319b985135e1d1d..27c58476fffeb5c9640ba9e49fbd9e38d0159d54:/templates/playing.html
diff --git a/templates/playing.html b/templates/playing.html
index 31eadfd..90cc6f6 100644
--- a/templates/playing.html
+++ b/templates/playing.html
@@ -24,7 +24,7 @@ USA
@if{@isplaying@}{@playing{@part:title@}@}{@label:playing.title@}@
-@include{@label{menu}@}@
+@include{topbar}@
@label:playing.title@
@#{extra control buttons for the management page}@
@@ -38,7 +38,7 @@ USA
title="@label:playing.resumeverbose@">@label:playing.pause@
-
+
}{
@@ -47,7 +47,7 @@ USA
title="@label:playing.pauseverbose@">@label:playing.pause@
-
+
}@
@if{@random-enabled@}{
@@ -57,7 +57,7 @@ USA
title="@label:playing.randomdisableverbose@">@label:playing.random@
-
+
}{
@@ -66,7 +66,7 @@ USA
title="@label:playing.randomenableverbose@">@label:playing.random@
-
+
}@
@if{@enabled@}{
@@ -76,7 +76,7 @@ USA
title="@label:playing.disableverbose@">@label:playing.playing@
-
+
}{
@@ -85,29 +85,29 @@ USA
title="@label:playing.enableverbose@">@label:playing.playing@
-
+
}@
}@
@@ -138,12 +138,18 @@ USA
@when@ |
@if{@eq{@who@}{}@}{@if{@eq{@state@}{random}@}{@label:playing.randomtrack@}{ }@}{@who@}@ |
- @right{play}{@part{short}{artist}@ |
- @part{short}{artist}@}{@part{short}{artist}@}@ |
+ @right{play}{@part{short}{album}@ |
+ title="@label:playing.albumverbose@"
+ >@part{short}{album}@}{@part{short}{album}@}@
@part{short}{title}@ |
@length@ |
@@ -171,14 +177,18 @@ USA
@when@ |
@if{@eq{@who@}{}@}{@if{@eq{@state@}{random}@}{@label:queue.randomtrack@}{ }@}{@who@}@ |
- @right{play}{@part{short}{artist}@}{@part{short}{artist}@ |
- @part{short}{artist}@}@ |
+ @right{play}{@part{short}{album}@ |
+ href="@url@?action=choose&directory=@urlquote{@dirname{@part:path@}@}@"
+ >@part{short}{album}@}{@part{short}{album}@}@
@part{short}{title}@ |
@length@ |
@@ -190,17 +200,22 @@ USA
class=button src="@label:images.noscratch@"
title="@label:playing.removeverbose@"
alt="@label:playing.remove@">}@
+
@if{@arg:mgmt@}{
- @if{@isfirst@}
- {
+ @if{@or{@isfirst@}
+ {@not{@movable@}@}@}{
+
+ |
|
}
- { |
+ title="@label:playing.upverbose@" alt="">
+ }{
+
+ |
}@
- @if{@islast@}
- { |
+ title="@label:playing.upverbose@" alt="@label:playing.up@">
+ }@
+
+ @if{@or{@islast@}
+ {@not{@movable@}@}@}{
+
+ |
+
+ |
+ }{
+
|
- }
- { |
-
- |
- }@
+ alt="@label:playing.downall@">
+ |
+
+ }@
+
}@
|
}@}@
}@
-@include{@label{menu}@end}@
+@include{topbarend}@