From: rjk@greenend.org.uk <>
Date: Sat, 5 Jan 2008 12:30:51 +0000 (+0000)
Subject: Macdink the web interface.
X-Git-Tag: 3.0~94
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/21c8e53a7e4deffb2e3bdf9829e4123c31a41803

Macdink the web interface.
---

diff --git a/templates/choose.html b/templates/choose.html
index c203157..dae34e0 100644
--- a/templates/choose.html
+++ b/templates/choose.html
@@ -145,7 +145,7 @@ USA
     @right{prefs}{<a class=imgprefs
      href="@url@?action=prefs&#38;0_file=@urlquote{@resolve{@file@}@}@&#38;nonce=@nonce@"
      ><img class=button
-      src="@@image:edit@"
+      src="@image:edit@"
       title="@label:choose.prefsverbose@"
       alt="@label:choose.prefs@"></a>}@
      <a class=file
@@ -155,18 +155,18 @@ USA
      @if{@eq{@trackstate{@file@}@}{queued}@}{[<b>queued</b>]}@
     </p>
     }@
+    <p class=allfiles>
+     @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="@@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@}@">
+      @label:choose.playall@
+     </a>
+    </p>
    </div>
-   <p class=allfiles>
-    @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="@@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@}@">
-     @label:choose.playall@
-    </a>
-   </p>
    }@
 
 @include{topbarend}@
diff --git a/templates/disorder.css b/templates/disorder.css
index 2f143bb..fce95fc 100644
--- a/templates/disorder.css
+++ b/templates/disorder.css
@@ -30,7 +30,8 @@ h1.title {
   text-align: center;
   border: 1px solid black;
   padding: 0.2em;
-  background-color: #e0e0e0
+  background-color: #e0e0e0;
+  display: block
 }
 
 /* secondary titles */
@@ -39,6 +40,7 @@ h2 {
   font-weight: bold;
   font-size: 16pt;
   font-variant: normal;
+  display: block
 }
 
 /* playing, recent and new ***************************************************/
@@ -182,7 +184,9 @@ p.choosealpha {
 
 /* containing directory */
 p.directoryname {
-  font-weight: bold
+  font-weight: bold;
+  background-color: #ffffe0;	/* pastel yellow */
+  padding: 0.2em
 }
 
 /* directories */
@@ -191,12 +195,16 @@ div.directories {
 
 /* heading for directories */
 p.directories {
-  font-weight: bold
+  font-weight: bold;
+  display: block;
+  background-color: #e0ffe0;	/* pastel green */
+  padding: 0.2em;
+  padding-left: 1.2em
 }
 
 /* one directory */
 p.directory {
-  margin-left: 1em
+  margin-left: 2em
 }
 
 a.directory {
@@ -220,12 +228,16 @@ div.files {
 
 /* heading for files */
 p.files {
-  font-weight: bold
+  font-weight: bold;
+  display: block;
+  background-color: #e0ffe0;	/* pastel green */
+  padding: 0.2em;
+  padding-left: 1.2em
 }
 
 /* one file */
 p.file {
-  margin-left: 1em
+  margin-left: 2em
 }
 
 a.file {
@@ -244,6 +256,11 @@ a.file:active {
   color: red
 }
 
+/* all files */
+p.allfiles {
+  margin-left: 1.2em
+}
+
 /* buttons *******************************************************************/
 
 /* a.allfiles turns up in track choice
@@ -476,6 +493,15 @@ input.prefs_name,input.prefs_value {
   font-weight: bold
 }
 
+span.configuration {
+  font-family: monospace
+}
+
+h2.helptitle {
+  background-color: #e0ffe0;	/* pastel green */
+  padding: 0.2em
+}
+
 /* volume ********************************************************************/
 
 p.volume {
@@ -540,7 +566,9 @@ p.error {
 /* credits */
 p.credits {
   font-size: small;		/* because visually intrusive */
-  text-align: right
+  text-align: right;
+  background-color: #e0e0e0;
+  padding: 0.2em
 }
 /*
 This file is part of DisOrder.
diff --git a/templates/help.html b/templates/help.html
index 37e0004..53c6169 100644
--- a/templates/help.html
+++ b/templates/help.html
@@ -27,18 +27,19 @@ USA
 @include{topbar}@
    <h1 class=title>@label{help.title}@</h1>
 
-   <h2 class=sidebarlink>Introduction</h2>
+   <h2 class=helptitle>Introduction</h2>
 
    <div class=helpsection>
 
      <p>All screens in the DisOrder web interface have a set of
      hyperlinks at the top.  You can use these to visit the various
      screens described below.  Note that if you are not logged in some
-     of these will be greyed out.</p>
+     of these will be greyed out.  The link for the currently active
+     screen is highlighted.</p>
 
    </div>
   
-   <h2 class=sidebarlink><a name=playing>Playing</a></h2>
+   <h2 class=helptitle><a name=playing>Playing</a></h2>
 
    <div class=helpsection>
 
@@ -47,26 +48,23 @@ USA
     being listed first.)  Where possible, estimated start times are
     given.</p>
 
-    <p>Each track has a <img class=button
-       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
-       track before it has finished.  For a track in the queue it
-       removes the track from the queue.</p>
+    <p>Each track has a <img class=button 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 track before it has finished; this is
+    called &ldquo;scratching&rdquo;.  For a track in the queue it
+    removes the track from the queue.</p>
 
-    <p>Depending on the server configuration, you may be able to do
-    this for any track, or only for tracks you submitted or that were
-    randomly picked.  See the "restrict" option in <a
-    href="@url@?action=disorder_config.5">disorder_config(5)</a> for more
-    details.</p>
+    <p>If you are not logged in, or if your user has limited rights,
+    you may only be able to scratch or remove certain tracks (for
+    instance, those you picked yourself).</p>
 
-   <p>Artist and album names are hyperlinks to the relevant locations
-   in the <a href="#choose">Choose</a> screen (see below).</p>
+    <p>Artist and album names are hyperlinks to the relevant locations
+    in the <a href="#choose">Choose</a> screen (see below).</p>
 
    </div>
 
-   <h2 class=sidebarlink><a name=manage>Manage</a></h2>
+   <h2 class=helptitle><a name=manage>Manage</a></h2>
 
    <div class=helpsection>
 
@@ -121,13 +119,16 @@ USA
      alt="@label:playing.upall@"> and <img
      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
-    users can move tracks around the queue.</p>
+    tail of the queue.</p>
+
+    <p>If you are not logged in, or if your user has limited rights,
+    you may only be able to move certain tracks (for instance, those
+    you picked yourself), and may not be able to adjust the volume,
+    random play setting, etc.</p>
 
    </div>
 
-   <h2 class=sidebarlink><a name=recent>Recent</a></h2>
+   <h2 class=helptitle><a name=recent>Recent</a></h2>
 
    <div class=helpsection>
 
@@ -138,13 +139,14 @@ USA
     href="#prefs">Editing Preferences</a> below.</p>
 
     <p>The number of tracks remembered is controlled by the server
-    configuration.  See the "history" option in <a
-    href="@url@?action=disorder_config.5">disorder_config(5)</a> for more
-    details.</p>
+    configuration.  See the <span class=configuration>history</span>
+    option in <a
+    href="@url@?action=disorder_config.5">disorder_config(5)</a> for
+    more details.</p>
 
    </div>
 
-   <h2 class=sidebarlink><a name=new>New</a></h2>
+   <h2 class=helptitle><a name=new>New</a></h2>
 
    <div class=helpsection>
 
@@ -156,13 +158,14 @@ USA
     and clicking on the track title will add it to the queue.</p>
 
     <p>The time tracks are remembered for is controlled by the server
-    configuration.  See the "noticed_history" option in <a
+    configuration.  See the <span
+    class=configuration>noticed_history</span> option in <a
     href="@url@?action=disorder_config.5">disorder_config(5)</a> for
     more details.</p>
 
    </div>
 
-   <h2 class=sidebarlink><a name=choose>Choose</a></h2>
+   <h2 class=helptitle><a name=choose>Choose</a></h2>
 
    <div class=helpsection>
 
@@ -194,14 +197,19 @@ USA
     href="@url@?action=choosealpha&#38;nonce=@nonce@">choosealpha</a>,
     which breaks them down by initial letter.</p>
 
+    <p>This screen will may not be available if you are not logged in
+    or if your user has limited rights.</p>
+
    </div>
 
-   <h2 class=sidebarlink><a name=prefs>Editing Preferences</a></h2>
+   <h2 class=helptitle><a name=prefs>Editing Preferences</a></h2>
 
    <div class=helpsection>
 
     <p>This screen, reached from <a href="#choose">Choose</a> or <a
-    href="#recent">Recent</a>, is used to edit a track's preferences.</p>
+    href="#recent">Recent</a>, is used to edit a track's preferences.
+    Note that if you are not logged in, or your user has limited
+    rights, you may not be able to edit track preferences.</p>
     
     <p>The form can be used to
     edit artist, album and title fields for the track as displayed, or
@@ -212,12 +220,13 @@ USA
     characters (including spaces).  Leading and trailing spaces are
     not significant.</p>
 
-    <p>Random play for any given track is enabled by default, but you
-    can use this screen to disable it for undesirable tracks.</p>
+    <p>By default, any track can be picked for random play.  The check
+    box at the bottom can be used to selectivel enable or disable it
+    for individual tracks.</p>
 
    </div>
 
-   <h2 class=sidebarlink>Search</h2>
+   <h2 class=helptitle>Search</h2>
 
    <div class=helpsection>
 
@@ -228,14 +237,18 @@ USA
     <p>It is possible to limit results to tracks with a particular
     tag, by using <b>tag:</b><i>TAG</i> among the search terms.</p>
 
-    <p>Some keywords, known as "stopwords", are excluded from the search, and
-    will never match.  See the "stopword" option in <a
-    href="@url@?action=disorder_config.5">disorder_config(5)</a> for further
-    details about this.</p>
+    <p>Some keywords, known as &ldquo;stopwords&rdquo;, are excluded
+    from the search, and will never match.  See the <span
+    class=configuration>stopword</span> option in <a
+    href="@url@?action=disorder_config.5">disorder_config(5)</a> for
+    further details about this.</p>
+
+    <p>This screen will may not be available if you are not logged in
+    or if your user has limited rights.</p>
 
    </div>
 
-  <h2 class=sidebarlink><a name=Login>Login</a></h2>
+  <h2 class=helptitle><a name=Login>Login</a></h2>
 
   <div class=helpsection>
 
@@ -257,7 +270,7 @@ USA
 
   </div>
 
-  <h2 class=sidebarlink>Troubleshooting</h2>
+  <h2 class=helptitle>Troubleshooting</h2>
 
   <div class=helpsection>
 
@@ -267,29 +280,31 @@ USA
    <ul>
 
     <li>Are there any error messages in the system log?  The server
-    logs to <tt>LOG_DAEMON</tt>, which typically ends up in
-    <i>/var/log/daemon.log</i> or <i>/var/log/messages</i>, though
-    this depends on local configuration.
+    logs to <span class=configuration>LOG_DAEMON</span>, which
+    typically ends up in <i>/var/log/daemon.log</i> or
+    <i>/var/log/messages</i>, though this depends on local
+    configuration.
 
-    <li>Is the track in a known format?  Have a look at the
-    configuration file for the formats recognized by the local
-    installation.  The filename matching is case-sensitive.
+    <li>Is the track in a known format?  Out of the box, OGG, MP3,
+     FLAC and WAV are supported.  You can look at the configuration
+     file for additional formats recognized by the local installation.
 
-    <li>Do permissions on the track allow the server to read it?
+    <li>Do permissions on the track allow the server to read it?  If
+    the server cannot read it then it will not be able to play it.
      
     <li>Do the permissions on the containing directories allow the
     server to read and execute them?
 
    </ul>
 
-   <p>The user the server runs as is determined by the <tt>user</tt>
-   directive in the configuration file.  The README recommends using
-   <b>jukebox</b> for this purpose but it could be different
-   locally.</p>
+   <p>The user the server runs as is determined by the <span
+   class=configuration>user</span> directive in the configuration
+   file.  The README recommends using <b>jukebox</b> for this purpose
+   but it could be different locally.</p>
 
   </div>
 
-   <h2 class=sidebarlink>Man Pages</h2>
+   <h2 class=helptitle>Man Pages</h2>
 
    <div class=helpsection>
 
diff --git a/templates/playing.html b/templates/playing.html
index b0b186f..815b895 100644
--- a/templates/playing.html
+++ b/templates/playing.html
@@ -74,7 +74,7 @@ USA
     <span class=button>
     <a class=button
     href="@url@?action=disable&#38;nonce=@nonce@&#38;mgmt=true"
-     title="@label:playing.disableverbose@">@label:playing.playing@</a>
+     title="@label:playing.playingdisableverbose@">@label:playing.playing@</a>
     </a>
     </span>
     <img width=16 height=16 class=imgbutton src="@image:enabled@">
@@ -83,7 +83,7 @@ USA
     <span class=button>
     <a class=button
     href="@url@?action=enable&#38;nonce=@nonce@&#38;mgmt=true"
-     title="@label:playing.enableverbose@">@label:playing.playing@</a>
+     title="@label:playing.playingenableverbose@">@label:playing.playing@</a>
     </a>
     </span>
     <img width=16 height=16 class=imgbutton src="@image:disabled@">