diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-07-01 23:51:41 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-07-01 23:51:41 +0000 |
| commit | 4d4712f34166a9138c6c2f627187bfcccbddd169 (patch) | |
| tree | 0207890fc425095acad08db9d1ec64620a284ced /templates | |
| parent | c78314791e6b84945f693720c33fcdf9a4ba324f (diff) | |
| download | ampache-4d4712f34166a9138c6c2f627187bfcccbddd169.tar.gz ampache-4d4712f34166a9138c6c2f627187bfcccbddd169.tar.bz2 ampache-4d4712f34166a9138c6c2f627187bfcccbddd169.zip | |
bunch of minor fixes and a db change
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/show_adds_catalog.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_artist_box.inc.php | 12 | ||||
| -rw-r--r-- | templates/show_edit_catalog.inc.php | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/templates/show_adds_catalog.inc.php b/templates/show_adds_catalog.inc.php index 14844aaf..6031ef65 100644 --- a/templates/show_adds_catalog.inc.php +++ b/templates/show_adds_catalog.inc.php @@ -22,6 +22,6 @@ show_box_top(); echo "\n" . _('Starting New Song Search on') . " <b>[$this->name]</b> " . _('catalog') . "<br />\n"; echo _('Found') . ": <span id=\"add_count_" . $this->id ."\">" . _('None') . "</span><br />\n"; -echo _('Reading') . ":<span id=\"add_dir_$catalog_id\"></span><br />"; +echo _('Reading') . ":<span id=\"add_dir_" . $this->id . "\"></span><br />"; show_box_bottom(); ?> diff --git a/templates/show_artist_box.inc.php b/templates/show_artist_box.inc.php index cf3d71e6..d75c116e 100644 --- a/templates/show_artist_box.inc.php +++ b/templates/show_artist_box.inc.php @@ -29,12 +29,12 @@ if (Config::get('ratings')) { echo "</span>"; } // end if ratings ?> <strong><?php echo _('Actions'); ?>:</strong><br /> -<a href="<?php echo $web_path; ?>/artists.php?action=show_all_songs&artist=<?php echo $artist_id; ?>"><?php echo _("Show All Songs By") . " " . $artist->full_name; ?></a><br /> -<a href="<?php echo $web_path; ?>/song.php?action=artist&artist_id=<?php echo $artist_id; ?>"><?php echo _("Play All Songs By") . " " . $artist->full_name; ?></a><br /> -<a href="<?php echo $web_path; ?>/song.php?action=artist_random&artist_id=<?php echo $artist_id; ?>"><?php echo _("Play Random Songs By") . " " . $artist->full_name; ?></a><br /> +<a href="<?php echo $web_path; ?>/artists.php?action=show_all_songs&artist=<?php echo $artist->id; ?>"><?php echo _("Show All Songs By") . " " . $artist->full_name; ?></a><br /> +<a href="<?php echo $web_path; ?>/stream.php?action=artist&artist_id=<?php echo $artist->id; ?>"><?php echo _("Play All Songs By") . " " . $artist->full_name; ?></a><br /> +<a href="<?php echo $web_path; ?>/stream.php?action=artist_random&artist_id=<?php echo $artist->id; ?>"><?php echo _("Play Random Songs By") . " " . $artist->full_name; ?></a><br /> <?php if ($GLOBALS['user']->has_access('100')) { ?> - <a href="<?php echo $web_path; ?>/artists.php?action=update_from_tags&artist=<?php echo $artist_id; ?>"><?php echo _("Update from tags"); ?></a><br /> - <a href="<?php echo $web_path; ?>/artists.php?action=show_rename&artist=<?php echo $artist_id; ?>"><?php echo _("Rename Artist"); ?></a><br /> - <a href="<?php echo $web_path; ?>/artists.php?action=show_similar&artist=<?php echo $artist_id; ?>"><?php echo _("Find duplicate artists"); ?></a><br /> + <a href="<?php echo $web_path; ?>/artists.php?action=update_from_tags&artist=<?php echo $artist->id; ?>"><?php echo _("Update from tags"); ?></a><br /> + <a href="<?php echo $web_path; ?>/artists.php?action=show_rename&artist=<?php echo $artist->id; ?>"><?php echo _("Rename Artist"); ?></a><br /> + <a href="<?php echo $web_path; ?>/artists.php?action=show_similar&artist=<?php echo $artist->id; ?>"><?php echo _("Find duplicate artists"); ?></a><br /> <?php } ?> <?php show_box_bottom(); ?> diff --git a/templates/show_edit_catalog.inc.php b/templates/show_edit_catalog.inc.php index aaa3e950..efd406ae 100644 --- a/templates/show_edit_catalog.inc.php +++ b/templates/show_edit_catalog.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 @@ -20,7 +20,7 @@ */ ?> <?php show_box_top(_('Settings for') . ' ' . $catalog->name . ' (' . $catalog->path . ')'); ?> -<form method="post" action="<?php echo conf('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data"> +<form method="post" action="<?php echo Config::get('web_path'); ?>/admin/catalog.php" enctype="multipart/form-data"> <table cellspacing="0" cellpadding="0" border="0"> <tr> <td><?php echo _('Name'); ?>:</td> |