yetangitu/ampache
1
0
Fork 0
mirror of https://github.com/Yetangitu/ampache synced 2025-10-03 09:49:30 +02:00
Code Issues Releases Wiki Activity

added link from now playing to the lyrics

Browse source
This commit is contained in:
dipsol 2009-05-26 13:24:58 +00:00
parent 2130244323
commit 25fab47331
3 changed files with 105 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

42
song.php
View file

@ -21,18 +21,19 @@
require 'lib/init.php';
show_header();
show_header();
$show_lyrics = Config::get('show_lyrics');
// Switch on Action
switch ($_REQUEST['action']) {
default:
case 'show_song':
$song = new Song($_REQUEST['song_id']);
$song->format();
$song->fill_ext_info();
require_once Config::get('prefix') . '/templates/show_song.inc.php';
switch ($_REQUEST['action']) {
default:
case 'show_song':
$song = new Song($_REQUEST['song_id']);
$song->format();
$song->fill_ext_info();
require_once Config::get('prefix') . '/templates/show_song.inc.php';
// does user want to display lyrics?
$show_lyrics = Config::get('show_lyrics');
if($show_lyrics == 1) {
$lyric = new Artist();
$return = $lyric->get_song_lyrics($song->id, ucwords($song->f_artist), ucwords($song->title));
@ -42,9 +43,26 @@ switch ($_REQUEST['action']) {
$link .= "</a><br /><br />";
require_once Config::get('prefix') . '/templates/show_lyrics.inc.php';
}
break;
} // end data collection
break;
case 'show_lyrics':
if($show_lyrics == 1) {
$song = new Song($_REQUEST['song_id']);
$song->format();
$song->fill_ext_info();
require_once Config::get('prefix') . '/templates/show_lyrics_song.inc.php';
show_footer();
// get the lyrics
$show_lyrics = Config::get('show_lyrics');
$lyric = new Artist();
$return = $lyric->get_song_lyrics($song->id, ucwords($song->f_artist), ucwords($song->title));
$link = '<a href="http://lyricwiki.org/' . rawurlencode(ucwords($song->f_artist)) . ':' . rawurlencode(ucwords($song->title)) . '" target="_blank">';
/* HINT: Artist, Song Title */
$link .= sprintf(_('%1$s - %2$s Lyrics Detail'), ucwords($song->f_artist), ucwords($song->title));
$link .= "</a><br /><br />";
require_once Config::get('prefix') . '/templates/show_lyrics.inc.php';
}
} // end data collection
show_footer();
?>

65
templates/show_lyrics_song.inc.php Normal file
View file

@ -0,0 +1,65 @@
<?php
/*
Copyright (c) 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 v2
as published by the Free Software Foundation.
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.
*/
show_box_top($song->title);
/* Prepare the variables */
$title = scrub_out(truncate_with_ellipsis($song->title));
$album = scrub_out(truncate_with_ellipsis($song->f_album_full));
$artist = scrub_out(truncate_with_ellipsis($song->f_artist_full));
?>
<div class="np_group">
<?php if (Config::get('show_album_art')) { ?>
<div class="np_cell cel_albumart">
<a target="_blank" href="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>" onclick="popup_art('<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>'); return false;">
<img align="middle" src="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;thumb=1&amp;sid=<?php echo session_id(); ?>" alt="<?php echo scrub_out($song->f_album_full); ?>" title="<?php echo scrub_out($song->f_album_full); ?>" height="75" width="75" />
</a>
</div>
<?php } // end play album art ?>
</div>
<div class="np_group">
<div class="np_cell cel_song">
<label><?php echo _('Song'); ?></label>
<a title="<?php echo scrub_out($song->title); ?>" href="<?php echo $web_path; ?>/stream.php?action=single_song&amp;song_id=<?php echo $song->id; ?>">
<?php echo $title; ?>
</a>
</div>
<div class="np_cell cel_album">
<label><?php echo _('Album'); ?></label>
<a title="<?php echo scrub_out($song->f_album_full); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&amp;album=<?php echo $song->album; ?>">
<?php echo $album; ?>
</a>
</div>
<div class="np_cell cel_artist">
<label><?php echo _('Artist'); ?></label>
<a title="<?php echo scrub_out($song->f_artist_full); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&amp;artist=<?php echo $song->artist; ?>">
<?php echo $artist; ?>
</a>
</div>
</div>
<?php show_box_bottom(); ?>

11
templates/show_now_playing_row.inc.php
View file

@ -31,13 +31,22 @@ $artist = scrub_out(truncate_with_ellipsis($media->f_artist_full));
<?php echo scrub_out($np_user->fullname); ?>
</a>
</div>
<div class="np_cell cel_rating">
<label><?php echo _('Rating'); ?></label>
<div id="rating_<?php echo $media->id; ?>_song">
<?php Rating::show($media->id,'song'); ?>
</div>
</div>
<?php if (Config::get('show_lyrics')) {?>
<div class="np_cell cel_lyrics">
<label>&nbsp;</label>
<a title="<?php echo scrub_out($media->title); ?>" href="<?php echo $web_path; ?>/song.php?action=show_lyrics&amp;song_id=<?php echo $media->id; ?>">
<?php echo _('Show Lyrics');?>
</a>
</div>
<?php } ?>
</div>
<div class="np_group">