Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/matomo-org/matomo.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKate Butler <kate@innocraft.com>2019-09-19 01:00:09 +0300
committerThomas Steur <tsteur@users.noreply.github.com>2019-09-19 01:00:09 +0300
commitf697570e06d16c79e4b32ed4733b48f63f2173f6 (patch)
treee26d6c7fa46cbabb233f8c85ff24f7ec3dca23f2 /plugins/CoreHome
parent782768d1ecca400bfb5fafb1c06ef04e82a68a98 (diff)
Make it easier to search help resources from within Matomo (#14870)
* Add link to matomo.org resources in awesome search * Add "How can we help" card to help page * PR fixes * CSS improvements * Update UI test screenshots * PR improvements * CSS improvements * Remove duplicate links and reword community help links * Update reference screenshot * make it work for mobile, remove duplicate dot, minor style tweak * fix screenshot test
Diffstat (limited to 'plugins/CoreHome')
-rw-r--r--plugins/CoreHome/angularjs/quick-access/quick-access.directive.html10
-rw-r--r--plugins/CoreHome/angularjs/quick-access/quick-access.directive.js5
-rw-r--r--plugins/CoreHome/angularjs/quick-access/quick-access.directive.less3
3 files changed, 17 insertions, 1 deletions
diff --git a/plugins/CoreHome/angularjs/quick-access/quick-access.directive.html b/plugins/CoreHome/angularjs/quick-access/quick-access.directive.html
index 374e3b1d8a..5de3a7eeb5 100644
--- a/plugins/CoreHome/angularjs/quick-access/quick-access.directive.html
+++ b/plugins/CoreHome/angularjs/quick-access/quick-access.directive.html
@@ -23,7 +23,7 @@
ng-click="quickAccess.selectMenuItem(submenuEntry.index)"
ng-repeat="submenuEntry in subcategory.items"><a>{{ submenuEntry.name | trim }}</a></li>
</ul>
- <ul>
+ <ul class="quickAccessMatomoSearch">
<li class="quick-access-category websiteCategory"
ng-show="hasSitesSelector && ((quickAccess.sitesModel.sites | length) || quickAccess.sitesModel.isLoading)"
>{{ 'SitesManager_Sites' | translate }}</li>
@@ -36,5 +36,13 @@
ng-click="quickAccess.selectSite(site.idsite)"
ng-repeat="site in quickAccess.sitesModel.sites"><a ng-bind="site.name"></a></li>
</ul>
+ <ul>
+ <li class="quick-access-category helpCategory">{{ 'General_HelpResources' | translate }}</li>
+ <li ng-class="{selected: search.index == 'help'}"
+ class="quick-access-help"
+ ng-mouseenter="search.index='help'">
+ <a ng-href="https://matomo.org?s={{ urlEncode(search.term) }}" target="_blank">{{'Feedback_SearchOnMatomo' | translate:(search.term)}}</a>
+ </li>
+ </ul>
</div>
</div>
diff --git a/plugins/CoreHome/angularjs/quick-access/quick-access.directive.js b/plugins/CoreHome/angularjs/quick-access/quick-access.directive.js
index a9ac612ebf..3dbef79ca0 100644
--- a/plugins/CoreHome/angularjs/quick-access/quick-access.directive.js
+++ b/plugins/CoreHome/angularjs/quick-access/quick-access.directive.js
@@ -259,6 +259,11 @@
}
};
+ scope.urlEncode = function(term)
+ {
+ return encodeURIComponent(term);
+ };
+
piwikHelper.registerShortcut('f', _pk_translate('CoreHome_ShortcutSearch'), function(event) {
if (event.altKey) {
return;
diff --git a/plugins/CoreHome/angularjs/quick-access/quick-access.directive.less b/plugins/CoreHome/angularjs/quick-access/quick-access.directive.less
index d0ec71ec98..3bad77b9ba 100644
--- a/plugins/CoreHome/angularjs/quick-access/quick-access.directive.less
+++ b/plugins/CoreHome/angularjs/quick-access/quick-access.directive.less
@@ -59,4 +59,7 @@
.websiteCategory {
cursor: default;
}
+ li.quick-access-help a {
+ word-break: break-word;
+ }
} \ No newline at end of file