X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/d7ce365eca55a962425e2f4cbaee241ef5c90f96..109ef5da39009190b00f64c710971c665ac8659c:/templates/playing.html
diff --git a/templates/playing.html b/templates/playing.html
index 43811ae..9c35326 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}@}{@part{short}{album}@ |
+ >@part{short}{album}@}@
@part{short}{title}@ |
@length@ |
@@ -197,7 +207,7 @@ USA
|
![]()
|
@@ -223,7 +233,7 @@ USA
|
|
![]()
|
@@ -250,7 +260,7 @@ USA
}@
-@include{@label{menu}@end}@
+@include{topbarend}@
|