summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorxgizzmo <xgizzmo@ampache>2006-06-23 01:00:36 +0000
committerxgizzmo <xgizzmo@ampache>2006-06-23 01:00:36 +0000
commit2b62d84743744d01e71f8e6772261300b367fe8b (patch)
treeb9bb47a3ae1be60267e48a7b91262fb0f0864aa4
parent9687564ce0256f807373ee947b1b6a5f38ddbdfb (diff)
downloadampache-2b62d84743744d01e71f8e6772261300b367fe8b.tar.gz
ampache-2b62d84743744d01e71f8e6772261300b367fe8b.tar.bz2
ampache-2b62d84743744d01e71f8e6772261300b367fe8b.zip
Added new pages to ui.lib,Fixed typo in show_playlist,Some XHTML fix ups
-rw-r--r--lib/class/localplay.class.php2
-rw-r--r--lib/ui.lib.php9
-rw-r--r--song.php2
-rw-r--r--templates/show_playlist_box.inc.php2
-rw-r--r--templates/show_random_play.inc1
5 files changed, 11 insertions, 5 deletions
diff --git a/lib/class/localplay.class.php b/lib/class/localplay.class.php
index 3fe95f78..b6cacfd5 100644
--- a/lib/class/localplay.class.php
+++ b/lib/class/localplay.class.php
@@ -116,7 +116,7 @@ class Localplay {
$name = scrub_out($name);
if ($this->has_function('skip')) {
- $url = conf('web_path') . '/server/ajax.server.php?action=localplay&cmd=skip&value=' . $id . '&user_id=' . $GLOBALS['user']->id . '&sessid=' . session_id();
+ $url = conf('web_path') . '/server/ajax.server.php?action=localplay&amp;cmd=skip&amp;value=' . $id . '&amp;user_id=' . $GLOBALS['user']->id . '&amp;sessid=' . session_id();
$name = "<span style=\"cursor:pointer;text-decoration:underline;\" onclick=\"ajaxRequest('$url');\">$name</span>";
}
diff --git a/lib/ui.lib.php b/lib/ui.lib.php
index e1f3c663..7ccd43b6 100644
--- a/lib/ui.lib.php
+++ b/lib/ui.lib.php
@@ -893,7 +893,7 @@ function get_location() {
case 'upload.php':
$location['title'] = 'Upload';
break;
- case 'mpd.php':
+ case 'localplay.php':
$location['title'] = 'Local Play';
break;
case 'randomplay.php':
@@ -932,6 +932,10 @@ function get_location() {
$location['title'] = 'Site Preferences';
$location['section'] = 'admin';
break;
+ case 'admin/modules.php':
+ $location['title'] = 'Manage Modules';
+ $location['section'] = 'admin';
+ break;
case 'browse.php':
$location['title'] = 'Browse Music';
$location['section'] = 'browse';
@@ -948,6 +952,9 @@ function get_location() {
$location['title'] = 'Genre';
$location['section'] = 'browse';
break;
+ case 'stats.php':
+ $location['title'] = 'Statistics';
+ break;
default:
$location['title'] = '';
break;
diff --git a/song.php b/song.php
index 37851117..a8362961 100644
--- a/song.php
+++ b/song.php
@@ -37,8 +37,6 @@ if (conf('demo_mode') || !$user->has_access('25')) {
}
-$web_path = conf('web_path');
-
$song_ids = array();
$web_path = conf('web_path');
diff --git a/templates/show_playlist_box.inc.php b/templates/show_playlist_box.inc.php
index bd120127..26055365 100644
--- a/templates/show_playlist_box.inc.php
+++ b/templates/show_playlist_box.inc.php
@@ -44,7 +44,7 @@ $playlist_id = scrub_out($_REQUEST['playlist_id']);
<li><a href="<?php echo $web_path; ?>/playlist.php?action=show_import_playlist"><?php echo _('Import From File'); ?></a></li>
<li><a href="<?php echo $web_path; ?>/playlist.php?action=new"><?php echo _('Create New Playlist'); ?></a></li>
<?php if ($GLOBALS['user']->has_access(100)) { ?>
- <li><a href="<?php echo $web_path; ?>/playlist.php?action=prune_empty"><?php echo _('Delete Empty Playlists'); ?></a</li>
+ <li><a href="<?php echo $web_path; ?>/playlist.php?action=prune_empty"><?php echo _('Delete Empty Playlists'); ?></a></li>
<?php } ?>
<?php } ?>
</ul>
diff --git a/templates/show_random_play.inc b/templates/show_random_play.inc
index 5dfd321c..84ef198a 100644
--- a/templates/show_random_play.inc
+++ b/templates/show_random_play.inc
@@ -76,6 +76,7 @@
<option value="1024">1024MB</option>
</select>
</td>
+</tr>
<tr>
<td colspan="4">
<input type="hidden" name="action" value="random" />