From 21c8e53a7e4deffb2e3bdf9829e4123c31a41803 Mon Sep 17 00:00:00 2001
Message-Id: <21c8e53a7e4deffb2e3bdf9829e4123c31a41803.1711643615.git.mdw@distorted.org.uk>
From: Mark Wooding
+ @right{prefs}{}@ + + @label:choose.playall@ + +
-- @right{prefs}{}@ - - @label:choose.playall@ - -
}@ @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}@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.
+ of these will be greyed out. The link for the currently active + screen is highlighted.Each track has a 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.
+Each track has a + 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 “scratching”. For a track in the queue it + removes the track from the queue.
-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 disorder_config(5) for more - details.
+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).
-Artist and album names are hyperlinks to the relevant locations - in the Choose screen (see below).
+Artist and album names are hyperlinks to the relevant locations + in the Choose screen (see below).
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.
The number of tracks remembered is controlled by the server - configuration. See the "history" option in disorder_config(5) for more - details.
+ configuration. See the history + option in disorder_config(5) for + more details.The time tracks are remembered for is controlled by the server - configuration. See the "noticed_history" option in noticed_history option in disorder_config(5) for more details.
This screen will may not be available if you are not logged in + or if your user has limited rights.
+This screen, reached from Choose or Recent, is used to edit a track's preferences.
+ href="#recent">Recent, 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.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.
-Random play for any given track is enabled by default, but you - can use this screen to disable it for undesirable tracks.
+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.
It is possible to limit results to tracks with a particular tag, by using tag:TAG among the search terms.
-Some keywords, known as "stopwords", are excluded from the search, and - will never match. See the "stopword" option in disorder_config(5) for further - details about this.
+Some keywords, known as “stopwords”, are excluded + from the search, and will never match. See the stopword option in disorder_config(5) for + further details about this.
+ +This screen will may not be available if you are not logged in + or if your user has limited rights.
The user the server runs as is determined by the user - directive in the configuration file. The README recommends using - jukebox for this purpose but it could be different - locally.
+The user the server runs as is determined by the user directive in the configuration + file. The README recommends using jukebox for this purpose + but it could be different locally.