diff --git a/core/Piwik.php b/core/Piwik.php
index 9ad4eee94123f62ee8868ce9cb4f16678ff642f5..c0dba6bdcc6cc106920f8b7922f374ed7c8a14e8 100644
--- a/core/Piwik.php
+++ b/core/Piwik.php
@@ -1618,7 +1618,7 @@ class Piwik
static public function getJavascriptCode($idSite, $piwikUrl)
{
$jsCode = file_get_contents( PIWIK_INCLUDE_PATH . "/core/Tracker/javascriptCode.tpl");
- $jsCode = nl2br(htmlentities($jsCode));
+ $jsCode = htmlentities($jsCode);
$piwikUrl = preg_match('~^(http|https)://(.*)$~D', $piwikUrl, $matches);
$piwikUrl = @$matches[2];
$jsCode = str_replace('{$idSite}', $idSite, $jsCode);
diff --git a/core/Tracker/javascriptCode.tpl b/core/Tracker/javascriptCode.tpl
index 1a7673c2ed423d2ce02f37076b2d43a18700df1a..51bbbd13ef7f2d71ed564c18718704bd47bdfcc4 100644
--- a/core/Tracker/javascriptCode.tpl
+++ b/core/Tracker/javascriptCode.tpl
@@ -1,11 +1,16 @@
-<!-- Piwik --> <script type="text/javascript">
-var _paq = _paq || [];
-(function(){ var u=(("https:" == document.location.protocol) ? "https://{$piwikUrl}/" : "http://{$piwikUrl}/");
-_paq.push(['setSiteId', {$idSite}]);
-_paq.push(['setTrackerUrl', u+'piwik.php']);
-_paq.push(['trackPageView']);
-_paq.push(['enableLinkTracking']);
-var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript'; g.defer=true; g.async=true; g.src=u+'piwik.js';
-s.parentNode.insertBefore(g,s); })();
- </script><noscript><p><img src="http://{$piwikUrl}piwik.php?idsite={$idSite}" style="border:0" alt="" /></p></noscript>
+<!-- Piwik -->
+<script type="text/javascript">
+ var _paq = _paq || [];
+ _paq.push(['setSiteId', {$idSite}]);
+ _paq.push(['trackPageView']);
+ _paq.push(['enableLinkTracking']);
+
+ (function() {
+ var u=(("https:" == document.location.protocol) ? "https" : "http") + "://{$piwikUrl}/";
+ _paq.push(['setTrackerUrl', u+'piwik.php']);
+ var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';
+ g.defer=true; g.async=true; g.src=u+'piwik.js'; s.parentNode.insertBefore(g,s);
+ })();
+</script>
+<noscript><p><img src="http://{$piwikUrl}piwik.php?idsite={$idSite}" style="border:0" alt="" /></p></noscript>
<!-- End Piwik Code -->
diff --git a/js/piwik.js b/js/piwik.js
index 310d9a510d03e9444afed07bf071e92b44d52976..e1fe744a573ebbcb2d367e992af375a1bf81f00d 100644
--- a/js/piwik.js
+++ b/js/piwik.js
@@ -2882,9 +2882,20 @@ var
Date.prototype.getTimeAlias = Date.prototype.getTime;
asyncTracker = new Tracker();
+
+ // find the call to setTrackerUrl (if any) and call it first
+ for (i = 0; i < _paq.length; i++) {
+ if (_paq[i][0] == 'setTrackerUrl') {
+ apply(_paq[i]);
+ delete _paq[i];
+ }
+ }
+ // apply the queue of actions
for (i = 0; i < _paq.length; i++) {
- apply(_paq[i]);
+ if (_paq[i]) {
+ apply(_paq[i]);
+ }
}
// replace initialization array with proxy object
diff --git a/plugins/CoreAdminHome/templates/jsTrackingGenerator.js b/plugins/CoreAdminHome/templates/jsTrackingGenerator.js
index 46e5a20afe84416e0dc52e3ecfb3e2dcb9753d4e..017eb8959de8d0b8810e4704f2179d8a688e008b 100644
--- a/plugins/CoreAdminHome/templates/jsTrackingGenerator.js
+++ b/plugins/CoreAdminHome/templates/jsTrackingGenerator.js
@@ -27,7 +27,7 @@ $(document).ready(function() {
{
var key = customVariables[i][0],
value = customVariables[i][1];
- result += '_paq.push(["setCustomVariable", ' + (i + 1) + ', ' + JSON.stringify(key) + ', '
+ result += ' _paq.push(["setCustomVariable", ' + (i + 1) + ', ' + JSON.stringify(key) + ', '
+ JSON.stringify(value) + ', ' + JSON.stringify(scope) + ']);\n';
}
}
@@ -136,18 +136,17 @@ $(document).ready(function() {
// resets the select options of a goal select using a site ID
var resetGoalSelectItems = function (idsite, id)
{
- var newOptions = '<option value="">' + noneText + '</option>';
+ var selectElement = $('#' + id).html('');
+
+ selectElement.append($('<option value=""></option>').text(noneText));
var goals = allGoals[idsite] || [];
for (var key in goals)
{
var goal = goals[key];
- newOptions += '<option value="' + goal.idgoal + '">' + goal.name + '</option>';
+ selectElement.append($('<option/>').attr('value', goal.idgoal).text(goal.name));
}
- // set goal select items
- $('#' + id).html(newOptions);
-
// set currency string
$('#' + id).parent().find('.currency').text(siteCurrencies[idsite]);
};
@@ -175,19 +174,18 @@ $(document).ready(function() {
// generate JS
var result = '<!-- Piwik -->\n\
<script type="text/javascript">\n\
-var _paq = _paq || [];\n\
-(function(){ var u=(("https:" == document.location.protocol) ? "https://' + piwikHost + '/" : "http://' + piwikHost + '/");\n\
-_paq.push(["setSiteId", ' + JSON.stringify(idSite) + ']);\n';
+ var _paq = _paq || [];\n\
+ _paq.push(["setSiteId", ' + JSON.stringify(idSite) + ']);\n';
if (groupPageTitlesByDomain)
{
- result += '_paq.push(["setDocumentTitle", document.domain + "/" + document.title]);\n';
+ result += ' _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);\n';
}
if (mergeSubdomains)
{
var mainHostAllSub = '*.' + getHostNameFromUrl(siteUrls[idSite][0]);
- result += '_paq.push(["setCookieDomain", ' + JSON.stringify(mainHostAllSub) + ']);\n';
+ result += ' _paq.push(["setCookieDomain", ' + JSON.stringify(mainHostAllSub) + ']);\n';
}
if (mergeAliasUrls)
@@ -197,45 +195,49 @@ _paq.push(["setSiteId", ' + JSON.stringify(idSite) + ']);\n';
{
siteHosts[i] = '*.' + getHostNameFromUrl(siteUrls[idSite][i]);
}
- result += '_paq.push(["setDomains", ' + JSON.stringify(siteHosts) + ']);\n';
+ result += ' _paq.push(["setDomains", ' + JSON.stringify(siteHosts) + ']);\n';
}
if (visitorCustomVariables.length)
{
- result += '// you can set up to 5 custom variables for each visitor\n';
+ result += ' // you can set up to 5 custom variables for each visitor\n';
result += getCustomVariableJS(visitorCustomVariables, 'visit');
}
if (pageCustomVariables.length)
{
- result += '// you can set up to 5 custom variables for each action (page view, ' +
+ result += ' // you can set up to 5 custom variables for each action (page view, ' +
'download, click, site search)\n';
result += getCustomVariableJS(pageCustomVariables, 'page');
}
if (customCampaignNameQueryParam)
{
- result += '_paq.push(["setCampaignNameKey", ' + JSON.stringify(customCampaignNameQueryParam) + ']);\n';
+ result += ' _paq.push(["setCampaignNameKey", ' + JSON.stringify(customCampaignNameQueryParam) + ']);\n';
}
if (customCampaignKeywordParam)
{
- result += '_paq.push(["setCampaignKeywordKey", ' + JSON.stringify(customCampaignKeywordParam) + ']);\n';
+ result += ' _paq.push(["setCampaignKeywordKey", ' + JSON.stringify(customCampaignKeywordParam) + ']);\n';
}
if (doNotTrack)
{
- result += '_paq.push(["setDoNotTrack", true]);\n';
+ result += ' _paq.push(["setDoNotTrack", true]);\n';
}
- result += 'var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0];\n\
-g.type="text/javascript"; g.defer=true; g.async=true; g.src=u+"piwik.js";\n\
-s.parentNode.insertBefore(g,s); })();\n\
+ result += ' _paq.push(["trackPageView"]);\n\
+ _paq.push(["enableLinkTracking"]);\n\n\
+ (function() {\n\
+ var u=(("https:" == document.location.protocol) ? "https" : "http") + "://' + piwikHost + '/";\n\
+ _paq.push(["setTrackerUrl", u+"piwik.php"]);\n\
+ var d=document, g=d.createElement("script"), s=d.getElementsByTagName("script")[0]; g.type="text/javascript";\n\
+ g.defer=true; g.async=true; g.src=u+"piwik.js"; s.parentNode.insertBefore(g,s);\n\
+ })();\n\
</script>\n\
<!-- End Piwik Code -->';
- var ta = $('#javascript-text textarea');
- ta.val(result)
+ $('#javascript-text textarea').val(result)
};
// function that generates image tracker link
@@ -281,8 +283,7 @@ s.parentNode.insertBefore(g,s); })();\n\
<img src="' + piwikURL + '/?' + $.param(params) + '" style="border:0" alt="" />\n\
<!-- End Piwik -->';
- var ta = $('#image-tracking-link textarea');
- ta.val(result);
+ $('#image-tracking-link textarea').val(result);
};
// on image link tracker site change, change available goals
@@ -295,13 +296,12 @@ s.parentNode.insertBefore(g,s); })();\n\
// on js link tracker site change, change available goals
$('#js-tracker-website').bind('piwik:siteSelected', function(e, site) {
+ $('.current-site-name', '#optional-js-tracking-options').each(function() {
+ $(this).text(site.name);
+ });
+
getSiteData(site.id, '#js-code-options', function() {
resetGoalSelectItems(site.id, 'js-tracker-goal');
-
- $('.current-site-name', '#javascript-tracking-options').each(function() {
- $(this).text(site.name);
- });
-
generateJsCode();
});
});
diff --git a/plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl b/plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl
index 4a9848f7c54e0137ad1427f3176dd9354c460cdd..8af6eb79f1257647284ec48d244cb75f652523ad 100644
--- a/plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl
+++ b/plugins/CoreAdminHome/templates/jsTrackingGenerator.tpl
@@ -39,7 +39,7 @@
{* track across all subdomains *}
<div class="tracking-option-section">
<input type="checkbox" id="javascript-tracking-all-subdomains"/>
- <label for="javascript-tracking-all-subdomains">{'CoreAdminHome_JSTracking_MergeSubdomains'|translate} <span class='current-site-name'>{$defaultReportSiteName|escape:'html'}</span></label>
+ <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'}
@@ -49,7 +49,7 @@
{* 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|escape:'html'}</span></label>
+ <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}
diff --git a/plugins/CoreHome/templates/autocomplete.js b/plugins/CoreHome/templates/autocomplete.js
index 52523ae054ac2fbd196a6291f8b8838a8c7ca5b3..78d892dbf3357ad83845f81fa55056cdefde6cf8 100644
--- a/plugins/CoreHome/templates/autocomplete.js
+++ b/plugins/CoreHome/templates/autocomplete.js
@@ -72,29 +72,22 @@ $(function() {
source: '?module=SitesManager&action=getSitesForAutocompleter',
appendTo: $('.custom_select_container', selector),
select: function(event, ui) {
- if (piwik.idSite == ui.item.id)
+ if (ui.item.id > 0)
{
+ // set attributes of selected site display (what shows in the box)
+ $('.custom_select_main_link', selector)
+ .attr('siteid', ui.item.id)
+ .text(ui.item.name);
+
+ // hide the dropdown
$('.custom_select_block', selector).removeClass('custom_select_block_show');
+
+ // fire the site selected event
+ selector.trigger('piwik:siteSelected', ui.item);
}
else
{
- if (ui.item.id > 0)
- {
- // set attributes of selected site display (what shows in the box)
- $('.custom_select_main_link', selector)
- .attr('siteid', ui.item.id)
- .text(ui.item.name);
-
- // hide the dropdown
- $('.custom_select_block', selector).removeClass('custom_select_block_show');
-
- // fire the site selected event
- selector.trigger('piwik:siteSelected', ui.item);
- }
- else
- {
- reset(selector);
- }
+ reset(selector);
}
return false;
@@ -242,7 +235,10 @@ $(function() {
if (selector.attr('data-switch-site-on-select') == 1)
{
selector.bind('piwik:siteSelected', function (e, site) {
- switchSite(site.id, site.name);
+ if (piwik.idSite !== site.id)
+ {
+ switchSite(site.id, site.name);
+ }
});
}
});
diff --git a/plugins/CoreHome/templates/piwik_tag.tpl b/plugins/CoreHome/templates/piwik_tag.tpl
index 41ed881ad84b39f2fd34698a670c0f277adcd85e..9c254d5e050e5619f807ced3a45de51934772b13 100644
--- a/plugins/CoreHome/templates/piwik_tag.tpl
+++ b/plugins/CoreHome/templates/piwik_tag.tpl
@@ -5,26 +5,32 @@
<div class="clear"></div>
{literal}
<!-- Piwik -->
-<script src="js/piwik.js" type="text/javascript"></script>
-<script type="text/javascript">
-try {
- var piwikTracker = Piwik.getTracker("piwik.php", 1);
- {/literal}
- {if $piwikUrl == 'http://demo.piwik.org/'}
- piwikTracker.setCookieDomain('*.piwik.org');
- {/if}
- {literal}
- //Set the domain the visitor landed on, in the Custom Variable
- if(!piwikTracker.getCustomVariable(1)) {
- piwikTracker.setCustomVariable(1, "Domain landed", document.domain );
- }
- //Set the selected Piwik language in a custom var
- piwikTracker.setCustomVariable(2, "Demo language", piwik.languageName );
- piwikTracker.setDocumentTitle(document.domain + "/" + document.title);
- piwikTracker.trackPageView();
- piwikTracker.enableLinkTracking();
-} catch(err) {}
+<script type="text/javascript">
+ var _paq = _paq || [];
+ _paq.push(['setTrackerUrl', 'piwik.php']);
+ _paq.push(['setSiteId', {/literal}{$idSite}{literal}]);
+{/literal}{if $piwikUrl == 'http://demo.piwik.org/'}{literal}
+ _paq.push(['setCookieDomain', '*.piwik.org']);
+{/literal}{/if}{literal}
+ // set the domain the visitor landed on, in the Custom Variable
+ _paq.push([function () {
+ if (!this.getCustomVariable(1))
+ {
+ this.setCustomVariable(1, "Domain landed", document.domain);
+ }
+ }]);
+ // Set the selected Piwik language in a custom var
+ _paq.push(['setCustomVariable', 2, "Demo language", piwik.languageName]);
+ _paq.push(['setDocumentTitle', document.domain + "/" + document.title]);
+ _paq.push(['trackPageView']);
+ _paq.push(['enableLinkTracking']);
+
+ (function() {
+ var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0]; g.type='text/javascript';
+ g.defer=true; g.async=true; g.src='js/piwik.js'; s.parentNode.insertBefore(g,s);
+ })();
</script>
<!-- End Piwik Code -->
{/literal}
+
{/if}
diff --git a/plugins/SitesManager/templates/DisplayJavascriptCode.tpl b/plugins/SitesManager/templates/DisplayJavascriptCode.tpl
index 3e0b7e1aa72b6d08053358d09e6272d6f8c4a547..51bf27e2fdec8d9543b4ff2e346ceb9d0951609b 100644
--- a/plugins/SitesManager/templates/DisplayJavascriptCode.tpl
+++ b/plugins/SitesManager/templates/DisplayJavascriptCode.tpl
@@ -27,7 +27,7 @@ p {
<h3>{'SitesManager_JsTrackingTag'|translate}</h3>
<p>{'CoreAdminHome_JSTracking_CodeNote'|translate:"</body>"}</p>
-<code>{$jsTag}</code>
+<pre class="code-pre"><code>{$jsTag}</code></pre>
<br />
{'CoreAdminHome_JSTrackingIntro5'|translate:'<a target="_blank" href="http://piwik.org/docs/javascript-tracking/">':'</a>'}
@@ -35,4 +35,32 @@ p {
{'Installation_JSTracking_EndNote'|translate:'<em>':'</em>'}
</div>
-
+{literal}
+<script type="text/javascript">
+$(document).ready(function () {
+ // when code element is clicked, select the text
+ $('code').click(function () {
+ // credit where credit is due:
+ // http://stackoverflow.com/questions/1173194/select-all-div-text-with-single-mouse-click
+ var range;
+ if (document.body.createTextRange) // MSIE
+ {
+ range = document.body.createTextRange();
+ range.moveToElementText(this);
+ range.select();
+ }
+ else if (window.getSelection) // others
+ {
+ range = document.createRange();
+ range.selectNodeContents(this);
+
+ var selection = window.getSelection();
+ selection.removeAllRanges();
+ selection.addRange(range);
+ }
+ });
+
+ $('code').click();
+});
+</script>
+{/literal}
diff --git a/plugins/SitesManager/templates/SitesManager.tpl b/plugins/SitesManager/templates/SitesManager.tpl
index edf772452d56ca20826ebbdc66b82da9667671b1..775e82f816ac0f584652a7812815a4bdb27b0b58 100644
--- a/plugins/SitesManager/templates/SitesManager.tpl
+++ b/plugins/SitesManager/templates/SitesManager.tpl
@@ -187,7 +187,7 @@ vertical-align:middle;
<td id="ecommerce" class="editableSite">{if $site.ecommerce}<span class='ecommerceActive'>{'General_Yes'|translate}</span>{else}<span class='ecommerceInactive'>-</span>{/if}</td>
<td><span id="row{$site.idsite}" class='editSite link_but'><img src='themes/default/images/ico_edit.png' title="{'General_Edit'|translate}" border="0"/> {'General_Edit'|translate}</span></td>
<td><span id="row{$site.idsite}" class="deleteSite link_but"><img src='themes/default/images/ico_delete.png' title="{'General_Delete'|translate}" border="0" /> {'General_Delete'|translate}</span></td>
- <td><a href='{url action=displayJavascriptCode idSite=$site.idsite updated=false}'>{'SitesManager_ShowTrackingTag'|translate}</a></td>
+ <td><a href='{url module=CoreAdminHome action=trackingCodeGenerator idSite=$site.idsite updated=false}'>{'SitesManager_ShowTrackingTag'|translate}</a></td>
</tr>
{/foreach}
</tbody>
diff --git a/plugins/UsersManager/templates/UsersManager.js b/plugins/UsersManager/templates/UsersManager.js
index c361d68a0b5d35e728fb32fa35caf38bac94e73d..505e400f44ff66aaaf057a8d20380e942ca60e2e 100644
--- a/plugins/UsersManager/templates/UsersManager.js
+++ b/plugins/UsersManager/templates/UsersManager.js
@@ -244,11 +244,14 @@ $(document).ready( function() {
// when a site is selected, reload the page w/o showing the ajax loading element
$('#usersManagerSiteSelect').bind('piwik:siteSelected', function(e, site) {
- switchSite(
- site.id,
- site.name,
- false /* do not show main ajax loading animation */,
- true /* do not go to all websites dash */
- );
+ if (site.id != piwik.idSite)
+ {
+ switchSite(
+ site.id,
+ site.name,
+ false /* do not show main ajax loading animation */,
+ true /* do not go to all websites dash */
+ );
+ }
});
});
diff --git a/themes/default/styles.css b/themes/default/styles.css
index 9cbd667bad36a7f683eefe6d684e4b3bd341b329..eb20ae94569573025c0752aaa330a574b786a490 100644
--- a/themes/default/styles.css
+++ b/themes/default/styles.css
@@ -46,3 +46,7 @@ code {
line-height:1.3em;
font-family: "Courier New" Courier monospace;
}
+
+pre.code-pre {
+ white-space:pre-wrap;
+}