From e12da4d96c1310152b11abfe70c3f868282a0e8b Mon Sep 17 00:00:00 2001
From: "rjk@greenend.org.uk" <>
Date: Sun, 23 Dec 2007 18:51:52 +0000
Subject: [PATCH] abolish sidebar.html; too much hassle to maintain two
---
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}@