Refs #1845, display current site's host in help text/description of t…

…racking code admin page's inputs.
matomo-org · Feb 27, 2013 · 3cee71c · 3cee71c
1 parent a06d961
commit 3cee71c
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 2 deletions.
diff --git a/plugins/CoreAdminHome/Controller.php b/plugins/CoreAdminHome/Controller.php
@@ -133,6 +133,20 @@ public function trackingCodeGenerator()
 		$view->defaultReportSiteName = Piwik_Site::getNameFor($view->idSite);
 		$view->defaultSiteRevenue = Piwik::getCurrency($view->idSite);
 
+		$allUrls = Piwik_SitesManager_API::getInstance()->getSiteUrlsFromId($view->idSite);
+		if (isset($allUrls[1]))
+		{
+			$aliasUrl = $allUrls[1];
+		}
+		else
+		{
+			$aliasUrl = 'x.domain.com';
+		}
+		$view->defaultReportSiteAlias = $aliasUrl;
+
+		$mainUrl = Piwik_Site::getMainUrlFor($view->idSite);
+		$view->defaultReportSiteDomain = @parse_url($mainUrl, PHP_URL_HOST);
+
 		// get currencies for each viewable site
 		$view->currencySymbols = Piwik_SitesManager_API::getInstance()->getCurrencySymbols();
 

diff --git a/plugins/CoreAdminHome/templates/jsTrackingGenerator.js b/plugins/CoreAdminHome/templates/jsTrackingGenerator.js
@@ -302,6 +302,13 @@ $(document).ready(function() {
 		});
 
 		getSiteData(site.id, '#js-code-options', function() {
+			var siteHost = getHostNameFromUrl(siteUrls[site.id][0]);
+			$('.current-site-host', '#optional-js-tracking-options').each(function() {
+				$(this).text(siteHost);
+			});
+
+			$('.current-site-alias').text(siteUrls[site.id][1] || 'x.domain.com');
+
 			resetGoalSelectItems(site.id, 'js-tracker-goal');
 			generateJsCode();
 		});

diff --git a/plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl b/plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl
@@ -42,7 +42,7 @@
 		<label for="javascript-tracking-all-subdomains">{'CoreAdminHome_JSTracking_MergeSubdomains'|translate} <span class='current-site-name'>{$defaultReportSiteName}</span></label>
 
 		<div class="small-form-description">
-			{'CoreAdminHome_JSTracking_MergeSubdomainsDesc'|translate:'x.domain.com':'y.domain.com'}
+			{'CoreAdminHome_JSTracking_MergeSubdomainsDesc'|translate:"x.<span class='current-site-host'>$defaultReportSiteDomain</span>":"y.<span class='current-site-host'>$defaultReportSiteDomain</span>"}
 		</div>
 	</div>
 
@@ -52,7 +52,7 @@
 		<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:'x.domain.com'}
+			{'CoreAdminHome_JSTracking_MergeAliasesDesc'|translate:"<span class='current-site-alias'>$defaultReportSiteAlias</span>"}
 		</div>
 	</div>