diff options
author | Chris Slamar <chris@slamar.org> | 2010-12-30 20:11:53 -0600 |
---|---|---|
committer | Chris Slamar <chris@slamar.org> | 2010-12-30 20:11:53 -0600 |
commit | 15c35ff741c0085ad8f2222440f8a1d5a93b63f8 (patch) | |
tree | d3d0d91313f455e95f647a48b18f256292628628 /templates | |
parent | b74175b7e663e8996f75ae5e24d649b78c834e46 (diff) | |
parent | ef8721bedb75900d9c79d446ea7a7665a6b6e674 (diff) | |
download | ampache-15c35ff741c0085ad8f2222440f8a1d5a93b63f8.tar.gz ampache-15c35ff741c0085ad8f2222440f8a1d5a93b63f8.tar.bz2 ampache-15c35ff741c0085ad8f2222440f8a1d5a93b63f8.zip |
Merge commit 'refs/merge-requests/4' of git://gitorious.org/ampache/ampache into integration
Diffstat (limited to 'templates')
-rw-r--r-- | templates/show_now_playing.inc.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/templates/show_now_playing.inc.php b/templates/show_now_playing.inc.php index 05b3f828..ef5d7d96 100644 --- a/templates/show_now_playing.inc.php +++ b/templates/show_now_playing.inc.php @@ -30,8 +30,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. if (count($results)) { $link = Config::get('use_rss') ? ' ' . AmpacheRSS::get_display('nowplaying') : ''; +$twitter = Config::get('twitter') ? ' ' . '<a href="' . Config::get('web_path') . '/modules/twitter/twitter_login.php"><img src="' . Config::get('web_path') . '/modules/twitter/Twitter-Icon.png" alt="Tweet Your Now Playing!" width="18" height="18"></a>' : ''; ?> -<?php show_box_top(_('Now Playing') . $link); ?> +<?php show_box_top(_('Now Playing') . $link . $twitter ); ?> <?php foreach ($results as $item) { $media = $item['media']; |