X-Git-Url: https://git.distorted.org.uk/~mdw/disorder/blobdiff_plain/b43dc0cc5003562a37b52e744fd3d3e3b12b3c06..547553359fed90562714987654ce06feb9480cc8:/templates/choose.tmpl?ds=inline diff --git a/templates/choose.tmpl b/templates/choose.tmpl index 6277c12..fcba496 100644 --- a/templates/choose.tmpl +++ b/templates/choose.tmpl @@ -24,65 +24,65 @@ USA @stdmenu{choose} -

@label:choose.title@

+

@label{choose.title}

- @if{@eq{@label{sidebar.choosewhich}}{choosealpha}} + @if{@eq{@label{menu.choosewhich}}{choosealpha}} {

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]">*

} @@ -97,22 +97,69 @@ USA - + + + @label{search.clear} +

@if{@ne{@arg{query}}{}} - { -@# There's a search query - @search{@arg{query}}{ -

TODO @quote{@track}

- } - } - { -@# No search query + {@# There's a search query + + + + + + +@right{prefs}{ + } + + @search{@arg{query}}{ + + + + + + @right{prefs}{ + + } + } + } + {@# 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}}{ @@ -129,16 +176,16 @@ USA - + } } @credits