clean-up XHTML self-closing tags in preparation for validation; note: I skipped plugins/Live as there's a large patch to merge

7 files changed, 22 insertions, 22 deletions

diff --git a/plugins/Goals/API.php b/plugins/Goals/API.php
index 27b0818eb1..f3a5d80345 100644
--- a/plugins/Goals/API.php
+++ b/plugins/Goals/API.php
@@ -157,7 +157,7 @@ class Piwik_Goals_API
 		$request = new Piwik_API_Request("method=VisitFrequency.getVisitsReturning&idSite=$idSite&period=$period&date=$date&format=original");
 		$nbVisitsReturning = $request->process();
 //		echo $nbVisitsConvertedReturningVisitors;
-//		echo "<br>". $nbVisitsReturning;exit;
+//		echo "<br />". $nbVisitsReturning;exit;
 
 		return Piwik::getPercentageSafe($nbVisitsConvertedReturningVisitors, $nbVisitsReturning, Piwik_Goals::ROUNDING_PRECISION);
 	}
diff --git a/plugins/Goals/Goals.php b/plugins/Goals/Goals.php
index b4e7fc0a80..d69e766a52 100644
--- a/plugins/Goals/Goals.php
+++ b/plugins/Goals/Goals.php
@@ -180,7 +180,7 @@ class Piwik_Goals extends Piwik_Plugin
 					$metricName = Piwik_Archive::$mappingFromIdToNameGoal[$metricId];
 					$recordName = self::getRecordName($metricName, $idgoal, $visitor_returning);
 					$archiveProcessing->insertNumericRecord($recordName, $value);
-//					echo $record . "<br>";
+//					echo $record . "<br />";
 				}
 			}
 		}
diff --git a/plugins/Goals/templates/add_edit_goal.tpl b/plugins/Goals/templates/add_edit_goal.tpl
index 997f68d61a..b493cf44b0 100644
--- a/plugins/Goals/templates/add_edit_goal.tpl
+++ b/plugins/Goals/templates/add_edit_goal.tpl
@@ -34,14 +34,14 @@ var mappingMatchTypeName = {ldelim}
 {rdelim};
 var mappingMatchTypeExamples = {ldelim}
 	"url": "{'General_ForExampleShort'|translate} {'Goals_Contains'|translate:"'checkout/confirmation'"} \
-		<br/>{'General_ForExampleShort'|translate} {'Goals_IsExactly'|translate:"'http://example.com/thank-you.html'"} \
-		<br/>{'General_ForExampleShort'|translate} {'Goals_MatchesExpression'|translate:"matches the expression '(.*)\\\/demo\\\/(.*)'"}", 
+		<br />{'General_ForExampleShort'|translate} {'Goals_IsExactly'|translate:"'http://example.com/thank-you.html'"} \
+		<br />{'General_ForExampleShort'|translate} {'Goals_MatchesExpression'|translate:"matches the expression '(.*)\\\/demo\\\/(.*)'"}", 
 	"file": "{'General_ForExampleShort'|translate} {'Goals_Contains'|translate:"'files/brochure.pdf'"} \
-		<br/>{'General_ForExampleShort'|translate} {'Goals_IsExactly'|translate:"'http://example.com/files/brochure.pdf'"} \
-		<br/>{'General_ForExampleShort'|translate} {'Goals_MatchesExpression'|translate:"'(.*)\\\.zip'"}", 
+		<br />{'General_ForExampleShort'|translate} {'Goals_IsExactly'|translate:"'http://example.com/files/brochure.pdf'"} \
+		<br />{'General_ForExampleShort'|translate} {'Goals_MatchesExpression'|translate:"'(.*)\\\.zip'"}", 
 	"external_website": "{'General_ForExampleShort'|translate} {'Goals_Contains'|translate:"'amazon.com'"} \
-		<br>{'General_ForExampleShort'|translate} {'Goals_IsExactly'|translate:"'http://mypartner.com/landing.html'"} \
-		<br>{'General_ForExampleShort'|translate} {'Goals_MatchesExpression'|translate:"'http://www.amazon.com\\\/(.*)\\\/yourAffiliateId'"}" 
+		<br />{'General_ForExampleShort'|translate} {'Goals_IsExactly'|translate:"'http://mypartner.com/landing.html'"} \
+		<br />{'General_ForExampleShort'|translate} {'Goals_MatchesExpression'|translate:"'http://www.amazon.com\\\/(.*)\\\/yourAffiliateId'"}" 
 {rdelim};
 bindGoalForm();
 
diff --git a/plugins/Goals/templates/form_add_goal.tpl b/plugins/Goals/templates/form_add_goal.tpl
index 9c0178b9b2..163605ef59 100644
--- a/plugins/Goals/templates/form_add_goal.tpl
+++ b/plugins/Goals/templates/form_add_goal.tpl
@@ -24,13 +24,13 @@
 				</select>
 			</td>
 			<td>
-				<input type="radio" id="match_attribute_url" value="url" name="match_attribute"/>
+				<input type="radio" id="match_attribute_url" value="url" name="match_attribute" />
                 <label for="match_attribute_url">{'Goals_VisitUrl'|translate}</label>
 				<br />
-				<input type="radio" id="match_attribute_file" value="file" name="match_attribute"/>
+				<input type="radio" id="match_attribute_file" value="file" name="match_attribute" />
 				<label for="match_attribute_file">{'Goals_Download'|translate}</label>
 				<br />
-				<input type="radio" id="match_attribute_external_website" value="external_website" name="match_attribute"/>
+				<input type="radio" id="match_attribute_external_website" value="external_website" name="match_attribute" />
 				<label for="match_attribute_external_website">{'Goals_ClickOutlink'|translate}</label>
 			</td>
 			</tr>
@@ -50,7 +50,7 @@
 				<div id="examples_pattern" class="goalInlineHelp"></div>
 				<br />
 				<span style="float:right">
-				{'Goals_Optional'|translate} <input type="checkbox" id="case_sensitive"/>
+				{'Goals_Optional'|translate} <input type="checkbox" id="case_sensitive" />
                 <label for="case_sensitive">{'Goals_CaseSensitive'|translate}</label>
 				</span>
 			</td>
@@ -64,7 +64,7 @@
 	<tbody>
 		<tr>
             <td>(optional) {'Goals_DefaultRevenue'|translate}</td>
-			<td>{$currency} <input type="text" name="revenue" size="1" value="0"/>
+			<td>{$currency} <input type="text" name="revenue" size="1" value="0" />
             <div class="goalInlineHelp"> {'Goals_DefaultRevenueHelp'|translate} </div>
 			</td>
 		</tr>
@@ -72,7 +72,7 @@
 		<tr>
 			<td colspan="2" style="border:0">
 			<div class="submit">	
-				<input type="hidden" name="methodGoalAPI" value="" />	
+				<input type="hidden" name="methodGoalAPI" value="" />
 				<input type="hidden" name="goalIdUpdate" value="" />
                 <input type="submit" value="" name="submit" id="goal_submit" class="submit" />
 			</div>
diff --git a/plugins/Goals/templates/list_goal_edit.tpl b/plugins/Goals/templates/list_goal_edit.tpl
index c5081b3fc2..92beb13f33 100644
--- a/plugins/Goals/templates/list_goal_edit.tpl
+++ b/plugins/Goals/templates/list_goal_edit.tpl
@@ -13,10 +13,10 @@
 	<tr>
 		<td>{$goal.idgoal}</td>
 		<td>{$goal.name}</td>
-        <td><span class='matchAttribute'>{$goal.match_attribute}</span> {if isset($goal.pattern_type)}<br>{'Goals_Pattern'|translate} {$goal.pattern_type}: {$goal.pattern}</b>{/if}</td>
+        <td><span class='matchAttribute'>{$goal.match_attribute}</span> {if isset($goal.pattern_type)}<br />{'Goals_Pattern'|translate} {$goal.pattern_type}: {$goal.pattern}</b>{/if}</td>
 		<td>{if $goal.revenue==0}-{else}{$currency}{$goal.revenue}{/if}</td>
-		<td><a href='#' name="linkEditGoal" id="{$goal.idgoal}"><img src='plugins/UsersManager/images/edit.png' border=0> {'General_Edit'|translate}</a></td>
-		<td><a href='#' name="linkDeleteGoal" id="{$goal.idgoal}"><img src='plugins/UsersManager/images/remove.png' border=0> {'General_Delete'|translate}</a></td>
+		<td><a href='#' name="linkEditGoal" id="{$goal.idgoal}"><img src='plugins/UsersManager/images/edit.png' border="0" /> {'General_Edit'|translate}</a></td>
+		<td><a href='#' name="linkDeleteGoal" id="{$goal.idgoal}"><img src='plugins/UsersManager/images/remove.png' border="0" /> {'General_Delete'|translate}</a></td>
 	</tr>
 	{/foreach}
 	</table>
@@ -39,4 +39,4 @@ $(document).ready( function() {
 	});
 } );
 {/literal}
-</script>
\ No newline at end of file
+</script>
diff --git a/plugins/Goals/templates/release_notes.tpl b/plugins/Goals/templates/release_notes.tpl
index dbb12984ea..a6d164de49 100644
--- a/plugins/Goals/templates/release_notes.tpl
+++ b/plugins/Goals/templates/release_notes.tpl
@@ -1,6 +1,6 @@
 <div style="clear:both;"></div>
-<br><br><hr>
-<b>About the Goal Tracking Plugin</b><br>
+<br /><br /><hr />
+<b>About the Goal Tracking Plugin</b><br />
 <pre>
 The Goal Tracking Plugin is in alpha release. There is more coming soon!
 
diff --git a/plugins/Goals/templates/single_goal.tpl b/plugins/Goals/templates/single_goal.tpl
index c0b45b8dde..48f142def8 100644
--- a/plugins/Goals/templates/single_goal.tpl
+++ b/plugins/Goals/templates/single_goal.tpl
@@ -10,10 +10,10 @@
     <li>{'Goals_ReturningVisitorsConversionRateIs'|translate:"<b>$conversion_rate_returning%</b>"}, {'Goals_NewVisitorsConversionRateIs'|translate:"<b>$conversion_rate_new%</b>"}</li>
 	</ul>
 {/if}
-<hr>
+<hr />
 {$tableByConversion}
 
-<hr>
+<hr />
 {literal}
 <style>
 ul.ulGoalTopElements {