From 21c8e53a7e4deffb2e3bdf9829e4123c31a41803 Mon Sep 17 00:00:00 2001 Message-Id: <21c8e53a7e4deffb2e3bdf9829e4123c31a41803.1711643615.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sat, 5 Jan 2008 12:30:51 +0000 Subject: [PATCH] Macdink the web interface. Organization: Straylight/Edgeware From: rjk@greenend.org.uk <> --- templates/choose.html | 24 ++++----- templates/disorder.css | 42 ++++++++++++--- templates/help.html | 117 +++++++++++++++++++++++------------------ templates/playing.html | 4 +- 4 files changed, 115 insertions(+), 72 deletions(-) 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}{@label:choose.prefs@}@ queued]}@

}@ +

+ @right{prefs}{@label:choose.allprefs@}@ + + @label:choose.playall@ + +

-

- @right{prefs}{@label:choose.allprefs@}@ - - @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}@

@label{help.title}@

- +

Introduction

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.

- +

Playing

@@ -47,26 +48,23 @@ USA being listed first.) Where possible, estimated start times are given.

-

Each track has a @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.

+

Each track has a @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 “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).

- +

Manage

@@ -121,13 +119,16 @@ USA alt="@label:playing.upall@"> and @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.

+ tail of the queue.

+ +

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.

- +

Recent

@@ -138,13 +139,14 @@ USA href="#prefs">Editing Preferences below.

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.

- +

New

@@ -156,13 +158,14 @@ USA and clicking on the track title will add it to the queue.

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.

- +

Choose

@@ -194,14 +197,19 @@ USA href="@url@?action=choosealpha&nonce=@nonce@">choosealpha, which breaks them down by initial letter.

+

This screen will may not be available if you are not logged in + or if your user has limited rights.

+
- +

Editing Preferences

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.

- +

Search

@@ -228,14 +237,18 @@ USA

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.

- +

Login

@@ -257,7 +270,7 @@ USA
- +

Troubleshooting

@@ -267,29 +280,31 @@ USA -

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.

- +

Man Pages

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 @label:playing.playing@ + title="@label:playing.playingdisableverbose@">@label:playing.playing@ @@ -83,7 +83,7 @@ USA @label:playing.playing@ + title="@label:playing.playingenableverbose@">@label:playing.playing@ -- [mdw]