Commit, still no internet paying for it.. curse you free.fr

45 files changed, 133 insertions, 280 deletions

diff --git a/templates/base.css b/templates/base.css
new file mode 100644
index 00000000..17a43d97
--- /dev/null
+++ b/templates/base.css
@@ -0,0 +1,46 @@
+/*
+
+ Copyright (c) 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 v2
+ as published by the Free Software Foundation
+
+ 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.
+
+*/
+/*****************************************************************************/
+/* Base Definitions, may be overwridden by themes
+/*****************************************************************************/
+
+/*****************
+ * Tag Definitions
+ *****************/
+.tag_size1 { 
+	font-size:.6em;
+} 
+.tag_size2 { 
+	font-size:.8em; 
+} 
+.tag_size3 { 
+	font-size:1em; 
+} 
+.tag_size4 { 
+	font-size:1.2em; 
+} 
+
+a.tag_size1, a.tag_size2, a.tag_size3, a.tag_size4 { text-decoration: none; } 
+
+.hover-add:hover { font-weight:900; } 
+.hover-remove:hover { text-decoration:line-through;} 
+
+
+
diff --git a/templates/handheld.css b/templates/handheld.css
deleted file mode 100644
index 5543d671..00000000
--- a/templates/handheld.css
+++ /dev/null
@@ -1,106 +0,0 @@
-<!--
-/*
-
- Copyright (c) 2001 - 2006 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 v2
- as published by the Free Software Foundation.
-
- 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.
-
-*/
--->
-/*
-#topbar {
-display: none;
-}
-*/
-html, address,
-blockquote,
-body, dd, div, 
-dl, dt, fieldset, form,
-frame, frameset,
-h1, h2, h3, h4,
-h5, h6, noframes,
-ol, p, ul, center,
-dir, hr, menu, pre   { display: block }
-li              { display: list-item }
-head            { display: none }
-table           { display: block }
-tr              { display: table-row }
-thead           { display: table-header-group }
-tbody           { display: table-row-group }
-tfoot           { display: table-footer-group }
-col             { display: table-column }
-colgroup        { display: table-column-group }
-td, th          { display: table-cell }
-caption         { display: table-caption }
-th              { font-weight: bolder; text-align: center }
-caption         { text-align: center }
-body            { margin: 8px }
-h1              { font-size: 2em; margin: .67em 0 }
-h2              { font-size: 1.5em; margin: .75em 0 }
-h3              { font-size: 1.17em; margin: .83em 0 }
-h4, p,
-blockquote, ul,
-fieldset, form,
-ol, dl, dir,
-menu            { margin: 1.12em 0 }
-h5              { font-size: .83em; margin: 1.5em 0 }
-h6              { font-size: .75em; margin: 1.67em 0 }
-h1, h2, h3, h4,
-h5, h6, b,
-strong          { font-weight: bolder }
-blockquote      { margin-left: 40px; margin-right: 40px }
-i, cite, em,
-var, address    { font-style: italic }
-pre, tt, code,
-kbd, samp       { font-family: monospace }
-pre             { white-space: pre }
-textarea,
-input, select   { display: block }
-big             { font-size: 1.17em }
-small, sub, sup { font-size: .83em }
-sub             { vertical-align: sub }
-sup             { vertical-align: super }
-table           { border-spacing: 2px; }
-thead, tbody,
-tfoot           { vertical-align: middle }
-td, th          { vertical-align: inherit }
-s, strike, del  { text-decoration: line-through }
-hr              { border: 1px inset }
-ol, ul, dir,
-menu, dd        { margin-left: 40px }
-ol              { list-style-type: decimal }
-ol ul, ul ol,
-ul ul, ol ol    { margin-top: 0; margin-bottom: 0 }
-u, ins          { text-decoration: underline }
-br:before       { content: "\A" }
-:before, :after { white-space: pre }
-center          { text-align: center }
-:link, :visited { text-decoration: underline }
-:focus          { outline: thin dotted invert }
-
-/* Begin bidirectionality settings (do not change) */
-BDO[DIR="ltr"]  { direction: ltr; unicode-bidi: bidi-override }
-BDO[DIR="rtl"]  { direction: rtl; unicode-bidi: bidi-override }
-
-*[DIR="ltr"]    { direction: ltr; unicode-bidi: embed }
-*[DIR="rtl"]    { direction: rtl; unicode-bidi: embed }
-
-@media print {
-  h1            { page-break-before: always }
-  h1, h2, h3,
-  h4, h5, h6    { page-break-after: avoid }
-  ul, ol, dl    { page-break-before: avoid }
-
-}
diff --git a/templates/header.inc.php b/templates/header.inc.php
index 2bc6d190..4caf51d5 100644
--- a/templates/header.inc.php
+++ b/templates/header.inc.php
@@ -33,23 +33,19 @@ $location = get_location();
 <?php
 if (Config::get('use_rss')) { ?>
 <link rel="alternate" type="application/rss+xml" title="<?php echo Config::get('rss_main_title'); ?>" href="<?php echo $web_path; ?>/rss.php" />
-<link rel="alternate" type="application/rss+xml" title="<?php echo _('Ampache Latest Artists Additions'); ?>" href="<?php echo $web_path; ?>/rss.php?type=latestartist" />
-<link rel="alternate" type="application/rss+xml" title="<?php echo _('Ampache Latest Albums Additions'); ?>" href="<?php echo $web_path; ?>/rss.php?type=latestalbum" />
-<link rel="alternate" type="application/rss+xml" title="<?php echo _('Ampache Most Popular Albums'); ?>" href="<?php echo $web_path; ?>/rss.php?type=popularalbum" />
-<link rel="alternate" type="application/rss+xml" title="<?php echo _('Ampache Most Popular Artists'); ?>" href="<?php echo $web_path; ?>/rss.php?type=popularalbum" />
-<link rel="alternate" type="application/rss+xml" title="<?php echo _('Ampache Most Popular Songs'); ?>" href="<?php echo $web_path; ?>/rss.php?type=popularsong" />
 <link rel="alternate" type="application/rss+xml" title="<?php echo _('Ampache Recently Played'); ?>" href="<?php echo $web_path; ?>/rss.php?type=recentlyplayed" />
 <?php } ?>
 <meta http-equiv="Content-Type" content="application/xhtml+xml; charset=<?php echo Config::get('site_charset'); ?>" />
 <title><?php echo scrub_out(Config::get('site_title')); ?> - <?php echo $location['title']; ?></title>
+<link rel="stylesheet" href="<?php echo $web_path; ?>/templates/base.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="<?php echo $web_path; ?><?php echo Config::get('theme_path'); ?>/templates/default.css" type="text/css" media="screen" />
 <link rel="stylesheet" href="<?php echo $web_path; ?>/templates/print.css" type="text/css" media="print" />
-<link rel="stylesheet" href="<?php echo $web_path; ?>/templates/handheld.css" type="text/css" media="handheld" />
 </head>
 <body>
 <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>
+<!-- rfc3514 implementation --> 
 <div id="rfc3514" style="display:none;">0x0</div>
 <div id="maincontainer" <?php 
 	if ($GLOBALS['theme']['orientation'] == 'horizontal') { 
@@ -78,8 +74,6 @@ if (Config::get('use_rss')) { ?>
 	<div id="rightbar"><!-- This is the rightbar -->
 		<?php require_once Config::get('prefix') . '/templates/rightbar.inc.php'; ?>
 	</div><!-- End rightbar -->
-<!-- I hate IE... 
-<table class="smeg-ie" width="100%"><tr><td> -->
 <!-- Tiny little iframe, used to cheat the system --> 
 <div id="ajax-loading">Loading . . .</div>
 <iframe name="util_iframe" id="util_iframe" style="display:none;" src="<?php echo Config::get('web_path'); ?>/util.php"></iframe>
diff --git a/templates/install.css b/templates/install.css
index f37431df..10eb86eb 100644
--- a/templates/install.css
+++ b/templates/install.css
@@ -92,7 +92,7 @@ h3 {
 /* Table style */
 td{
 	padding:5px;
-	//background-color: #D9E0E8;
+	/*background-color: #D9E0E8;*/
     font-size: smaller;
 }
 
@@ -120,13 +120,13 @@ textarea:focus{
 .ok {
 font-weight:bold;
 color:#009900;
-margin:10px 10 10px 10px;
+margin:10px 10px 10px 10px;
 }
 
 .notok {
 font-weight:bold;
 color:#FF3300;
-margin:10px 10 10px 10px;
+margin:10px 10px 10px 10px;
 }
 
 /* Bottom */
diff --git a/templates/print.css b/templates/print.css
index 05027a52..b2045256 100644
--- a/templates/print.css
+++ b/templates/print.css
@@ -84,7 +84,7 @@ br:before       { content: "\A" }
 :before, :after { white-space: pre }
 center          { text-align: center }
 :link, :visited { text-decoration: underline }
-:focus          { outline: thin dotted invert }
+/* :focus          { outline: thin invert }*/
 
 /* Begin bidirectionality settings (do not change) */
 BDO[DIR="ltr"]  { direction: ltr; unicode-bidi: bidi-override }
@@ -99,6 +99,7 @@ BDO[DIR="rtl"]  { direction: rtl; unicode-bidi: bidi-override }
   h1, h2, h3,
   h4, h5, h6    { page-break-after: avoid }
   ul, ol, dl    { page-break-before: avoid }
+}
 
 #sidebar {
 display: none;
@@ -122,5 +123,4 @@ display: none;
 }
 select {
 display: none;
-}
-
+}
\ No newline at end of file
diff --git a/templates/rightbar.inc.php b/templates/rightbar.inc.php
index fab81de3..22bc74e6 100644
--- a/templates/rightbar.inc.php
+++ b/templates/rightbar.inc.php
@@ -32,6 +32,7 @@
 		  </li>
 		<?php 
 			$playlists = Playlist::get_users($GLOBALS['user']->id); 
+			Playlist::build_cache($playlists); 
 			foreach ($playlists as $playlist_id) { 
 				$playlist = new Playlist($playlist_id);
 				$playlist->format(); 
diff --git a/templates/show_album_row.inc.php b/templates/show_album_row.inc.php
index 734bacb1..fd712364 100644
--- a/templates/show_album_row.inc.php
+++ b/templates/show_album_row.inc.php
@@ -44,7 +44,6 @@
 		<?php echo get_user_icon('comment',_('Post Shout')); ?>
 		</a>
 	<?php } ?>
-	<?php echo Ajax::button('?page=tag&action=show_add_tag&type=album&id=' . $album->id,'add_tag',_('Add Tag'),'add_album_tag_' . $album->id); ?>
 	<?php if (Access::check_function('batch_download')) { ?>
 		<a href="<?php echo Config::get('web_path'); ?>/batch.php?action=album&amp;id=<?php echo $album->id; ?>">
 			<?php echo get_user_icon('batch_download',_('Batch Download')); ?>
diff --git a/templates/show_artist.inc.php b/templates/show_artist.inc.php
index 62a54076..2f29d11a 100644
--- a/templates/show_artist.inc.php
+++ b/templates/show_artist.inc.php
@@ -25,7 +25,7 @@ $title = sprintf(_('Albums by %s'), $artist->full_name);
 show_box_top(sprintf(gettext('%s by %s'), ucfirst($object_type) ,$artist->f_name),'info-box');
 if (Config::get('ratings')) { 
 ?>
-<div id="rating_"<?php echo intval($artist->id); ?>"_artist" style="display:inline;">
+<div id="rating_<?php echo intval($artist->id); ?>_artist" style="display:inline;">
 	<?php show_rating($artist->id, 'artist'); ?>
 </div>
 <?php } ?>
@@ -38,7 +38,7 @@ if (Config::get('ratings')) {
 	<?php echo Ajax::button('?action=basket&type=artist&id=' . $artist->id,'add',_('Add'),'add_' . $artist->id); ?><?php printf(_('Add All Songs By %s'), $artist->f_name); ?>
 </li>
 <li>
-	<?php echo Ajax::button('?action=basket&type=artist_random&id=' . $artist->id,'random',_('Random'),'random_' . $artist->id); ?><?php printf(_('Add Random Songs By %s'), $artist->f_name); ?>>
+	<?php echo Ajax::button('?action=basket&type=artist_random&id=' . $artist->id,'random',_('Random'),'random_' . $artist->id); ?><?php printf(_('Add Random Songs By %s'), $artist->f_name); ?>
 </li>
 <?php if (Access::check('interface','50')) { ?>
 <li>
@@ -53,7 +53,7 @@ if (Config::get('ratings')) {
 <?php } ?>
 <li>
         <input type="checkbox" id="show_artist_artCB" <?php echo $string = Browse::get_filter('show_art') ? 'checked="checked"' : ''; ?>/> <?php echo _('Show Art'); ?>
-        <?php echo Ajax::observe('show_artist_artCB','click',Ajax::action('?page=browse&action=browse&key=show_art&value=1','')); ?>
+        <?php echo Ajax::observe('show_artist_artCB','click',Ajax::action('?page=browse&action=browse&key=show_art&value=1&type=album','')); ?>
 </ul>
 </div>
 <?php show_box_bottom(); ?>
diff --git a/templates/show_big_art.inc.php b/templates/show_big_art.inc.php
index 4121fff3..eb9ba0c4 100644
--- a/templates/show_big_art.inc.php
+++ b/templates/show_big_art.inc.php
@@ -28,7 +28,7 @@ $htmllang = str_replace("_","-",Config::get('lang'));
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo Config::get('site_charset'); ?>" />
 <title><?php echo Config::get('site_title'); ?> - <?php echo _("Album Art"); ?></title>
 </head>
-<body onLoad="self.resizeTo(document.images[0].width+30, document.images[0].height+70)">
+<body onload="self.resizeTo(document.images[0].width+30, document.images[0].height+70)">
 <?php
 echo "<a href=\"javascript:window.close()\" title=\"" . _('Click to close window') . "\">";
 echo "<img src=\"" . Config::get('web_path') . "/image.php?id=" . scrub_out($_GET['id']) . "&amp;sid=" . session_id() . "\" border=\"0\" alt=\"\" />";
diff --git a/templates/show_create_democratic.inc.php b/templates/show_create_democratic.inc.php
index 7059cebe..3175da2b 100644
--- a/templates/show_create_democratic.inc.php
+++ b/templates/show_create_democratic.inc.php
@@ -24,7 +24,7 @@ show_box_top(_('Create Democratic Playlist')); ?>
 <table class="tabledata" cellspacing="0" cellpadding="0">
 <tr>
 	<td><?php echo _('Name'); ?></td>
-	<td><input type="textbox" name="name" value="" /></td>
+	<td><input type="text" name="name" value="" /></td>
 </tr>
 <tr>
 	<td><?php echo _('Base Playlist'); ?></td>
@@ -32,7 +32,7 @@ show_box_top(_('Create Democratic Playlist')); ?>
 </tr>
 <tr>
 	<td><?php echo _('Cooldown Time'); ?></td>	
-	<td><input type="textbox" size="4" maxlength="6" name="cooldown" value="5" /><?php echo _('minutes'); ?></td>
+	<td><input type="text" size="4" maxlength="6" name="cooldown" value="5" /><?php echo _('minutes'); ?></td>
 </tr>
 <tr>
 	<td><?php echo _('Level'); ?></td>
diff --git a/templates/show_denied.inc.php b/templates/show_denied.inc.php
index 1b59cf08..74afe4ef 100644
--- a/templates/show_denied.inc.php
+++ b/templates/show_denied.inc.php
@@ -25,9 +25,9 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>Ampache -- Debug Page</title>
+<link rel="stylesheet" href="<?php echo Config::get('web_path'); ?>/templates/install.css" type="text/css" media="screen" />
 </head>
 <body bgcolor="#f0f0f0">
-<link rel="stylesheet" href="<?php echo Config::get('web_path'); ?>/templates/install.css" type="text/css" media="screen" />
 <div id="header">
 <h1>Ampache :: <?php echo _('Access Denied'); ?></h1>
 <p>This Event has been logged</p>
diff --git a/templates/show_disabled_songs.inc.php b/templates/show_disabled_songs.inc.php
index 2e85543c..75f763cb 100644
--- a/templates/show_disabled_songs.inc.php
+++ b/templates/show_disabled_songs.inc.php
@@ -30,7 +30,7 @@
   <col id="col_additiontime" />
 </colgroup>
 <tr class="th-top">
-	<th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo _('Select'); ?></a></td>
+	<th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo _('Select'); ?></a></th>
 	<th class="cel_song"><?php echo _('Title'); ?></th>
 	<th class="cel_album"><?php echo _('Album'); ?></th>
 	<th class="cel_artist"><?php echo _('Artist'); ?></th>
@@ -53,7 +53,7 @@
 	</tr>
 <?php } ?>
 <tr class="th-bottom">
-	<th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo _('Select'); ?></a></td>
+	<th class="cel_select"><a href="#" onclick="check_select('song'); return false;"><?php echo _('Select'); ?></a></th>
 	<th class="cel_song"><?php echo _('Title'); ?></th>
 	<th class="cel_album"><?php echo _('Album'); ?></th>
 	<th class="cel_artist"><?php echo _('Artist'); ?></th>
diff --git a/templates/show_edit_access.inc.php b/templates/show_edit_access.inc.php
index 14848946..9aa6c25e 100644
--- a/templates/show_edit_access.inc.php
+++ b/templates/show_edit_access.inc.php
@@ -24,7 +24,7 @@
 <table class="table-data">
 <tr>
 	<td><?php echo _('Name'); ?>: </td>
-	<td><input type="textbox" name="name" value="<?php echo scrub_out($access->name); ?>" /></td>
+	<td><input type="text" name="name" value="<?php echo scrub_out($access->name); ?>" /></td>
 </tr>
 <tr>
 	<td><?php echo _('ACL Type'); ?>: </td>
@@ -65,7 +65,6 @@
 		<input type="text" name="key" value="<?php echo scrub_out($access->key); ?>" size="32" maxlength="32" />
 	</td>
 </tr>
-</tr>
 <tr>
 	<td><?php echo _('Level'); ?>:</td>
 	<td>
diff --git a/templates/show_edit_album.inc.php b/templates/show_edit_album.inc.php
index e8f30373..41e6ccb7 100644
--- a/templates/show_edit_album.inc.php
+++ b/templates/show_edit_album.inc.php
@@ -26,13 +26,13 @@
 <tr class="<?php echo flip_class(); ?>">
 	<td><?php echo _('Name'); ?></td>
 	<td>
-		<input type="textbox" name="name" value="<?php echo scrub_out($album->full_name); ?>">
+		<input type="text" name="name" value="<?php echo scrub_out($album->full_name); ?>">
 	</td>
 </tr>
 <tr class="<?php echo flip_class(); ?>">
 	<td><?php echo _('Year'); ?></td>
 	<td>
-		<input type="textbox" name="year" value="<?php echo scrub_out($album->year); ?>">
+		<input type="text" name="year" value="<?php echo scrub_out($album->year); ?>">
 	</td>
 </tr>
 <tr class="<?php echo flip_class(); ?>">
diff --git a/templates/show_edit_album_row.inc.php b/templates/show_edit_album_row.inc.php
index c6168972..e1a1a694 100644
--- a/templates/show_edit_album_row.inc.php
+++ b/templates/show_edit_album_row.inc.php
@@ -24,7 +24,7 @@
 <table class="inline-edit" cellpadding="3" cellspacing="0">
 <tr>
 <td>
-	<input type="textbox" name="name" value="<?php echo scrub_out($album->full_name); ?>" />
+	<input type="text" name="name" value="<?php echo scrub_out($album->full_name); ?>" />
 </td>
 <td>
 	<?php 
@@ -37,7 +37,7 @@
 	?>
 </td>
 <td>
-	<input type="textbox" name="year" value="<?php echo scrub_out($album->year); ?>" /> 
+	<input type="text" name="year" value="<?php echo scrub_out($album->year); ?>" /> 
 </td>
 <td>
 	<input type="hidden" name="id" value="<?php echo $album->id; ?>" />
diff --git a/templates/show_edit_artist.inc.php b/templates/show_edit_artist.inc.php
index 50e256c8..030466a2 100644
--- a/templates/show_edit_artist.inc.php
+++ b/templates/show_edit_artist.inc.php
@@ -26,7 +26,7 @@
 <tr class="<?php echo flip_class(); ?>">
 	<td><?php echo _('Name'); ?></td>
 	<td>
-		<input type="textbox" name="name" value="<?php echo scrub_out($artist->name); ?>">
+		<input type="text" name="name" value="<?php echo scrub_out($artist->name); ?>">
 	</td>
 </tr>
 <tr class="<?php echo flip_class(); ?>">
diff --git a/templates/show_edit_artist_row.inc.php b/templates/show_edit_artist_row.inc.php
index 9e8ec913..de4c16b2 100644
--- a/templates/show_edit_artist_row.inc.php
+++ b/templates/show_edit_artist_row.inc.php
@@ -24,7 +24,7 @@
 <table class="inline-edit" cellpadding="3" cellspacing="0">
 <tr>
 <td>
-	<input type="textbox" name="name" value="<?php echo scrub_out($artist->f_full_name); ?>" />
+	<input type="text" name="name" value="<?php echo scrub_out($artist->f_full_name); ?>" />
 </td>
 <td>
 	<input type="hidden" name="id" value="<?php echo $artist->id; ?>" />
diff --git a/templates/show_edit_live_stream_row.inc.php b/templates/show_edit_live_stream_row.inc.php
index 475a2e78..48284165 100644
--- a/templates/show_edit_live_stream_row.inc.php
+++ b/templates/show_edit_live_stream_row.inc.php
@@ -32,19 +32,19 @@
 </tr>
 <tr>
 <td>
-	<input type="textbox" name="name" value="<?php echo scrub_out($radio->name); ?>" size="9" />
+	<input type="text" name="name" value="<?php echo scrub_out($radio->name); ?>" size="9" />
 </td>
 <td>
-	<input type="textbox" name="url" value="<?php echo scrub_out($radio->url); ?>" size ="12" />
+	<input type="text" name="url" value="<?php echo scrub_out($radio->url); ?>" size ="12" />
 </td>
 <td>
-	<input type="textbox" name="site_url" value="<?php echo scrub_out($radio->site_url); ?>" size="9" />
+	<input type="text" name="site_url" value="<?php echo scrub_out($radio->site_url); ?>" size="9" />
 </td>
 <td>
-	<input type="textbox" name="call_sign" value="<?php echo scrub_out($radio->call_sign); ?>" size="6" />
+	<input type="text" name="call_sign" value="<?php echo scrub_out($radio->call_sign); ?>" size="6" />
 </td>
 <td>
-	<input type="textbox" name="frequency" value="<?php echo scrub_out($radio->frequency); ?>" size="6" />
+	<input type="text" name="frequency" value="<?php echo scrub_out($radio->frequency); ?>" size="6" />
 </td>
 <td>
 	<input type="hidden" name="id" value="<?php echo $radio->id; ?>" />
diff --git a/templates/show_edit_playlist_row.inc.php b/templates/show_edit_playlist_row.inc.php
index 3a1e6161..ce752772 100644
--- a/templates/show_edit_playlist_row.inc.php
+++ b/templates/show_edit_playlist_row.inc.php
@@ -24,7 +24,7 @@
 <table cellpadding="0" cellspacing="0">
 <tr>
 	<td>
-		<input type="textbox" name="name" size="9" value="<?php echo scrub_out($playlist->name); ?>" />
+		<input type="text" name="name" size="9" value="<?php echo scrub_out($playlist->name); ?>" />
 	</td>
 	<td>	
 		<?php $name = 'select_' . $playlist->type; ${$name} = ' selected="selected"'; ?> 
diff --git a/templates/show_edit_playlist_song_row.inc.php b/templates/show_edit_playlist_song_row.inc.php
index 8a8d612c..fec8c24a 100644
--- a/templates/show_edit_playlist_song_row.inc.php
+++ b/templates/show_edit_playlist_song_row.inc.php
@@ -24,7 +24,7 @@
 <table class="inline-edit" cellpadding="3" cellspacing="0">
 <tr>
 <td>
-	<input type="textbox" name="track" size="3" maxlength="4" value="<?php echo intval($track['track']); ?>" />
+	<input type="text" name="track" size="3" maxlength="4" value="<?php echo intval($track['track']); ?>" />
 </td>
 <td class="cel_song"><?php echo $song->f_link; ?></td>
 <td class="cel_artist"><?php echo $song->f_artist_link; ?></td>
diff --git a/templates/show_edit_song.inc.php b/templates/show_edit_song.inc.php
index 028d2933..ee2dde80 100644
--- a/templates/show_edit_song.inc.php
+++ b/templates/show_edit_song.inc.php
@@ -30,7 +30,7 @@
 <tr class="<?php echo flip_class(); ?>">
 	<td><?php echo _('Title'); ?></td>
 	<td>
-		<input type="textbox" name="title" value="<?php echo scrub_out($song->title); ?>" size="45" />
+		<input type="text" name="title" value="<?php echo scrub_out($song->title); ?>" size="45" />
 	</td>
 </tr>
 <tr class="<?php echo flip_class(); ?>">
@@ -38,7 +38,7 @@
 	<td>
 		<?php show_album_select('album',$song->album); ?>
 		<br /><?php echo _('OR'); ?><br />
-		<input type="textbox" name="album_string" value="<?php echo scrub_out($song->get_album_name()); ?>" />
+		<input type="text" name="album_string" value="<?php echo scrub_out($song->get_album_name()); ?>" />
 	</td>
 </tr>
 <tr class="<?php echo flip_class(); ?>">
@@ -46,7 +46,7 @@
 	<td>
 		<?php show_artist_select('artist',$song->artist); ?>
 		<br /><?php echo _('OR'); ?><br />
-		<input type="textbox" name="artist_string" value="<?php echo scrub_out($song->get_artist_name()); ?>" />
+		<input type="text" name="artist_string" value="<?php echo scrub_out($song->get_artist_name()); ?>" />
 	</td>
 </tr>
 <tr class="<?php echo flip_class(); ?>">
@@ -54,25 +54,25 @@
 	<td>
 		<?php show_genre_select('genre',$song->genre); ?>
 		<br /><?php echo _('OR'); ?><br />
-		<input type="textbox" name="genre_string" value="<?php echo scrub_out($song->f_genre); ?>" />
+		<input type="text" name="genre_string" value="<?php echo scrub_out($song->f_genre); ?>" />
 	</td>
 </tr>
 <tr class="<?php echo flip_class(); ?>">
 	<td><?php echo _('Track'); ?></td>
 	<td>
-		<input type="textbox" name="track" value="<?php echo scrub_out($song->track); ?>" size="3" />
+		<input type="text" name="track" value="<?php echo scrub_out($song->track); ?>" size="3" />
 	</td>
 </tr>
 <tr class="<?php echo flip_class(); ?>">
 	<td><?php echo _('Year'); ?></td>
 	<td>
-		<input type="textbox" name="year" value="<?php echo scrub_out($song->year); ?>" size="5" />
+		<input type="text" name="year" value="<?php echo scrub_out($song->year); ?>" size="5" />
 	</td>
 </tr>
 <tr class="<?php echo flip_class(); ?>">
 	<td><?php echo _('Comment'); ?></td>
 	<td>
-		<input type="textbox" name="comment" value="<?php echo scrub_out($song->comment); ?>" size="45" />
+		<input type="text" name="comment" value="<?php echo scrub_out($song->comment); ?>" size="45" />
 	</td>
 </tr>
 <tr class="<?php echo flip_class(); ?>">
diff --git a/templates/show_edit_song_row.inc.php b/templates/show_edit_song_row.inc.php
index 97eb47b1..f8cdc36c 100644
--- a/templates/show_edit_song_row.inc.php
+++ b/templates/show_edit_song_row.inc.php
@@ -1,7 +1,7 @@
 <?php
 /*
 
- Copyright (c) 2001 - 2008 Ampache.org
+ Copyright (c) Ampache.org
  All rights reserved.
 
  This program is free software; you can redistribute it and/or
@@ -22,8 +22,9 @@
 <td colspan="8">
 <form method="post" id="edit_song_<?php echo $song->id; ?>">
 <table class="inline-edit" cellpadding="3" cellspacing="0">
+<tr>
 <td>
-	<input type="textbox" name="title" value="<?php echo scrub_out($song->title); ?>" />
+	<input type="text" name="title" value="<?php echo scrub_out($song->title); ?>" />
 </td>
 <td>
 	<?php show_artist_select('artist',$song->artist,true,$song->id); ?>
@@ -36,18 +37,14 @@
 <?php echo Ajax::observe('album_select_'.$song->id,'change','check_inline_song_edit("album", '.$song->id.')'); ?>
 </td>
 <td>
-	<?php show_genre_select('genre',$song->genre,'',true,$song->id); ?>
-	<div id="genre_select_song_<?php echo $song->id ?>"></div>
-<?php echo Ajax::observe('genre_select_'.$song->id,'change','check_inline_song_edit("genre", '.$song->id.')'); ?>
-</td>
-<td>
-	<input type="textbox" name="track" size="3" value="<?php echo scrub_out($song->track); ?>" />
+	<input type="text" name="track" size="3" value="<?php echo scrub_out($song->track); ?>" />
 </td>
 <td>
 	<input type="hidden" name="id" value="<?php echo $song->id; ?>" />
 	<input type="hidden" name="type" value="song" />
 	<?php echo Ajax::button('?action=edit_object&id=' . $song->id . '&type=song','download',_('Save Changes'),'save_song_' . $song->id,'edit_song_' . $song->id); ?>
 </td>
+</tr>
 </table>
 </form>
 </td>
diff --git a/templates/show_genre.inc.php b/templates/show_genre.inc.php
index 630aab61..6e1ee56f 100644
--- a/templates/show_genre.inc.php
+++ b/templates/show_genre.inc.php
@@ -26,7 +26,7 @@
 */
 $web_path = Config::get('web_path');
 ?>
-<?php show_box_top(sprintf(_('Viewing %s Genre') $genre->name)); ?>
+<?php show_box_top(sprintf(_('Viewing %s Genre'), $genre->name)); ?>
 		[<?php echo $genre->get_album_count(); ?>] 
 		<a href="<?php echo $web_path; ?>/genre.php?action=show_albums&amp;genre_id=<?php echo $genre->id; ?>">
 			<?php echo _('Albums'); ?></a><br />
diff --git a/templates/show_install.inc.php b/templates/show_install.inc.php
index b42b6769..799ba65b 100644
--- a/templates/show_install.inc.php
+++ b/templates/show_install.inc.php
@@ -25,7 +25,7 @@ if (INSTALL != '1') { exit; }
 <head>
 <title>Ampache :: For The Love Of Music - Install</title>
 <link rel="stylesheet" href="templates/install.css" type="text/css" media="screen" />
-<meta http-equiv="Content-Type" Content="text/html; Charset=<?php echo $charset; ?>" />
+<meta http-equiv="Content-Type" content="text/html; Charset=<?php echo $charset; ?>" />
 </head>
 <body>
 <script src="lib/javascript-base.js" language="javascript" type="text/javascript"></script>
diff --git a/templates/show_install_account.inc.php b/templates/show_install_account.inc.php
index 1e6991d3..9c52b93e 100644
--- a/templates/show_install_account.inc.php
+++ b/templates/show_install_account.inc.php
@@ -26,7 +26,7 @@ if (INSTALL != '1') { exit; }
 <head>
 <title>Ampache :: For The Love Of Music - Install</title>
 <link rel="stylesheet" href="templates/install.css" type="text/css" media="screen" />
-<meta http-equiv="Content-Type" Content="text/html; Charset=<?php echo $charset; ?>" />
+<meta http-equiv="Content-Type" content="text/html; Charset=<?php echo $charset; ?>" />
 </head>
 <body>
 <div id="header"> 
diff --git a/templates/show_install_config.inc.php b/templates/show_install_config.inc.php
index 43c55c3b..ef8d861f 100644
--- a/templates/show_install_config.inc.php
+++ b/templates/show_install_config.inc.php
@@ -26,7 +26,7 @@ if (INSTALL != '1') { exit; }
 <head>
 <title>Ampache :: For The Love Of Music - Install</title>
 <link rel="stylesheet" href="templates/install.css" type="text/css" media="screen" />
-<meta http-equiv="Content-Type" Content="text/html; Charset=<?php echo $charset; ?>" />
+<meta http-equiv="Content-Type" content="text/html; Charset=<?php echo $charset; ?>" />
 </head>
 <body>
 <div id="header"> 
diff --git a/templates/show_install_lang.inc.php b/templates/show_install_lang.inc.php
index a813d80f..91cb606b 100644
--- a/templates/show_install_lang.inc.php
+++ b/templates/show_install_lang.inc.php
@@ -26,7 +26,7 @@
 <head>
 <title>Ampache :: Pour l'Amour de la Musique - Install</title>
 <link rel="stylesheet" href="templates/install.css" type="text/css" media="screen" />
-<meta http-equiv="Content-Type" Content="text/html; Charset=<?php echo $charset; ?>" />
+<meta http-equiv="Content-Type" content="text/html; Charset=<?php echo $charset; ?>" />
 </head>
 <body>
 <script src="lib/javascript-base.js" language="javascript" type="text/javascript"></script>
diff --git a/templates/show_local_catalog_info.inc.php b/templates/show_local_catalog_info.inc.php
index 389f3099..71b6df78 100644
--- a/templates/show_local_catalog_info.inc.php
+++ b/templates/show_local_catalog_info.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
@@ -21,7 +21,7 @@
 */
 
 ?>
-<?php show_box_top(_('Catalog Statistics')); ?>
+<i><?php echo _('Catalog Statistics'); ?></i>
 <table class="tabledata" cellpadding="3" cellspacing="1">
 <tr class="th-top">
 	<th><?php echo _('Connected Users'); ?></th>
@@ -44,4 +44,3 @@
 	<td><?php echo $stats['time_text']; ?></td>
 </tr>
 </table>
-<?php show_box_bottom(); ?>
diff --git a/templates/show_localplay_add_instance.inc.php b/templates/show_localplay_add_instance.inc.php
index 224994c7..68d83f22 100644
--- a/templates/show_localplay_add_instance.inc.php
+++ b/templates/show_localplay_add_instance.inc.php
@@ -27,7 +27,7 @@
 <?php foreach ($fields as $key=>$field) { ?>
 <tr>
 	<td><?php echo $field['description']; ?></td>
-	<td><input type="textbox" name="<?php echo $key; ?>" /></td>
+	<td><input type="text" name="<?php echo $key; ?>" /></td>
 </tr>
 <?php } ?>
 </table>
diff --git a/templates/show_localplay_edit_instance.inc.php b/templates/show_localplay_edit_instance.inc.php
index 49a34d5c..6f3f8d70 100644
--- a/templates/show_localplay_edit_instance.inc.php
+++ b/templates/show_localplay_edit_instance.inc.php
@@ -26,7 +26,7 @@
 <?php foreach ($fields as $key=>$field) { ?>
 <tr>
 	<td><?php echo $field['description']; ?></td>
-	<td><input type="textbox" name="<?php echo $key; ?>" value="<?php echo scrub_out($instance[$key]); ?>" /></td>
+	<td><input type="text" name="<?php echo $key; ?>" value="<?php echo scrub_out($instance[$key]); ?>" /></td>
 </tr>
 <?php } ?>
 </table>
diff --git a/templates/show_login_form.inc.php b/templates/show_login_form.inc.php
index a5fd3499..44b58be5 100644
--- a/templates/show_login_form.inc.php
+++ b/templates/show_login_form.inc.php
@@ -55,11 +55,11 @@ function focus(){ document.login.username.focus(); }
 		<form name="login" method="post" enctype="multipart/form-data" action="<?php echo Config::get('web_path'); ?>/login.php">
 
 			<div class="loginfield" id="usernamefield">
-        <label for="username"><?php echo  _('Login'); ; ?>:</label> 
+        <label for="username"><?php echo  _('Username'); ?>:</label> 
 			  <input class="text_input" type="text" id="username" name="username" value="<?php echo  $_REQUEST['username']; ; ?>" />
       </div>
 			<div class="loginfield" id="passwordfield">
-        <label for="password"><?php echo  _('Password'); ; ?>:</label> 
+        <label for="password"><?php echo  _('Password'); ?>:</label> 
   			<input class="text_input" type="password" id="password" name="password" value="" />
       </div>
 			<div class="loginfield" id="remembermefield"><label for="rememberme">
diff --git a/templates/show_manage_shoutbox.inc.php b/templates/show_manage_shoutbox.inc.php
index 9394aaab..ec155203 100644
--- a/templates/show_manage_shoutbox.inc.php
+++ b/templates/show_manage_shoutbox.inc.php
@@ -27,7 +27,7 @@ $web_path = Config::get('web_path');
   <col id="col_username" />
   <col id="col_sticky" />
   <col id="col_comment" />
-  <col id="col_date />
+  <col id="col_date" />
   <col id="col_action" />
 </colgroup>
 <tr class="th-top">
diff --git a/templates/show_object_rating.inc.php b/templates/show_object_rating.inc.php
index cba5d713..75ae6995 100644
--- a/templates/show_object_rating.inc.php
+++ b/templates/show_object_rating.inc.php
@@ -35,7 +35,7 @@ $base_url = '?action=set_rating&rating_type=' . $rating->type . '&object_id=' .
     if ($rating->rating <= 0) {
     	echo _('not rated yet') . "</li>\n";
     }
-    else printf(_('%s of 5', $rating->preciserating)); echo "</li>\n";
+    else printf(_('%s of 5'), $rating->preciserating); echo "</li>\n";
     
     for ($i=1; $i<6; $i++)
     {
diff --git a/templates/show_play_selected.inc.php b/templates/show_play_selected.inc.php
index 3d2ce215..e545e0ac 100644
--- a/templates/show_play_selected.inc.php
+++ b/templates/show_play_selected.inc.php
@@ -60,7 +60,7 @@ if (is_object($GLOBALS['playlist'])) { ?>
 		<option value="artist"><?php echo _('Artist'); ?></option> 
 		<option value="year"><?php echo _('Year'); ?></option> 
 	</select>
-	<input type="textbox" name="update_value" />
+	<input type="text" name="update_value" />
 	<input class="button" type="button" value="<?php echo _('Update'); ?>" onclick="return SubmitToPage('songs','<?php echo $web_path; ?>/admin/flag.php?action=mass_update');" />
 </td>
 </tr>
diff --git a/templates/show_playlist.inc.php b/templates/show_playlist.inc.php
index 05d30d7f..44234032 100644
--- a/templates/show_playlist.inc.php
+++ b/templates/show_playlist.inc.php
@@ -38,7 +38,6 @@
 </div>
 <?php show_box_bottom(); ?>
 <?php 
-	$object_ids = $playlist->get_items(); 
 	Browse::set_type('playlist_song'); 
 	Browse::add_supplemental_object('playlist',$playlist->id); 
 	Browse::set_static_content(1);
diff --git a/templates/show_registration_confirmation.inc.php b/templates/show_registration_confirmation.inc.php
index 55cb78db..21b30c9a 100644
--- a/templates/show_registration_confirmation.inc.php
+++ b/templates/show_registration_confirmation.inc.php
@@ -27,16 +27,14 @@ $web_path = Config::get('web_path');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo Config::get('site_charset'); ?>" />
 <title><?php echo Config::get('site_title'); ?> - <?php echo _('Registration'); ?></title>
-</head>
-<body bgcolor="#f0f0f0">
 <link rel="stylesheet" href="<?php echo Config::get('web_path'); ?>/templates/install.css" type="text/css" media="screen" />
 <link rel="shortcut icon" href="<?php echo Config::get('web_path'); ?>/favicon.ico" />
+</head>
+<body>
 <div id="header">
 <h1><?php echo scrub_out(Config::get('site_title')); ?></h1>
 <?php echo _('Registration Complete'); ?>...
 </div>
-</head>
-<body>
 <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>
diff --git a/templates/show_stats_newest.inc.php b/templates/show_stats_newest.inc.php
index 04489b2b..0bd0bb66 100644
--- a/templates/show_stats_newest.inc.php
+++ b/templates/show_stats_newest.inc.php
@@ -19,23 +19,9 @@
 
 */
 ?>
-<div id="recent_added">
-        <?php
-                $objects = Stats::get_newest('album');
-                $headers = array('f_link'=>_('Newest Albums'));
-                show_box_top('','info-box box_newest_albums');
-                require Config::get('prefix') . '/templates/show_objects.inc.php';
-                show_box_bottom();
-                $objects = Stats::get_newest('artist');
-                $headers = array('f_name_link'=>_('Newest Artists'));
-                show_box_top('','info-box box_newest_artists');
-                require Config::get('prefix') . '/templates/show_objects.inc.php';
-                show_box_bottom();
-                $objects = Stats::get_newest('genre');
-                $headers = array('f_link'=>_('Newest Genres'));
-                show_box_top('','info-box box_newest_genres');
-                require Config::get('prefix') . '/templates/show_objects.inc.php';
-                show_box_bottom();
-        ?>
-</div>
-
+<i><?php echo _('Newest Albums'); ?></i>
+<?php $object_ids = Stats::get_newest('album'); ?>
+<?php require_once Config::get('prefix') . '/templates/show_albums.inc.php'; ?>
+<?php $object_ids = Stats::get_newest('artist'); ?>
+<i><?php echo _('Newest Artists'); ?></i>
+<?php require_once Config::get('prefix') . '/templates/show_artists.inc.php'; ?>
diff --git a/templates/show_stats_popular.inc.php b/templates/show_stats_popular.inc.php
index 648945a9..432f971f 100644
--- a/templates/show_stats_popular.inc.php
+++ b/templates/show_stats_popular.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
@@ -33,10 +33,5 @@
                 require Config::get('prefix') . '/templates/show_objects.inc.php'; 
                 show_box_bottom(); 
 
-                $objects = Stats::get_top('genre'); 
-                $headers = array('f_link'=>_('Most Popular Genres')); 
-                show_box_top('','info-box box_popular_genres'); 
-                require Config::get('prefix') . '/templates/show_objects.inc.php'; 
-                show_box_bottom(); 
 ?>
 </div>
diff --git a/templates/show_tagcloud.inc.php b/templates/show_tagcloud.inc.php
index 882246db..bde48898 100644
--- a/templates/show_tagcloud.inc.php
+++ b/templates/show_tagcloud.inc.php
@@ -21,56 +21,3 @@
 */ 
 $web_path = Config::get('web_path'); 
 ?>
-<?php show_box_top('', 'info-box'); 
-/* make a map id->name
-$tagbyid = array();
-foreach ($tagcloudList as $f)
-  $tagbyid[$f['id']] = $f;
-$ar = $_GET;
-unset($ar['tag']);
-$base = rebuild_query($ar);
-$currentTags = array_fill_keys($_SESSION['browse']['filter']['tag'], '1');
-$filter=0;
-foreach ($_SESSION['browse']['filter']['tag'] as $t) {
-    if (!$filter) {
-      $filter = 1;
-      echo _('Filters(remove): ');
-    }
-    $ctags = $currentTags;
-    unset($ctags[$t]);
-    $stags = implode(',', array_keys($ctags));
-    $col = 'black';
-    $alt = '';
-    if (isset($tagbyid[$t]['color'])) {
-      $col = $tagbyid[$t]['color'];
-      $alt = ' title="owner: '. $tagbyid[$t]['username'].'" ';
-    }
-    echo '<a style="color:'. $col.'"'.$alt .' href="' .$base 
-       . 'tag='.$stags.'">'.$tagbyid[$t]['name'].'</a> ';
-}
-echo '<br/>';
-$filter = 0;
-foreach ($tagcloudList as $f) {
-   $n = $f['name'];
-   $id = $f['id'];
-   if (!$currentTags[$id]) {
-     if (!$filter) {
-       $filter = 1;
-       echo _('Matching tags: ');
-     }
-     $ctags = $currentTags;
-     $ctags[$id] = 1;
-     $stags = implode(',', array_keys($ctags));
-     $col = 'black';
-     $alt = '';
-     if (isset($f['color'])) {
-       $col = $f['color'];
-       $alt = ' title="owner: '. $f['username'].'" ';
-     }
-     echo '<a style="color:'.$col.'"'.$alt.' href="' .$base
-     . 'tag='.$stags.'">'.$n.'</a> ';
-   }
-}
-*/
-?>
-<?php show_box_bottom(); ?>
diff --git a/templates/show_test.inc.php b/templates/show_test.inc.php
index 43338288..5c193f98 100644
--- a/templates/show_test.inc.php
+++ b/templates/show_test.inc.php
@@ -25,13 +25,14 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>Ampache -- Debug Page</title>
+<link rel="stylesheet" href="templates/install.css" type="text/css" media="screen" />
 </head>
 <body bgcolor="#f0f0f0">
-<link rel="stylesheet" href="templates/install.css" type="text/css" media="screen" />
 <div id="header">
 <h1><?php echo _('Ampache Debug'); ?></h1>
 <p><?php echo _('You\'ve reached this page because a configuration error has occured. Debug Information below'); ?></p>
 </div>
+<div>
 <table align="center" cellpadding="3" cellspacing="0">
 <tr>
 	<td><font size="+1"><?php echo _('CHECK'); ?></font></td>
@@ -246,7 +247,7 @@
 		}
 		$results['web_path'] = $http_type . $_SERVER['SERVER_NAME'] . ":" . $_SERVER['SERVER_PORT'] . Config::get('web_path');
 		if ($status['parse_config']) { 
-			echo "<img src=\"" . $results['web_path'] ."/images/ampache.png\" width=\"80\" height=\"15\"/>";
+			echo "&nbsp;&nbsp;&nbsp;<img src=\"" . $results['web_path'] ."/images/icon_enable.png\" />&nbsp;&nbsp;&nbsp;";
 		}
 		else {
 			$status['check_webpath'] = false;
@@ -257,15 +258,15 @@
 	]
 	</td>
 	<td>
-	This test makes sure that your web_path variable is set correctly and that we are able to get to the index page. If you do not see the ampache
-	logo here then your web_path is not set correctly. 
+	This test makes sure that your web_path variable is set correctly and that we are able to get to the index page. If you do not see a check mark
+	here then your web_path is not set correctly. 
 	</td>
 </tr>
 </table>
 </div>
 <div id="bottom">
 <p><strong>Ampache Debug.</strong><br />
-For the love of Music.</p>
+Pour l'Amour de la Musique.</p>
 </div>
 </body>
 </html>
diff --git a/templates/show_test_config.inc.php b/templates/show_test_config.inc.php
index 085fa17c..9c1807b0 100644
--- a/templates/show_test_config.inc.php
+++ b/templates/show_test_config.inc.php
@@ -25,8 +25,6 @@
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 <title>Ampache -- Config Debug Page</title>
-</head>
-<body bgcolor="#f0f0f0">
 <link rel="stylesheet" href="templates/install.css" type="text/css" media="screen" />
 <style type="text/css">
 body { 
@@ -36,6 +34,8 @@ body {
 	padding-left: 10px; 
 } 
 </style>
+</head>
+<body bgcolor="#f0f0f0">
 <div id="header">
 <h1><?php echo _('Ampache Debug'); ?></h1>
 <p>Ampache.cfg.php error detected</p>
@@ -47,7 +47,7 @@ If you are upgrading from 3.3.x please see the directions below.</p>
 
 <h3>Migrating from 3.3.x to 3.4.x</h3>
 <p>Ampache 3.4 uses a different config parser that is over 10x faster then the previous version. Unfortunately the new parser is
-unable to read the old config files. You must run <strong>php /bin/migrate_config.inc</strong> from the command line to create your
+unable to read the old config files. From inside the Ampache root directory you must run <strong>php bin/migrate_config.inc</strong> from the command line to create your
 new config file.</p>
 
 <p>The following settings will not be migrated by the <strong>migrate_config.inc</strong> script due to major changes between versions. The default
@@ -75,7 +75,7 @@ This variable no longer exists, all downsampling/transcoding is handled by the t
 </div>
 <div id="bottom">
 <p><strong>Ampache Debug.</strong><br />
-For the love of Music.</p>
+Pour l'Amour de la Musique.</p>
 </div>
 </body>
 </html>
diff --git a/templates/show_user_activate.inc.php b/templates/show_user_activate.inc.php
index 99e8796f..4b5b6cc0 100644
--- a/templates/show_user_activate.inc.php
+++ b/templates/show_user_activate.inc.php
@@ -27,16 +27,15 @@ $web_path = Config::get('web_path');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo Config::get('site_charset'); ?>" />
 <title><?php echo Config::get('site_title'); ?> - <?php echo _('Registration'); ?></title>
-</head>
-<body bgcolor="#f0f0f0">
 <link rel="stylesheet" href="<?php echo Config::get('web_path'); ?>/templates/install.css" type="text/css" media="screen" />
 <link rel="shortcut icon" href="<?php echo Config::get('web_path'); ?>/favicon.ico" />
+</head>
+<body>
 <div id="header">
 <h1><?php echo Config::get('site_title'); ?></h1>
 <?php echo _('Registration'); ?>...
 </div>
-</head>
-<body>
+
 <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>
@@ -48,7 +47,8 @@ $web_path = Config::get('web_path');
 ?>
 <h3><?php echo _('User Activated'); ?></h3>
 <p>
-	<?php printf(_('This User ID is activated and can be used %sLogin%s'), '<a href="' . Config::get('web_path'). '/login.php">', '</a>'); ?></a>
+	<?php
+	 printf(_('This User ID is activated and can be used %sLogin%s'), '<a href="' . Config::get('web_path'). '/login.php">', '</a>'); ?>
 </p>
 <?php } else { ?>
 <h3><?php echo _('Validation Failed'); ?></h3>
diff --git a/templates/show_user_registration.inc.php b/templates/show_user_registration.inc.php
index c435293d..f162c6c6 100644
--- a/templates/show_user_registration.inc.php
+++ b/templates/show_user_registration.inc.php
@@ -27,16 +27,14 @@ $web_path = Config::get('web_path');
 <head>
 <meta http-equiv="Content-Type" content="text/html; charset=<?php echo Config::get('site_charset'); ?>" />
 <title><?php echo Config::get('site_title'); ?> - <?php echo _('Registration'); ?></title>
-</head>
-<body bgcolor="#f0f0f0">
 <link rel="stylesheet" href="<?php echo Config::get('web_path'); ?>/templates/install.css" type="text/css" media="screen" />
 <link rel="shortcut icon" href="<?php echo Config::get('web_path'); ?>/favicon.ico" />
+</head>
+<body>
 <div id="header">
 <h1><?php echo scrub_out(Config::get('site_title')); ?></h1>
 <?php echo _('Registration'); ?>...
 </div>
-</head>
-<body>
 <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>
@@ -62,7 +60,7 @@ if (Config::get('user_agreement')) { ?>
 </tr>
 <tr>
 	<td>
-		<input type='checkbox' name='accept_agreement'> <?php echo _('I Accept'); ?>
+		<input type='checkbox' name='accept_agreement' /> <?php echo _('I Accept'); ?>
 		<?php Error::display('user_agreement'); ?>
 	</td>
 </tr>
diff --git a/templates/show_verify_catalog.inc.php b/templates/show_verify_catalog.inc.php
index 22a37af3..a915d681 100644
--- a/templates/show_verify_catalog.inc.php
+++ b/templates/show_verify_catalog.inc.php
@@ -20,7 +20,7 @@
 */
 
 show_box_top();
-printf(_('Updating the %s catalog', "<strong>[ $catalog->name ]</strong>"));
+printf(_('Updating the %s catalog'), "<strong>[ $catalog->name ]</strong>");
 echo "<br />\n" . $number . " " . _('songs found checking tag information.') . "<br />\n\n";
 echo _('Verifed') . ":<span id=\"verify_count_$catalog_id\">$catalog_verify_found</span><br />"; 
 echo _('Reading') . ":<span id=\"verify_dir_$catalog_id\">$catalog_verify_directory</span><br />";
diff --git a/templates/sidebar_home.inc.php b/templates/sidebar_home.inc.php
index 114cb256..ec37677b 100644
--- a/templates/sidebar_home.inc.php
+++ b/templates/sidebar_home.inc.php
@@ -43,7 +43,7 @@ $ajax_info = Config::get('ajax_url'); $web_path = Config::get('web_path');
         <?php if (in_array('starts_with',$allowed_filters)) { ?>
         <form id="multi_alpha_filter_form" method="post" action="javascript:void(0);">
                 <label id="multi_alpha_filterLabel" for="multi_alpha_filter"><?php echo _('Starts With'); ?></label>
-                <input type="textbox" id="multi_alpha_filter" name="multi_alpha_filter" value="<?php echo scrub_out(Browse::get_filter('starts_with')); ?>" onKeyUp="DelayRun(this,'400','ajaxState','<?php echo Config::get('ajax_url'); ?>?page=browse&action=browse&type=<?php echo Browse::get_type(); ?>&key=starts_with','multi_alpha_filter');">
+                <input type="text" id="multi_alpha_filter" name="multi_alpha_filter" value="<?php echo scrub_out(Browse::get_filter('starts_with')); ?>" onKeyUp="DelayRun(this,'400','ajaxState','<?php echo Config::get('ajax_url'); ?>?page=browse&action=browse&type=<?php echo Browse::get_type(); ?>&key=starts_with','multi_alpha_filter');">
         </form>
         <?php } // end if alpha_match ?>
         <?php if (in_array('minimum_count',$allowed_filters)) { ?>