From 4643301abe10e622907b8fa20d56967aa27fa2cb Mon Sep 17 00:00:00 2001
From: mattab <matthieu.aubry@gmail.com>
Date: Wed, 27 Feb 2013 23:09:27 +1300
Subject: [PATCH] most important first
---
.../templates/jsTrackingGenerator.tpl | 23 ++++++++++---------
1 file changed, 12 insertions(+), 11 deletions(-)
diff --git a/plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl b/plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl
index 861e1a8d78..64ed6b9f42 100644
--- a/plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl
+++ b/plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl
@@ -45,17 +45,7 @@
{'CoreAdminHome_JSTracking_MergeSubdomainsDesc'|translate:"x.<span class='current-site-host'>$defaultReportSiteDomain</span>":"y.<span class='current-site-host'>$defaultReportSiteDomain</span>"}
</div>
</div>
-
- {* track across all site aliases *}
- <div class="tracking-option-section">
- <input type="checkbox" id="javascript-tracking-all-aliases"/>
- <label for="javascript-tracking-all-aliases">{'CoreAdminHome_JSTracking_MergeAliases'|translate} <span class='current-site-name'>{$defaultReportSiteName}</span></label>
-
- <div class="small-form-description">
- {'CoreAdminHome_JSTracking_MergeAliasesDesc'|translate:"<span class='current-site-alias'>$defaultReportSiteAlias</span>"}
- </div>
- </div>
-
+
{* group page titles by site domain *}
<div class="tracking-option-section">
<input type="checkbox" id="javascript-tracking-group-by-domain"/>
@@ -65,6 +55,17 @@
{'CoreAdminHome_JSTracking_GroupPageTitlesByDomainDesc'|translate}
</div>
</div>
+
+ {* track across all site aliases *}
+ <div class="tracking-option-section">
+ <input type="checkbox" id="javascript-tracking-all-aliases"/>
+ <label for="javascript-tracking-all-aliases">{'CoreAdminHome_JSTracking_MergeAliases'|translate} <span class='current-site-name'>{$defaultReportSiteName}</span></label>
+
+ <div class="small-form-description">
+ {'CoreAdminHome_JSTracking_MergeAliasesDesc'|translate:"<span class='current-site-alias'>$defaultReportSiteAlias</span>"}
+ </div>
+ </div>
+
</td>
<td>
<div id="javascript-advanced-options" style="display:none">
--
GitLab