diff options
Diffstat (limited to 'templates')
| -rw-r--r-- | templates/show_alphabet_form.inc.php | 5 | ||||
| -rw-r--r-- | templates/show_artist.inc | 3 | ||||
| -rw-r--r-- | templates/show_localplay.inc.php | 7 | ||||
| -rw-r--r-- | templates/show_localplay_status.inc.php | 46 |
4 files changed, 51 insertions, 10 deletions
diff --git a/templates/show_alphabet_form.inc.php b/templates/show_alphabet_form.inc.php index d5eb9fb2..f7476bee 100644 --- a/templates/show_alphabet_form.inc.php +++ b/templates/show_alphabet_form.inc.php @@ -20,9 +20,8 @@ */ ?> -<form name="f" method="get" action="<?php echo conf('web_path') . "/$action"; ?>" enctype="multipart/form-data"> +<form style="display:inline;" name="f" method="get" action="<?php echo conf('web_path') . "/$action"; ?>" enctype="multipart/form-data"> <label for="match" accesskey="S"><?php echo $text; ?></label> - <input type="text" size="3" id="match" name="match" value="<?php echo $match; ?>" /> + <input type="text" size="1" id="match" name="match" value="<?php echo $match; ?>" /> <input type="hidden" name="action" value="match" /> </form> -<br /> diff --git a/templates/show_artist.inc b/templates/show_artist.inc index 7c7420da..0048c84e 100644 --- a/templates/show_artist.inc +++ b/templates/show_artist.inc @@ -21,10 +21,11 @@ */ //FIXME: I don't like having to re-create this friggin object.. :( -global $user; $artist_id = $artist->id; $web_path = conf('web_path'); ?> +<?php show_alphabet_form('',_('Artists'),'artists.php?action=match'); ?> +<?php show_alphabet_form('',_('Albums'),'albums.php?aciont=mathc'); ?> <br /> <?php require (conf('prefix') . '/templates/show_artist_box.inc.php'); ?> <!-- *** Multi-Album Art Display Thx MrBlahh Updated by clader *** --> diff --git a/templates/show_localplay.inc.php b/templates/show_localplay.inc.php index aa124503..8abc788a 100644 --- a/templates/show_localplay.inc.php +++ b/templates/show_localplay.inc.php @@ -34,12 +34,7 @@ $songs = $localplay->get(); </ul> </div> <br /> -<div class="text-box"> -<h2>Debug Status Information (Temp!)</h2> -<pre> -<?php print_r($localplay->status()); ?> -</pre> -</div> +<?php require_once(conf('prefix') . '/templates/show_localplay_status.inc.php'); ?> <br /> <div class="text-box"> <table class="border" cellspacing="0" border="0"> diff --git a/templates/show_localplay_status.inc.php b/templates/show_localplay_status.inc.php new file mode 100644 index 00000000..df7857dc --- /dev/null +++ b/templates/show_localplay_status.inc.php @@ -0,0 +1,46 @@ +<?php +/* + + Copyright (c) 2001 - 2006 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 + as published by the Free Software Foundation; either version 2 + of the License, or (at your option) any later version. + + 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. + +*/ + +$web_path = conf('web_path'); +$localplay = init_localplay(); + +$required_info = "&user_id=" . $GLOBALS['user']->id . "&sessid=" . session_id(); +$ajax_url = $web_path . '/server/ajax.server.php'; +$status = $localplay->status(); + +/* Format the track name */ +$track_name = $status['track_artist'] . ' - ' . $status['track_album'] . ' - ' . $status['track_title']; + +/* This is a cheezball fix for when we were unable to find a + * artist/album (or one wasn't provided) + */ +$track_name = ltrim(ltrim($track_name,' - ')); + +?> +<div class="text-box"> +<?php echo _('State') .": ". ucfirst($status['state']); ?><br /> +<?php echo _('Repeat') . ":" . print_boolean($status['repeat']); ?> | +<?php echo _('Random') . ":" . print_boolean($status['random']); ?><br /> +<?php echo _('Volume') . ":" . $status['volume']; ?><br /> +<br /> +<span class="header2"><?php echo _('Now Playing') . '</span><br />[' . $status['track'] . '] - ' . $track_name . '<br />'; ?> +</div> |