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:
authordizzy <diosmosis@users.noreply.github.com>2021-02-10 08:37:26 +0300
committerGitHub <noreply@github.com>2021-02-10 08:37:26 +0300
commitbc1d57f6dc43e843d26cbb5e484539201f518cf9 (patch)
tree124d9ba0bb2f0a860fdaa9e39c059944dc94af4e /plugins/Live/Categories
parentf3782b96ad41d9ec52e759e7ca47bceba570bc35 (diff)
Display help icons for categories/subcategories (#17062)
* show help icons in left and display help messages on click * pointless commit * more fixes for when to show icon persistent * More docs & more fixes. * some fixes, more styling changes + UI test * remove line breaks * fix link * update SecurityInfo plugin to latest * apply more review feedback * Adding help text + tweak to notification title bar. * fix issues after review and make exception clearer * update submodules * Update CustomVariables submodule. * fixing tests * fix test Co-authored-by: sgiehl <stefan@matomo.org>
Diffstat (limited to 'plugins/Live/Categories')
-rw-r--r--plugins/Live/Categories/RealTimeVisitorsSubcategory.php7
-rw-r--r--plugins/Live/Categories/VisitorLogSubcategory.php8
2 files changed, 15 insertions, 0 deletions
diff --git a/plugins/Live/Categories/RealTimeVisitorsSubcategory.php b/plugins/Live/Categories/RealTimeVisitorsSubcategory.php
index 822d1bf268..0527f60ee0 100644
--- a/plugins/Live/Categories/RealTimeVisitorsSubcategory.php
+++ b/plugins/Live/Categories/RealTimeVisitorsSubcategory.php
@@ -9,6 +9,7 @@
namespace Piwik\Plugins\Live\Categories;
use Piwik\Category\Subcategory;
+use Piwik\Piwik;
class RealTimeVisitorsSubcategory extends Subcategory
{
@@ -16,4 +17,10 @@ class RealTimeVisitorsSubcategory extends Subcategory
protected $id = 'General_RealTime';
protected $order = 7;
+ public function getHelp()
+ {
+ $result = '<p>' . Piwik::translate('Live_RealTimeHelp1') . '</p>';
+ $result .= '<p>' . Piwik::translate('Live_RealTimeHelp2') . '</p>';
+ return $result;
+ }
}
diff --git a/plugins/Live/Categories/VisitorLogSubcategory.php b/plugins/Live/Categories/VisitorLogSubcategory.php
index 0fcd02223d..cba1e00af5 100644
--- a/plugins/Live/Categories/VisitorLogSubcategory.php
+++ b/plugins/Live/Categories/VisitorLogSubcategory.php
@@ -9,6 +9,7 @@
namespace Piwik\Plugins\Live\Categories;
use Piwik\Category\Subcategory;
+use Piwik\Piwik;
class VisitorLogSubcategory extends Subcategory
{
@@ -16,4 +17,11 @@ class VisitorLogSubcategory extends Subcategory
protected $id = 'Live_VisitorLog';
protected $order = 5;
+ public function getHelp()
+ {
+ $help = '<p>' . Piwik::translate('Live_VisitorLogSubcategoryHelp1') . '</p>';
+ $help .= '<p>' . Piwik::translate('Live_VisitorLogSubcategoryHelp2') . '</p>';
+ $help .= '<p><a href="https://matomo.org/docs/real-time/" target="_blank" rel="noreferrer noopener">' . Piwik::translate('Live_VisitorLogSubcategoryHelp3') . '</a></p>';
+ return $help;
+ }
}