initial genre browsing and improved artists/albums browse code (made it consistent)

3 files changed, 50 insertions, 5 deletions

diff --git a/templates/show_alphabet_form.inc.php b/templates/show_alphabet_form.inc.php
new file mode 100644
index 00000000..383683b6
--- /dev/null
+++ b/templates/show_alphabet_form.inc.php
@@ -0,0 +1,38 @@
+<?php
+/*
+
+ Copyright (c) 2001 - 2005 Ampache.org
+ All rights reserved.
+
+ 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.
+
+*/
+/*!
+ @header
+ A template file
+
+*/
+
+?>
+
+<form name="f" method="get" action="<?php echo conf('web_path') . "/$action"; ?>" enctype="multipart/form-data">
+	<label for="match" accesskey="S"><?php echo $text; ?>
+	<input type="text" size="3" id="match" name="match" value="<?php echo $match; ?>" />
+	<input type="hidden" name="action" value="match" />
+</form>
+<br />
+
+
+
diff --git a/templates/show_browse_menu.inc b/templates/show_browse_menu.inc
index 63b7b4fb..6edafcfe 100644
--- a/templates/show_browse_menu.inc
+++ b/templates/show_browse_menu.inc
@@ -34,7 +34,7 @@ $web_path = conf('web_path');
 $items = array(
 	        _("Artist")      => "$web_path/artists.php",
 		_("Albums")      => "$web_path/albums.php",
-		_("Genre")       => "$web_path/genres.php",
+		_("Genre")       => "$web_path/browse.php?action=genre",
         );
 
 ?>
@@ -42,7 +42,7 @@ $items = array(
 
 	<?php
 	foreach ( array_keys($items) as $item ) {
-		if ( $admin_highlight == $item ) {
+		if ( _($highlight) == $item ) {
         		echo "<li class=\"active\"><a class=\"active\" href=\"$items[$item]\">" . $item . "</a></li>\n";
 		}
 		else {
diff --git a/templates/show_genres.inc.php b/templates/show_genres.inc.php
index cf9faf72..a263e630 100644
--- a/templates/show_genres.inc.php
+++ b/templates/show_genres.inc.php
@@ -39,12 +39,19 @@ $total_items = $view->total_items;
 </tr>
 <?php 
 	foreach ($genres as $genre) { 
-
+		$genre->format_genre();
 ?>
-<tr>
+<tr class="<?php echo flip_class(); ?>">
 	<td><?php echo $genre->link; ?></td>
 	<td><?php echo $genre->get_song_count(); ?></td>
-	<td>Play | Download</td>
+	<td>
+		<?php echo _("Play"); ?>:
+		<a href="<?php echo $genre->play_link; ?>">All</a> 
+		|
+		<a href="<?php echo $genre->random_link; ?>">Random</a>
+		|
+		Download
+	</td>
 </tr>
 <? } // end foreach genres ?>
 <tr class="even" align="center">