diff options
-rw-r--r-- | lib/search.php | 2 | ||||
-rw-r--r-- | lib/ui.lib.php | 2 | ||||
-rw-r--r-- | modules/localplay/icecast.controller.php | 6 | ||||
-rw-r--r-- | register.php | 2 | ||||
-rw-r--r-- | templates/header.inc.php | 2 | ||||
-rw-r--r-- | templates/rightbar.inc.php | 1 | ||||
-rw-r--r-- | templates/show_add_user.inc.php | 1 | ||||
-rw-r--r-- | templates/show_all_popular.inc.php | 1 | ||||
-rw-r--r-- | templates/show_artist_box.inc.php | 4 | ||||
-rw-r--r-- | templates/show_box.inc.php | 2 | ||||
-rw-r--r-- | templates/show_edit_catalog.inc.php | 1 | ||||
-rw-r--r-- | templates/show_now_playing_row.inc.php | 2 | ||||
-rw-r--r-- | templates/show_preferences.inc.php | 2 | ||||
-rw-r--r-- | templates/show_random_albums.inc.php | 2 | ||||
-rw-r--r-- | templates/show_songs.inc.php | 4 |
15 files changed, 19 insertions, 15 deletions
diff --git a/lib/search.php b/lib/search.php index 2e91a3ef..061f8572 100644 --- a/lib/search.php +++ b/lib/search.php @@ -219,7 +219,7 @@ function search_song($data,$operator,$method,$limit) { */ $_SESSION['userdata']['stored_search'] = $sql; - //echo "DEBUG: $sql<BR>"; flush(); + //echo "DEBUG: $sql<br />"; flush(); $db_results = mysql_query($sql, dbh()); while ($r = mysql_fetch_assoc($db_results)) { diff --git a/lib/ui.lib.php b/lib/ui.lib.php index aa407adf..459e8424 100644 --- a/lib/ui.lib.php +++ b/lib/ui.lib.php @@ -1242,7 +1242,7 @@ function get_user_icon($name,$hover_name='',$title='') { $hov_url = Config::get('web_path') . '/images/' . $hover_icon; } - $hov_txt = "onMouseOver=\"this.src='$hov_url'; return true;\" onMouseOut=\"this.src='$img_url'; return true;\""; + $hov_txt = "onmouseover=\"this.src='$hov_url'; return true;\" onmouseout=\"this.src='$img_url'; return true;\""; } // end hover } // end if not cached diff --git a/modules/localplay/icecast.controller.php b/modules/localplay/icecast.controller.php index c95fd96a..9556d173 100644 --- a/modules/localplay/icecast.controller.php +++ b/modules/localplay/icecast.controller.php @@ -109,7 +109,7 @@ class AmpacheIcecast { function add_songs($songs) { $filename = conf('localplay_icecast_tracklist'); - //echo "$filename " . _("Opened for writing") . "<br>\n"; + //echo "$filename " . _("Opened for writing") . "<br />\n"; /* Open the file for writing */ if (!$handle = @fopen($filename, "w")) { @@ -121,7 +121,7 @@ class AmpacheIcecast { $song = new Song($song_id); $url = $song->get_url(); - //echo "$song->file<br>\n"; + //echo "$song->file<br />\n"; $line = "$song->file\n"; if (!fwrite($handle, $line)) { debug_event('icecast',"Fwrite: Unabled to write $line into $filename",'3'); @@ -131,7 +131,7 @@ class AmpacheIcecast { } // end foreach - //echo $filename . " " . _("Closed after write") . "<br>\n"; + //echo $filename . " " . _("Closed after write") . "<br />\n"; fclose($handle); return true; diff --git a/register.php b/register.php index 0f13e9a7..38005c28 100644 --- a/register.php +++ b/register.php @@ -123,7 +123,7 @@ switch ($action) { $mmsg = "MAILOK"; } else { - $GLOBALS['error']->add_error('email',_("Error Email address not confirmed<br>$validate_results[1]")); + $GLOBALS['error']->add_error('email',_("Error Email address not confirmed<br />$validate_results[1]")); } /* End of mailcheck */ diff --git a/templates/header.inc.php b/templates/header.inc.php index a29f55a8..2c1e56c2 100644 --- a/templates/header.inc.php +++ b/templates/header.inc.php @@ -50,7 +50,7 @@ if (Config::get('use_rss')) { ?> <script src="<?php echo $web_path; ?>/lib/javascript-base.js" language="javascript" type="text/javascript"></script> <script src="<?php echo $web_path; ?>/modules/kajax/ajax.js" language="javascript" type="text/javascript"></script> <script src="<?php echo $web_path; ?>/modules/prototype/prototype.js" language="javascript" type="text/javascript"></script> -<div id="3514" style="display:none;"></div> +<div id="rfc3514" style="display:none;"></div> <div id="maincontainer" <?php if ($GLOBALS['theme']['orientation'] == 'horizontal') { echo " class=\"horizontal_menu\" "; diff --git a/templates/rightbar.inc.php b/templates/rightbar.inc.php index a9d644bd..444db2ed 100644 --- a/templates/rightbar.inc.php +++ b/templates/rightbar.inc.php @@ -55,4 +55,5 @@ <tr><td class="error"><?php echo _('Not Enough Data'); ?></td></tr> <?php } ?> </table> +</div> <?php show_box_bottom(); ?> diff --git a/templates/show_add_user.inc.php b/templates/show_add_user.inc.php index 38871dc1..54d261d8 100644 --- a/templates/show_add_user.inc.php +++ b/templates/show_add_user.inc.php @@ -79,6 +79,7 @@ </select> </td> </tr> +<tr> <td colspan="2"> <input type="submit" value="<?php echo _('Add User'); ?>" /> </td> diff --git a/templates/show_all_popular.inc.php b/templates/show_all_popular.inc.php index a6478952..af8f16b5 100644 --- a/templates/show_all_popular.inc.php +++ b/templates/show_all_popular.inc.php @@ -45,3 +45,4 @@ </td> </tr> <tr><td colspan="2"> </td></tr> +</table>
\ No newline at end of file diff --git a/templates/show_artist_box.inc.php b/templates/show_artist_box.inc.php index d75c116e..0b1cd1c7 100644 --- a/templates/show_artist_box.inc.php +++ b/templates/show_artist_box.inc.php @@ -24,9 +24,9 @@ $title = _('Albums by') . " " . $artist->full_name; show_box_top(_('Albums by') . ' ' . $artist->full_name); if (Config::get('ratings')) { - echo "<span id=\"rating_" . $artist->id . "_artist\" style=\"display:inline;\">"; + echo "<div id=\"rating_" . $artist->id . "_artist\" style=\"display:inline;\">"; show_rating($artist->id, 'artist'); - echo "</span>"; + echo "</div>"; } // end if ratings ?> <strong><?php echo _('Actions'); ?>:</strong><br /> <a href="<?php echo $web_path; ?>/artists.php?action=show_all_songs&artist=<?php echo $artist->id; ?>"><?php echo _("Show All Songs By") . " " . $artist->full_name; ?></a><br /> diff --git a/templates/show_box.inc.php b/templates/show_box.inc.php index 7a4fb127..f0b8ea3c 100644 --- a/templates/show_box.inc.php +++ b/templates/show_box.inc.php @@ -27,5 +27,5 @@ echo "<li>".$item->f_name_link."</li>\n"; } ?> - <?php } else { echo '<span class="error">' . _('Not Enough Data') . '</span>'; } ?> + <?php } else { echo '<li><span class="error">' . _('Not Enough Data') . '</span></li>'; } ?> </ol> diff --git a/templates/show_edit_catalog.inc.php b/templates/show_edit_catalog.inc.php index efd406ae..7ee1767a 100644 --- a/templates/show_edit_catalog.inc.php +++ b/templates/show_edit_catalog.inc.php @@ -40,6 +40,7 @@ <tr> <td><?php echo _('Catalog Type'); ?></td> <td><?php echo scrub_out(ucfirst($catalog->catalog_type)); ?></td> +</tr> <tr> <td><?php echo _('XML-RPC Key'); ?>:</td> <td> diff --git a/templates/show_now_playing_row.inc.php b/templates/show_now_playing_row.inc.php index 56697326..79998aee 100644 --- a/templates/show_now_playing_row.inc.php +++ b/templates/show_now_playing_row.inc.php @@ -24,7 +24,7 @@ $title = scrub_out(truncate_with_ellipse($song->title,'25')); $album = scrub_out(truncate_with_ellipse($song->f_album_full,'25')); $artist = scrub_out(truncate_with_ellipse($song->f_artist_full,'25')); ?> -<td class="np_cell_left"><b><?php echo _('Username'); ?></b>:<br><?php echo scrub_out($np_user->fullname); ?><br><br><!-- ## modified ##--> +<td class="np_cell_left"><b><?php echo _('Username'); ?></b>:<br /><?php echo scrub_out($np_user->fullname); ?><br /><br /><!-- ## modified ##--> <b><?php echo _('Song'); ?></b><br /><a title="<?php echo scrub_out($song->title); ?>" href="<?php echo $web_path; ?>/song.php?action=single_song&song_id=<?php echo $song->id; ?>"> <?php echo $title; ?> </a> diff --git a/templates/show_preferences.inc.php b/templates/show_preferences.inc.php index 81b2c06e..aabb5ca4 100644 --- a/templates/show_preferences.inc.php +++ b/templates/show_preferences.inc.php @@ -46,5 +46,5 @@ if ($_REQUEST['tab'] == 'account') { } ?> </form> -</div> + <?php show_box_bottom(); ?> diff --git a/templates/show_random_albums.inc.php b/templates/show_random_albums.inc.php index 28606db7..a3fcd98e 100644 --- a/templates/show_random_albums.inc.php +++ b/templates/show_random_albums.inc.php @@ -36,7 +36,7 @@ $web_path = Config::get('web_path'); <?php } else { ?> <?php echo '[' . $album->f_artist . '] ' . $album->f_name; ?> <?php } ?> - </a><br> + </a><br /> <?php if(Config::get('ratings')){ echo "<div style=\"float:left; display:inline;\" id=\"rating_" . $album->id . "_album\">"; diff --git a/templates/show_songs.inc.php b/templates/show_songs.inc.php index 7ad023db..24687b10 100644 --- a/templates/show_songs.inc.php +++ b/templates/show_songs.inc.php @@ -39,8 +39,8 @@ $ajax_url = Config::get('ajax_url'); <th><?php echo _('Album'); ?></th> <th><?php echo _('Genre'); ?></th> <th><?php echo _('Track'); ?></th> - <td><?php echo _('Time'); ?></th> - <td><?php echo _('Action'); ?></td> + <th><?php echo _('Time'); ?></th> + <th><?php echo _('Action'); ?></th> </tr> <?php foreach ($object_ids as $song_id) { |