summaryrefslogtreecommitdiffstats
path: root/templates/show_search_bar.inc
diff options
context:
space:
mode:
authorKarl 'vollmerk' Vollmer <vollmer@ampache.org>2005-09-08 18:02:12 +0000
committerKarl 'vollmerk' Vollmer <vollmer@ampache.org>2005-09-08 18:02:12 +0000
commitbacb5b9a62c475d6583dd3cec87b169859a27335 (patch)
treec689672b42bd18d3ff344b1321158ed547fb563e /templates/show_search_bar.inc
parent23fdc1659cf38e895e76a4f0b4767221db464bfa (diff)
downloadampache-bacb5b9a62c475d6583dd3cec87b169859a27335.tar.gz
ampache-bacb5b9a62c475d6583dd3cec87b169859a27335.tar.bz2
ampache-bacb5b9a62c475d6583dd3cec87b169859a27335.zip
new search mojo, only song object type current works...
Diffstat (limited to 'templates/show_search_bar.inc')
-rw-r--r--templates/show_search_bar.inc42
1 files changed, 12 insertions, 30 deletions
diff --git a/templates/show_search_bar.inc b/templates/show_search_bar.inc
index 9b2e61f6..3429e0a0 100644
--- a/templates/show_search_bar.inc
+++ b/templates/show_search_bar.inc
@@ -30,7 +30,7 @@
*/
?>
-<form name="search" method="post" action="<?php echo conf('web_path'); ?>/search.php" enctype="multipart/form-data" style="Display:inline">
+<form name="search" method="post" action="<?php echo conf('web_path'); ?>/search.php" enctype="multipart/form-data" style="Display:inline">
<table class="tabledata" cellspacing="0" cellpadding="3" border="0" style="clear:both;" width="100%">
<tr class="table-header">
<td colspan="4"><b><?php echo _("Search Ampache"); ?>...</b></td>
@@ -38,39 +38,21 @@
<tr class="<?php echo flip_class(); ?>">
<td><input type="text" name="search_string" value="<?php echo $_REQUEST['search_string']; ?>" /></td>
<td>
- <?php
- $search_type = $_REQUEST['search_field'];
- if (isset($_REQUEST['search_field'])) {
- $search_field = $_REQUEST['search_field'];
- ${$search_field} = 1;
- } else {
- $search_field = conf('search_field');
- ${$search_field} = 1;
- }
-
- if (isset($_REQUEST['search_type'])) {
- $search_type = $_REQUEST['search_type'];
- ${$search_type} = 1;
- } else {
- $search_type = conf('search_type');
- ${$search_type} = 1;
- }
- ?>
- <select name="search_field">
- <option value="artist" <?php if ($artist) { echo 'selected="selected"'; } ?>>Artist</option>
- <option value="album" <?php if ($album) { echo 'selected="selected"'; } ?>>Album</option>
- <option value="song_title" <?php if ($song_title) { echo 'selected="selected"'; } ?>>Song Title</option>
- <option value="song_genre" <?php if ($song_genre) { echo 'selected="selected"'; } ?>>Song Genre</option>
- <option value="song_year" <?php if ($song_year) { echo 'selected="selected"'; } ?>>Song Year</option>
- <option value="song_bitrate" <?php if ($song_bitrate) { echo 'selected="selected"'; } ?>>Song Bitrate</option>
- <option value="song_min_bitrate" <?php if ($song_min_bitrate) { echo 'selected="selected"'; } ?>>Minimum Bitrate</option>
- <option value="song_filename" <?php if ($song_filename) { echo 'selected="selected"'; } ?>>Song Filename</option>
+ <select name="search_object[]">
+ <option value="title"><?php echo _("Song Title"); ?></option>
+ <option value="artist"><?php echo _("Artist"); ?></option>
+ <option value="album"><?php echo _("Album"); ?></option>
+ <option value="genre"><?php echo _("Song Genre"); ?></option>
+ <option value="year"><?php echo _("Song Year"); ?></option>
+ <option value="minbitrate"><?php echo _("Minimum Bitrate"); ?></option>
+ <option value="filename"><?php echo _("Filename"); ?></option>
</select>
</td>
<td>
<input class="button" type="submit" value="<?php echo _("Search"); ; ?>" />&nbsp;&nbsp;
- <input type="hidden" name="action" value="search" />
- <input type="hidden" name="search_type" value="fuzzy" />
+ <input type="hidden" name="action" value="quick_search" />
+ <input type="hidden" name="method" value="fuzzy" />
+ <input type="hidden" name="object_type" value="song" />
</td>
</tr>
</table>