diff --git a/plugins/PDFReports/templates/index.twig b/plugins/PDFReports/templates/index.twig
index 92f647fb77955a0584d7165f5775fa341cfbed87..9de5e3f0e1ab53e3d231692d184cd9017bdff934 100644
--- a/plugins/PDFReports/templates/index.twig
+++ b/plugins/PDFReports/templates/index.twig
@@ -35,7 +35,7 @@
ReportPlugin.reportList = {{ reportsJSON }};
ReportPlugin.createReportString = "{{ 'PDFReports_CreateReport'|translate }}";
ReportPlugin.updateReportString = "{{ 'PDFReports_UpdateReport'|translate }}";
- $(document).ready(function () {
+ $(function () {
initManagePdf();
});
</script>
diff --git a/plugins/SitesManager/SitesManager.php b/plugins/SitesManager/SitesManager.php
index 54b7f9330d61f6a8e736f8f342be67ccffb1e121..b2b5821d0aedae8d119c8e8252dee88d71d56d6e 100644
--- a/plugins/SitesManager/SitesManager.php
+++ b/plugins/SitesManager/SitesManager.php
@@ -57,6 +57,7 @@ class Piwik_SitesManager extends Piwik_Plugin
{
$cssFiles = & $notification->getNotificationObject();
+ $cssFiles[] = "plugins/SitesManager/stylesheets/SitesManager.css";
$cssFiles[] = "plugins/Zeitgeist/stylesheets/styles.css";
}
diff --git a/plugins/SitesManager/javascripts/SitesManager.js b/plugins/SitesManager/javascripts/SitesManager.js
index 4d32b283f3ece8b37b07a937302f68d10d7c00da..a74ce3010eac4331b1ada6a0d491768e2b72e6a9 100644
--- a/plugins/SitesManager/javascripts/SitesManager.js
+++ b/plugins/SitesManager/javascripts/SitesManager.js
@@ -431,3 +431,28 @@ function onClickSiteSearchUseDefault() {
}
}
+$(function () {
+
+ // when code element is clicked, select the text
+ $('.trackingHelp 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);
+ }
+ })
+ .click();
+});
diff --git a/plugins/SitesManager/stylesheets/SitesManager.css b/plugins/SitesManager/stylesheets/SitesManager.css
new file mode 100644
index 0000000000000000000000000000000000000000..4866c98d9431350ab295bb49344aa34d4810612f
--- /dev/null
+++ b/plugins/SitesManager/stylesheets/SitesManager.css
@@ -0,0 +1,59 @@
+.trackingHelp ul {
+ padding-left: 40px;
+ list-style-type: square;
+}
+
+.trackingHelp ul li {
+ margin-bottom: 10px;
+}
+
+.trackingHelp h2 {
+ margin-top: 20px;
+}
+
+.trackingHelp p {
+ text-align: justify;
+}
+
+#editSites {
+ vertical-align: top;
+}
+
+#editSites h4 {
+ font-size: .8em;
+ margin: 1em 0 1em 0;
+ font-weight: bold;
+}
+
+#editSites .entityTable tr td {
+ vertical-align: top;
+ padding-top: 7px;
+}
+
+#editSites .addRowSite:hover,
+#editSites .editableSite:hover,
+#editSites .addsite:hover,
+#editSites .cancel:hover,
+#editSites .deleteSite:hover,
+#editSites .editSite:hover,
+#editSites .updateSite:hover {
+ cursor: pointer;
+}
+
+#editSites .addRowSite a {
+ text-decoration: none;
+}
+
+#editSites .addRowSite {
+ padding: 1em;
+ font-weight: bold;
+}
+
+.ecommerceInactive,
+.sitesearchInactive {
+ color: #666666;
+}
+
+#searchSiteParameters {
+ display: none;
+}
\ No newline at end of file
diff --git a/plugins/SitesManager/templates/_displayJavascriptCode.twig b/plugins/SitesManager/templates/_displayJavascriptCode.twig
index 950ce47705fad7636d664e54dfdb5f4fa7012153..508f3dd21ba203d33c36e75d60665a837dd51ec4 100644
--- a/plugins/SitesManager/templates/_displayJavascriptCode.twig
+++ b/plugins/SitesManager/templates/_displayJavascriptCode.twig
@@ -1,22 +1,3 @@
-<style type="text/css">
- .trackingHelp ul {
- padding-left: 40px;
- list-style-type: square;
- }
-
- .trackingHelp ul li {
- margin-bottom: 10px;
- }
-
- .trackingHelp h2 {
- margin-top: 20px;
- }
-
- p {
- text-align: justify;
- }
-</style>
-
<h2>{{ 'SitesManager_TrackingTags'|translate(displaySiteName) }}</h2>
<div class='trackingHelp'>
@@ -34,31 +15,4 @@
{{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a target="_blank" href="http://piwik.org/docs/javascript-tracking/">','</a>')|raw }}
<br/><br/>
{{ 'Installation_JSTracking_EndNote'|translate('<em>','</em>')|raw }}
-</div>
-<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>
\ No newline at end of file
+</div>
\ No newline at end of file
diff --git a/plugins/SitesManager/templates/index.twig b/plugins/SitesManager/templates/index.twig
index d4bb37d7ce3f49b0345166d5d0d91f5ae47ca4a7..b34312f5a5b32e6531723e38ba62a63fca8da4f2 100644
--- a/plugins/SitesManager/templates/index.twig
+++ b/plugins/SitesManager/templates/index.twig
@@ -1,453 +1,413 @@
{% extends 'admin.twig' %}
{% block content %}
-{% import 'macros.twig' as piwik %}
-{% import 'ajaxMacros.twig' as ajax %}
-{{ loadJavascriptTranslations(['SitesManager']) }}
-
-{% set excludedIpHelpPlain %}
- {{ 'SitesManager_HelpExcludedIps'|translate("1.2.3.*","1.2.*.*") }}
- <br/><br/>
- {{ 'SitesManager_YourCurrentIpAddressIs'|translate("<i>" ~ currentIpAddress ~ "</i>")|raw }}
-{% endset %}
-{% set excludedIpHelp=piwik.inlineHelp(excludedIpHelpPlain) %}
-
-{% set defaultTimezoneHelpPlain %}
- {% if timezoneSupported %}
- {{ 'SitesManager_ChooseCityInSameTimezoneAsYou'|translate }}
+ {% import 'macros.twig' as piwik %}
+ {% import 'ajaxMacros.twig' as ajax %}
+ {{ loadJavascriptTranslations(['SitesManager']) }}
+
+ {% set excludedIpHelpPlain %}
+ {{ 'SitesManager_HelpExcludedIps'|translate("1.2.3.*","1.2.*.*") }}
+ <br/><br/>
+ {{ 'SitesManager_YourCurrentIpAddressIs'|translate("<i>" ~ currentIpAddress ~ "</i>")|raw }}
+ {% endset %}
+
+ {% set excludedIpHelp=piwik.inlineHelp(excludedIpHelpPlain) %}
+
+ {% set defaultTimezoneHelpPlain %}
+ {% if timezoneSupported %}
+ {{ 'SitesManager_ChooseCityInSameTimezoneAsYou'|translate }}
+ {% else %}
+ {{ 'SitesManager_AdvancedTimezoneSupportNotFound'|translate }}
+ {% endif %}
+ <br/><br/>
+ {{ 'SitesManager_UTCTimeIs'|translate(utcTime) }}
+ {% endset %}
+
+ {% set timezoneHelpPlain %}
+ {{ defaultTimezoneHelpPlain }}
+ <br/><br/>
+ {{ 'SitesManager_ChangingYourTimezoneWillOnlyAffectDataForward'|translate }}
+ {% endset %}
+
+ {% set currencyHelpPlain %}
+ {{ piwik.inlineHelp('SitesManager_CurrencySymbolWillBeUsedForGoals'|translate) }}
+ {% endset %}
+
+ {% set ecommerceHelpPlain %}
+ {{ 'SitesManager_EcommerceHelp'|translate }}
+ <br/>
+ {{ 'SitesManager_PiwikOffersEcommerceAnalytics'|translate("<a href='http://piwik.org/docs/ecommerce-analytics/' target='_blank'>","</a>")|raw }}
+ {% endset %}
+
+ {% set excludedQueryParametersHelp %}
+ {{ 'SitesManager_ListOfQueryParametersToExclude'|translate }}
+ <br/><br/>
+ {{ 'SitesManager_PiwikWillAutomaticallyExcludeCommonSessionParameters'|translate("phpsessid, sessionid, ...") }}
+ {% endset %}
+
+ {% set excludedQueryParametersHelp=piwik.inlineHelp(excludedQueryParametersHelp) %}
+
+ {% set excludedUserAgentsHelp %}
+ {{ 'SitesManager_GlobalExcludedUserAgentHelp1'|translate }}
+ <br/><br/>
+ {{ 'SitesManager_GlobalListExcludedUserAgents_Desc'|translate }} {{ 'SitesManager_GlobalExcludedUserAgentHelp2'|translate }}
+ {% endset %}
+
+ {% set excludedUserAgentsHelp=piwik.inlineHelp(excludedUserAgentsHelp) %}
+
+ {% set keepURLFragmentSelectHTML %}
+ <h4 style="display:inline-block;">{{ 'SitesManager_KeepURLFragmentsLong'|translate }}</h4>
+
+ <select id="keepURLFragmentSelect">
+ <option value="0"> {% if globalKeepURLFragments %}{{ 'General_Yes'|translate }}{% else %}{{ 'General_No'|translate }}{% endif %}
+ ({{ 'General_Default'|translate }})
+ </option>
+ <option value="1">{{ 'General_Yes'|translate }}</option>
+ <option value="2">{{ 'General_No'|translate }}</option>
+ </select>
+ {% endset %}
+
+ <script type="text/javascript">
+ var excludedIpHelp = '{{ excludedIpHelp|e('js') }}';
+ var aliasUrlsHelp = '{{ piwik.inlineHelp('SitesManager_AliasUrlHelp'|translate)|e('js') }}';
+ var excludedQueryParametersHelp = '{{ excludedQueryParametersHelp|e('js') }}';
+ var excludedUserAgentsHelp = '{{ excludedUserAgentsHelp|e('js') }}';
+ var timezoneHelp = '{{ piwik.inlineHelp(timezoneHelpPlain)|e('js') }}';
+ var currencyHelp = '{{ currencyHelpPlain|e('js') }}';
+ var ecommerceHelp = '{{ piwik.inlineHelp(ecommerceHelpPlain)|e('js') }}';
+ var ecommerceEnabled = '{{ 'SitesManager_EnableEcommerce'|translate|e('js') }}';
+ var ecommerceDisabled = '{{ 'SitesManager_NotAnEcommerceSite'|translate|e('js') }}';
+ {% set defaultTimezoneHelp=piwik.inlineHelp(defaultTimezoneHelpPlain) %}
+ {% set searchKeywordHelp=piwik.inlineHelp('SitesManager_SearchKeywordParametersDesc'|translate) %}
+ {% set searchCategoryHelpText %}
+ {{ 'Goals_Optional'|translate }} {{ 'SitesManager_SearchCategoryParametersDesc'|translate }}
+ {% endset %}
+ {% set searchCategoryHelp=piwik.inlineHelp(searchCategoryHelpText) %}
+ var sitesearchEnabled = '{{ 'SitesManager_EnableSiteSearch'|translate|e('js') }}';
+ var sitesearchDisabled = '{{ 'SitesManager_DisableSiteSearch'|translate|e('js') }}';
+ var searchKeywordHelp = '{{ searchKeywordHelp|e('js') }}';
+ var searchCategoryHelp = '{{ searchCategoryHelp|e('js') }}';
+ var sitesearchDesc = '{{ 'SitesManager_TrackingSiteSearch'|translate|e('js') }}';
+ var keepURLFragmentSelectHTML = '{{ keepURLFragmentSelectHTML|e('js') }}';
+
+ var sitesManager = new SitesManager({{ timezones|raw }}, {{ currencies|raw }}, '{{ defaultTimezone|raw }}', '{{ defaultCurrency|raw }}');
+ {% set searchKeywordLabel='SitesManager_SearchKeywordLabel'|translate %}
+ {% set searchCategoryLabel='SitesManager_SearchCategoryLabel'|translate %}
+ var searchKeywordLabel = '{{ searchKeywordLabel|e('js') }}';
+ var searchCategoryLabel = '{{ searchCategoryLabel|e('js') }}';
+ {% set sitesearchIntro='SitesManager_SiteSearchUse'|translate %}
+ var sitesearchIntro = '{{ piwik.inlineHelp(sitesearchIntro)|e('js') }}';
+ var sitesearchUseDefault = '{% if isSuperUser %}{{ 'SitesManager_SearchUseDefault'|translate('<a href="#globalSiteSearch">','</a>')|e('js') }}{% else %}{{ 'SitesManager_SearchUseDefault'|translate('','')|e('js') }}{% endif %}';
+ var strDefault = '{{ 'General_Default'|translate|e('js') }}';
+
+ $(function () {
+ sitesManager.init();
+ });
+ </script>
+
+ <h2>{{ 'SitesManager_WebsitesManagement'|translate }}</h2>
+ <p>{{ 'SitesManager_MainDescription'|translate }}
+ {{ 'SitesManager_YouCurrentlyHaveAccessToNWebsites'|translate("<strong>" ~ adminSitesCount ~ "</strong>")|raw }}
+ {% if isSuperUser %}
+ <br/>
+ {{ 'SitesManager_SuperUserCan'|translate("<a href='#globalSettings'>","</a>")|raw }}
+ {% endif %}
+ </p>
+ {{ ajax.errorDiv() }}
+ {{ ajax.loadingDiv() }}
+
+ {% set createNewWebsite %}
+ <div class="addRowSite">
+ <img src='plugins/UsersManager/images/add.png' alt="Add Website"/> {{ 'SitesManager_AddSite'|translate }}
+ </div>
+ {% endset %}
+
+ {% if adminSites|length == 0 %}
+ {{ 'SitesManager_NoWebsites'|translate }}
{% else %}
- {{ 'SitesManager_AdvancedTimezoneSupportNotFound'|translate }}
+ <div class="ui-confirm" id="confirm">
+ <h2></h2>
+ <input role="yes" type="button" value="{{ 'General_Yes'|translate }}"/>
+ <input role="no" type="button" value="{{ 'General_No'|translate }}"/>
+ </div>
+ <div class="entityContainer">
+ {% if isSuperUser %}
+ {{ createNewWebsite }}
+ {% endif %}
+ <table class="entityTable dataTable" id="editSites">
+ <thead>
+ <tr>
+ <th>{{ 'General_Id'|translate }}</th>
+ <th>{{ 'General_Name'|translate }}</th>
+ <th>{{ 'SitesManager_Urls'|translate }}</th>
+ <th>{{ 'SitesManager_ExcludedIps'|translate }}</th>
+ <th>{{ 'SitesManager_ExcludedParameters'|translate|replace({" ":"<br />"}) }}</th>
+ <th id='exclude-user-agent-header'
+ {% if not allowSiteSpecificUserAgentExclude %}style="display:none"{% endif %}>{{ 'SitesManager_ExcludedUserAgents'|translate }}</th>
+ <th>{{ 'Actions_SubmenuSitesearch'|translate }}</th>
+ <th>{{ 'SitesManager_Timezone'|translate }}</th>
+ <th>{{ 'SitesManager_Currency'|translate }}</th>
+ <th>{{ 'Goals_Ecommerce'|translate }}</th>
+ <th></th>
+ <th></th>
+ <th>{{ 'SitesManager_JsTrackingTag'|translate }}</th>
+ </tr>
+ </thead>
+ <tbody>
+ {% for i,site in adminSites %}
+ <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">
+ {% for url in site.alias_urls %}{{ url|replace({'http://': ''}) }}<br/>{% endfor %}
+ </td>
+ <td id="excludedIps" class="editableSite">
+ {% for ip in site.excluded_ips %}{{ ip }}<br/>{% endfor %}
+ </td>
+ <td id="excludedQueryParameters" class="editableSite">
+ {% for parameter in site.excluded_parameters %}{{ parameter }}<br/>{% endfor %}
+ </td>
+ <td id="excludedUserAgents" class="editableSite"
+ {% if not allowSiteSpecificUserAgentExclude %}style="display:none"{% endif %}>
+ {% for ua in site.excluded_user_agent %}{{ ua }}<br/>{% endfor %}
+ </td>
+ <td id="sitesearch" class="editableSite">
+ {% if site.sitesearch %}
+ <span class='sitesearchActive'>{{ 'General_Yes'|translate }}</span>
+ {% else %}
+ <span class='sitesearchInactive'>-</span>
+ {% endif %}
+ <span class='sskp' sitesearch_keyword_parameters="{{ site.sitesearch_keyword_parameters }}""
+ sitesearch_category_parameters="{{ site.sitesearch_category_parameters }}"
+ id="sitesearch_parameters">
+ </span>
+ </td>
+ <td id="timezone" class="editableSite">{{ site.timezone }}</td>
+ <td id="currency" class="editableSite">{{ site.currency }}</td>
+ <td id="ecommerce" class="editableSite">
+ {% if site.ecommerce %}
+ <span class='ecommerceActive'>{{ 'General_Yes'|translate }}</span>
+ {% else %}
+ <span class='ecommerceInactive'>-</span>
+ {% endif %}
+ </td>
+ <td>
+ <span id="row{{ site.idsite }}" class='editSite link_but'>
+ <img src='plugins/Zeitgeist/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='plugins/Zeitgeist/images/ico_delete.png' title="{{ 'General_Delete'|translate }}"
+ border="0"/>
+ {{ 'General_Delete'|translate }}
+ </span>
+ </td>
+ <td>
+ <a href='{{ linkTo({'module':'CoreAdminHome','action':'trackingCodeGenerator','idSite':site.idsite,'updated':false }) }}'>
+ {{ 'SitesManager_ShowTrackingTag'|translate }}
+ </a>
+ </td>
+ </tr>
+ {% endfor %}
+ </tbody>
+ </table>
+ {% if isSuperUser %}
+ {{ createNewWebsite }}
+ {% endif %}
+ </div>
{% endif %}
- <br/><br/>
- {{ 'SitesManager_UTCTimeIs'|translate(utcTime) }}
-{% endset %}
-
-{% set timezoneHelpPlain %}
- {{ defaultTimezoneHelpPlain }}
- <br/><br/>
- {{ 'SitesManager_ChangingYourTimezoneWillOnlyAffectDataForward'|translate }}
-{% endset %}
-
-{% set currencyHelpPlain %}
- {{ piwik.inlineHelp('SitesManager_CurrencySymbolWillBeUsedForGoals'|translate) }}
-{% endset %}
-
-{% set ecommerceHelpPlain %}
- {{ 'SitesManager_EcommerceHelp'|translate }}
- <br/>
- {{ 'SitesManager_PiwikOffersEcommerceAnalytics'|translate("<a href='http://piwik.org/docs/ecommerce-analytics/' target='_blank'>","</a>")|raw }}
-{% endset %}
-
-{% set excludedQueryParametersHelp %}
- {{ 'SitesManager_ListOfQueryParametersToExclude'|translate }}
- <br/><br/>
- {{ 'SitesManager_PiwikWillAutomaticallyExcludeCommonSessionParameters'|translate("phpsessid, sessionid, ...") }}
-{% endset %}
-{% set excludedQueryParametersHelp=piwik.inlineHelp(excludedQueryParametersHelp) %}
-
-{% set excludedUserAgentsHelp %}
- {{ 'SitesManager_GlobalExcludedUserAgentHelp1'|translate }}
- <br/><br/>
- {{ 'SitesManager_GlobalListExcludedUserAgents_Desc'|translate}} {{ 'SitesManager_GlobalExcludedUserAgentHelp2'|translate }}
-{% endset %}
-{% set excludedUserAgentsHelp=piwik.inlineHelp(excludedUserAgentsHelp) %}
-
-{% set keepURLFragmentSelectHTML %}
-<h4 style="display:inline-block;">{{ 'SitesManager_KeepURLFragmentsLong'|translate }}</h4>
-
-<select id="keepURLFragmentSelect">
- <option value="0"> {% if globalKeepURLFragments %}{{ 'General_Yes'|translate }}{% else %}{{ 'General_No'|translate }}{% endif %}
- ({{ 'General_Default'|translate }})
- </option>
- <option value="1">{{ 'General_Yes'|translate }}</option>
- <option value="2">{{ 'General_No'|translate }}</option>
-</select>
-{% endset %}
-
-<script type="text/javascript">
-var excludedIpHelp = '{{ excludedIpHelp|e('js') }}';
-var aliasUrlsHelp = '{{ piwik.inlineHelp('SitesManager_AliasUrlHelp'|translate)|e('js') }}';
-var excludedQueryParametersHelp = '{{ excludedQueryParametersHelp|e('js') }}';
-var excludedUserAgentsHelp = '{{ excludedUserAgentsHelp|e('js') }}';
-var timezoneHelp = '{{ piwik.inlineHelp(timezoneHelpPlain)|e('js') }}';
-var currencyHelp = '{{ currencyHelpPlain|e('js') }}';
-var ecommerceHelp = '{{ piwik.inlineHelp(ecommerceHelpPlain)|e('js') }}';
-var ecommerceEnabled = '{{ 'SitesManager_EnableEcommerce'|translate|e('js') }}';
-var ecommerceDisabled = '{{ 'SitesManager_NotAnEcommerceSite'|translate|e('js') }}';
-{% set defaultTimezoneHelp=piwik.inlineHelp(defaultTimezoneHelpPlain) %}
-{% set searchKeywordHelp=piwik.inlineHelp('SitesManager_SearchKeywordParametersDesc'|translate) %}
-{% set searchCategoryHelpText %}
- {{ 'Goals_Optional'|translate }} {{ 'SitesManager_SearchCategoryParametersDesc'|translate }}
-{% endset %}
-{% set searchCategoryHelp=piwik.inlineHelp(searchCategoryHelpText) %}
-var sitesearchEnabled = '{{ 'SitesManager_EnableSiteSearch'|translate|e('js') }}';
-var sitesearchDisabled = '{{ 'SitesManager_DisableSiteSearch'|translate|e('js') }}';
-var searchKeywordHelp = '{{ searchKeywordHelp|e('js') }}';
-var searchCategoryHelp = '{{ searchCategoryHelp|e('js') }}';
-var sitesearchDesc = '{{ 'SitesManager_TrackingSiteSearch'|translate|e('js') }}';
-var keepURLFragmentSelectHTML = '{{ keepURLFragmentSelectHTML|e('js') }}';
-
-var sitesManager = new SitesManager({{ timezones|raw }}, {{ currencies|raw }}, '{{ defaultTimezone|raw }}', '{{ defaultCurrency|raw }}');
-{% set searchKeywordLabel='SitesManager_SearchKeywordLabel'|translate %}
-{% set searchCategoryLabel='SitesManager_SearchCategoryLabel'|translate %}
-var searchKeywordLabel = '{{ searchKeywordLabel|e('js') }}';
-var searchCategoryLabel = '{{ searchCategoryLabel|e('js') }}';
-{% set sitesearchIntro='SitesManager_SiteSearchUse'|translate %}
-var sitesearchIntro = '{{ piwik.inlineHelp(sitesearchIntro)|e('js') }}';
-var sitesearchUseDefault = '{% if isSuperUser %}{{ 'SitesManager_SearchUseDefault'|translate('<a href="#globalSiteSearch">','</a>')|e('js') }}{% else %}{{ 'SitesManager_SearchUseDefault'|translate('','')|e('js') }}{% endif %}';
-var strDefault = '{{ 'General_Default'|translate|e('js') }}';
-
-$(document).ready(function () {
- sitesManager.init();
-});
-</script>
-
-<style type="text/css">
- .entityTable tr td {
- vertical-align: top;
- padding-top: 7px;
- }
-
- .addRowSite:hover, .editableSite:hover, .addsite:hover, .cancel:hover, .deleteSite:hover, .editSite:hover, .updateSite:hover {
- cursor: pointer;
- }
-
- .addRowSite a {
- text-decoration: none;
- }
-
- .addRowSite {
- padding: 1em;
- font-weight: bold;
- }
-
- #editSites {
- vertical-align: top;
- }
-
- option, select {
- font-size: 11px;
- }
-
- textarea {
- font-size: 9pt;
- }
-
- .admin thead th {
- vertical-align: middle;
- }
-
- .ecommerceInactive, .sitesearchInactive {
- color: #666666;
- }
-
- #searchSiteParameters {
- display: none;
- }
-
- #editSites h4 {
- font-size: .8em;
- margin: 1em 0 1em 0;
- font-weight: bold;
- }
-</style>
-
-<h2>{{ 'SitesManager_WebsitesManagement'|translate }}</h2>
-<p>{{ 'SitesManager_MainDescription'|translate }}
-{{ 'SitesManager_YouCurrentlyHaveAccessToNWebsites'|translate("<strong>" ~ adminSitesCount ~ "</strong>")|raw }}
-{% if isSuperUser %}
- <br/>
- {{ 'SitesManager_SuperUserCan'|translate("<a href='#globalSettings'>","</a>")|raw }}
-{% endif %}
-</p>
-{{ ajax.errorDiv() }}
-{{ ajax.loadingDiv() }}
-
-{% set createNewWebsite %}
-<div class="addRowSite">
- <img src='plugins/UsersManager/images/add.png' alt="Add Website" /> {{ 'SitesManager_AddSite'|translate }}
-</div>
-{% endset %}
-
-{% if adminSites|length == 0 %}
- {{ 'SitesManager_NoWebsites'|translate }}
-{% else %}
-<div class="ui-confirm" id="confirm">
- <h2></h2>
- <input role="yes" type="button" value="{{ 'General_Yes'|translate }}"/>
- <input role="no" type="button" value="{{ 'General_No'|translate }}"/>
-</div>
-<div class="entityContainer">
- {% if isSuperUser %}
- {{ createNewWebsite }}
+
+
+ {# Admin users use these values for Site Search column, when editing websites #}
+ {% if not isSuperUser %}
+ <input type="hidden" size="15" id="globalSearchKeywordParameters"
+ value="{{ globalSearchKeywordParameters }}"/>
+ <input type="hidden" size="15" id="globalSearchCategoryParameters"
+ value="{{ globalSearchCategoryParameters }}"/>
{% endif %}
- <table class="entityTable dataTable" id="editSites">
- <thead>
- <tr>
- <th>{{ 'General_Id'|translate }}</th>
- <th>{{ 'General_Name'|translate }}</th>
- <th>{{ 'SitesManager_Urls'|translate }}</th>
- <th>{{ 'SitesManager_ExcludedIps'|translate }}</th>
- <th>{{ 'SitesManager_ExcludedParameters'|translate|replace({" ":"<br />"}) }}</th>
- <th id='exclude-user-agent-header'
- {% if not allowSiteSpecificUserAgentExclude %}style="display:none"{% endif %}>{{ 'SitesManager_ExcludedUserAgents'|translate }}</th>
- <th>{{ 'Actions_SubmenuSitesearch'|translate }}</th>
- <th>{{ 'SitesManager_Timezone'|translate }}</th>
- <th>{{ 'SitesManager_Currency'|translate }}</th>
- <th>{{ 'Goals_Ecommerce'|translate }}</th>
- <th></th>
- <th></th>
- <th>{{ 'SitesManager_JsTrackingTag'|translate}}</th>
- </tr>
- </thead>
- <tbody>
- {% for i,site in adminSites %}
- <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">
- {% for url in site.alias_urls %}{{ url|replace({'http://': ''}) }}<br />{% endfor %}
- </td>
- <td id="excludedIps" class="editableSite">
- {% for ip in site.excluded_ips %}{{ ip }}<br/>{% endfor %}
- </td>
- <td id="excludedQueryParameters" class="editableSite">
- {% for parameter in site.excluded_parameters %}{{ parameter }}<br />{% endfor %}
+
+ {% if isSuperUser %}
+ <br/>
+
+ <h2 id="globalSettings">{{ 'SitesManager_GlobalWebsitesSettings'|translate }}</h2>
+ <br/>
+ <table style='width:600px' class="adminTable">
+
+ <tr>
+ <td colspan="2">
+ <strong>{{ 'SitesManager_GlobalListExcludedIps'|translate }}</strong>
+
+ <p>{{ 'SitesManager_ListOfIpsToBeExcludedOnAllWebsites'|translate }} </p>
</td>
- <td id="excludedUserAgents" class="editableSite" {% if not allowSiteSpecificUserAgentExclude %}style="display:none"{% endif %}>
- {% for ua in site.excluded_user_agent %}{{ ua }}<br />{% endfor %}
+ </tr>
+ <tr>
+ <td>
+ <textarea cols="30" rows="3" id="globalExcludedIps">{{ globalExcludedIps }}
+ </textarea>
</td>
- <td id="sitesearch" class="editableSite">
- {% if site.sitesearch %}
- <span class='sitesearchActive'>{{ 'General_Yes'|translate }}</span>
- {% else %}
- <span class='sitesearchInactive'>-</span>
- {% endif %}
- <span class='sskp' sitesearch_keyword_parameters="{{ site.sitesearch_keyword_parameters }}""
- sitesearch_category_parameters="{{ site.sitesearch_category_parameters }}"
- id="sitesearch_parameters">
- </span>
+ <td>
+ <label for="globalExcludedIps">{{ excludedIpHelp }}</label>
</td>
- <td id="timezone" class="editableSite">{{ site.timezone }}</td>
- <td id="currency" class="editableSite">{{ site.currency }}</td>
- <td id="ecommerce" class="editableSite">
- {% if site.ecommerce %}
- <span class='ecommerceActive'>{{ 'General_Yes'|translate }}</span>
- {% else %}
- <span class='ecommerceInactive'>-</span>
- {% endif %}
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <b>{{ 'SitesManager_GlobalListExcludedQueryParameters'|translate }}</b>
+
+ <p>{{ 'SitesManager_ListOfQueryParametersToBeExcludedOnAllWebsites'|translate }} </p>
</td>
+ </tr>
+
+ <tr>
<td>
- <span id="row{{ site.idsite }}" class='editSite link_but'>
- <img src='plugins/Zeitgeist/images/ico_edit.png' title="{{ 'General_Edit'|translate }}" border="0"/>
- {{ 'General_Edit'|translate }}
- </span>
+ <textarea cols="30" rows="3" id="globalExcludedQueryParameters">{{ globalExcludedQueryParameters }}
+ </textarea>
</td>
<td>
- <span id="row{{ site.idsite }}" class="deleteSite link_but">
- <img src='plugins/Zeitgeist/images/ico_delete.png' title="{{ 'General_Delete'|translate }}" border="0"/>
- {{ 'General_Delete'|translate }}
- </span>
+ <label for="globalExcludedQueryParameters">{{ excludedQueryParametersHelp }}</label>
+ </td>
+ </tr>
+
+ {# global excluded user agents #}
+ <tr>
+ <td colspan="2">
+ <strong>{{ 'SitesManager_GlobalListExcludedUserAgents'|translate }}</strong>
+
+ <p>{{ 'SitesManager_GlobalListExcludedUserAgents_Desc'|translate }}</p>
</td>
+ </tr>
+
+ <tr>
<td>
- <a href='{{ linkTo({'module':'CoreAdminHome','action':'trackingCodeGenerator','idSite':site.idsite,'updated':false }) }}'>
- {{ 'SitesManager_ShowTrackingTag'|translate }}
- </a>
+ <textarea cols="30" rows="3" id="globalExcludedUserAgents">{{ globalExcludedUserAgents }}</textarea>
+ </td>
+ <td><label for="globalExcludedUserAgents">{{ excludedUserAgentsHelp }}</label>
</td>
</tr>
- {% endfor %}
- </tbody>
- </table>
- {% if isSuperUser %}
- {{ createNewWebsite }}
- {% endif %}
-</div>
-{% endif %}
-
-
-{# Admin users use these values for Site Search column, when editing websites #}
-{% if not isSuperUser %}
-<input type="hidden" size="15" id="globalSearchKeywordParameters"
- value="{{ globalSearchKeywordParameters }}"/>
-<input type="hidden" size="15" id="globalSearchCategoryParameters"
- value="{{ globalSearchCategoryParameters }}"/>
-{% endif %}
-
-{% if isSuperUser %}
-<br/>
-
-<h2 id="globalSettings">{{ 'SitesManager_GlobalWebsitesSettings'|translate }}</h2>
-<br/>
-<table style='width:600px' class="adminTable">
-
- <tr>
- <td colspan="2">
- <strong>{{ 'SitesManager_GlobalListExcludedIps'|translate }}</strong>
-
- <p>{{ 'SitesManager_ListOfIpsToBeExcludedOnAllWebsites'|translate }} </p>
- </td>
- </tr>
- <tr>
- <td>
- <textarea cols="30" rows="3" id="globalExcludedIps">{{ globalExcludedIps }}
- </textarea>
- </td>
- <td>
- <label for="globalExcludedIps">{{ excludedIpHelp }}</label>
- </td>
- </tr>
-
- <tr>
- <td colspan="2">
- <b>{{ 'SitesManager_GlobalListExcludedQueryParameters'|translate }}</b>
-
- <p>{{ 'SitesManager_ListOfQueryParametersToBeExcludedOnAllWebsites'|translate }} </p>
- </td>
- </tr>
-
- <tr>
- <td>
- <textarea cols="30" rows="3" id="globalExcludedQueryParameters">{{ globalExcludedQueryParameters }}
- </textarea>
- </td>
- <td>
- <label for="globalExcludedQueryParameters">{{ excludedQueryParametersHelp }}</label>
- </td>
- </tr>
-
-{# global excluded user agents #}
- <tr>
- <td colspan="2">
- <strong>{{ 'SitesManager_GlobalListExcludedUserAgents'|translate }}</strong>
-
- <p>{{ 'SitesManager_GlobalListExcludedUserAgents_Desc'|translate }}</p>
- </td>
- </tr>
-
- <tr>
- <td>
- <textarea cols="30" rows="3" id="globalExcludedUserAgents">{{ globalExcludedUserAgents }}</textarea>
- </td>
- <td><label for="globalExcludedUserAgents">{{ excludedUserAgentsHelp }}</label>
- </td>
- </tr>
-
- <tr>
- <td>
- <input type="checkbox" id="enableSiteUserAgentExclude" name="enableSiteUserAgentExclude"
- {% if allowSiteSpecificUserAgentExclude %}checked="checked"{% endif %}/>
- <label for="enableSiteUserAgentExclude">
- {{ 'SitesManager_EnableSiteSpecificUserAgentExclude'|translate }}
- </label>
+
+ <tr>
+ <td>
+ <input type="checkbox" id="enableSiteUserAgentExclude" name="enableSiteUserAgentExclude"
+ {% if allowSiteSpecificUserAgentExclude %}checked="checked"{% endif %}/>
+ <label for="enableSiteUserAgentExclude">
+ {{ 'SitesManager_EnableSiteSpecificUserAgentExclude'|translate }}
+ </label>
<span id='enableSiteUserAgentExclude-loading' class='loadingPiwik' style='display:none'>
<img src='plugins/Zeitgeist/images/loading-blue.gif'/>
</span>
- </td>
- <td>
- {{ piwik.inlineHelp('SitesManager_EnableSiteSpecificUserAgentExclude_Help'|translate('<a href="#editSites">','</a>')) }}
- </td>
- </tr>
-
-{# global keep URL fragments #}
- <tr>
- <td colspan="2">
- <strong>{{ 'SitesManager_KeepURLFragments'|translate }}</strong>
-
- <p>{{ 'SitesManager_KeepURLFragmentsHelp'|translate("<em>#</em>","<em>example.org/index.html#first_section</em>","<em>example.org/index.html</em>")|raw }}
- </p>
- <input type="checkbox" id="globalKeepURLFragments" name="globalKeepURLFragments"
- {% if globalKeepURLFragments %}checked="checked"{% endif %}/>
- <label for="globalKeepURLFragments">{{ 'SitesManager_KeepURLFragmentsLong'|translate }}</label>
-
- <p>{{ 'SitesManager_KeepURLFragmentsHelp2'|translate }}</p>
- </td>
- </tr>
-
-{# global site search #}
- <tr>
- <td colspan="2">
- <b id="globalSiteSearch">{{ 'SitesManager_TrackingSiteSearch'|translate }}</b>
- <p>{{ sitesearchIntro }}</p>
+ </td>
+ <td>
+ {{ piwik.inlineHelp('SitesManager_EnableSiteSpecificUserAgentExclude_Help'|translate('<a href="#editSites">','</a>')) }}
+ </td>
+ </tr>
+
+ {# global keep URL fragments #}
+ <tr>
+ <td colspan="2">
+ <strong>{{ 'SitesManager_KeepURLFragments'|translate }}</strong>
+
+ <p>{{ 'SitesManager_KeepURLFragmentsHelp'|translate("<em>#</em>","<em>example.org/index.html#first_section</em>","<em>example.org/index.html</em>")|raw }}
+ </p>
+ <input type="checkbox" id="globalKeepURLFragments" name="globalKeepURLFragments"
+ {% if globalKeepURLFragments %}checked="checked"{% endif %}/>
+ <label for="globalKeepURLFragments">{{ 'SitesManager_KeepURLFragmentsLong'|translate }}</label>
+
+ <p>{{ 'SitesManager_KeepURLFragmentsHelp2'|translate }}</p>
+ </td>
+ </tr>
+
+ {# global site search #}
+ <tr>
+ <td colspan="2">
+ <b id="globalSiteSearch">{{ 'SitesManager_TrackingSiteSearch'|translate }}</b>
+
+ <p>{{ sitesearchIntro }}</p>
<span class="form-description" style='font-size:8pt'>
{{ 'SitesManager_SearchParametersNote'|translate }} {{ 'SitesManager_SearchParametersNote2'|translate }}
</span>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <label>{{ searchKeywordLabel }}
- <input type="text" size="15" id="globalSearchKeywordParameters" value="{{ globalSearchKeywordParameters }}"/>
-
- <div style='width: 200px;float:right;'>{{ searchKeywordHelp }}</div>
- </label>
- </td>
- </tr>
-
- <tr>
- <td colspan="2">
- {% if not isSearchCategoryTrackingEnabled %}
- <input value='globalSearchCategoryParametersIsDisabled' id="globalSearchCategoryParameters" type='hidden'/>
- <span class='form-description'>Note: you could also track your Internal Search Engine Categories, but the plugin Custom Variables is required. Please enable the plugin CustomVariables (or ask your Piwik admin).</span>
- {% else %}
- {{ 'Goals_Optional'|translate }} {{ 'SitesManager_SearchCategoryDesc'|translate }} <br/>
- </td>
- </tr>
- <tr>
- <td colspan="2">
- <label>{{ searchCategoryLabel }}
- <input type="text" size="15" id="globalSearchCategoryParameters" value="{{ globalSearchCategoryParameters }}"/>
-
- <div style='width: 200px;float:right;'>{{ searchCategoryHelp }}</div>
- </label>
- {% endif %}
- </td>
- </tr>
-
- <tr>
- <td colspan="2">
- <strong>{{ 'SitesManager_DefaultTimezoneForNewWebsites'|translate }}</strong>
-
- <p>{{ 'SitesManager_SelectDefaultTimezone'|translate }} </p>
- </td>
- </tr>
- <tr>
- <td>
- <div id='defaultTimezone'></div>
- </td>
- <td>
- {{ defaultTimezoneHelp }}
- </td>
- </tr>
-
- <tr>
- <td colspan="2">
- <strong>{{ 'SitesManager_DefaultCurrencyForNewWebsites'|translate }}</strong>
-
- <p>{{ 'SitesManager_SelectDefaultCurrency'|translate }}</p>
- </td>
- </tr>
- <tr>
- <td>
- <div id='defaultCurrency'></div>
- </td>
- <td>
- {{ currencyHelpPlain }}
- </td>
- </tr>
-</table>
-<span style="margin-left:20px">
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <label>{{ searchKeywordLabel }}
+ <input type="text" size="15" id="globalSearchKeywordParameters"
+ value="{{ globalSearchKeywordParameters }}"/>
+
+ <div style='width: 200px;float:right;'>{{ searchKeywordHelp }}</div>
+ </label>
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ {% if not isSearchCategoryTrackingEnabled %}
+ <input value='globalSearchCategoryParametersIsDisabled' id="globalSearchCategoryParameters"
+ type='hidden'/>
+ <span class='form-description'>Note: you could also track your Internal Search Engine Categories, but the plugin Custom Variables is required. Please enable the plugin CustomVariables (or ask your Piwik admin).</span>
+ {% else %}
+ {{ 'Goals_Optional'|translate }} {{ 'SitesManager_SearchCategoryDesc'|translate }} <br/>
+ </td>
+ </tr>
+ <tr>
+ <td colspan="2">
+ <label>{{ searchCategoryLabel }}
+ <input type="text" size="15" id="globalSearchCategoryParameters"
+ value="{{ globalSearchCategoryParameters }}"/>
+
+ <div style='width: 200px;float:right;'>{{ searchCategoryHelp }}</div>
+ </label>
+ {% endif %}
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <strong>{{ 'SitesManager_DefaultTimezoneForNewWebsites'|translate }}</strong>
+
+ <p>{{ 'SitesManager_SelectDefaultTimezone'|translate }} </p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div id='defaultTimezone'></div>
+ </td>
+ <td>
+ {{ defaultTimezoneHelp }}
+ </td>
+ </tr>
+
+ <tr>
+ <td colspan="2">
+ <strong>{{ 'SitesManager_DefaultCurrencyForNewWebsites'|translate }}</strong>
+
+ <p>{{ 'SitesManager_SelectDefaultCurrency'|translate }}</p>
+ </td>
+ </tr>
+ <tr>
+ <td>
+ <div id='defaultCurrency'></div>
+ </td>
+ <td>
+ {{ currencyHelpPlain }}
+ </td>
+ </tr>
+ </table>
+ <span style="margin-left:20px">
<input type="submit" class="submit" id='globalSettingsSubmit' value="{{ 'General_Save'|translate }}"/>
</span>
- {{ ajax.errorDiv('ajaxErrorGlobalSettings') }}
- {{ ajax.loadingDiv('ajaxLoadingGlobalSettings') }}
-{% endif %}
-{% if showAddSite %}
-<script type="text/javascript">
-$(document).ready(function () {
- $('.addRowSite:first').trigger('click');
-});
-</script>
-{% endif %}
-
-<br/><br/><br/><br/>
+ {{ ajax.errorDiv('ajaxErrorGlobalSettings') }}
+ {{ ajax.loadingDiv('ajaxLoadingGlobalSettings') }}
+ {% endif %}
+ {% if showAddSite %}
+ <script type="text/javascript">
+ $(document).ready(function () {
+ $('.addRowSite:first').trigger('click');
+ });
+ </script>
+ {% endif %}
+
+ <br/><br/><br/><br/>
{% endblock %}