diff options
| author | Klaus <klaus@jsxc.org> | 2019-01-31 12:50:59 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-01-31 12:50:59 +0300 |
| commit | 368738a005da74900211ffd0b24babddacd86750 (patch) | |
| tree | 9c0d1084ef1418973566a72ffa08edc66737e878 | |
| parent | 6e556f51bcc39a8d9da385872637e3edd96fbe20 (diff) | |
| parent | 09a751671ccce1ca092c29ef7252781205931fa9 (diff) | |
Merge pull request #65 from DrMurx/contentBlockerNotification
Notify admin if a content blocker affects settings form
| -rw-r--r-- | js/settings/admin.js | 2 | ||||
| -rw-r--r-- | templates/settings/admin.php | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/js/settings/admin.js b/js/settings/admin.js index cf5c94f..6a577e7 100644 --- a/js/settings/admin.js +++ b/js/settings/admin.js @@ -1,6 +1,8 @@ /* global OCP, OC */ $(function() { + $('#piwikAdblockerWarning').hide(); + function showRequestResult(element, result) { if (element.attr('type') === 'checkbox') { element = $('label[for="' + element.attr('id') + '"]'); diff --git a/templates/settings/admin.php b/templates/settings/admin.php index ed4ec9e..023834f 100644 --- a/templates/settings/admin.php +++ b/templates/settings/admin.php @@ -6,6 +6,7 @@ style('piwik', 'settings'); <div id="piwikSettings" class="section"> <h2>Piwik/Matomo Tracking</h2> <p class="settings-hint">If you have no Piwik/Matomo instance, go to <a href="https://matomo.org" target="_blank">matomo.org</a> for further instructions.</p> + <p id="piwikAdblockerWarning" style="border-left:2px red solid;padding-left:1em">It seems that you use a content blocker plugin in your browser to stop trackers like Matomo. Unfortunately, your plugin also breaks this settings form, so you might want to disable the content blocker for your NextCloud.</p> <form> <table> |