chiark
/
gitweb
/
~mdw
/
disorder
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge fixes up to 3.0.1
[disorder]
/
templates
/
search.html
diff --git
a/templates/search.html
b/templates/search.html
index f4a7ece8266ceb0637513cda8263ce61cd276d60..1b0fa1ce282bb979502cc150eb11b087b2fea22d 100644
(file)
--- a/
templates/search.html
+++ b/
templates/search.html
@@
-1,7
+1,7
@@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
<!--
This file is part of DisOrder.
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01//EN">
<!--
This file is part of DisOrder.
-Copyright (C) 2003, 2004, 2005 Richard Kettlewell
+Copyright (C) 2003, 2004, 2005
, 2007, 2008
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
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
@@
-24,34
+24,34
@@
USA
<title>@label:search.title@</title>
</head>
<body>
<title>@label:search.title@</title>
</head>
<body>
-@include{
@label{menu}@
}@
- <h1
class=title
>@label:search.title@</h1>
+@include{
topbar
}@
+ <h1>@label:search.title@</h1>
<form class=search action="@url@" method=POST
enctype="multipart/form-data" accept-charset=utf-8>
<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@"
<input class=query name=query type=text value="@arg:query@"
- size=
32
>
- <button class=search name=
action type=submit value=search
>
+ size=
50
>
+ <button class=search name=
submit type=submit
>
@label:search.search@
</button>
@label:search.search@
</button>
- <input name=
nonce type=hidden value="@nonce@"
>
-
</div
>
+ <input name=
action type=hidden value=search
>
+
</p
>
</form>
<div class=searchresults>
@search{artist}{display}{
<div class="search_artist">
</form>
<div class=searchresults>
@search{artist}{display}{
<div class="search_artist">
- <p
class="search_artist"
>Artist:
+ <p>Artist:
<span class="search_artist">@part:artist@</span></p>
@search{album}{display}{
<div class="search_album">
<span class="search_artist">@part:artist@</span></p>
@search{album}{display}{
<div class="search_album">
- <p
class="search_album"
>Album:
+ <p>Album:
<span class="search_album">@part:album@</span></p>
@search{title}{
<div class="search_title">
<span class="search_album">@part:album@</span></p>
@search{title}{
<div class="search_title">
- <p
class="search_title"
>Title:
- <a href="@url@
/?action=play&file=@urlquote{@file@}@&back=@urlquote{@thisurl@}@&nonce=@nonce
@">@part:title@</a>
+ <p>Title:
+ <a href="@url@
?action=play&file=@urlquote{@file@}@&back=@urlquote{@thisurl@}
@">@part:title@</a>
@if{@eq{@trackstate{@file@}@}{playing}@}{[<b>playing</b>]}@
@if{@eq{@trackstate{@file@}@}{queued}@}{[<b>queued</b>]}@
</p>
@if{@eq{@trackstate{@file@}@}{playing}@}{[<b>playing</b>]}@
@if{@eq{@trackstate{@file@}@}{queued}@}{[<b>queued</b>]}@
</p>
@@
-63,7
+63,7
@@
USA
}@
</div>
}@
</div>
-@include{
@label{menu}@
end}@
+@include{
topbar
end}@
</body>
</html>
@@
</body>
</html>
@@