fix a display issue with the now playing that caused it to split up the results

3 files changed, 8 insertions, 7 deletions

diff --git a/templates/show_now_playing.inc.php b/templates/show_now_playing.inc.php
index a1ee87a7..9f043cc1 100644
--- a/templates/show_now_playing.inc.php
+++ b/templates/show_now_playing.inc.php
@@ -31,7 +31,6 @@ if (count($results)) {
 $link = Config::get('use_rss') ? ' ' . AmpacheRSS::get_display('nowplaying') : ''; 
 ?>
 <?php show_box_top(_('Now Playing') . $link); ?>
-<div class="np_row">
 <?php 
 foreach ($results as $item) {
 	$song = $item['song'];
@@ -41,11 +40,12 @@ foreach ($results as $item) {
 	/* If we've gotten a non-song object just skip this row */
 	if (!is_object($song)) { continue; }
 	if (!$np_user->fullname) { $np_user->fullname = "Ampache User"; }
-
-	require Config::get('prefix') . '/templates/show_now_playing_row.inc.php';
-
-} // end foreach
 ?>
+<div class="np_row">
+<?php require Config::get('prefix') . '/templates/show_now_playing_row.inc.php'; ?>
 </div>
+<?php
+} // end foreach
+?>
 <?php show_box_bottom(); ?>
 <?php } // end if count results ?>
diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php
index afb5c3b7..a9e98e9e 100644
--- a/templates/show_now_playing_row.inc.php
+++ b/templates/show_now_playing_row.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
-Copyright (c) 2001 - 2007 Ampache.org
+Copyright (c) Ampache.org
 All rights reserved.
 
 This program is free software; you can redistribute it and/or
diff --git a/themes/classic/templates/default.css b/themes/classic/templates/default.css
index 6e9542e9..0f236ff1 100644
--- a/themes/classic/templates/default.css
+++ b/themes/classic/templates/default.css
@@ -609,8 +609,9 @@ dt:hover, dt:hover + dd {background:#9cf;}
 .np_row {

 	padding: 3px;

 	float:left;

-	clear:both;

 	font-size:0.75em;

+	display:block;

+	

 }

 .np_cell {

   padding-left:5px;