I should have done it this way in the first place, instead of that ugly

show_playlist_full_row hack.

13 files changed, 23 insertions, 22 deletions

diff --git a/templates/show_album_row.inc.php b/templates/show_album_row.inc.php
index fe395342..a413b6ae 100644
--- a/templates/show_album_row.inc.php
+++ b/templates/show_album_row.inc.php
@@ -52,6 +52,6 @@ if (Browse::is_enabled('show_art')) {
 		</a>
 	<?php } ?>
 	<?php if (Access::check('interface','50')) { ?>
-		<?php echo Ajax::button('?action=show_edit_object&type=album&id=' . $album->id,'edit',_('Edit'),'edit_album_' . $album->id); ?>
+		<?php echo Ajax::button('?action=show_edit_object&type=album_row&id=' . $album->id,'edit',_('Edit'),'edit_album_' . $album->id); ?>
 	<?php } ?>
 </td>
diff --git a/templates/show_artist_row.inc.php b/templates/show_artist_row.inc.php
index c02b27cf..e61aca56 100644
--- a/templates/show_artist_row.inc.php
+++ b/templates/show_artist_row.inc.php
@@ -37,6 +37,6 @@
         </a>
 <?php } ?>
 <?php if (Access::check('interface','50')) { ?>
-	<?php echo Ajax::button('?action=show_edit_object&type=artist&id=' . $artist->id,'edit',_('Edit'),'edit_artist_' . $artist->id); ?>
+	<?php echo Ajax::button('?action=show_edit_object&type=artist_row&id=' . $artist->id,'edit',_('Edit'),'edit_artist_' . $artist->id); ?>
 <?php } ?>
 </td>
diff --git a/templates/show_edit_album_row.inc.php b/templates/show_edit_album_row.inc.php
index 0f4d5324..b103a2cd 100644
--- a/templates/show_edit_album_row.inc.php
+++ b/templates/show_edit_album_row.inc.php
@@ -45,8 +45,8 @@
 </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); ?>
+	<input type="hidden" name="type" value="album_row" />
+	<?php echo Ajax::button('?action=edit_object&id=' . $album->id . '&type=album_row','download',_('Save Changes'),'save_album_' . $album->id,'edit_album_' . $album->id); ?>
 </td>
 </tr>
 </table>
diff --git a/templates/show_edit_artist_row.inc.php b/templates/show_edit_artist_row.inc.php
index 341f4b9e..d8e925f8 100644
--- a/templates/show_edit_artist_row.inc.php
+++ b/templates/show_edit_artist_row.inc.php
@@ -29,9 +29,8 @@
 </td>
 <td>
 	<input type="hidden" name="id" value="<?php echo $artist->id; ?>" />
-	<input type="hidden" name="type" value="artist" />
-	<?php echo Ajax::button('?action=edit_object&id=' . $artist->id . '&type=artist','download',_('Save Changes'),'save_artist_' . $artist->id,'edit_artist_' . $artist->id); ?>
-	<?php echo Ajax::observe('edit_artist_' . $artist->id,'submit',Ajax::action('?action=edit_object&id=' . $artist->id . '&type=artist','edit_artist_' . $artist->id,'edit_artist_' . $artist->id),1); ?>
+	<input type="hidden" name="type" value="artist_row" />
+	<?php echo Ajax::button('?action=edit_object&id=' . $artist->id . '&type=artist_row','download',_('Save Changes'),'save_artist_' . $artist->id,'edit_artist_' . $artist->id); ?>
 
 </tr>
 </table>
diff --git a/templates/show_edit_live_stream_row.inc.php b/templates/show_edit_live_stream_row.inc.php
index cf5b903e..2bde6f78 100644
--- a/templates/show_edit_live_stream_row.inc.php
+++ b/templates/show_edit_live_stream_row.inc.php
@@ -49,8 +49,8 @@
 </td>
 <td>
 	<input type="hidden" name="id" value="<?php echo $radio->id; ?>" />
-	<input type="hidden" name="type" value="live_stream" />
-	<?php echo Ajax::button('?action=edit_object&id=' . $radio->id . '&type=live_stream','download',_('Save Changes'),'save_live_stream_' . $radio->id,'edit_live_stream_' . $radio->id); ?>
+	<input type="hidden" name="type" value="live_stream_row" />
+	<?php echo Ajax::button('?action=edit_object&id=' . $radio->id . '&type=live_stream_row','download',_('Save Changes'),'save_live_stream_' . $radio->id,'edit_live_stream_' . $radio->id); ?>
 </td>
 </tr>
 </table>
diff --git a/templates/show_edit_playlist_row.inc.php b/templates/show_edit_playlist_row.inc.php
index ff06a9c3..755c7c75 100644
--- a/templates/show_edit_playlist_row.inc.php
+++ b/templates/show_edit_playlist_row.inc.php
@@ -35,8 +35,8 @@
 		</select>
 	<td>
 	<input type="hidden" name="id" value="<?php echo $playlist->id; ?>" />
-	<input type="hidden" name="type" value="playlist" />
-	<?php echo Ajax::button('?action=edit_object&id=' . $playlist->id . '&type=playlist','download',_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?>
+	<input type="hidden" name="type" value="playlist_row" />
+	<?php echo Ajax::button('?action=edit_object&id=' . $playlist->id . '&type=playlist_row','download',_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?>
 	</td>
 </tr>
 </table>
diff --git a/templates/show_edit_playlist_full_row.inc.php b/templates/show_edit_playlist_title.inc.php
index 74af6972..1b85f7d4 100644
--- a/templates/show_edit_playlist_full_row.inc.php
+++ b/templates/show_edit_playlist_title.inc.php
@@ -34,8 +34,8 @@
 		</select>
 	<td>
 	<input type="hidden" name="id" value="<?php echo $playlist->id; ?>" />
-	<input type="hidden" name="type" value="playlist_full" />
-	<?php echo Ajax::button('?action=edit_object&id=' . $playlist->id . '&type=playlist_full','download',_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?>
+	<input type="hidden" name="type" value="playlist_title" />
+	<?php echo Ajax::button('?action=edit_object&id=' . $playlist->id . '&type=playlist_title','download',_('Save Changes'),'save_playlist_' . $playlist->id,'edit_playlist_' . $playlist->id); ?>
 	</td>
 </tr>
 </table>
diff --git a/templates/show_edit_song_row.inc.php b/templates/show_edit_song_row.inc.php
index 40c8e57f..60dec7df 100644
--- a/templates/show_edit_song_row.inc.php
+++ b/templates/show_edit_song_row.inc.php
@@ -42,8 +42,8 @@
 </td>
 <td>
 	<input type="hidden" name="id" value="<?php echo $song->id; ?>" />
-	<input type="hidden" name="type" value="song" />
-	<?php echo Ajax::button('?action=edit_object&id=' . $song->id . '&type=song','download',_('Save Changes'),'save_song_' . $song->id,'edit_song_' . $song->id); ?>
+	<input type="hidden" name="type" value="song_row" />
+	<?php echo Ajax::button('?action=edit_object&id=' . $song->id . '&type=song_row','download',_('Save Changes'),'save_song_' . $song->id,'edit_song_' . $song->id); ?>
 </td>
 </tr>
 </table>
diff --git a/templates/show_live_stream_row.inc.php b/templates/show_live_stream_row.inc.php
index c73d0176..baf91c90 100644
--- a/templates/show_live_stream_row.inc.php
+++ b/templates/show_live_stream_row.inc.php
@@ -29,7 +29,7 @@
 <td class="cel_tag"><?php echo $radio->f_tag; ?></td>
 <td class="cel_action">
 	<?php if (Access::check('interface','50')) { ?>
-		<?php echo Ajax::button('?action=show_edit_object&type=live_stream&id=' . $radio->id,'edit',_('Edit'),'edit_radio_' . $radio->id); ?>
+		<?php echo Ajax::button('?action=show_edit_object&type=live_stream_row&id=' . $radio->id,'edit',_('Edit'),'edit_radio_' . $radio->id); ?>
 	<?php } ?>
 	<?php if (Access::check('interface','75')) { ?>
 		<?php echo Ajax::button('?page=browse&action=delete_object&type=live_stream&id=' . $radio->id,'delete',_('Delete'),'delete_radio_' . $radio->id); ?>
diff --git a/templates/show_playlist.inc.php b/templates/show_playlist.inc.php
index a6d702ea..a38fdee1 100644
--- a/templates/show_playlist.inc.php
+++ b/templates/show_playlist.inc.php
@@ -25,9 +25,11 @@
  */
 ?>
 <?php 
-/* HINT: Playlist Type, Playlist Name */
-show_box_top('<div id="playlist_row_' . $playlist->id . '">' . 
-	sprintf(_('%s %s (Playlist)'), $playlist->f_type, $playlist->name) .
+ob_start();
+require Config::get('prefix') . '/templates/show_playlist_title.inc.php';
+$title = ob_get_contents();
+ob_end_clean();
+show_box_top('<div id="playlist_row_' . $playlist->id . '">' . $title . 
 	'</div>');
 ?>
 <div id="information_actions">
@@ -52,7 +54,7 @@ show_box_top('<div id="playlist_row_' . $playlist->id . '">' .
 	</li>
 	<?php if ($playlist->has_access()) { ?>
 	<li>
-		<?php echo Ajax::button('?action=show_edit_object&type=playlist_full&id=' . $playlist->id,'edit',_('Edit'),'edit_playlist_' . $playlist->id); ?>
+		<?php echo Ajax::button('?action=show_edit_object&type=playlist_title&id=' . $playlist->id,'edit',_('Edit'),'edit_playlist_' . $playlist->id); ?>
 		<?php echo _('Edit'); ?>
 	</li>
 	<li>
diff --git a/templates/show_playlist_row.inc.php b/templates/show_playlist_row.inc.php
index e4ac5cd4..cc746c9b 100644
--- a/templates/show_playlist_row.inc.php
+++ b/templates/show_playlist_row.inc.php
@@ -35,7 +35,7 @@
                 </a>
         <?php } ?>
 	<?php if ($playlist->has_access()) { ?>
-		<?php echo Ajax::button('?action=show_edit_object&type=playlist&id=' . $playlist->id,'edit',_('Edit'),'edit_playlist_' . $playlist->id); ?>
+		<?php echo Ajax::button('?action=show_edit_object&type=playlist_row&id=' . $playlist->id,'edit',_('Edit'),'edit_playlist_' . $playlist->id); ?>
 		<?php echo Ajax::button('?page=browse&action=delete_object&type=playlist&id=' . $playlist->id,'delete',_('Delete'),'delete_playlist_' . $playlist->id); ?>
 	<?php } ?>
 </td>
diff --git a/templates/show_playlist_full_row.inc.php b/templates/show_playlist_title.inc.php
index 5d315540..5d315540 100644
--- a/templates/show_playlist_full_row.inc.php
+++ b/templates/show_playlist_title.inc.php
diff --git a/templates/show_song_row.inc.php b/templates/show_song_row.inc.php
index ca4ca4e4..a7174d8b 100644
--- a/templates/show_song_row.inc.php
+++ b/templates/show_song_row.inc.php
@@ -45,7 +45,7 @@
 	</a>
 	<?php } ?>
 	<?php if (Access::check('interface','75')) { ?>
-		<?php echo Ajax::button('?action=show_edit_object&type=song&id=' . $song->id,'edit',_('Edit'),'edit_song_' . $song->id); ?>
+		<?php echo Ajax::button('?action=show_edit_object&type=song_row&id=' . $song->id,'edit',_('Edit'),'edit_song_' . $song->id); ?>
 		<?php $icon = $song->enabled ? 'disable' : 'enable'; ?>
 		<?php $button_flip_state_id = 'button_flip_state_' . $song_id; ?>
 		<span id="<?php echo($button_flip_state_id); ?>">