Fixes #3232, remove keep url fragments column in website table and mo…

…ve to under URLs column in edit mode.
matomo-org · Feb 11, 2013 · da85ebe · da85ebe
1 parent 00bccee
commit da85ebe
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 16 deletions.
diff --git a/plugins/SitesManager/templates/SitesManager.js b/plugins/SitesManager/templates/SitesManager.js
@@ -168,11 +168,10 @@ function SitesManager ( _timezones, _currencies, _defaultTimezone, _defaultCurre
 		$(' <tr id="'+newRowId+'">\
 				<td>&nbsp;</td>\
 				<td><input id="name" value="Name" size="15" /><br/><br/><br/>'+submitButtonHtml+'</td>\
-				<td><textarea cols="25" rows="3" id="urls">http://siteUrl.com/\nhttp://siteUrl2.com/</textarea><br />'+aliasUrlsHelp+'</td>\
+				<td><textarea cols="25" rows="3" id="urls">http://siteUrl.com/\nhttp://siteUrl2.com/</textarea><br />'+aliasUrlsHelp+keepURLFragmentSelectHTML+'</td>\
 				<td><textarea cols="20" rows="4" id="excludedIps"></textarea><br />'+excludedIpHelp+'</td>\
 				<td><textarea cols="20" rows="4" id="excludedQueryParameters"></textarea><br />'+excludedQueryParametersHelp+'</td>\
 				<td><textarea cols="20" rows="4" id="excludedUserAgents"></textarea><br />'+excludedUserAgentsHelp+'</td>\
-				<td>'+keepURLFragmentSelectHTML+'</td>\
 				<td>'+getSitesearchSelector(false)+'</td>\
 				<td>'+getTimezoneSelector(defaultTimezone)+'<br />' + timezoneHelp + '</td>\
 				<td>'+getCurrencySelector(defaultCurrency)+'<br />' + currencyHelp + '</td>\
@@ -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 = '<textarea cols="25" rows="3" id="urls">'+contentBefore.replace(/<br *\/? *>/gi,"\n")+'</textarea>';
-						contentAfter += '<br />'+aliasUrlsHelp;
-						$(n).html(contentAfter);
+						contentAfter += '<br />'+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(/<br *\/? *>/gi,"\n")+'</textarea><br />'+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
@@ -44,6 +44,8 @@ var aliasUrlsHelp = '{'SitesManager_AliasUrlHelp'|translate|inlineHelp|escape:ja
 {assign var=excludedUserAgentsHelp value=$excludedUserAgentsHelp|inlineHelp}
 
 {capture assign=keepURLFragmentSelectHTML}
+	<h4 style="display:inline-block;">{'SitesManager_KeepURLFragments'|translate}</h4>
+	
 	<select id="keepURLFragmentSelect">
 		<option value="0">{'General_Default'|translate}</option>
 		<option value="1">{'General_Yes'|translate}</option>
@@ -117,6 +119,11 @@ vertical-align:middle;
 #searchSiteParameters {
 	display:none;
 }
+#editSites h4 {
+	font-size:.8em;
+	margin:1em 0 1em 0;
+	font-weight:bold;
+}
 </style>
 {/literal}
 
@@ -156,7 +163,6 @@ vertical-align:middle;
 			<th>{'SitesManager_ExcludedIps'|translate}</th>
 			<th>{'SitesManager_ExcludedParameters'|translate|replace:" ":"<br />"}</th>
 			<th id='exclude-user-agent-header' {if !$allowSiteSpecificUserAgentExclude}style="display:none"{/if}>{'SitesManager_ExcludedUserAgents'|translate}</th>
-			<th>{'SitesManager_KeepURLFragments'|translate}</th>
 			<th>{'Actions_SubmenuSitesearch'|translate}</th>
 			<th>{'SitesManager_Timezone'|translate}</th>
 			<th>{'SitesManager_Currency'|translate}</th>
@@ -168,14 +174,13 @@ vertical-align:middle;
 		</thead>
 		<tbody>
 			{foreach from=$adminSites key=i item=site}
-			<tr id="row{$site.idsite}">
+			<tr id="row{$site.idsite}" data-keep-url-fragments="{$site.keep_url_fragment}">
 				<td id="idSite">{$site.idsite}</td>
 				<td id="siteName" class="editableSite">{$site.name}</td>
 				<td id="urls" class="editableSite">{foreach from=$site.alias_urls item=url}{$url|replace:"http://":""}<br />{/foreach}</td>       
 				<td id="excludedIps" class="editableSite">{foreach from=$site.excluded_ips item=ip}{$ip}<br />{/foreach}</td>       
 				<td id="excludedQueryParameters" class="editableSite">{foreach from=$site.excluded_parameters item=parameter}{$parameter}<br />{/foreach}</td>
 				<td id="excludedUserAgents" class="editableSite" {if !$allowSiteSpecificUserAgentExclude}style="display:none"{/if}>{foreach from=$site.excluded_user_agents item=ua}{$ua}<br />{/foreach}</td>
-				<td id="keepURLFragments" class="editableSite">{if $site.keep_url_fragment eq 0}-{elseif $site.keep_url_fragment eq 1}{'General_Yes'|translate}{else}{'General_No'|translate}{/if}</td>
 				<td id="sitesearch" class="editableSite">{if $site.sitesearch}<span class='sitesearchActive'>{'General_Yes'|translate}</span>{else}<span class='sitesearchInactive'>-</span>{/if}<span class='sskp' sitesearch_keyword_parameters="{$site.sitesearch_keyword_parameters|escape:'html'}" sitesearch_category_parameters="{$site.sitesearch_category_parameters|escape:'html'}" id="sitesearch_parameters"></span></td>
 				<td id="timezone" class="editableSite">{$site.timezone}</td>
 				<td id="currency" class="editableSite">{$site.currency}</td>