diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-02-11 06:13:21 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-02-11 06:13:21 +0000 |
| commit | 949d7bb12fe9de9ccf3d2958bccde4354ab04d9b (patch) | |
| tree | 7228810d63f0823b1557b4b33ecd29f1bf194328 /templates | |
| parent | 66de7ffff1c95e5bb415f1c3b56966f2d9916864 (diff) | |
| download | ampache-949d7bb12fe9de9ccf3d2958bccde4354ab04d9b.tar.gz ampache-949d7bb12fe9de9ccf3d2958bccde4354ab04d9b.tar.bz2 ampache-949d7bb12fe9de9ccf3d2958bccde4354ab04d9b.zip | |
* Fixed xmlrpc, hopefully
* Added min count filter to browse by artist
* Fixed ratings to show yours, not average if rated
* other misc fixes
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/show_albums.inc.php (renamed from templates/show_albums.inc) | 0 | ||||
| -rw-r--r-- | templates/show_artists.inc.php (renamed from templates/show_artists.inc) | 21 | ||||
| -rw-r--r-- | templates/show_confirm_action.inc.php | 32 |
3 files changed, 8 insertions, 45 deletions
diff --git a/templates/show_albums.inc b/templates/show_albums.inc.php index b24804b1..b24804b1 100644 --- a/templates/show_albums.inc +++ b/templates/show_albums.inc.php diff --git a/templates/show_artists.inc b/templates/show_artists.inc.php index 4e2cef72..7b1176b6 100644 --- a/templates/show_artists.inc +++ b/templates/show_artists.inc.php @@ -1,7 +1,7 @@ <?php /* - Copyright (c) 2001 - 2006 Ampache.org + Copyright (c) 2001 - 2007 Ampache.org All rights reserved. This program is free software; you can redistribute it and/or @@ -18,11 +18,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/*! - @header Show Artists - Shows multiple artists.... takes an array of artist objects - -*/ $web_path = conf('web_path'); // Build array of the table classes we are using @@ -37,7 +32,7 @@ $total_items = $view->total_items; </tr> <tr class="table-header"> <td> - <a href="<?php echo $web_path; ?>/<?php echo $_SESSION['view_script']; ?>?action=<?php echo $_REQUEST['action']; ?>&keep_view=true&sort_type=artist.name&sort_order=0"> <?php echo _("Artist"); ?> </a> + <a href="<?php echo $web_path; ?>/<?php echo $_SESSION['view_script']; ?>?action=<?php echo $_REQUEST['action']; ?>&keep_view=true&sort_type=artist.name&sort_order=0"> <?php echo _('Artist'); ?> </a> </td> <td> <?php echo _('Songs'); ?> </td> <td> <?php echo _('Albums'); ?> </td> @@ -48,18 +43,18 @@ $total_items = $view->total_items; //FIXME: These should come in as objects... foreach ($artists as $artist) { ?> <tr class="<?php echo flip_class(); ?>"> - <td><?php echo $artist['name']; ?></td> - <td><?php echo $artist['songs']; ?></td> - <td><?php echo $artist['albums']; ?></td> + <td><?php echo $artist->f_name; ?></td> + <td><?php echo $artist->songs; ?></td> + <td><?php echo $artist->albums; ?></td> <td nowrap="nowrap"> - <a href="<?php echo $web_path; ?>/song.php?action=artist&artist_id=<?php echo $artist['id']; ?>"> + <a href="<?php echo $web_path; ?>/song.php?action=artist&artist_id=<?php echo $artist->id; ?>"> <?php echo get_user_icon('all'); ?> </a> - <a href="<?php echo $web_path; ?>/song.php?action=artist_random&artist_id=<?php echo $artist['id']; ?>"> + <a href="<?php echo $web_path; ?>/song.php?action=artist_random&artist_id=<?php echo $artist->id; ?>"> <?php echo get_user_icon('random'); ?> </a> <?php if ($GLOBALS['user']->has_access(100)) { ?> - <a href="<?php echo $web_path; ?>/admin/flag.php?action=show_edit_artist&artist_id=<?php echo $artist['id']; ?>"> + <a href="<?php echo $web_path; ?>/admin/flag.php?action=show_edit_artist&artist_id=<?php echo $artist->id; ?>"> <?php echo get_user_icon('edit'); ?> </a> <?php } ?> diff --git a/templates/show_confirm_action.inc.php b/templates/show_confirm_action.inc.php deleted file mode 100644 index bef0e8db..00000000 --- a/templates/show_confirm_action.inc.php +++ /dev/null @@ -1,32 +0,0 @@ -<?php -/* - - Copyright (c) 2001 - 2006 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. -*/ -?> - -<br /> -<div class="text-box" style="margin-right:25%;text-align:center;margin-left:25%;"> -<form name="confirm" method="post" action="<?php echo $web_path; ?>/<?php echo $script; ?>?<?php echo $arg; ?>" enctype="multipart/form-data"> - <p><?php echo $text; ?></p> - <p> - <input type="submit" name="confirm" value="<?php echo _("Yes"); ?>" /> - <input type="submit" name="confirm" value="<?php echo _("No"); ?>" /> - </p> -</form> -</div> |