X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/fdf98378d2d8c8550661f657d30ec5186ff642f1..a767291ce9d525f0077463643efc896d79428fcf:/templates/options.labels

diff --git a/templates/options.labels b/templates/options.labels
index f5cfd90..249d6ae 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).
@@ -204,24 +200,12 @@ label	heading.album		Album
 label	heading.title		Title
 label	heading.length		Length
 
-# Images.  These are (possibly relative) URLs.  In the factory configuration
-# DisOrder assumes that you have arranged for 'static' relative to the base
-# URL (i.e. the URL of the CGI) to point somewhere useful, but it's not
-# the only way.  The .deb for instance uses /disorder instead.
-label	images.enabled		static/tick.png
-label	images.disabled		static/cross.png
-label	images.scratch		static/cross.png
-label	images.noscratch	static/nocross.png
-label	images.up		static/up.png
-label	images.noup		static/noup.png
-label	images.down		static/down.png
-label	images.nodown		static/nodown.png
-label	images.edit		static/edit.png
-label	images.upall		static/upup.png
-label	images.noupall		static/noupup.png
-label	images.downall		static/downdown.png
-label	images.nodownall	static/nodowndown.png
-
-# Stylesheet.  As above, a (possibly relative) URL.
-label	links.css		static/disorder.css
+# (Possibly relative) URL to images.  This be a URL for the directory
+# containing the icons used by the web interface (which might be
+# /usr/local/share/disorder/static/).
+label	url.static		/disorder/
+
+# Stylesheet.  As above, a (possibly relative) URL, but this time pointing
+# to the stylesheet to use in all DisOrder web pages.
+label	links.css		/disorder/disorder.css