Further simplify web setup.

[disorder] / templates / options.labels

diff --git a/templates/options.labels b/templates/options.labels
index bd87554ba0baa111875fedbdfd08b6a8580c075b..249d6ae928e9dc06f181298deeb6ec6670661829 100644 (file)
--- a/templates/options.labels
+++ b/templates/options.labels
@@ -78,6 +78,9 @@ label playing.albumverbose    "more tracks from this album"
 # <TITLE> for recently played page
 label  recent.title            "Recently Played"
 
 # <TITLE> for recently played page
 label  recent.title            "Recently Played"
 

+# <TITLE> for new tracks page
+label  new.title               "New tracks"
+

 # <TITLE> for choose track page
 label  choose.title            "Pick track"
 
 # <TITLE> for choose track page
 label  choose.title            "Pick track"
 


@@ -98,6 +101,9 @@ label        choose.prefsverbose     "edit track information"
 label  choose.allprefs         "Edit all"
 label  choose.allprefsverbose  "edit all track information"
 
 label  choose.allprefs         "Edit all"
 label  choose.allprefsverbose  "edit all track information"
 

+# Caption for play-track links
+label  choose.play             "Add track to queue"
+

 # <TITLE> for search page
 label  search.title            Search
 
 # <TITLE> for search page
 label  search.title            Search
 


@@ -126,6 +132,23 @@ label      prefs.tags              "Tags"
 # <TITLE> for help page
 label  help.title              "DisOrder help"
 
 # <TITLE> for help page
 label  help.title              "DisOrder help"
 

+# <TITLE> for login page
+label  login.title             "DisOrder Login"
+
+# Text for login fields
+label  login.username          "Username"
+label  login.password          "Password"
+label  login.email             "Email address"
+
+# Text for login page buttons
+label  login.login             "Login"
+label  login.register          "Register"
+label  login.edituser          "Change Details"
+label  login.lougout           "Logout"
+
+# <TITLE> for account page
+label  account.title           "DisOrder User Details"
+

 # <TITLE> for error page.  Note that in this page the 'error' label is set
 # to a string indicating the type of error.
 label  error.title             "DisOrder error"
 # <TITLE> for error page.  Note that in this page the 'error' label is set
 # to a string indicating the type of error.
 label  error.title             "DisOrder error"


@@ -145,8 +168,10 @@ label      sidebar.choose          Choose
 label  sidebar.random          Random
 label  sidebar.search          Search
 label  sidebar.recent          Recent
 label  sidebar.random          Random
 label  sidebar.search          Search
 label  sidebar.recent          Recent

+label  sidebar.new             New

 label  sidebar.about           About
 label  sidebar.volume          Volume
 label  sidebar.about           About
 label  sidebar.volume          Volume

+label  sidebar.login           Login

 label  sidebar.help            Help
 label  sidebar.manage          Manage
 
 label  sidebar.help            Help
 label  sidebar.manage          Manage
 


@@ -155,15 +180,13 @@ label     sidebar.playingverbose  "current and queued tracks"
 label  sidebar.chooseverbose   "choose tracks"
 label  sidebar.searchverbose   "word search among track names"
 label  sidebar.recentverbose   "recently played tracks"
 label  sidebar.chooseverbose   "choose tracks"
 label  sidebar.searchverbose   "word search among track names"
 label  sidebar.recentverbose   "recently played tracks"

+label  sidebar.newverbose      "newly added tracks"

 label  sidebar.aboutverbose    "about DisOrder"
 label  sidebar.volumeverbose   "volume control"
 label  sidebar.aboutverbose    "about DisOrder"
 label  sidebar.volumeverbose   "volume control"

+label  sidebar.loginverbose    "log in to DisOrder"

 label  sidebar.helpverbose     "basic user guide"
 label  sidebar.manageverbose   "queue management and volume control"
 
 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).
 # 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).


@@ -177,24 +200,12 @@ label     heading.album           Album
 label  heading.title           Title
 label  heading.length          Length
 
 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