From 547553359fed90562714987654ce06feb9480cc8 Mon Sep 17 00:00:00 2001 Message-Id: <547553359fed90562714987654ce06feb9480cc8.1713435562.git.mdw@distorted.org.uk> From: Mark Wooding Date: Sat, 17 May 2008 21:33:55 +0100 Subject: [PATCH] Fix up choose page Organization: Straylight/Edgeware From: Richard Kettlewell --- templates/choose.tmpl | 90 +++++++++++++++++++++++++--------------- templates/options.labels | 3 +- 2 files changed, 59 insertions(+), 34 deletions(-) diff --git a/templates/choose.tmpl b/templates/choose.tmpl index a0d5549..fcba496 100644 --- a/templates/choose.tmpl +++ b/templates/choose.tmpl @@ -30,59 +30,59 @@ USA {

A | + href="@url?action=choose&re=^(the )?a">A | B | + href="@url?action=choose&re=^(the )?b">B | C | + href="@url?action=choose&re=^(the )?c">C | D | + href="@url?action=choose&re=^(the )?d">D | E | + href="@url?action=choose&re=^(the )?e">E | F | + href="@url?action=choose&re=^(the )?f">F | G | + href="@url?action=choose&re=^(the )?g">G | H | + href="@url?action=choose&re=^(the )?h">H | I | + href="@url?action=choose&re=^(the )?i">I | J | + href="@url?action=choose&re=^(the )?j">J | K | + href="@url?action=choose&re=^(the )?k">K | L | + href="@url?action=choose&re=^(the )?l">L | M | + href="@url?action=choose&re=^(the )?m">M | N | + href="@url?action=choose&re=^(the )?n">N | O | + href="@url?action=choose&re=^(the )?o">O | P | + href="@url?action=choose&re=^(the )?p">P | Q | + href="@url?action=choose&re=^(the )?q">Q | R | + href="@url?action=choose&re=^(the )?r">R | S | + href="@url?action=choose&re=^(the )?s">S | T | + href="@url?action=choose&re=^(?!the [^t])t">T | U | + href="@url?action=choose&re=^(the )?u">U | V | + href="@url?action=choose&re=^(the )?v">V | W | + href="@url?action=choose&re=^(the )?w">W | X | + href="@url?action=choose&re=^(the )?x">X | Y | + href="@url?action=choose&re=^(the )?y">Y | Z | + href="@url?action=choose&re=^(the )?z">Z | * + href="@url?action=choose&re=^[^a-z]">*

} @@ -98,12 +98,15 @@ USA @label{search.search} + + @label{search.clear} +

@if{@ne{@arg{query}}{}} - { -@# There's a search query + {@# There's a search query @@ -131,11 +134,32 @@ USA } }
@label{heading.artist}
} - { -@# No search query + {@# No search query + +@# We have the following possible cases: +@# choose.which dir re result +@# choose "" - Ask for top level +@# choose "" present Ask for top level with re applied +@# choose present - Ask for dir +@# choose present re Ask for dir with re applied +@# choosealpha "" - Nothing +@# choosealpha "" present Ask for top level with re applied +@# choosealpha present - Ask for dir +@# choosealpha present re Ask for dir with re applied +@# +@# So in fact the only oddity is choosealpha + no dir + no re. +@# +@# NB we don't really bother distinguishing between re being empty or absent, +@# and the server deliberately cooperates in this. @# TODO navigation... +@#

dir=[@arg{dir}]
re=[@arg{re}]
which=@label{choose.which}

+ + @if{@or{@ne{@label{menu.choosewhich}}{choosealpha}} + {@ne{@arg{dir}}{}} + {@ne{@arg{re}}{}}} + {@#
@dirs{@arg{dir}}{@arg{re}}{ @@ -184,13 +208,13 @@ USA alt="@label{choose.allprefs}"> } + href="@url?action=play&dir=@urlquote{@arg{dir}}&back=@urlquote{@thisurl}"> @label{choose.playall}

}
- + } } @credits diff --git a/templates/options.labels b/templates/options.labels index ee9d8cc..a897b1f 100644 --- a/templates/options.labels +++ b/templates/options.labels @@ -110,8 +110,9 @@ label choose.play "Add track to queue" # for search page label search.title Search -# Text for search button +# Text for search buttons label search.search Search +label search.clear Clear # <TITLE> for about page label about.title "About DisOrder" -- [mdw]