diff options
| author | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-01-06 20:59:26 +0000 |
|---|---|---|
| committer | Karl 'vollmerk' Vollmer <vollmer@ampache.org> | 2007-01-06 20:59:26 +0000 |
| commit | e73e55333452ce5615c21f27f323cc94bb8654bc (patch) | |
| tree | c7b6dd77684623d2461a77055f2b9608885f5570 /templates | |
| parent | db638040c7d6ee38187ffa9a99d083449e9669a3 (diff) | |
| download | ampache-e73e55333452ce5615c21f27f323cc94bb8654bc.tar.gz ampache-e73e55333452ce5615c21f27f323cc94bb8654bc.tar.bz2 ampache-e73e55333452ce5615c21f27f323cc94bb8654bc.zip | |
* Fixed display issues on TV page relating to
now playing Post AJAX and floating issues
* Fixed display of Last IP if tracking disabled
* Fixed play issue with invalid songs when
using Democratic Play
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/show_tv.inc.php | 2 | ||||
| -rw-r--r-- | templates/show_tv_nowplaying.inc.php | 3 | ||||
| -rw-r--r-- | templates/show_users.inc | 7 |
3 files changed, 6 insertions, 6 deletions
diff --git a/templates/show_tv.inc.php b/templates/show_tv.inc.php index 0db5f423..567e8ce8 100644 --- a/templates/show_tv.inc.php +++ b/templates/show_tv.inc.php @@ -25,12 +25,10 @@ $location = get_location(); ?> <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "DTD/xhtml1-transitional.dtd"> <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $htmllang; ?>" lang="<?php echo $htmllang; ?>"> - <head> <link rel="shortcut icon" href="<?php echo $web_path; ?>/favicon.ico" /> <meta http-equiv="Content-Type" content="text/html; charset=<?php echo conf('site_charset'); ?>" /> <title><?php echo conf('site_title'); ?> - <?php echo $location['title']; ?></title> -<link rel="stylesheet" href="<?php echo $web_path; ?>/templates/default.css" type="text/css" /> <link rel="stylesheet" href="<?php echo $web_path; ?><?php echo conf('theme_path'); ?>/templates/default.css" type="text/css" /> </head> <body> diff --git a/templates/show_tv_nowplaying.inc.php b/templates/show_tv_nowplaying.inc.php index 94e4dee2..10cf1f43 100644 --- a/templates/show_tv_nowplaying.inc.php +++ b/templates/show_tv_nowplaying.inc.php @@ -20,6 +20,7 @@ */ /* Pull the Now Playing Information */ $results = get_now_playing(); +$web_path = conf('web_path'); ?> <table cellpadding="0"> <?php @@ -31,7 +32,7 @@ foreach ($results as $row) { <tr> <td> <a target="_blank" href="<?php echo $web_path; ?>/image.php?id=<?php echo $row['song']->album; ?>&type=popup&sid=<?php echo session_id(); ?>" onclick="popup_art('<?php echo $web_path; ?>/image.php?id=<?php echo $row['song']->album; ?>&type=popup&sid=<?php echo session_id(); ?>'); return false;"> - <img align="middle" border="0" src="<?php echo $web_path; ?>/image.php?id=<?php echo $row['song']->album; ?>&fast=1" /> + <img align="middle" border="0" src="<?php echo $web_path; ?>/image.php?id=<?php echo $row['song']->album; ?>&fast=1" width="275" height="275" /> </a> </td> </tr> diff --git a/templates/show_users.inc b/templates/show_users.inc index 6b7d3e14..b92afb11 100644 --- a/templates/show_users.inc +++ b/templates/show_users.inc @@ -56,10 +56,11 @@ $admin_menu = "admin/"; <td align="center"> <b><?php echo _('Activity'); ?></b> </td> + <?php if (conf('track_user_ip')) { ?> <td align="center"> <b><?php echo _('Last Ip'); ?></b> </td> - + <?php } ?> <td colspan="5"> </td> <td align="center"> <b><?php echo _('On-line'); ?></b> @@ -91,13 +92,13 @@ while ($results = mysql_fetch_object($db_result)) { <td> <?php echo $user->f_useage; ?> </td> + <?php if (conf('track_user_ip')) { ?> <td> <a href="<?php echo $web_path; ?>/admin/users.php?action=show_ip_history&user_id=<?php echo $user->id; ?>"> <?php echo $user->ip_history; ?> </a> </td> - - + <?php } ?> <td> <a href="<?php echo $web_path; ?>/admin/users.php?action=edit&user=<?php echo $user->id; ?>"> <?php echo get_user_icon('edit'); ?> |