corrected ajax but introduced with prototype, tweaked how ajax stuff is done, now uses ajax:: class also replaced player with a logout icon

4 files changed, 47 insertions, 37 deletions

diff --git a/templates/show_album_row.inc.php b/templates/show_album_row.inc.php
index 58e03758..5c1b7aaa 100644
--- a/templates/show_album_row.inc.php
+++ b/templates/show_album_row.inc.php
@@ -20,24 +20,20 @@
 */
 ?>
 <td>
-	<span onclick="ajaxPut('<?php echo Config::get('ajax_url'); ?>?action=basket&amp;type=album&amp;id=<?php echo $album->id; ?>');return true;" >
-		<?php echo get_user_icon('add','',_('Add')); ?>
-	</span>
-	<span onclick="ajaxPut('<?php echo Config::get('ajax_url'); ?>?action=basket&amp;type=album_random&amp;id=<?php echo $album->id; ?>');return true;" >
-		<?php echo get_user_icon('random','',_('Random')); ?>
-	</span>
-	</td>
-	<td><?php echo $album->f_name_link; ?></td>
-	<td><?php echo $album->f_artist; ?></td>
-	<td><?php echo $album->song_count; ?></td>
-	<td><?php echo $album->year; ?></td>
-	<td>
+	<?php echo Ajax::button('?action=basket&type=album&id=' . $album->id,'add',_('Add'),'add_album_' . $album->id); ?>
+	<?php echo Ajax::button('?action=basket&type=album_random&id=' . $album->id,'random',_('Random'),'random_album_' . $album->id); ?>
+</td>
+<td><?php echo $album->f_name_link; ?></td>
+<td><?php echo $album->f_artist; ?></td>
+<td><?php echo $album->song_count; ?></td>
+<td><?php echo $album->year; ?></td>
+<td>
 	<?php if (Access::check_function('batch_download')) { ?>
 		<a href="<?php echo Config::get('web_path'); ?>/batch.php?action=album&amp;id=<?php echo $album->id; ?>">
-			<?php echo get_user_icon('batch_download','',_('Batch Download')); ?>
+			<?php echo get_user_icon('batch_download',_('Batch Download')); ?>
 		</a>
 	<?php } ?>
-	<span onclick="ajaxPut('<?php echo Config::get('ajax_url'); ?>?action=show_edit_object&amp;type=album&amp;id=<?php echo $album->id; ?>');return true;" >
-			<?php echo get_user_icon('edit','',_('Edit')); ?>
-	</span>
+	<?php if ($GLOBALS['user']->has_access('50')) { ?>
+		<?php echo Ajax::button('?action=show_edit_object&type=album&id=' . $album->id,'edit',_('Edit'),'edit_album_' . $album->id); ?>
+	<?php } ?>
 </td>
diff --git a/templates/show_edit_album_row.inc.php b/templates/show_edit_album_row.inc.php
index b66ae255..b5fd8d6d 100644
--- a/templates/show_edit_album_row.inc.php
+++ b/templates/show_edit_album_row.inc.php
@@ -21,12 +21,21 @@
 ?>
 <td colspan="6">
 <form method="post" id="edit_album_<?php echo $album->id; ?>">
-<input type="input" name="name" value="<?php echo scrub_out($album->name); ?>" />
-<input type="hidden" name="id" value="<?php echo $album->id; ?>" />
-<input type="hidden" name="type" value="album" />
-<span onclick="ajaxPost('<?php echo Config::get('ajax_url'); ?>?action=edit_object&amp;id=<?php echo $album->id; ?>&amp;type=album','edit_album_<?php echo $album->id; ?>');">
-	<img src="<?php echo Config::get('web_path'); ?>/images/icon_download.png">
-</span>
-</form>
+<table border="0" cellpadding="3" cellspacing="0">
+<td>
+	<input type="textbox" name="name" value="<?php echo scrub_out($album->name); ?>" />
+</td>
+<td>
+	<?php show_artist_pulldown($album->artist_id,'artist_id'); ?>
+</td>
+<td>
+	<input type="textbox" name="year" value="<?php echo scrub_out($album->year); ?>" />
 </td>
+<td>
+	<input type="hidden" name="id" value="<?php echo $album->id; ?>" />
+	<input type="hidden" name="type" value="album" />
+	<?php echo Ajax::button('?action=edit_object&id=' . $album->id . '&type=album','download',_('Save Changes'),'save_album_' . $album->id,'edit_album_' . $album->id); ?>
+</td>
+</table>
+</form>
 </td>
diff --git a/templates/show_songs.inc.php b/templates/show_songs.inc.php
index 24687b10..224b552f 100644
--- a/templates/show_songs.inc.php
+++ b/templates/show_songs.inc.php
@@ -48,8 +48,8 @@ $ajax_url = Config::get('ajax_url');
 		$song->format(); 
 ?>
 <tr class="<?php echo flip_class(); ?>">
-	<td onclick="ajaxPut('<?php echo $ajax_url; ?>?action=basket&amp;type=song&amp;id=<?php echo $song->id; ?>');return true;">
-		<?php echo get_user_icon('add'); ?>
+	<td>
+		<?php echo Ajax::button('?action=basket&atype=song&id=' . $song->id,'add',_('Add'),'add_' . $song->id); ?>
 	</td>
 	<td><?php echo $song->f_link; ?></td>
 	<td><?php echo $song->f_artist_link; ?></td>
diff --git a/templates/sidebar.inc.php b/templates/sidebar.inc.php
index 13612552..90ac42ce 100644
--- a/templates/sidebar.inc.php
+++ b/templates/sidebar.inc.php
@@ -27,25 +27,30 @@ $web_path = Config::get('web_path');
 $ajax_url = Config::get('ajax_url'); 
 ?>
 <ul id="sidebar-tabs">
-<li <?php echo $sidebar_home; ?> onclick="ajaxPut('<?php echo $ajax_url; ?>?action=sidebar&amp;button=home');" >
-	<?php echo get_user_icon('home','',_('Home')); ?>
+<li <?php echo $sidebar_home; ?>>
+	<?php echo Ajax::button("?action=sidebar&button=home",home,_('Home'),'sidebar_home'); ?>
 </li>
-<li <?php echo $sidebar_browse; ?> onclick="ajaxPut('<?php echo $ajax_url; ?>?action=sidebar&amp;button=browse');" >
-	<?php echo get_user_icon('browse','',_('Browse')); ?>
+<li <?php echo $sidebar_browse; ?>>
+	<?php echo Ajax::button("?action=sidebar&button=browse",browse,_('Browse'),'sidebar_browse'); ?>
 </li>
-<li <?php echo $sidebar_search; ?> onclick="ajaxPut('<?php echo $ajax_url; ?>?action=sidebar&amp;button=search');" >
-	<?php echo get_user_icon('view','',_('Search')); ?>
+<li <?php echo $sidebar_search; ?>>
+	<?php echo Ajax::button("?action=sidebar&button=search",'view',_('Search'),'sidebar_search'); ?>
 </li>
-<li <?php echo $sidebar_preferences; ?> onclick="ajaxPut('<?php echo $ajax_url; ?>?action=sidebar&amp;button=preferences');" >
-	<?php echo get_user_icon('edit','',_('Preferences')); ?>
+<li <?php echo $sidebar_preferences; ?>>
+	<?php echo Ajax::button("?action=sidebar&button=preferences",'edit',_('Preferences'),'sidebar_prefs'); ?>
 </li>
 <?php if ($GLOBALS['user']->has_access('100')) { ?>
-<li <?php echo $sidebar_admin; ?> onclick="ajaxPut('<?php echo $ajax_url; ?>?action=sidebar&amp;button=admin');" >
-	<?php echo get_user_icon('admin','',_('Admin')); ?>
+<li <?php echo $sidebar_admin; ?>>
+	<?php echo Ajax::button("?action=sidebar&button=admin",'admin',_('Admin'),'sidebar_admin'); ?>
 </li>
 <?php } ?>
-<li <?php echo $sidebar_player; ?> onclick="ajaxPut('<?php echo $ajax_url; ?>?action=sidebar&amp;button=player');" >
-	<?php echo get_user_icon('all','',_('Player')); ?>
+<!-- <li <?php echo $sidebar_player; ?> onclick="ajaxPut('<?php echo $ajax_url; ?>?action=sidebar&button=player');" >
+</li>
+-->
+<li>
+	<a href="<?php echo Config::get('web_path'); ?>/logout.php">
+	<?php echo get_user_icon('logout',_('Logout')); ?>
+	</a>
 </li>
 </ul>
 <div id="sidebar-page">