fixed some html syntax

git-svn-id: http://dev.piwik.org/svn/trunk@4825 59fd770c-687e-43c8-a1e3-f5a4ff64c105

6 files changed, 27 insertions, 25 deletions

diff --git a/plugins/CoreAdminHome/templates/generalSettings.tpl b/plugins/CoreAdminHome/templates/generalSettings.tpl
index fcba240d64..5595da35e8 100644
--- a/plugins/CoreAdminHome/templates/generalSettings.tpl
+++ b/plugins/CoreAdminHome/templates/generalSettings.tpl
@@ -58,12 +58,12 @@
 <div id='emailSettings'>
 <table class="adminTable" style='width:600px;'>
 	<tr>
-		<td>{'General_UseSMTPServerForEmail'|translate}<br>
+		<td>{'General_UseSMTPServerForEmail'|translate}<br />
 			<span class="form-description">{'General_SelectYesIfYouWantToSendEmailsViaServer'|translate}</span>
 		</td>
 		<td style='width:200px'>
-			<label><input type="radio" name="mailUseSmtp" value="1" {if $mail.transport eq 'smtp'} checked {/if}> {'General_Yes'|translate}</label>
-			<label><input type="radio" name="mailUseSmtp" value="0" style ="margin-left:20px;" {if $mail.transport eq ''} checked {/if}>  {'General_No'|translate}</label> 
+			<label><input type="radio" name="mailUseSmtp" value="1" {if $mail.transport eq 'smtp'} checked {/if}/> {'General_Yes'|translate}</label>
+			<label><input type="radio" name="mailUseSmtp" value="0" style ="margin-left:20px;" {if $mail.transport eq ''} checked {/if}/>  {'General_No'|translate}</label> 
 		</td>
 	</tr>
 </table>
@@ -76,12 +76,12 @@
 			<td style='width:200px'><input type="text" id="mailHost" value="{$mail.host}"></td>
 		</tr>
 		<tr>
-			<td><label for="mailPort">{'General_SmtpPort'|translate}</label><br>
+			<td><label for="mailPort">{'General_SmtpPort'|translate}</label><br />
 				<span class="form-description">{'General_OptionalSmtpPort'|translate}</span></td>
 			<td><input type="text" id="mailPort" value="{$mail.port}"></td>
 		</tr>
 		<tr>
-			<td><label for="mailType">{'General_AuthenticationMethodSmtp'|translate}</label><br>
+			<td><label for="mailType">{'General_AuthenticationMethodSmtp'|translate}</label><br />
 				<span class="form-description">{'General_OnlyUsedIfUserPwdIsSet'|translate}</span>
 			</td>
 			<td>
@@ -94,23 +94,23 @@
 			</td>
 		</tr>
 		<tr>
-			<td><label for="mailUsername">{'General_SmtpUsername'|translate}</label><br>
+			<td><label for="mailUsername">{'General_SmtpUsername'|translate}</label><br />
 				<span class="form-description">{'General_OnlyEnterIfRequired'|translate}</span></td>
 			<td>
-				<input type="text" id="mailUsername" value = "{$mail.username}" >
+				<input type="text" id="mailUsername" value = "{$mail.username}" />
 			</td>
 		</tr>
 		<tr>
-			<td><label for="mailPassword">{'General_SmtpPassword'|translate}</label><br>
+			<td><label for="mailPassword">{'General_SmtpPassword'|translate}</label><br />
 				<span class="form-description">{'General_OnlyEnterIfRequiredPassword'|translate}<br/>
 				{'General_WarningPasswordStored'|translate:"<strong>":"</strong>"}</span>
 			</td>
 			<td>
-				<input type="password" id="mailPassword" value = "{$mail.password}" >
+				<input type="password" id="mailPassword" value = "{$mail.password}" />
 			</td>
 		</tr>
 		<tr>
-			<td><label for="mailEncryption">{'General_SmtpEncryption'|translate}</label><br>
+			<td><label for="mailEncryption">{'General_SmtpEncryption'|translate}</label><br />
 				<span class="form-description">{'General_EncryptedSmtpTransport'|translate}</span></td>
 			<td>
 				<select id="mailEncryption">
@@ -130,8 +130,8 @@
     <tr>
         <td> {'CoreAdminHome_UseCustomLogo'|translate}</td>
         <td style='width:200px'>
-            <label><input type="radio" name="useCustomLogo" value="1" {if $branding.use_custom_logo == 1} checked {/if}> {'General_Yes'|translate}</label>
-            <label><input type="radio" name="useCustomLogo" value="0" style ="margin-left:20px;" {if $branding.use_custom_logo == 0} checked {/if}>  {'General_No'|translate}</label> 
+            <label><input type="radio" name="useCustomLogo" value="1" {if $branding.use_custom_logo == 1} checked {/if}/> {'General_Yes'|translate}</label>
+            <label><input type="radio" name="useCustomLogo" value="0" style ="margin-left:20px;" {if $branding.use_custom_logo == 0} checked {/if}/>  {'General_No'|translate}</label> 
         </td>
     </tr>
 </table>
@@ -146,7 +146,7 @@
     <table class="adminTable" style='width:550px;'> 
         <tr>
             {if $logosWriteable}
-            <td><label for="customLogo">{'CoreAdminHome_LogoUpload'|translate}:<br>
+            <td><label for="customLogo">{'CoreAdminHome_LogoUpload'|translate}:<br />
                 <span class="form-description">{'CoreAdminHome_LogoUploadDescription'|translate:"JPG / PNG / GIF"}</span></label></td>
             <td style='width:200px'>
             <input name="customLogo" type="file" id="customLogo" /><img src="themes/logo.png?r={math equation='rand(10,1000)'}" id="currentLogo" height="150"/>
diff --git a/plugins/CoreAdminHome/templates/header.tpl b/plugins/CoreAdminHome/templates/header.tpl
index a487332452..afd25fea11 100644
--- a/plugins/CoreAdminHome/templates/header.tpl
+++ b/plugins/CoreAdminHome/templates/header.tpl
@@ -55,11 +55,11 @@
 {include file="CoreHome/templates/header_message.tpl"}
 
 {if !empty($configFileNotWritable)}
-<div class="ajaxSuccess" style="display:normal">
+<div class="ajaxSuccess" style="display:block">
 	{'General_ConfigFileIsNotWritable'|translate:"(config/config.ini.php)":"<br/>"}
 </div>
 {elseif strpos($url, 'updated=1')}	
-<div class="ajaxSuccess" style="display:normal">
+<div class="ajaxSuccess" style="display:block">
 	{'General_YourChangesHaveBeenSaved'|translate}
 </div>
 {/if}
diff --git a/plugins/CoreAdminHome/templates/menu.tpl b/plugins/CoreAdminHome/templates/menu.tpl
index 2aa52e38b3..a0f710d92f 100644
--- a/plugins/CoreAdminHome/templates/menu.tpl
+++ b/plugins/CoreAdminHome/templates/menu.tpl
@@ -2,7 +2,8 @@
 	<div id="menu">
 	<ul id="tablist">
 	{foreach from=$menu key=name item=url name=menu}
-		<li> <a href='index.php{$url._url|@urlRewriteWithParameters}' {if isset($currentAdminMenuName) && $name==$currentAdminMenuName}class='active'{/if}>{$name|translate}</a></li>	{/foreach}
+		<li> <a href='index.php{$url._url|@urlRewriteWithParameters}' {if isset($currentAdminMenuName) && $name==$currentAdminMenuName}class='active'{/if}>{$name|translate}</a></li>
+	{/foreach}
 	</ul>
 	</div>
 {/if}
\ No newline at end of file
diff --git a/plugins/CoreAdminHome/templates/optOut.tpl b/plugins/CoreAdminHome/templates/optOut.tpl
index ea533b71fe..10c336d8a6 100644
--- a/plugins/CoreAdminHome/templates/optOut.tpl
+++ b/plugins/CoreAdminHome/templates/optOut.tpl
@@ -15,13 +15,13 @@
 		{/if}
 		<br/><br/> 
 		<form method="post" action="?module=CoreAdminHome&amp;action=optOut{if $language}&amp;language={$language}{/if}">
-			<input type="hidden" name="nonce" value="{$nonce}"></input>
+			<input type="hidden" name="nonce" value="{$nonce}" ></input>
 			<input type="hidden" name="fuzz" value="{$smarty.now}"></input>
-			<input onclick="this.form.submit()" type="checkbox" id="trackVisits" name="trackVisits" {if $trackVisits}checked="checked"{/if}>
+			<input onclick="this.form.submit()" type="checkbox" id="trackVisits" name="trackVisits" {if $trackVisits}checked="checked"{/if}></input>
 			<label for="trackVisits"><strong>
 			{if $trackVisits}{'CoreAdminHome_YouAreOptedIn'|translate} {'CoreAdminHome_ClickHereToOptOut'|translate}
 			{else}{'CoreAdminHome_YouAreOptedOut'|translate} {'CoreAdminHome_ClickHereToOptIn'|translate}{/if}
-			</strong></a></input>
+			</strong></label>
 		</form>
 	</body>
 </html>
diff --git a/plugins/DBStats/templates/DBStats.tpl b/plugins/DBStats/templates/DBStats.tpl
index 031210f7e5..5718d152b4 100644
--- a/plugins/DBStats/templates/DBStats.tpl
+++ b/plugins/DBStats/templates/DBStats.tpl
@@ -10,11 +10,13 @@
 {'DBStats_LearnMore'|translate:"<a href='?module=Proxy&action=redirect&url=http://piwik.org/docs/setup-auto-archiving/' target='_blank'>Piwik Auto Archiving</a>"}</p>
 <table class="dataTable entityTable">
 	<thead>
-		<th>{'DBStats_Table'|translate}</th>
-		<th>{'DBStats_RowCount'|translate}</th>
-		<th>{'DBStats_DataSize'|translate}</th>
-		<th>{'DBStats_IndexSize'|translate}</th>
-		<th>{'DBStats_TotalSize'|translate}</th>
+		<tr>
+			<th>{'DBStats_Table'|translate}</th>
+			<th>{'DBStats_RowCount'|translate}</th>
+			<th>{'DBStats_DataSize'|translate}</th>
+			<th>{'DBStats_IndexSize'|translate}</th>
+			<th>{'DBStats_TotalSize'|translate}</th>
+		</tr>
 	</thead>
 	<tbody id="tables">
 		{foreach from=$tablesStatus key=index item=table}
diff --git a/plugins/UsersManager/templates/userSettings.tpl b/plugins/UsersManager/templates/userSettings.tpl
index d8286470dd..d43906023b 100644
--- a/plugins/UsersManager/templates/userSettings.tpl
+++ b/plugins/UsersManager/templates/userSettings.tpl
@@ -23,7 +23,6 @@
 			</span>
 		{/if}
 	</td>
-</td>
 </tr>
 <tr>
 	<td><label for="email">{'UsersManager_Email'|translate} </label></td>