whole bunch of last-min fixes for Alpha2 release

6 files changed, 46 insertions, 11 deletions

diff --git a/templates/menu.inc b/templates/menu.inc
index 2ae05faf..bd084e2f 100644
--- a/templates/menu.inc
+++ b/templates/menu.inc
@@ -33,8 +33,8 @@ if ($GLOBALS['user']->prefs['play_type'] == 'mpd' && conf('localplay_menu')) {
 }
 
 $items += array(_("Browse")	=> htmlspecialchars(conf('web_path') . "/browse.php"),
-		_("Albums")	=> htmlspecialchars(conf('web_path') . "/albums.php"),
-		_("Artists")	=> htmlspecialchars(conf('web_path') . "/artists.php"),
+//		_("Albums")	=> htmlspecialchars(conf('web_path') . "/albums.php"),
+//		_("Artists")	=> htmlspecialchars(conf('web_path') . "/artists.php"),
 		_("Playlists")	=> htmlspecialchars(conf('web_path') . "/playlist.php"),
 		_("Search")	=> htmlspecialchars(conf('web_path') . "/search.php"),
 		_("Preferences") => htmlspecialchars(conf('web_path') . "/preferences.php")
@@ -81,7 +81,7 @@ if ($GLOBALS['user']->prefs['upload']) {
 	            " <a href=\"".conf('web_path')."/logout.php\">" . _("Logout") . "</a> </li>\n";
 		} // else
 	}  // if use_auth
-	elseif ( $GLOBALS['user']->id != '0') { 
+	elseif ( $_SESSION['userdata']['id'] != '-1') { 
 		print("\t\t<li><a href=\"".conf('web_path')."/logout.php\">" . _("Logout") . "</a> </li>\n");
 	} // else no user
 ?>
diff --git a/templates/show_all_popular.inc.php b/templates/show_all_popular.inc.php
index 1c472949..1b1c9987 100644
--- a/templates/show_all_popular.inc.php
+++ b/templates/show_all_popular.inc.php
@@ -27,16 +27,17 @@
 		<?php show_info_box(_("Most Popular Artists"), 'artist', $artists); ?>
 	</td>
 	<td valign="top" align="left">
-		<?php show_info_box(_("Most Popular Songs"), 'song', $songs); ?>
-	</td>
-	<td valign="top" align="right">
 		<?php show_info_box(_("Most Popular Albums"), '', $albums); ?>
 	</td>
+
 </tr>
-<tr><td colspan="3">&nbsp;</td></tr>
+<tr><td colspan="2">&nbsp;</td></tr>
 <tr>
 	<td valign="top" align="left">
 		<?php show_info_box(_("Most Popular Genres"), '', $genres); ?>
 	</td>
+	<td valign="top" align="right">
+		<?php show_info_box(_("Most Popular Songs"), 'song', $songs); ?>
+	</td>
 </tr>
 </table>
diff --git a/templates/show_all_recent.inc.php b/templates/show_all_recent.inc.php
new file mode 100644
index 00000000..28339c89
--- /dev/null
+++ b/templates/show_all_recent.inc.php
@@ -0,0 +1,33 @@
+<?php
+/*
+ 
+ Copyright (c) 2001 - 2005 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.
+ 
+*/
+
+?>
+<table class="tabledata">
+<tr>
+	<td valign="top" align="right">
+		<?php show_info_box(_("Newest Artist Additions"), '', $artists); ?>
+	</td>
+	<td valign="top" align="left">
+		<?php show_info_box(_("Newest Album Additions"), '', $albums); ?>
+	</td>
+</tr>
+</table>
diff --git a/templates/show_browse_menu.inc b/templates/show_browse_menu.inc
index 6edafcfe..bdef2e2a 100644
--- a/templates/show_browse_menu.inc
+++ b/templates/show_browse_menu.inc
@@ -32,7 +32,7 @@
 $web_path = conf('web_path');
 
 $items = array(
-	        _("Artist")      => "$web_path/artists.php",
+	        _("Artists")      => "$web_path/artists.php",
 		_("Albums")      => "$web_path/albums.php",
 		_("Genre")       => "$web_path/browse.php?action=genre",
         );
diff --git a/templates/show_play_selected.inc.php b/templates/show_play_selected.inc.php
index dab5369d..b89e7d47 100644
--- a/templates/show_play_selected.inc.php
+++ b/templates/show_play_selected.inc.php
@@ -46,12 +46,13 @@ function ToBatch(action)
 <table border="0" cellpadding="14" cellspacing="0" class="text-box">
 <tr align="left">
         <td>
-                <input class="button" type="button" name="super_action" value="<?php echo _("Play Selected"); ?>" onclick="return ToSong('play_selected');" />
+               <input class="button" type="button" name="super_action" value="<?php echo _("Play Selected"); ?>" onclick="return ToSong('play_selected');" />
 		<?php if (batch_ok()) { ?>
 		&nbsp;&nbsp;
 		<input class="button" type="button" name="super_action" value="<?php echo _("Download Selected"); ?>" onclick="return ToBatch('download_selected');" />
 		<? } ?>
-<!--                <input class="button" type="button" name="super_action" value="<?php echo _("Flag Selected"); ?>" />
+<!--
+                <input class="button" type="button" name="super_action" value="<?php echo _("Flag Selected"); ?>" />
                 <input class="button" type="button" name="super_action" value="<?php echo _("Edit Selected"); ?>" />
 -->
         </td>
diff --git a/templates/show_songs.inc b/templates/show_songs.inc
index c8d75ae4..0702a157 100644
--- a/templates/show_songs.inc
+++ b/templates/show_songs.inc
@@ -98,7 +98,7 @@ $web_path = conf('web_path');
             <td>
               <?php if ($user->has_access('100')) { ?>
                 <a href="<?php echo $web_path; ?>/admin/song.php?action=edit&amp;song=<?php echo $song->id; ?>">Edit</a> | <a href="<?php echo $web_path; ?>/flag.php?song=<?php echo $song->id; ?>&amp;action=flag">Flag</a> | 
-                  <?php if ($song->status === 'enabled') { ?>
+                  <?php if ($song->enabled) { ?>
                     <a href="<?php echo $web_path; ?>/admin/song.php?action=disable&amp;song_ids=<?php echo $song->id; ?>">Disable</a>
                   <?php } else { ?>
                     <a href="<?php echo $web_path; ?>/admin/song.php?action=enabled&amp;song_ids=<?php echo $song->id; ?>">Enable</a>