diff --git a/plugins/SitesManager/templates/SitesManager.js b/plugins/SitesManager/templates/SitesManager.js
index c53ec580090..70a42bf7db0 100644
--- a/plugins/SitesManager/templates/SitesManager.js
+++ b/plugins/SitesManager/templates/SitesManager.js
@@ -168,11 +168,10 @@ function SitesManager ( _timezones, _currencies, _defaultTimezone, _defaultCurre
$('
\
| \
'+submitButtonHtml+' | \
- '+aliasUrlsHelp+' | \
+ '+aliasUrlsHelp+keepURLFragmentSelectHTML+' | \
'+excludedIpHelp+' | \
'+excludedQueryParametersHelp+' | \
'+excludedUserAgentsHelp+' | \
- '+keepURLFragmentSelectHTML+' | \
'+getSitesearchSelector(false)+' | \
'+getTimezoneSelector(defaultTimezone)+' ' + timezoneHelp + ' | \
'+getCurrencySelector(defaultCurrency)+' ' + currencyHelp + ' | \
@@ -250,9 +249,11 @@ function SitesManager ( _timezones, _currencies, _defaultTimezone, _defaultCurre
}
else if(idName == 'urls')
{
+ var keepURLFragmentsForSite = $(this).closest('tr').attr('data-keep-url-fragments');
+
var contentAfter = '';
- contentAfter += '
'+aliasUrlsHelp;
- $(n).html(contentAfter);
+ contentAfter += '
'+aliasUrlsHelp+keepURLFragmentSelectHTML;
+ $(n).html(contentAfter).find('select').val(keepURLFragmentsForSite);
}
else if(idName == 'excludedIps')
{
@@ -272,15 +273,6 @@ function SitesManager ( _timezones, _currencies, _defaultTimezone, _defaultCurre
contentBefore.replace(/
/gi,"\n")+'
'+excludedUserAgentsHelp;
$(n).html(contentAfter);
}
- else if (idName == 'keepURLFragments')
- {
- $(n).html(keepURLFragmentSelectHTML)
- // find the option to select by the option text and select it
- .find('option').each(function() {
- this.selected = this.text == contentBefore
- || (this.value == 0 && contentBefore == '-');
- });
- }
else if(idName == 'timezone')
{
var contentAfter = getTimezoneSelector(contentBefore);
diff --git a/plugins/SitesManager/templates/SitesManager.tpl b/plugins/SitesManager/templates/SitesManager.tpl
index d8c9bfb2501..5d018df9bd6 100644
--- a/plugins/SitesManager/templates/SitesManager.tpl
+++ b/plugins/SitesManager/templates/SitesManager.tpl
@@ -44,6 +44,8 @@ var aliasUrlsHelp = '{'SitesManager_AliasUrlHelp'|translate|inlineHelp|escape:ja
{assign var=excludedUserAgentsHelp value=$excludedUserAgentsHelp|inlineHelp}
{capture assign=keepURLFragmentSelectHTML}
+ {'SitesManager_KeepURLFragments'|translate}
+