threw in add button for single playlist view, added the link for deleting catalogs back, also added back in the ACL page links, they dont work..

6 files changed, 12 insertions, 4 deletions

diff --git a/templates/show_access_list.inc b/templates/show_access_list.inc.php
index f709e33a..15fb3417 100644
--- a/templates/show_access_list.inc
+++ b/templates/show_access_list.inc.php
@@ -24,7 +24,7 @@
 	@discussion default display for access admin page
 
 */
-$web_path = conf('web_path');
+$web_path = Config::get('web_path');
 ?>
 <?php show_box_top(_('Host Access to Your Catalog')); ?>
 <p>Since your catalog can be accessed remotely you may want to limit the access from
diff --git a/templates/show_add_access.inc b/templates/show_add_access.inc.php
index cd211bfd..e171b507 100644
--- a/templates/show_add_access.inc
+++ b/templates/show_add_access.inc.php
@@ -23,7 +23,7 @@
 <p><?php echo _('Use the form below to add a host that you want to have access to your Ampache catalog.'); ?></p>
 
 
-<form name="update_catalog" method="post" enctype="multipart/form-data" action="<?php echo conf('web_path'); ?>/admin/access.php">
+<form name="update_catalog" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/admin/access.php">
 <table cellpadding="5" cellspacing="0" border="0">
 <tr>
 	<td><?php echo _('Name'); ?>:</td>
@@ -45,8 +45,8 @@
 </tr>
 <tr>
 	<td><?php echo _('User'); ?>:</td>
+		<!-- Stuff Goes Here --> 
 	<td>
-		<?php show_user_select('user'); ?>
 	</td>
 </tr>
 <tr>
diff --git a/templates/show_catalog_row.inc.php b/templates/show_catalog_row.inc.php
index d58d7e30..34f7ea77 100644
--- a/templates/show_catalog_row.inc.php
+++ b/templates/show_catalog_row.inc.php
@@ -29,4 +29,5 @@ $web_path = Config::get('web_path');
 	| <a href="<?php echo $web_path; ?>/admin/catalog.php?action=update_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Verify'); ?></a>
         | <a href="<?php echo $web_path; ?>/admin/catalog.php?action=clean_catalog&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Clean'); ?></a>
 	| <a href="<?php echo $web_path; ?>/admin/catalog.php?action=gather_album_art&amp;catalogs[]=<?php echo $catalog->id; ?>"><?php echo _('Gather Art'); ?></a>
+	| <a href="<?php echo $web_path; ?>/admin/catalog.php?action=delete_catalog&amp;catalog_id=<?php echo $catalog->id; ?>"><?php echo _('Delete'); ?></a>
 </td>
diff --git a/templates/show_playlist_song_row.inc.php b/templates/show_playlist_song_row.inc.php
index 50af6dec..9cfcc992 100644
--- a/templates/show_playlist_song_row.inc.php
+++ b/templates/show_playlist_song_row.inc.php
@@ -19,6 +19,7 @@
 
 */
 ?>
+<td><?php echo Ajax::button('?action=basket&type=song&id=' . $song->id,'add',_('Add'),'playlist_add_' . $song->id); ?></td>
 <td><?php echo $playlist_track; ?></td>
 <td><?php echo $song->f_link; ?></td>
 <td><?php echo $song->f_artist_link; ?></td>
diff --git a/templates/show_playlist_songs.inc.php b/templates/show_playlist_songs.inc.php
index 3e8918aa..17aa68a6 100644
--- a/templates/show_playlist_songs.inc.php
+++ b/templates/show_playlist_songs.inc.php
@@ -30,6 +30,7 @@ $ajax_url = Config::get('ajax_url');
 	</td>
 </tr>
 <tr class="table-header">
+	<th>&nbsp;</th>
 	<th><?php echo _('Track'); ?></th>
 	<th><?php echo _('Song Title'); ?></th>
 	<th><?php echo _('Artist'); ?></th>
diff --git a/templates/sidebar_admin.inc.php b/templates/sidebar_admin.inc.php
index 4f952e0f..c2348aec 100644
--- a/templates/sidebar_admin.inc.php
+++ b/templates/sidebar_admin.inc.php
@@ -10,7 +10,12 @@
       <li id="sb_admin_ut_BrowseUsers"><a href="<?php echo $web_path; ?>/admin/users.php"><?php echo _('Browse Users'); ?></a></li>
     </ul>
   </li>
-
+  <li><h4><?php echo _('Access Control'); ?></h4>
+    <ul class="sb3" id="sb_admin_acl">
+      <li id="sb_admin_acl_AddAccess"><a href="<?php echo $web_path; ?>/admin/access.php?action=show_add_host"><?php echo _('Add ACL'); ?></li>
+      <li id="sb_admin_acl_ShowAccess"><a href="<?php echo $web_path; ?>/admin/access.php"><?php echo _('Show ACL(s)'); ?></a>
+    </ul>
+  </li>
   <li><h4><?php echo _('Other Tools'); ?></h4>
     <ul class="sb3" id="sb_admin_ot">
       <li id="sb_admin_ot_ClearNowPlaying"><a href="<?php echo $web_path; ?>/admin/catalog.php?action=clear_now_playing"><?php echo _('Clear Now Playing'); ?></a></li>