albums and artists now have ratings

7 files changed, 12 insertions, 3 deletions

diff --git a/docs/CHANGELOG b/docs/CHANGELOG
index 833f8e33..ae4e480a 100755
--- a/docs/CHANGELOG
+++ b/docs/CHANGELOG
@@ -4,6 +4,7 @@
 
 --------------------------------------------------------------------------
   v.3.4-Beta3 
+	- Added Ratings links to Browse Albums and Browse Artist
 	- Fixed seeking on random track, giving you a new track every	
 		seek 
 	- Added additional error reporting if localplay access / config
diff --git a/templates/show_album_row.inc.php b/templates/show_album_row.inc.php
index 8a2b7be7..56a08091 100644
--- a/templates/show_album_row.inc.php
+++ b/templates/show_album_row.inc.php
@@ -37,6 +37,7 @@
 <td class="cel_artist"><?php echo $album->f_artist_link; ?></td>
 <td class="cel_songs"><?php echo $album->song_count; ?></td>
 <td class="cel_year"><?php echo $album->year; ?></td>
+<td class="cel_rating" id="rating_<?php echo $album->id; ?>_album"><?php Rating::show($album->id,'album'); ?></td>
 <td class="cel_action">
 	<?php if (Config::get('shoutbox')) { ?>
 		<a href="<?php echo Config::get('web_path'); ?>/shout.php?action=show_add_shout&amp;type=album&amp;id=<?php echo $album->id; ?>">
diff --git a/templates/show_albums.inc.php b/templates/show_albums.inc.php
index 7c1bab45..cea21087 100644
--- a/templates/show_albums.inc.php
+++ b/templates/show_albums.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2007 Ampache.org
+ Copyright (c) Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -32,6 +32,7 @@ $ajax_url = Config::get('ajax_url');
   <col id="col_artist" />
   <col id="col_songs" />
   <col id="col_year" />
+  <col id="col_rating" />
   <col id="col_action" />
 </colgroup>
 <tr class="th-top">
@@ -43,6 +44,7 @@ $ajax_url = Config::get('ajax_url');
 	<th class="cel_artist"><?php echo _('Artist'); ?></th>
 	<th class="cel_songs"><?php echo _('Songs'); ?></th>
 	<th class="cel_year"><?php echo Ajax::text('?page=browse&action=set_sort&sort=year',_('Year'),'album_sort_year'); ?></th>
+	<th class="col_rating"><?php echo _('Rating'); ?></th>
 	<th class="cel_action"><?php echo _('Actions'); ?></th>
 </tr>
 <?php 
@@ -69,6 +71,7 @@ $ajax_url = Config::get('ajax_url');
 	<th class="cel_artist"><?php echo _('Artist'); ?></th>
 	<th class="cel_songs"><?php echo _('Songs'); ?></th>
 	<th class="cel_year"><?php echo Ajax::text('?page=browse&action=set_sort&sort=year',_('Year'),'album_sort_year_bottom'); ?></th>
+	<th class="col_rating"><?php echo _('Rating'); ?></th>
 	<th class="cel_action"><?php echo _('Actions'); ?></th>
 </tr>
 </table>
diff --git a/templates/show_artist_row.inc.php b/templates/show_artist_row.inc.php
index e20ccfd9..00f2ac6e 100644
--- a/templates/show_artist_row.inc.php
+++ b/templates/show_artist_row.inc.php
@@ -26,6 +26,7 @@
 <td class="cel_artist"><?php echo $artist->f_name_link; ?></td>
 <td class="cel_songs"><?php echo $artist->songs; ?></td>
 <td class="cel_albums"><?php echo $artist->albums; ?></td>
+<td class="cel_rating" id="rating_<?php echo $artist->id; ?>_artist"><?php Rating::show($artist->id,'artist'); ?></td>
 <td class="cel_action">
 <?php if (Access::check_function('batch_download')) { ?>
 	<a href="<?php echo Config::get('web_path'); ?>/batch.php?action=artist&amp;id=<?php echo $artist->id; ?>">
diff --git a/templates/show_artists.inc.php b/templates/show_artists.inc.php
index a7d908a0..9e80363d 100644
--- a/templates/show_artists.inc.php
+++ b/templates/show_artists.inc.php
@@ -28,6 +28,7 @@ $web_path = Config::get('web_path');
   <col id="col_artist" />
   <col id="col_songs" />
   <col id="col_albums" />
+  <col id="col_rating" />
   <col id="col_action" />
 </colgroup>
 <tr class="th-top">
@@ -35,6 +36,7 @@ $web_path = Config::get('web_path');
 	<th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Artist'),'artist_sort_name'); ?></th>
 	<th class="cel_songs"> <?php echo _('Songs');  ?> </th>
 	<th class="cel_albums"> <?php echo _('Albums'); ?> </th>
+	<th class="cel_rating"> <?php echo _('Rating'); ?> </th>
 	<th class="cel_action"> <?php echo _('Action'); ?> </th>
 </tr>
 <?php 
@@ -57,6 +59,7 @@ foreach ($object_ids as $artist_id) {
 	<th class="cel_artist"><?php echo Ajax::text('?page=browse&action=set_sort&sort=name',_('Artist'),'artist_sort_name_bottom'); ?></th>
 	<th class="cel_songs"> <?php echo _('Songs');  ?> </th>
 	<th class="cel_albums"> <?php echo _('Albums'); ?> </th>
+	<th class="cel_rating"> <?php echo _('Rating'); ?> </th>
 	<th class="cel_action"> <?php echo _('Action'); ?> </th>
 </tr>
 </table>
diff --git a/templates/show_song_row.inc.php b/templates/show_song_row.inc.php
index 492fff9f..1dc3d1ed 100644
--- a/templates/show_song_row.inc.php
+++ b/templates/show_song_row.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2007 Ampache.org
+ Copyright (c) Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
diff --git a/templates/show_songs.inc.php b/templates/show_songs.inc.php
index 91ce1ce9..2e3c3579 100644
--- a/templates/show_songs.inc.php
+++ b/templates/show_songs.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2007 Ampache.org
+ Copyright (c) Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or