- Updated Now Playing html/css

- Fixed Star-rating css
- Updated Pager (5 elements around selected page# should be enough)
- Updated Album class so that disk# is part of the link
- Some more cleanup/updates to html/themes (hopefully it should be almost done in a week, so that themers can start theming on 3.4)

1 files changed, 47 insertions, 27 deletions

diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php
index 6faabb99..4c80e462 100644
--- a/templates/show_now_playing_row.inc.php
+++ b/templates/show_now_playing_row.inc.php
@@ -24,31 +24,51 @@ $title = scrub_out(truncate_with_ellipsis($song->title,'25'));
 $album = scrub_out(truncate_with_ellipsis($song->f_album_full,'25'));
 $artist = scrub_out(truncate_with_ellipsis($song->f_artist_full,'25'));
 ?>
-<td class="np_cell_left"><b><?php echo _('Username'); ?></b>:<br />
-	<a title="<?php echo scrub_out($agent); ?>" href="<?php echo $web_path; ?>/stats.php?action=show_user&amp;user_id=<?php echo $np_user->id; ?>"><?php echo scrub_out($np_user->fullname); ?></a><br /><br />
-	<!-- ##  modified ##-->
-	<strong><?php echo _('Song'); ?></strong><br />
-	<a title="<?php echo scrub_out($song->title); ?>" href="<?php echo $web_path; ?>/stream.php?action=single_song&amp;song_id=<?php echo $song->id; ?>">
-        <?php echo $title; ?>
-	</a>
-	<div id="rating_<?php echo $song->id; ?>_song">
-        <?php Rating::show($song->id,'song'); ?>
-	</div>
-</td>
-<td class="np_cell_m">
-	<strong><?php echo _('Artist'); ?></strong><br />
-	<a title="<?php echo scrub_out($song->f_artist_full); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&amp;artist=<?php echo $song->artist; ?>">
-	        <?php echo $artist; ?>
-	</a>
-	<br /><br />
-	<strong><?php echo _('Album'); ?></strong><br />
-	<a title="<?php echo scrub_out($song->f_album_full); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&amp;album=<?php echo $song->album; ?>">
-        	<?php echo $album; ?>
-	</a>
-</td>
-	<?php if (Config::get('show_album_art')) { ?>
-<td class="np_cell_right">
-    <a target="_blank" href="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>" onclick="popup_art('<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>'); return false;">
-    <img align="middle" src="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;thumb=1&amp;sid=<?php echo session_id(); ?>" alt="<?php echo scrub_out($song->f_album_full); ?>" title="<?php echo scrub_out($song->f_album_full); ?>" height="75" width="75" /></a>
-</td>
+<div class="np_group">
+  <div class="np_cell cel_username">
+    <label><?php echo _('Username'); ?></label>
+  	<a title="<?php echo scrub_out($agent); ?>" href="<?php echo $web_path; ?>/stats.php?action=show_user&amp;user_id=<?php echo $np_user->id; ?>">
+      <?php echo scrub_out($np_user->fullname); ?>
+    </a>
+  </div>
+  
+  <div class="np_cell cel_rating">
+    <label><?php echo _('Rating'); ?></label>
+    <div id="rating_<?php echo $song->id; ?>_song">
+      <?php Rating::show($song->id,'song'); ?>
+    </div>
+  </div>
+</div>
+
+<div class="np_group">
+  <div class="np_cell cel_song">
+  	<label><?php echo _('Song'); ?></label>
+  	<a title="<?php echo scrub_out($song->title); ?>" href="<?php echo $web_path; ?>/stream.php?action=single_song&amp;song_id=<?php echo $song->id; ?>">
+          <?php echo $title; ?>
+  	</a>
+  </div>
+
+  <div class="np_cell cel_album">
+  	<label><?php echo _('Album'); ?></label>
+  	<a title="<?php echo scrub_out($song->f_album_full); ?>" href="<?php echo $web_path; ?>/albums.php?action=show&amp;album=<?php echo $song->album; ?>">
+          	<?php echo $album; ?>
+  	</a>
+  </div>
+
+  <div class="np_cell cel_artist">
+  	<label><?php echo _('Artist'); ?></label>
+  	<a title="<?php echo scrub_out($song->f_artist_full); ?>" href="<?php echo $web_path; ?>/artists.php?action=show&amp;artist=<?php echo $song->artist; ?>">
+  	        <?php echo $artist; ?>
+  	</a>
+  </div>
+</div>
+
+<?php if (Config::get('show_album_art')) { ?>
+<div class="np_group">
+  <div class="np_cell cel_albumart">
+      <a target="_blank" href="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>" onclick="popup_art('<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;type=popup&amp;sid=<?php echo session_id(); ?>'); return false;">
+        <img align="middle" src="<?php echo $web_path; ?>/image.php?id=<?php echo $song->album; ?>&amp;thumb=1&amp;sid=<?php echo session_id(); ?>" alt="<?php echo scrub_out($song->f_album_full); ?>" title="<?php echo scrub_out($song->f_album_full); ?>" height="75" width="75" />
+      </a>
+  </div>
+</div>
 <?php } // end play album art ?>