X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/blobdiff_plain/fdf98378d2d8c8550661f657d30ec5186ff642f1..3225872d0e0435d868c364f074edafb1e3f8e45e:/templates/topbar.html

diff --git a/templates/topbar.html b/templates/topbar.html
index 3776234..be9beb8 100644
--- a/templates/topbar.html
+++ b/templates/topbar.html
@@ -3,36 +3,46 @@
  href="@url@"
  title="@label:sidebar.playingverbose@">@label:sidebar.playing@</a>
   <a class=@if{@eq{@action@}{recent}@}{activemenu}{inactivemenu}@
- href="@url@?action=recent&amp;nonce=@nonce@"
+ href="@url@?action=recent"
  title="@label:sidebar.recentverbose@">@label:sidebar.recent@</a>
   <a class=@if{@eq{@action@}{new}@}{activemenu}{inactivemenu}@
- href="@url@?action=new&amp;nonce=@nonce@"
+ href="@url@?action=new"
  title="@label:sidebar.newverbose@">@label:sidebar.new@</a>
+@right{play}{
   <a class=@if{@or{@eq{@action@}{choose}@}
                   {@eq{@action@}{choosealpha}@}@}
               {activemenu}
               {inactivemenu}@
- href="@url@?action=@label:sidebar.choosewhich@&amp;nonce=@nonce@"
- title="@label:sidebar.chooseverbose@">@label:sidebar.choose@</a>
+ href="@url@?action=@label:sidebar.choosewhich@"
+ title="@label:sidebar.chooseverbose@">@label:sidebar.choose@</a>}{
+  <span class=invalidmenu
+   title="@label:sidebar.chooseverbose@">@label:sidebar.choose@</span>}@
+@right{play}{
   <a class=@if{@eq{@action@}{search}@}{activemenu}{inactivemenu}@
- href="@url@?action=search&amp;nonce=@nonce@"
- title="@label:sidebar.searchverbose@">@label:sidebar.search@</a>
+ href="@url@?action=search"
+ title="@label:sidebar.searchverbose@">@label:sidebar.search@</a>}{
+  <span class=invalidmenu
+   title="@label:sidebar.searchverbose@">@label:sidebar.search@</span>}@
 <!-- disabled by default since now available from 'manage'
   <a class=@if{@eq{@action@}{volume}@}{activemenu}{inactivemenu}@
- href="@url@?action=volume&amp;nonce=@nonce@"
+ href="@url@?action=volume"
  title="@label:sidebar.volumeverbose@">@label:sidebar.volume@</a>
 -->
   <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}@
- href="@url@?action=login&amp;nonce=@nonce@"
+  <a class=@if{@or{@eq{@action@}{login}@}
+                  {@eq{@action@}{logout}@}
+                  {@eq{@action@}{register}@}
+                  {@eq{@action@}{reminder}@}
+                  {@eq{@action@}{edituser}@}@}{activemenu}{inactivemenu}@
+ href="@url@?action=login"
  title="@label:sidebar.loginverbose@">@label:sidebar.login@</a>
   <a class=@if{@eq{@action@}{help}@}{activemenu}{inactivemenu}@
- href="@url@?action=help&amp;nonce=@nonce@"
+ href="@url@?action=help"
  title="@label:sidebar.helpverbose@">@label:sidebar.help@</a>
   <a class=@if{@eq{@action@}{about}@}{activemenu}{inactivemenu}@
- href="@url@?action=about&amp;nonce=@nonce@"
+ href="@url@?action=about"
  title="@label:sidebar.aboutverbose@">@label:sidebar.about@</a>
 </p>
 <hr>