From e12da4d96c1310152b11abfe70c3f868282a0e8b Mon Sep 17 00:00:00 2001 Message-Id: From: Mark Wooding Date: Sun, 23 Dec 2007 18:51:52 +0000 Subject: [PATCH] abolish sidebar.html; too much hassle to maintain two Organization: Straylight/Edgeware From: rjk@greenend.org.uk <> --- doc/disorder_config.5.in | 7 ++--- templates/Makefile.am | 4 +-- templates/about.html | 4 +-- templates/choose.html | 4 +-- templates/choosealpha.html | 4 +-- templates/error.html | 4 +-- templates/help.html | 4 +-- templates/login.html | 4 +-- templates/new.html | 4 +-- templates/options.labels | 4 --- templates/playing.html | 4 +-- templates/prefs.html | 4 +-- templates/recent.html | 4 +-- templates/search.html | 4 +-- templates/sidebar.html | 53 -------------------------------------- templates/sidebarend.html | 22 ---------------- templates/volume.html | 4 +-- 17 files changed, 30 insertions(+), 108 deletions(-) delete mode 100644 templates/sidebar.html delete mode 100644 templates/sidebarend.html diff --git a/doc/disorder_config.5.in b/doc/disorder_config.5.in index eeef352..3cb36af 100644 --- a/doc/disorder_config.5.in +++ b/doc/disorder_config.5.in @@ -748,9 +748,10 @@ Additionally, other standard files are included by these: Included at the end of the main content \fB
\fR element. .TP .B topbar.html -Included at the start of the \fB\fR element. (This supplants -\fBsidebar.html\fR, though the latter is still available; override label -\fBmenu\fR to choose between them.) +Included at the start of the \fB\fR element. +.TP +.B topbarend.html +Included at the end of the \fB\fR element. .TP .B stdhead.html Included in the \fB\fR element. diff --git a/templates/Makefile.am b/templates/Makefile.am index 7c7a5d1..8c18552 100644 --- a/templates/Makefile.am +++ b/templates/Makefile.am @@ -20,8 +20,8 @@ pkgdata_DATA=about.html choose.html credits.html playing.html recent.html \ stdhead.html stylesheet.html search.html about.html volume.html \ - sidebar.html prefs.html help.html choosealpha.html topbar.html \ - sidebarend.html topbarend.html error.html new.html login.html \ + prefs.html help.html choosealpha.html topbar.html \ + topbarend.html error.html new.html login.html \ options options.labels \ options.columns static_DATA=disorder.css diff --git a/templates/about.html b/templates/about.html index e76566d..43a8a11 100644 --- a/templates/about.html +++ b/templates/about.html @@ -24,7 +24,7 @@ USA @label:about.title@ -@include{@label{menu}@}@ +@include{topbar.html}@

@label:about.title@

Copyright

@@ -60,7 +60,7 @@ USA @stats@ -@include{@label{menu}@end}@ +@include{topbarend}@ @@ diff --git a/templates/choose.html b/templates/choose.html index e6a39cb..67bddf0 100644 --- a/templates/choose.html +++ b/templates/choose.html @@ -24,7 +24,7 @@ USA @label:choose.title@ -@include{@label{menu}@}@ +@include{topbar}@

@label:choose.title@

@if{@ne{@arg:directory@}{}@}{ @@ -77,7 +77,7 @@ USA

}@ -@include{@label{menu}@end}@ +@include{topbarend}@ @@ diff --git a/templates/choosealpha.html b/templates/choosealpha.html index 53ce71d..759bb11 100644 --- a/templates/choosealpha.html +++ b/templates/choosealpha.html @@ -24,7 +24,7 @@ USA @label:choose.title@ -@include{@label{menu}@}@ +@include{topbar}@

@label:choose.title@

@@ -57,7 +57,7 @@ USA *

-@include{@label{menu}@end}@ +@include{topbarend}@ @@ diff --git a/templates/error.html b/templates/error.html index 4e0ef25..d8bcaf4 100644 --- a/templates/error.html +++ b/templates/error.html @@ -24,14 +24,14 @@ USA @label:error.title@ -@include{@label{menu}@}@ +@include{topbar}@

@label:error.title@

@label{error.@label:error@}@

@label:error.generic@

-@include{@label{menu}@end}@ +@include{topbarend}@ @@ diff --git a/templates/help.html b/templates/help.html index aeed65f..045d821 100644 --- a/templates/help.html +++ b/templates/help.html @@ -24,7 +24,7 @@ USA @label{help.title}@ -@include{@label{menu}@}@ +@include{topbar}@

@label{help.title}@

Playing

@@ -354,7 +354,7 @@ USA
-@include{@label{menu}@end}@ +@include{topbarend}@ diff --git a/templates/login.html b/templates/login.html index 9119a5f..16811f8 100644 --- a/templates/login.html +++ b/templates/login.html @@ -24,7 +24,7 @@ USA @label:login.title@ -@include{@label{menu}@}@ +@include{topbar}@

@label:login.title@

@if{@ne{@label:error@}{error}@}{ @@ -152,7 +152,7 @@ USA }@ -@include{@label{menu}@end}@ +@include{topbarend}@ @@ diff --git a/templates/new.html b/templates/new.html index dbac790..78b47dd 100644 --- a/templates/new.html +++ b/templates/new.html @@ -24,7 +24,7 @@ USA @label:new.title@ -@include{@label{menu}@}@ +@include{topbar}@

@label:new.title@

@#{only display the table if there is something to put in it}@ @@ -64,7 +64,7 @@ USA }@ -@include{@label{menu}@end}@ +@include{topbarend}@ @@ diff --git a/templates/options.labels b/templates/options.labels index f5cfd90..ca2fa7b 100644 --- a/templates/options.labels +++ b/templates/options.labels @@ -187,10 +187,6 @@ label sidebar.loginverbose "log in to DisOrder" label sidebar.helpverbose "basic user guide" label sidebar.manageverbose "queue management and volume control" -# This should be 'topbar' or 'sidebar'. If 'topbar' then the menu appears -# across the top of the screen, otherwise down the side. -label menu topbar - # This should be 'choose' or 'choosealpha'. If 'choose' then all artists # appear on the same page, otherwise they are broken up by initial letter # (which can be more convenient if you have huge numbers). diff --git a/templates/playing.html b/templates/playing.html index 43811ae..30346ac 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}@ @@ -250,7 +250,7 @@ USA }@ -@include{@label{menu}@end}@ +@include{topbarend}@ @@ diff --git a/templates/prefs.html b/templates/prefs.html index d37f11d..853e1b0 100644 --- a/templates/prefs.html +++ b/templates/prefs.html @@ -24,7 +24,7 @@ USA @label:prefs.title@ -@include{@label{menu}@}@ +@include{topbar}@

@label:prefs.title@

-@include{@label{menu}@end}@ +@include{topbarend}@ @@ diff --git a/templates/recent.html b/templates/recent.html index 71e359a..61fc962 100644 --- a/templates/recent.html +++ b/templates/recent.html @@ -24,7 +24,7 @@ USA @label:recent.title@ -@include{@label{menu}@}@ +@include{topbar}@

@label:recent.title@

@#{only display the table if there is something to put in it}@ @@ -66,7 +66,7 @@ USA }@ -@include{@label{menu}@end}@ +@include{topbarend}@ @@ diff --git a/templates/search.html b/templates/search.html index 42d1bc5..f1f7d5e 100644 --- a/templates/search.html +++ b/templates/search.html @@ -24,7 +24,7 @@ USA @label:search.title@ -@include{@label{menu}@}@ +@include{topbar}@

@label:search.title@

-@include{@label{menu}@end}@ +@include{topbarend}@ @@ diff --git a/templates/sidebar.html b/templates/sidebar.html deleted file mode 100644 index 4c011a8..0000000 --- a/templates/sidebar.html +++ /dev/null @@ -1,53 +0,0 @@ - -
-@@ - diff --git a/templates/sidebarend.html b/templates/sidebarend.html deleted file mode 100644 index 07055ca..0000000 --- a/templates/sidebarend.html +++ /dev/null @@ -1,22 +0,0 @@ -@include:credits@ -
-@@ - diff --git a/templates/volume.html b/templates/volume.html index 434632d..e2c4240 100644 --- a/templates/volume.html +++ b/templates/volume.html @@ -24,7 +24,7 @@ USA @label:volume.title@ -@include{@label{menu}@}@ +@include{topbar}@

@label:volume.title@

@@ -48,7 +48,7 @@ USA

-@include{@label{menu}@end}@ +@include{topbarend}@ @@ -- [mdw]