Included at the end of the main content \fB<DIV>\fR element.
.TP
.B topbar.html
-Included at the start of the \fB<BODY>\fR element. (This supplants
-\fBsidebar.html\fR, though the latter is still available; override label
-\fBmenu\fR to choose between them.)
+Included at the start of the \fB<BODY>\fR element.
+.TP
+.B topbarend.html
+Included at the end of the \fB<BODY>\fR element.
.TP
.B stdhead.html
Included in the \fB<HEAD>\fR element.
pkgdata_DATA=about.html choose.html credits.html playing.html recent.html \
stdhead.html stylesheet.html search.html about.html volume.html \
- sidebar.html prefs.html help.html choosealpha.html topbar.html \
- sidebarend.html topbarend.html error.html new.html login.html \
+ prefs.html help.html choosealpha.html topbar.html \
+ topbarend.html error.html new.html login.html \
options options.labels \
options.columns
static_DATA=disorder.css
<title>@label:about.title@</title>
</head>
<body>
-@include{@label{menu}@}@
+@include{topbar.html}@
<h1 class=title>@label:about.title@</h1>
<h2>Copyright</h2>
@stats@
-@include{@label{menu}@end}@
+@include{topbarend}@
</body>
</html>
@@
<title>@label:choose.title@</title>
</head>
<body>
-@include{@label{menu}@}@
+@include{topbar}@
<h1 class=title>@label:choose.title@</h1>
@if{@ne{@arg:directory@}{}@}{
</p>
}@
-@include{@label{menu}@end}@
+@include{topbarend}@
</body>
</html>
@@
<title>@label:choose.title@</title>
</head>
<body>
-@include{@label{menu}@}@
+@include{topbar}@
<h1 class=title>@label:choose.title@</h1>
<p class=choosealpha>
<a class=choosealpha href="@url@?action=choose&regexp=^[^a-z]">*</a>
</p>
-@include{@label{menu}@end}@
+@include{topbarend}@
</body>
</html>
@@
<title>@label:error.title@</title>
</head>
<body>
-@include{@label{menu}@}@
+@include{topbar}@
<h1 class=title>@label:error.title@</h1>
<p>@label{error.@label:error@}@</p>
<p>@label:error.generic@</p>
-@include{@label{menu}@end}@
+@include{topbarend}@
</body>
</html>
@@
<title>@label{help.title}@</title>
</head>
<body>
-@include{@label{menu}@}@
+@include{topbar}@
<h1 class=title>@label{help.title}@</h1>
<h2 class=sidebarlink><a name=playing>Playing</a></h2>
</div>
-@include{@label{menu}@end}@
+@include{topbarend}@
</div>
</body>
</html>
<title>@label:login.title@</title>
</head>
<body>
-@include{@label{menu}@}@
+@include{topbar}@
<h1 class=title>@label:login.title@</h1>
@if{@ne{@label:error@}{error}@}{
}@
-@include{@label{menu}@end}@
+@include{topbarend}@
</body>
</html>
@@
<title>@label:new.title@</title>
</head>
<body>
-@include{@label{menu}@}@
+@include{topbar}@
<h1 class=title>@label:new.title@</h1>
@#{only display the table if there is something to put in it}@
</table>
}@
-@include{@label{menu}@end}@
+@include{topbarend}@
</body>
</html>
@@
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).
<title>@if{@isplaying@}{@playing{@part:title@}@}{@label:playing.title@}@</title>
</head>
<body>
-@include{@label{menu}@}@
+@include{topbar}@
<h1 class=title>@label:playing.title@</h1>
@#{extra control buttons for the management page}@
</table>
}@
-@include{@label{menu}@end}@
+@include{topbarend}@
</body>
</html>
@@
<title>@label:prefs.title@</title>
</head>
<body>
-@include{@label{menu}@}@
+@include{topbar}@
<h1 class=title>@label:prefs.title@</h1>
<form class=prefs action="@url@" method=POST
</p>
</form>
-@include{@label{menu}@end}@
+@include{topbarend}@
</body>
</html>
@@
<title>@label:recent.title@</title>
</head>
<body>
-@include{@label{menu}@}@
+@include{topbar}@
<h1 class=title>@label:recent.title@</h1>
@#{only display the table if there is something to put in it}@
</table>
}@
-@include{@label{menu}@end}@
+@include{topbarend}@
</body>
</html>
@@
<title>@label:search.title@</title>
</head>
<body>
-@include{@label{menu}@}@
+@include{topbar}@
<h1 class=title>@label:search.title@</h1>
<form class=search action="@url@" method=POST
}@
</div>
-@include{@label{menu}@end}@
+@include{topbarend}@
</body>
</html>
@@
+++ /dev/null
-<div id=sidebar>
- <p class=sidebarlink>
- <a class=sidebarlink href="@url@">@label:sidebar.playing@</a>
- </p>
- <p class=sidebarlink>
- <a class=sidebarlink href="@url@?action=recent&nonce=@nonce@">@label:sidebar.recent@</a>
- </p>
- <p class=sidebarlink>
- <a class=sidebarlink href="@url@?action=new&nonce=@nonce@">@label:sidebar.new@</a>
- </p>
- <p class=sidebarlink>
- <a class=sidebarlink href="@url@?action=@label:sidebar.choosewhich@&nonce=@nonce@">@label:sidebar.choose@</a>
- </p>
- <p class=sidebarlink>
- <a class=sidebarlink href="@url@?action=search&nonce=@nonce@">@label:sidebar.search@</a>
- </p>
- <p class=sidebarlink>
- <a class=sidebarlink href="@url@?action=volume&nonce=@nonce@">@label:sidebar.volume@</a>
- </p>
- <p class=sidebarlink>
- <a class=sidebarlink href="@url@?mgmt=true">@label:sidebar.manage@</a>
- </p>
- <p class=sidebarlink>
- <a class=sidebarlink href="@url@?action=login&nonce=@nonce@">@label:sidebar.login@</a>
- </p>
- <p class=sidebarlink>
- <a class=sidebarlink href="@url@?action=help&nonce=@nonce@">@label:sidebar.help@</a>
- </p>
- <p class=sidebarlink>
- <a class=sidebarlink href="@url@?action=about&nonce=@nonce@">@label:sidebar.about@</a>
- </p>
-</div>
-<div id=content>
-@@
-<!--
-This file is part of DisOrder.
-Copyright (C) 2004, 2005, 2007 Richard Kettlewell
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA
--->
+++ /dev/null
-@include:credits@
-</div>
-@@
-<!--
-This file is part of DisOrder.
-Copyright (C) 2005 Richard Kettlewell
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-General Public License for more details.
-
-You should have received a copy of the GNU General Public License
-along with this program; if not, write to the Free Software
-Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
-USA
--->
<title>@label:volume.title@</title>
</head>
<body>
-@include{@label{menu}@}@
+@include{topbar}@
<h1 class=title>@label:volume.title@</h1>
<form class=volume action="@url@" method=POST>
</p>
</form>
-@include{@label{menu}@end}@
+@include{topbarend}@
</body>
</html>
@@
~mdw / disorder / commitdiff