From 328248baff5193180b6658e15503053ea8eeeb3f Mon Sep 17 00:00:00 2001 Message-Id: <328248baff5193180b6658e15503053ea8eeeb3f.1716921893.git.mdw@distorted.org.uk> From: Mark Wooding Date: Tue, 1 Jan 2008 18:55:51 +0000 Subject: [PATCH] Various visual improvements to web interface Organization: Straylight/Edgeware From: rjk@greenend.org.uk <> --- templates/about.html | 1 + templates/choose.html | 34 +++++++++++++++++++ templates/disorder.css | 72 ++++++++++++++++++++++++++++++++-------- templates/error.html | 2 ++ templates/login.html | 8 +++-- templates/options.labels | 6 ++-- templates/playing.html | 3 ++ templates/search.html | 6 ++-- templates/topbar.html | 5 ++- 9 files changed, 115 insertions(+), 22 deletions(-) diff --git a/templates/about.html b/templates/about.html index 5022e35..8d0db92 100644 --- a/templates/about.html +++ b/templates/about.html @@ -30,6 +30,7 @@ USA

Copyright

DisOrder version @version@ - select and play digital audio files

diff --git a/templates/choose.html b/templates/choose.html index 394397e..7b8e786 100644 --- a/templates/choose.html +++ b/templates/choose.html @@ -26,6 +26,40 @@ USA @include{topbar}@

@label:choose.title@

+ + @#{always have the first-letter bar, if choosealpha enabled}@ + @if{@eq{@label:sidebar.choosewhich@}{choosealpha}@}{ + +

+ A | + B | + C | + D | + E | + F | + G | + H | + I | + J | + K | + L | + M | + N | + O | + P | + Q | + R | + S | + T | + U | + V | + W | + X | + Y | + Z | + * +

+ }@ @if{@ne{@arg:directory@}{}@}{

@navigate{@arg:directory@}{/@label:error.title@ +

@label{error.@label:error@}@

@label:error.generic@

@include{topbarend}@ diff --git a/templates/login.html b/templates/login.html index ab943f9..8516de2 100644 --- a/templates/login.html +++ b/templates/login.html @@ -29,12 +29,16 @@ USA @if{@ne{@label:error@}{error}@}{ @#{error reporting from some earlier operation}@ -

@label{error.@label:error@}@

}@ @if{@ne{@label:status@}{status}@}{ @#{some action succeeded}@ -

@label{login.@label:status@}@

}@ @if{@eq{@user@}{guest}@}{ diff --git a/templates/options.labels b/templates/options.labels index cb41b62..d81f7be 100644 --- a/templates/options.labels +++ b/templates/options.labels @@ -79,10 +79,10 @@ label playing.albumverbose "more tracks from this album" label recent.title "Recently Played" # for new tracks page -label new.title "New tracks" +label new.title "New Tracks" # <TITLE> for choose track page -label choose.title "Pick track" +label choose.title "Pick Track" # Text for play all button label choose.playall "Play all" @@ -130,7 +130,7 @@ label prefs.random "Random play" label prefs.tags "Tags" # <TITLE> for help page -label help.title "DisOrder help" +label help.title "DisOrder Help" # <TITLE> for login page label login.title "DisOrder Login" diff --git a/templates/playing.html b/templates/playing.html index 19e0861..b0b186f 100644 --- a/templates/playing.html +++ b/templates/playing.html @@ -29,6 +29,7 @@ USA @#{extra control buttons for the management page}@ @if{@arg:mgmt@}{ + <div class=mgmt> <p class=mgmt> @if{@paused@}{  @@ -110,6 +111,8 @@ USA </a>}{<img class=button src="@image:noup@">}@ </form> </span> + </p> + </div> }@ @#{only display the table if there is something to put in it}@ diff --git a/templates/search.html b/templates/search.html index f1f7d5e..457186d 100644 --- a/templates/search.html +++ b/templates/search.html @@ -29,14 +29,14 @@ USA <form class=search action="@url@" method=POST enctype="multipart/form-data" accept-charset=utf-8> - <div class=search> + <p class=search>Enter search terms: <input class=query name=query type=text value="@arg:query@" - size=32> + size=50> <button class=search name=action type=submit value=search> @label:search.search@ </button> <input name=nonce type=hidden value="@nonce@"> - </div> + </p> </form> <div class=searchresults> diff --git a/templates/topbar.html b/templates/topbar.html index 4935829..a1e89ee 100644 --- a/templates/topbar.html +++ b/templates/topbar.html @@ -31,7 +31,10 @@ <a class=@if{@eq{@action@}{manage}@}{activemenu}{inactivemenu}@ href="@url@?mgmt=true" title="@label:sidebar.manageverbose@">@label:sidebar.manage@</a> - <a class=@if{@eq{@action@}{login}@}{activemenu}{inactivemenu}@ + <a class=@if{@or{@eq{@action@}{login}@} + {@eq{@action@}{logout}@} + {@eq{@action@}{register}@} + {@eq{@action@}{edituser}@}@}{activemenu}{inactivemenu}@ href="@url@?action=login&nonce=@nonce@" title="@label:sidebar.loginverbose@">@label:sidebar.login@</a> <a class=@if{@eq{@action@}{help}@}{activemenu}{inactivemenu}@ -- [mdw]