diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2005-12-18 03:04:59 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2005-12-18 03:04:59 +0000 |
| commit | 0154f3736070c0847c5912dca88954b6bebe6001 (patch) | |
| tree | bb40a15d7d9b475f5ff5c0ed85d32a6e932d1428 /templates | |
| parent | 1ce04520cdadbc03726da96608a8b5bbb20ee95a (diff) | |
| download | ampache-0154f3736070c0847c5912dca88954b6bebe6001.tar.gz ampache-0154f3736070c0847c5912dca88954b6bebe6001.tar.bz2 ampache-0154f3736070c0847c5912dca88954b6bebe6001.zip | |
added ability to rename/merge artists thx spcombs
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/show_artist.inc | 4 | ||||
| -rw-r--r-- | templates/show_install_config.inc | 2 | ||||
| -rw-r--r-- | templates/show_rename_artist.inc.php (renamed from templates/show_rename_artist.php.inc) | 28 |
3 files changed, 15 insertions, 19 deletions
diff --git a/templates/show_artist.inc b/templates/show_artist.inc index 4d948707..bb3f6f51 100644 --- a/templates/show_artist.inc +++ b/templates/show_artist.inc @@ -23,6 +23,7 @@ //FIXME: I don't like having to re-create this friggin object.. :( global $user; $artist_id = $artist->id; +$web_path = conf('web_path'); ?> <br /> <table class="text-box"> @@ -34,7 +35,8 @@ $artist_id = $artist->id; <li><a href="<?php print $web_path; ?>/song.php?action=m3u&artist=<?php print $artist_id; ?>"><?php print _("Play All Songs By") . " " . $artist->full_name; ?></a></li> <li><a href="<?php print $web_path; ?>/song.php?action=m3u&artist_random=<?php print $artist_id; ?>"><?php print _("Play Random Songs By") . " " . $artist->full_name; ?></a></li> <?php if ($user->has_access('100')) { ?> - <li><a href="<?php print $web_path; ?>/artists.php?action=update_from_tags&artist=<?php print $artist_id; ?>"><?php print _("Update from tags"); ?></a></li> + <li><a href="<?php echo $web_path; ?>/artists.php?action=update_from_tags&artist=<?php print $artist_id; ?>"><?php print _("Update from tags"); ?></a></li> + <li><a href="<?php echo $web_path; ?>/artists.php?action=show_rename&artist=<?php echo $artist_id; ?>"><?php echo _("Rename Artist"); ?></a></li> <?php } ?> </ul> </td> diff --git a/templates/show_install_config.inc b/templates/show_install_config.inc index fda681d3..2f58215d 100644 --- a/templates/show_install_config.inc +++ b/templates/show_install_config.inc @@ -104,7 +104,7 @@ <?php echo _("Ampache.cfg.php Configured?"); ?> </td> <td valign="top">[ - <? + <?php $results = read_config($configfile, 0, 0); if (!check_config_values($results)) { $status['parse_config'] = 'false'; diff --git a/templates/show_rename_artist.php.inc b/templates/show_rename_artist.inc.php index cc99ec96..17ee4eda 100644 --- a/templates/show_rename_artist.php.inc +++ b/templates/show_rename_artist.inc.php @@ -26,34 +26,28 @@ } </script> -<form name="rename_artist" method="post" action="<?php echo conf('web_path'); ?>/artists.php?action=rename&artist=<?php echo $artist->id; ?>"> -<table class="text-box"> -<tr class="table-header"> - <th colspan="3"> - <?php echo _("Renaming") . " " . $artist->name; ?> +<form name="rename_artist" method="post" action="<?php echo conf('web_path'); ?>/artists.php?action=rename&artist=<?php echo $artist->id; ?>" style="Display:inline;"> +<table class="text-box" cellspacing="0"> +<tr> + <th align="left"> + <span class="header2"><?php echo _("Rename") . " " . $artist->name . " " . _("to"); ?></span> </th> </tr> -<tr class="odd"> - <td> - <?php echo _("New name"); ?> - </td> +<tr> <td> <?php show_artist_pulldown($artist->id,"artist_id",4); ?> <br /> <?php echo _("OR"); ?><br /> - <input type="text" name="artist_name" size="30" value=<?php echo scrub_out($_REQUEST['artist_name']); ?>" id="artist_name" /> - <a href="javascript:insert()"><?php echo _("Insert current"); ?></a> + <input type="text" name="artist_name" size="30" value="<?php echo scrub_out($_REQUEST['artist_name']); ?>" id="artist_name" /> + <a href="javascript:insert()">[<?php echo _("Insert current"); ?>]</a> <?php $GLOBALS['error']->print_error('artist_name'); ?> </td> </tr> -<tr class="even"> - <td> </td> +<tr> <td><input type="checkbox" name="update_id3" value="1" /> <?php echo _("Update id3 tags"); ?></td> - <td> </td> </tr> -<tr class="odd"> - <td> </td> - <td colspan="2"> +<tr> + <td> <input type="submit" value="<?php echo _("Rename"); ?>" /> </td> </tr> |