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:
authorZoltan Flamis <flamisz@gmail.com>2021-03-15 03:39:33 +0300
committerGitHub <noreply@github.com>2021-03-15 03:39:33 +0300
commit069d2de9acb02bf337eb3d079e712a3071ee4f6d (patch)
treeebcb4830816a68dbbfd4d5c4291df853eb138f64 /plugins/Feedback
parentfb963fa4280a6a5a7d0dc83088c212c26fb05baf (diff)
update help screen (#17338)
* update help screen
Diffstat (limited to 'plugins/Feedback')
-rw-r--r--plugins/Feedback/templates/index.twig32
-rw-r--r--plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png4
2 files changed, 18 insertions, 18 deletions
diff --git a/plugins/Feedback/templates/index.twig b/plugins/Feedback/templates/index.twig
index 5f34596644..c14603f52e 100644
--- a/plugins/Feedback/templates/index.twig
+++ b/plugins/Feedback/templates/index.twig
@@ -8,22 +8,6 @@
{% block content %}
<div id="feedback-faq" class="admin">
- <div piwik-content-block
- content-title="{{ headline|e('html_attr') }}"
- feature="{{ 'General_Help'|translate|e('html_attr') }}">
- <p>{{ 'General_MatomoIsACollaborativeProjectYouCanContributeAndDonateNextRelease'|translate(
- "<a target='_blank' rel='noreferrer noopener' href='https://matomo.org'>",
- "</a>",
- "<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/get-involved/'>",
- "</a>",
- "<a href='" ~ linkTo({'module':'CoreAdminHome', 'action': 'home'})~"'>",
- "</a>",
- "<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/team/'>",
- "</a>"
- )|raw }}
- </p>
- </div>
-
<div piwik-content-block content-title="{{ "Feedback_HowCanWeHelp"|translate|e('html_attr') }}" class="feedback-help-resources">
<form target="_blank" method="GET" action="https://matomo.org/">
<div class="search-matomo-form z-depth-1">
@@ -67,6 +51,22 @@
</form>
</div>
+ <div piwik-content-block
+ content-title="{{ headline|e('html_attr') }}"
+ feature="{{ 'General_Help'|translate|e('html_attr') }}">
+ <p>{{ 'General_MatomoIsACollaborativeProjectYouCanContributeAndDonateNextRelease'|translate(
+ "<a target='_blank' rel='noreferrer noopener' href='https://matomo.org'>",
+ "</a>",
+ "<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/get-involved/'>",
+ "</a>",
+ "<a href='" ~ linkTo({'module':'CoreAdminHome', 'action': 'home'})~"'>",
+ "</a>",
+ "<a target='_blank' rel='noreferrer noopener' href='https://matomo.org/team/'>",
+ "</a>"
+ )|raw }}
+ </p>
+ </div>
+
<div piwik-content-block content-title="Premium products">
<p>Grow your business, understand your audience better and increase your sales and conversions with a premium plugin:
<p> &bull; <a rel='noreferrer noopener' target='_blank' href='https://matomo.org/recommends/users-flow/'>Users Flow</a>: a visual representation of the most popular paths your users take through your website or app.</p>
diff --git a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png
index 08ae0e1075..3637fa3dbb 100644
--- a/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png
+++ b/plugins/Feedback/tests/UI/expected-screenshots/FeedbackForm_show.png
@@ -1,3 +1,3 @@
version https://git-lfs.github.com/spec/v1
-oid sha256:21a53d77e5d92c85b18bf6a6a2e831f14123cb46d38da7e646845d83ac431e41
-size 270205
+oid sha256:084d20e309a39b4f07b16aa242baa2d2089d0b047f3cf56ac1db954e7a511e5b
+size 269997