XHTML tweakage

4 files changed, 19 insertions, 19 deletions

diff --git a/templates/show_album.inc b/templates/show_album.inc
index ae8d8b97..ae2825af 100644
--- a/templates/show_album.inc
+++ b/templates/show_album.inc
@@ -47,9 +47,9 @@ $title		= scrub_out($album->name) . ' -- ' . $album->f_artist;
 	<div style="display:table-cell;vertical-align:top;">
 		<?php
 		if (conf('ratings')) {	
-			echo "<span style=\"float:left; display:inline;\" id=\"rating_" . $album->id . "_album\">";
+			echo "<div style=\"float:left; display:inline;\" id=\"rating_" . $album->id . "_album\">";
 			show_rating($album->id, 'album');} // end if ratings
-			echo "</span>";
+			echo "</div>";
 		echo "<br />\n";
 		?>
 		<strong><?php echo _('Actions'); ?>:</strong><br />
diff --git a/templates/show_localplay_control.inc.php b/templates/show_localplay_control.inc.php
index 4e83bdef..d1de9e0d 100644
--- a/templates/show_localplay_control.inc.php
+++ b/templates/show_localplay_control.inc.php
@@ -29,23 +29,23 @@ $ajax_url	= conf('ajax_url');
 ?>
 <div class="localplaycontrol" style="display:table-cell;cursor:pointer;padding:2px;">
 <?php if ($localplay->has_function('prev')) { ?>
-<span class="prev_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&cmd=prev<?php echo $required_info; ?>');return true;">
+<span class="prev_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=prev<?php echo $required_info; ?>');return true;">
 	<img src="<?php echo $web_path; ?>/images/localplay/prev.gif" alt="prev" />
 </span>
 <?php } ?>
-<span class="stop_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&cmd=stop<?php echo $required_info; ?>');return true;">
+<span class="stop_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=stop<?php echo $required_info; ?>');return true;">
 	<img src="<?php echo $web_path; ?>/images/localplay/stop.gif" alt="stop" />
 </span>
 <?php if ($localplay->has_function('pause')) { ?>
-<span class="pause_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&cmd=pause<?php echo $required_info; ?>');return true;">
+<span class="pause_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=pause<?php echo $required_info; ?>');return true;">
 	<img src="<?php echo $web_path; ?>/images/localplay/pause.gif" alt="pause" />
 </span>
 <?php } ?>
-<span class="play_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&cmd=play<?php echo $required_info; ?>');return true;">
+<span class="play_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=play<?php echo $required_info; ?>');return true;">
 	<img src="<?php echo $web_path; ?>/images/localplay/play.gif" alt="play" />
 </span>
 <?php if ($localplay->has_function('next')) { ?>
-<span class="next_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&cmd=next<?php echo $required_info; ?>');return true;">
+<span class="next_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=next<?php echo $required_info; ?>');return true;">
 	<img src="<?php echo $web_path; ?>/images/localplay/next.gif" alt="next" />
 </span>
 <?php } ?>
diff --git a/templates/show_localplay_status.inc.php b/templates/show_localplay_status.inc.php
index 0e250923..e7f4dcce 100644
--- a/templates/show_localplay_status.inc.php
+++ b/templates/show_localplay_status.inc.php
@@ -23,7 +23,7 @@
 $web_path = conf('web_path'); 
 $localplay = init_localplay();
 
-$required_info 	= "&user_id=" . $GLOBALS['user']->id . "&sessid=" . session_id(); 
+$required_info 	= "&amp;user_id=" . $GLOBALS['user']->id . "&amp;sessid=" . session_id(); 
 $ajax_url	= $web_path . '/server/ajax.server.php';
 $status		= $localplay->status();
 
@@ -40,17 +40,17 @@ $status		= $localplay->status();
 	-->
 	</script>
 	<?php if ($localplay->has_function('volume_up')) { ?>
-	<span class="up_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&cmd=volume_up<?php echo $required_info; ?>','lp_v');return true;">
+	<span class="up_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=volume_up<?php echo $required_info; ?>','lp_v');return true;">
 	        <img src="<?php echo $web_path; ?>/images/localplay/volup.gif" alt="volume up" />
 	</span>
 	<?php } ?>
 	<?php if ($localplay->has_function('volume_down')) { ?>
-	<span class="down_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&cmd=volume_down<?php echo $required_info; ?>','lp_v');return true;">
+	<span class="down_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=volume_down<?php echo $required_info; ?>','lp_v');return true;">
 	        <img src="<?php echo $web_path; ?>/images/localplay/voldn.gif" alt="volume down" />
 	</span>
 	<?php } ?>
 	<?php if ($localplay->has_function('volume_mute')) { ?>
-	<span class="mute_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&cmd=volume_mute<?php echo $required_info; ?>','lp_v');return true;">
+	<span class="mute_button" onclick="ajaxPut('<?php echo $ajax_url; ?>?action=localplay&amp;cmd=volume_mute<?php echo $required_info; ?>','lp_v');return true;">
 	        <img src="<?php echo $web_path; ?>/images/localplay/volmute.gif" alt="volume mute" />
 	</span>
 	<?php } ?>
diff --git a/templates/show_object_rating.inc.php b/templates/show_object_rating.inc.php
index 7be0a870..d24b62c6 100644
--- a/templates/show_object_rating.inc.php
+++ b/templates/show_object_rating.inc.php
@@ -21,7 +21,7 @@
 
 /* Create some variables we are going to need */
 $web_path = conf('web_path');
-$base_url = conf('ajax_url') . '?action=set_rating&rating_type=' . $rating->type . '&object_id=' . $rating->id . conf('ajax_info');
+$base_url = conf('ajax_url') . '?action=set_rating&amp;rating_type=' . $rating->type . '&amp;object_id=' . $rating->id . conf('ajax_info');
 
 
 //set the background to no stars
@@ -29,10 +29,10 @@ echo "<ul class=\"star-rating\">\n";
 
 /* Handle the "Not rated" possibility */
 if ($rating->rating == '-1') { 
-	echo "<li class=\"zero-stars\"><span onclick=\"ajaxPut('" . $base_url . "&rating=-1');return true;\" title=\"don't play\" class=\"zero-stars\"></span></li>\n";
+	echo "<li class=\"zero-stars\"><span onclick=\"ajaxPut('" . $base_url . "&amp;rating=-1');return true;\" title=\"don't play\" class=\"zero-stars\"></span></li>\n";
 }
 else { 
-	echo "<li class=\"zero-stars\"><span onclick=\"ajaxPut('" . $base_url . "&rating=-1');return true;\" title=\"remove rating\" class=\"zero-stars\"></span></li>\n";
+	echo "<li class=\"zero-stars\"><span onclick=\"ajaxPut('" . $base_url . "&amp;rating=-1');return true;\" title=\"remove rating\" class=\"zero-stars\"></span></li>\n";
 }
 // decide width of rating. image is 16 px wide
 $width = $rating->rating*16;
@@ -48,19 +48,19 @@ else echo "$rating->rating of 5</li>\n";
 //it did not like my "1-star", "2-star" ... css styles, and I changed it to this after I realized star1... would have worked :\
 ?>
 <li>
-	<span onclick="ajaxPut('<?php echo $base_url; ?>&rating=1');return true;" class="one-stars" title="1 <?php echo _('out of'); ?> 5"></span>
+	<span onclick="ajaxPut('<?php echo $base_url; ?>&amp;rating=1');return true;" class="one-stars" title="1 <?php echo _('out of'); ?> 5"></span>
 </li>
 <li>
-	<span onclick="ajaxPut('<?php echo $base_url; ?>&rating=2');return true;" class="two-stars" title="2 <?php echo _('out of'); ?> 5"></span>
+	<span onclick="ajaxPut('<?php echo $base_url; ?>&amp;rating=2');return true;" class="two-stars" title="2 <?php echo _('out of'); ?> 5"></span>
 </li>
 <li>
-	<span onclick="ajaxPut('<?php echo $base_url; ?>&rating=3');return true;" class="three-stars" title="3 <?php echo _('out of'); ?> 5"></span>
+	<span onclick="ajaxPut('<?php echo $base_url; ?>&amp;rating=3');return true;" class="three-stars" title="3 <?php echo _('out of'); ?> 5"></span>
 </li>
 <li>
-	<span onclick="ajaxPut('<?php echo $base_url; ?>&rating=4');return true;" class="four-stars" title="4 <?php echo _('out of'); ?> 5"></span>
+	<span onclick="ajaxPut('<?php echo $base_url; ?>&amp;rating=4');return true;" class="four-stars" title="4 <?php echo _('out of'); ?> 5"></span>
 </li>
 <li>
-	<span onclick="ajaxPut('<?php echo $base_url; ?>&rating=5');return true;" class="five-stars" title="5 <?php echo _('out of'); ?> 5"></span>
+	<span onclick="ajaxPut('<?php echo $base_url; ?>&amp;rating=5');return true;" class="five-stars" title="5 <?php echo _('out of'); ?> 5"></span>
 </li>
 </ul>