Sort out static content. There is a new expansion @image:NAME@ which

produces the URL for the static content called NAME (or NAME.png if
you don't supply an extexnsion).  The labels images.NAME can be used
to indirect role names.

url.static still has its old meaning but does not appear in
options.labels as it has a sensible default.

This is then used throughout to find images and the stylesheet.

The main options file is now the same for Debian and non-Debian.  On
Debian a deafult empty options.user file is installed.

Updated a lot of copyright dates.

diff --git a/README b/README
index 5f1c632..11bbbb0 100644 (file)
--- a/README
+++ b/README
@@ -257,7 +257,7 @@ Copyright
   "Nothing but another drug, a licence that you buy and sell"
 
 DisOrder - select and play digital audio files
-Copyright (C) 2003-2007 Richard Kettlewell
+Copyright (C) 2003-2008 Richard Kettlewell
 Portions copyright (C) 2007 Ross Younger
 Portions copyright (C) 2007 Mark Wooding
 Portions extracted from MPG321, http://mpg321.sourceforge.net/

diff --git a/debian/Makefile.am b/debian/Makefile.am
index ec4dab2..6296b24 100644 (file)
--- a/debian/Makefile.am
+++ b/debian/Makefile.am
@@ -1,6 +1,6 @@
 #
 # This file is part of DisOrder
-# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
+# Copyright (C) 2004-2008 Richard Kettlewell
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -22,7 +22,7 @@ noinst_SCRIPTS=rules
 
 EXTRA_DIST=README.Debian config.disorder-server control \
           copyright README.RTP \
-          etc.disorder.options etc.disorder.config htaccess \
+          etc.disorder.options.user etc.disorder.config htaccess \
           postinst.disorder-server prerm.disorder-server \
           postrm.disorder-server \
           templates.disorder-server conffiles.disorder-server \

diff --git a/debian/conffiles.disorder-server b/debian/conffiles.disorder-server
index 41df91d..5d44ee4 100644 (file)
--- a/debian/conffiles.disorder-server
+++ b/debian/conffiles.disorder-server
@@ -1,3 +1,4 @@
 /etc/disorder/config
 /etc/disorder/options
+/etc/disorder/options.user
 /etc/init.d/disorder

diff --git a/debian/etc.disorder.options b/debian/etc.disorder.options
deleted file mode 100644 (file)
index 3a696ef..0000000
--- a/debian/etc.disorder.options
+++ /dev/null
@@ -1,15 +0,0 @@
-# debian-specific disorder options
-include options.labels
-
-# default columns
-include options.columns
-
-# trackname transformations - supply your own or keep the default
-include options.transform
-
-# where to find static web content
-label  url.static              /disorder/
-label  links.css               /disorder/disorder.css
-
-# user overrides - you supply this
-include options.user

diff --git a/debian/etc.disorder.options.user b/debian/etc.disorder.options.user
new file mode 100644 (file)
index 0000000..8c8a20a
--- /dev/null
+++ b/debian/etc.disorder.options.user
@@ -0,0 +1,2 @@
+# This file is included from /etc/disorder/options as its last act, so you can
+# use it to override any of the default settings.

diff --git a/debian/rules b/debian/rules
index e9f8d9f..805a5e0 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,6 @@
 #! /usr/bin/make -f
 #
-# Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
+# Copyright (C) 2004-2008 Richard Kettlewell
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -156,8 +156,10 @@ pkg-disorder-server: build
                debian/disorder-server/etc/init.d/disorder
        $(INSTALL_DATA) debian/etc.disorder.config \
                debian/disorder-server/etc/disorder/config
-       $(INSTALL_DATA) debian/etc.disorder.options \
+       $(INSTALL_DATA) templates/options \
                debian/disorder-server/etc/disorder/options
+       $(INSTALL_DATA) debian/etc.disorder.options.user \
+               debian/disorder-server/etc/disorder/options.user
        $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) server/disorder.cgi \
                $(shell pwd)/debian/disorder-server/usr/lib/cgi-bin/disorder
        dpkg-shlibdeps -Tdebian/substvars.disorder-server \

diff --git a/disobedience/menu.c b/disobedience/menu.c
index 346e2fa..99b9e7e 100644 (file)
--- a/disobedience/menu.c
+++ b/disobedience/menu.c
@@ -155,7 +155,7 @@ static void about_popup_got_version(void attribute((unused)) *v,
                      FALSE/*fill*/,
                      1/*padding*/);
   gtk_box_pack_start(GTK_BOX(vbox),
-                     gtk_label_new("\xC2\xA9 2004-2007 Richard Kettlewell"),
+                     gtk_label_new("\xC2\xA9 2004-2008 Richard Kettlewell"),
                      FALSE/*expand*/,
                      FALSE/*fill*/,
                      1/*padding*/);

diff --git a/doc/disorder_config.5.in b/doc/disorder_config.5.in
index a58f787..a2e6383 100644 (file)
--- a/doc/disorder_config.5.in
+++ b/doc/disorder_config.5.in
@@ -1,5 +1,5 @@
 .\"
-.\" Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
+.\" Copyright (C) 2004-2008 Richard Kettlewell
 .\"
 .\" This program is free software; you can redistribute it and/or modify
 .\" it under the terms of the GNU General Public License as published by
@@ -911,7 +911,18 @@ The ID of the current track.
 If \fIBOOL\fR expands to \fBtrue\fR then expands to \fITRUEPART\fR, otherwise
 to \fIFALSEPART\fR (which may be omitted).
 .TP
-.B @include:\fIPATH\fR@
+.B @image:\fINAME\fB@
+Expands to the (possibly relative) URL for image \fINAME\fR.
+.IP
+If there is a label \fBimages.\fINAME\fR then that will be the image base name.
+Otherwise the image base name is \fINAME\fB.png\fR or just \fINAME\fR if it
+alraedy has an extension.  Thus labels may be defined to give images role
+names.
+.IP
+If there is a label \fBurl.static\fR then that is the base URL for images.  If
+it is not defined then \fB/disorder\fR is used as a default.
+.TP
+.B @include:\fIPATH\fB@
 Include the named file as if it were a template file.  If \fIPATH\fR
 starts with a \fB/\fR then it is used as-is; otherwise, ".html" is
 appended and the template path is searched.

diff --git a/server/cgi.c b/server/cgi.c
index 5e475ed..5abf145 100644 (file)
--- a/server/cgi.c
+++ b/server/cgi.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004, 2005, 2006 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2006, 2008 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -603,6 +603,11 @@ const char *cgi_label(const char *key) {
   return label;
 }
 
+int cgi_label_exists(const char *key) {
+  read_options();
+  return kvp_get(labels, key) ? 1 : 0;
+}
+
 char **cgi_columns(const char *name, int *ncolumns) {
   struct column *c;
 

diff --git a/server/cgi.h b/server/cgi.h
index 6c387d7..385b9f2 100644 (file)
--- a/server/cgi.h
+++ b/server/cgi.h
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004, 2005 Richard Kettlewell
+ * Copyright (C) 2004, 2005, 2008 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -86,6 +86,8 @@ char *cgi_makeurl(const char *url, ...);
 const char *cgi_label(const char *key);
 /* look up the translated label @key@ */
 
+int cgi_label_exists(const char *key);
+
 char **cgi_columns(const char *name, int *nheadings);
 /* return the list of columns for @name@ */
 

diff --git a/server/dcgi.c b/server/dcgi.c
index 69c9214..19a8021 100644 (file)
--- a/server/dcgi.c
+++ b/server/dcgi.c
@@ -1,6 +1,6 @@
 /*
  * This file is part of DisOrder.
- * Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
+ * Copyright (C) 2004-2008 Richard Kettlewell
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -1697,6 +1697,26 @@ static void exp_userinfo(int attribute((unused)) nargs,
   cgi_output(output, "%s", value);
 }
 
+static void exp_image(int attribute((unused)) nargs,
+                     char **args,
+                     cgi_sink *output,
+                     void attribute((unused)) *u) {
+  char *labelname;
+  const char *imagestem;
+
+  byte_xasprintf(&labelname, "images.%s", args[0]);
+  if(cgi_label_exists(labelname))
+    imagestem = cgi_label(labelname);
+  else if(strchr(args[0], '.'))
+    imagestem = args[0];
+  else
+    byte_xasprintf((char **)&imagestem, "%s.png", args[0]);
+  if(cgi_label_exists("url.static"))
+    cgi_output(output, "%s/%s", cgi_label("url.static"), imagestem);
+  else
+    cgi_output(output, "/disorder/%s", imagestem);
+}
+
 static const struct cgi_expansion expansions[] = {
   { "#", 0, INT_MAX, EXP_MAGIC, exp_comment },
   { "action", 0, 0, 0, exp_action },
@@ -1712,6 +1732,7 @@ static const struct cgi_expansion expansions[] = {
   { "fullname", 0, 0, 0, exp_fullname },
   { "id", 0, 0, 0, exp_id },
   { "if", 2, 3, EXP_MAGIC, exp_if },
+  { "image", 1, 1, 0, exp_image },
   { "include", 1, 1, 0, exp_include },
   { "index", 0, 0, 0, exp_index },
   { "isdirectories", 0, 0, 0, exp_isdirectories },

diff --git a/templates/about.html b/templates/about.html
index b8242b5..5022e35 100644 (file)
--- a/templates/about.html
+++ b/templates/about.html
@@ -34,7 +34,7 @@ USA
    version @version@</a> - select and play digital
    audio files</p>
 
-   <p>Copyright &copy; 2003-2007 <a href="http://www.greenend.org.uk/rjk/">Richard Kettlewell</a><br>
+   <p>Copyright &copy; 2003-2008 <a href="http://www.greenend.org.uk/rjk/">Richard Kettlewell</a><br>
    Portions copyright &copy; 2007 <a href="http://www.chiark.greenend.org.uk/~ryounger/">Ross Younger</a><br>
    Portions copyright &copy; 2007 Mark Wooding</p>
 

diff --git a/templates/choose.html b/templates/choose.html
index cfd0b4b..394397e 100644 (file)
--- a/templates/choose.html
+++ b/templates/choose.html
@@ -57,7 +57,7 @@ USA
     @right{prefs}{<a class=imgprefs
      href="@url@?action=prefs&#38;0_file=@urlquote{@resolve{@file@}@}@&#38;nonce=@nonce@"
      ><img class=button
-      src="@label:images.edit@"
+      src="@@image:edit@"
       title="@label:choose.prefsverbose@"
       alt="@label:choose.prefs@"></a>}@
      <a class=file
@@ -72,7 +72,7 @@ USA
     @right{prefs}{<a class=imgprefs
     href="@url@?action=prefs&#38;directory=@urlquote{@arg:directory@}@&#38;nonce=@nonce@&#38;back=@urlquote{@thisurl@}@"
     ><img class=button 
-     src="@label:images.edit@"
+     src="@@image:edit@"
      title="@label:choose.allprefsverbose@"
      alt="@label:choose.allprefs@"></a>}@
     <a class=allfiles href="@url@?action=play&#38;directory=@urlquote{@arg:directory@}@&#38;nonce=@nonce@&#38;back=@urlquote{@thisurl@}@">

diff --git a/templates/credits.html b/templates/credits.html
index 6cc1f5c..c9a9ac8 100644 (file)
--- a/templates/credits.html
+++ b/templates/credits.html
@@ -1,11 +1,11 @@
 <p class=credits><a
 href="http://www.greenend.org.uk/rjk/disorder/"
 title="DisOrder web site">DisOrder
-version @version@</a> &copy; 2003-2007 Richard Kettlewell</p>
+version @version@</a> &copy; 2003-2008 Richard Kettlewell</p>
 @@
 <!--
 This file is part of DisOrder.
-Copyright (C) 2004, 2005, 2006 Richard Kettlewell
+Copyright (C) 2004-2007 Richard Kettlewell
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/templates/disorder.css b/templates/disorder.css
index 1123ffd..92c1768 100644 (file)
--- a/templates/disorder.css
+++ b/templates/disorder.css
@@ -490,7 +490,7 @@ p.credits {
 }
 /*
 This file is part of DisOrder.
-Copyright (C) 2003, 2004, 2005, 2007 Richard Kettlewell
+Copyright (C) 2003-2007 Richard Kettlewell
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/templates/error.html b/templates/error.html
index d87e1ee..13a803e 100644 (file)
--- a/templates/error.html
+++ b/templates/error.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <!--
 This file is part of DisOrder.
-Copyright (C) 2005 Richard Kettlewell
+Copyright (C) 2005 ,2007 Richard Kettlewell
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/templates/help.html b/templates/help.html
index 1b4cecc..37e0004 100644 (file)
--- a/templates/help.html
+++ b/templates/help.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <!--
 This file is part of DisOrder.
-Copyright (C) 2004, 2005, 2006, 2007 Richard Kettlewell
+Copyright (C) 2004-2008 Richard Kettlewell
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -48,7 +48,7 @@ USA
     given.</p>
 
     <p>Each track has a <img class=button
-       src="@label:images.scratch@"
+       src="@image:scratch@"
        title="@label:playing.scratch@"
        alt="@label:playing.scratch@"> button next to it.  For the
        currently playing track this can be used to stop playing the
@@ -79,29 +79,29 @@ USA
    <ul>
     <li>Pause.  This button can be used to pause playing (provided the
     player supports it).  <img width=16 height=16 class=imgbutton
-    src="@label:images.enabled@"> indicates that playing is paused,
+    src="@image:enabled@"> indicates that playing is paused,
     <img width=16 height=16 class=imgbutton
-    src="@label:images.disabled@"> that it is not.</li>
+    src="@image:disabled@"> that it is not.</li>
 
     <li>Enable/disable random play.  If disabled then queued tracks
     will still be played but if the queue is empty nothing will be
     picked at random.  <img width=16 height=16 class=imgbutton
-    src="@label:images.enabled@"> indicates that random play is
+    src="@image:enabled@"> indicates that random play is
     enabled, <img width=16 height=16 class=imgbutton
-    src="@label:images.disabled@"> that it is disabled.</li>
+    src="@image:disabled@"> that it is disabled.</li>
 
     <li>Enable/disable play.  If disabled then tracks in the queue
     will not be played, but will remain in the queue instead.  <img
-    width=16 height=16 class=imgbutton src="@label:images.enabled@">
+    width=16 height=16 class=imgbutton src="@image:enabled@">
     indicates that play is enabled, <img width=16 height=16
-    class=imgbutton src="@label:images.disabled@"> that it is
+    class=imgbutton src="@image:disabled@"> that it is
     disabled.</li>
 
     <li>Volume control.  You can use the <img class=button
-       src="@label:images.up@"
+       src="@image:up@"
        title="@label:volume.increase@"
        alt="@label:volume.increase@"> and <img
-       src="@label:images.down@"
+       src="@image:down@"
        title="@label:volume.reduce@"
        alt="@label:volume.reduce@"> buttons to increase or
     decrease the volume, or enter new volume settings for the left
@@ -112,14 +112,14 @@ USA
    <p>Below this is the same table of current and queued tracks as for
     the main playing screen, but with extra buttons for managing the
     queue.
-    The <img class=button src="@label:images.up@"
+    The <img class=button src="@image:up@"
      title="@label:playing.up@" alt="@label:playing.up@"> and <img
-     src="@label:images.down@" title="@label:playing.down@"
+     src="@image:down@" title="@label:playing.down@"
      alt="@label:playing.down@"> buttons on each track move that
     track around in the queue.  Similarly the <img class=button
-     src="@label:images.upall@" title="@label:playing.upall@"
+     src="@image:upall@" title="@label:playing.upall@"
      alt="@label:playing.upall@"> and <img
-     src="@label:images.downall@" title="@label:playing.downall@"
+     src="@image:downall@" title="@label:playing.downall@"
      alt="@label:playing.downall@"> buttons move each track to the head or
     tail of the queue.
     Depending on server configuration, it may be that only trusted
@@ -132,7 +132,7 @@ USA
    <div class=helpsection>
 
     <p>This screen displays recently played tracks, most recent first.
-    The <img class=button src="@label:images.edit@"
+    The <img class=button src="@image:edit@"
     title="@label:choose.prefs@" alt="@label:choose.prefs@">
     button can be used to edit the details for a track; see <a
     href="#prefs">Editing Preferences</a> below.</p>
@@ -150,7 +150,7 @@ USA
 
     <p>This screen displays tracks recently added to the database,
     most recent first.  The <img class=button
-    src="@label:images.edit@" title="@label:choose.prefs@"
+    src="@image:edit@" title="@label:choose.prefs@"
     alt="@label:choose.prefs@"> button can be used to edit the details
     for a track; see <a href="#prefs">Editing Preferences</a> below,
     and clicking on the track title will add it to the queue.</p>
@@ -174,7 +174,7 @@ USA
      <tbody>
       <tr>
        <td class=helpbuttons><img
-       class=button src="@label:images.edit@"
+       class=button src="@image:edit@"
        title="@label:choose.prefs@"
        alt="@label:choose.prefs@"></td>
        <td class=helpbuttons>This button can be used to edit the details for a

diff --git a/templates/new.html b/templates/new.html
index e73164f..49746ce 100644 (file)
--- a/templates/new.html
+++ b/templates/new.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <!--
 This file is part of DisOrder.
-Copyright (C) 2004, 2005, 2007 Richard Kettlewell
+Copyright (C) 2004-2008 Richard Kettlewell
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -62,7 +62,7 @@ USA
 @right{prefs}{
      <td class=imgbutton><a class=imgbutton
       href="@url@?action=prefs&#38;nonce=@nonce@&#38;0_file=@urlquote{@file@}@"><img
-       class=button src="@label:images.edit@"
+       class=button src="@image:edit@"
        title="@label:choose.prefsverbose@"
        alt="@label:choose.prefs@"></a></td>
     </tr>}@

diff --git a/templates/options.labels b/templates/options.labels
index 1197b04..cb41b62 100644 (file)
--- a/templates/options.labels
+++ b/templates/options.labels
@@ -229,12 +229,13 @@ label     heading.album           Album
 label  heading.title           Title
 label  heading.length          Length
 
-# (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
-
+# Role images.  See the documentation for @images:NAME@.
+label   images.enabled          tick.png
+label   images.disabled         cross.png
+label   images.scratch          cross.png
+label   images.noscratch        nocross.png
+label   images.noup             noup.png
+label   images.upall            upup.png
+label   images.noupall          noupup.png
+label   images.downall          downdown.png
+label   images.nodownall        nodowndown.png

diff --git a/templates/playing.html b/templates/playing.html
index 9c35326..19e0861 100644 (file)
--- a/templates/playing.html
+++ b/templates/playing.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <!--
 This file is part of DisOrder.
-Copyright (C) 2004, 2005 Richard Kettlewell
+Copyright (C) 2004-2008 Richard Kettlewell
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -38,7 +38,7 @@ USA
      title="@label:playing.resumeverbose@">@label:playing.pause@</a>
     </a>
     </span>
-    <img width=16 height=16 class=imgbutton src="@label:images.tick@">
+    <img width=16 height=16 class=imgbutton src="@image:enabled@">
     }{
     <!-- not paused -->
     <span class=button>
@@ -47,7 +47,7 @@ USA
      title="@label:playing.pauseverbose@">@label:playing.pause@</a>
     </a>
     </span>
-    <img width=16 height=16 class=imgbutton src="@label:images.cross@">
+    <img width=16 height=16 class=imgbutton src="@image:disabled@">
     }@
     @if{@random-enabled@}{
     <!-- random played enabled -->
@@ -57,7 +57,7 @@ USA
      title="@label:playing.randomdisableverbose@">@label:playing.random@</a>
     </a>
     </span>
-    <img width=16 height=16 class=imgbutton src="@label:images.tick@">
+    <img width=16 height=16 class=imgbutton src="@image:enabled@">
     }{
     <!-- random played disabled -->
     <span class=button>
@@ -66,7 +66,7 @@ USA
      title="@label:playing.randomenableverbose@">@label:playing.random@</a>
     </a>
     </span>
-    <img width=16 height=16 class=imgbutton src="@label:images.cross@">
+    <img width=16 height=16 class=imgbutton src="@image:disabled@">
     }@
     @if{@enabled@}{
     <!-- playing enabled -->
@@ -76,7 +76,7 @@ USA
      title="@label:playing.disableverbose@">@label:playing.playing@</a>
     </a>
     </span>
-    <img width=16 height=16 class=imgbutton src="@label:images.tick@">
+    <img width=16 height=16 class=imgbutton src="@image:enabled@">
     }{
     <!-- playing disabled -->
     <span class=button>
@@ -85,7 +85,7 @@ USA
      title="@label:playing.enableverbose@">@label:playing.playing@</a>
     </a>
     </span>
-    <img width=16 height=16 class=imgbutton src="@label:images.cross@">
+    <img width=16 height=16 class=imgbutton src="@image:disabled@">
     }@
     <form class=volume action="@url@" method=POST
      enctype="multipart/form-data" accept-charset=utf-8>
@@ -93,9 +93,9 @@ USA
      @label:playing.volume@
      @right{volume}{<a class=imgbutton
       href="@url@?action=volume&#38;delta=-@label:volume.resolution@&#38;back=@urlquote{@thisurl@?mgmt=true}@">
-      <img class=button src="@label:images.down@"
+      <img class=button src="@image:down@"
        alt="@label:volume.reduce@" title="@label:volume.reduceverbose@">
-     </a>}{<img class=button src="@label:images.nodown@">}@
+     </a>}{<img class=button src="@image:nodown@">}@
      @label:volume.left@ <input size=3 name=left type=text value="@volume:left@">
      @label:volume.right@ <input size=3 name=right type=text value="@volume:right@">
      <input name=nonce type=hidden value="@nonce@">
@@ -105,9 +105,9 @@ USA
      </button>}@
      @right{volume}{<a class=imgbutton
       href="@url@?action=volume&#38;delta=@label:volume.resolution@&#38;back=@urlquote{@thisurl@?mgmt=true}@">
-      <img class=button src="@label:images.up@"
+      <img class=button src="@image:up@"
        alt="@label:volume.increase@" title="@label:volume.increaseverbose@">
-     </a>}{<img class=button src="@label:images.noup@">}@
+     </a>}{<img class=button src="@image:noup@">}@
     </form>
     </span>
    }@
@@ -155,10 +155,10 @@ USA
       <td class=length>@length@</td>
       <td class=imgbutton>@if{@scratchable@}{<a class=imgbutton
        href="@url@?action=scratch&#38;nonce=@nonce@&#38;id=@id@&#38;mgmt=@arg:mgmt@"><img
-       class=button src="@label:images.scratch@"
+       class=button src="@image:scratch@"
        title="@label:playing.scratchverbose@"
        alt="@label:playing.scratch@"></a>}{<img
-       class=button src="@label:images.noscratch@"
+       class=button src="@image:noscratch@"
        title="@label:playing.scratchverbose@"
        alt="@label:playing.scratch@">}@</td>
       @if{@arg:mgmt@}{
@@ -194,10 +194,10 @@ USA
       <td class=length>@length@</td>
       <td class=imgbutton>@if{@removable@}{<a class=imgbutton
        href="@url@?action=remove&#38;nonce=@nonce@&#38;id=@id@&#38;mgmt=@arg:mgmt@"><img
-       class=button src="@label:images.scratch@"
+       class=button src="@image:scratch@"
        title="@label:playing.removeverbose@" 
        alt="@label:playing.remove@"></a>}{<img
-       class=button src="@label:images.noscratch@"
+       class=button src="@image:noscratch@"
        title="@label:playing.removeverbose@"
        alt="@label:playing.remove@">}@</td>
 
@@ -207,24 +207,24 @@ USA
      <!-- cannot move up -->
      <td class=imgbutton>
       <img
-       class=button src="@label:images.noupup@"
+       class=button src="@image:noupall@"
        title="@label:playing.upallverbose@" alt="">
      <td class=imgbutton>
       <img
-       class=button src="@label:images.noup@"
+       class=button src="@image:noup@"
        title="@label:playing.upverbose@" alt="">
          }{
      <!-- can move up -->
      <td class=imgbutton>
       <a class=imgbutton
         href="@url@?action=move&#38;nonce=@nonce@&#38;id=@id@&#38;delta=2147483647&#38;mgmt=true"><img
-       class=button src="@label:images.upup@"
+       class=button src="@image:upall@"
        title="@label:playing.upallverbose@"
        alt="@label:playing.upall@"></a>
      <td class=imgbutton>
      <a class=imgbutton
         href="@url@?action=move&#38;nonce=@nonce@&#38;id=@id@&#38;delta=1&#38;mgmt=true"><img
-       class=button src="@label:images.up@"
+       class=button src="@image:up@"
        title="@label:playing.upverbose@" alt="@label:playing.up@"></a>
          }@
 
@@ -233,24 +233,24 @@ USA
      <!-- cannot move down -->
      <td class=imgbutton>
       <img
-       class=button src="@label:images.nodowndown@"
+       class=button src="@image:nodownall@"
        title="@label:playing.downallverbose@" alt="">
      <td class=imgbutton>
       <img
-       class=button src="@label:images.nodown@"
+       class=button src="@image:nodown@"
        title="@label:playing.downverbose@" alt="">
          }{
      <!-- can move down -->
      <td class=imgbutton>
       <a class=imgbutton
         href="@url@?action=move&#38;nonce=@nonce@&#38;id=@id@&#38;delta=-2147483647&#38;mgmt=true"><img
-       class=button src="@label:images.downdown@"
+       class=button src="@image:downall@"
        title="@label:playing.downallverbose@"
        alt="@label:playing.downall@"></a>
      <td class=imgbutton>
      <a class=imgbutton
         href="@url@?action=move&#38;nonce=@nonce@&#38;id=@id@&#38;delta=-1&#38;mgmt=true"><img
-       class=button src="@label:images.down@"
+       class=button src="@image:down@"
        title="@label:playing.downverbose@" alt="@label:playing.down@"></a>
          }@
 

diff --git a/templates/recent.html b/templates/recent.html
index 2efb1f9..c9e1674 100644 (file)
--- a/templates/recent.html
+++ b/templates/recent.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <!--
 This file is part of DisOrder.
-Copyright (C) 2004, 2005 Richard Kettlewell
+Copyright (C) 2004, 2005, 2007, 2008 Richard Kettlewell
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -62,7 +62,7 @@ USA
 @right{prefs}{
      <td class=imgbutton><a class=imgbutton
       href="@url@?action=prefs&#38;nonce=@nonce@&#38;0_file=@urlquote{@file@}@"><img
-       class=button src="@label:images.edit@"
+       class=button src="@image:edit@"
        title="@label:choose.prefsverbose@"
        alt="@label:choose.prefs@"></a></td>
     </tr>}@

diff --git a/templates/stylesheet.html b/templates/stylesheet.html
index e96f86f..da58e56 100644 (file)
--- a/templates/stylesheet.html
+++ b/templates/stylesheet.html
@@ -1,10 +1,10 @@
-  <link rel=stylesheet type="text/css" href="@label:links.css@">
+  <link rel=stylesheet type="text/css" href="@image:disorder.css@">
 @@
 This file is a standard place to put a link to a stylesheet,
 or an embedded stylesheet.
 <!--
 This file is part of DisOrder.
-Copyright (C) 2005 Richard Kettlewell
+Copyright (C) 2005, 2007, 2008 Richard Kettlewell
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by

diff --git a/templates/volume.html b/templates/volume.html
index e2c4240..63a7630 100644 (file)
--- a/templates/volume.html
+++ b/templates/volume.html
@@ -1,7 +1,7 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
 <!--
 This file is part of DisOrder.
-Copyright (C) 2004, 2005 Richard Kettlewell
+Copyright (C) 2004, 2005, 2008 Richard Kettlewell
 
 This program is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
@@ -31,7 +31,7 @@ USA
     <p class=volume>
      <a class=imgbutton
       href="@url@?action=volume&#38;delta=-@label:volume.resolution@">
-      <img class=button src="@label:images.down@"
+      <img class=button src="@image:down@"
        alt="@label:volume.reduce@" title="@label:volume.reduceverbose@">
      </a>
      @label:volume.left@ <input size=3 name=left type=text value="@volume:left@">
@@ -42,7 +42,7 @@ USA
      </button>
      <a class=imgbutton
       href="@url@?action=volume&#38;delta=@label:volume.resolution@">
-      <img class=button src="@label:images.up@"
+      <img class=button src="@image:up@"
        alt="@label:volume.increase@" title="@label:volume.increaseverbose@">
      </a>
     </p>