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:
authordiosmosis <benakamoorthi@fastmail.fm>2013-10-15 22:44:43 +0400
committerdiosmosis <benakamoorthi@fastmail.fm>2013-10-15 22:44:43 +0400
commit13cc37978119fd536f7ecca9b73e8f105c0b43dc (patch)
treecc041b0eb46e3e0e2dd8aaed5ff66bfc1f2c98aa
parent8f77c123d9169438e609e355a900812c89db922c (diff)
Add help icon to visitor profile and add ucwords filter to Twig environment.
-rw-r--r--core/Twig.php1
-rw-r--r--lang/en.json3
-rw-r--r--plugins/Live/stylesheets/visitor_profile.less9
-rw-r--r--plugins/Live/templates/getVisitorProfilePopup.twig1
4 files changed, 12 insertions, 2 deletions
diff --git a/core/Twig.php b/core/Twig.php
index 55fe74d011..edb037623f 100644
--- a/core/Twig.php
+++ b/core/Twig.php
@@ -65,6 +65,7 @@ class Twig
$this->addFilter_money();
$this->addFilter_truncate();
$this->twig->addFilter(new Twig_SimpleFilter('implode', 'implode'));
+ $this->twig->addFilter(new Twig_SimpleFilter('ucwords', 'ucwords'));
$this->addFunction_includeAssets();
$this->addFunction_linkTo();
diff --git a/lang/en.json b/lang/en.json
index 9def71bc7e..992396e46c 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -427,7 +427,8 @@
"OverlayRowActionTooltipTitle": "Open Page Overlay",
"OverlayRowActionTooltip": "See analytics data directly on your website (opens new tab)",
"XComparedToY": "%1$s compared to %2$s",
- "JsTrackingTag": "JavaScript Tracking Code"
+ "JsTrackingTag": "JavaScript Tracking Code",
+ "ViewDocumentationFor": "View documentation for %1$s"
},
"Actions": {
"PluginDescription": "Reports about the page views, the outlinks and downloads. Outlinks and Downloads tracking is automatic! You can also track your internal website's Search Engine.",
diff --git a/plugins/Live/stylesheets/visitor_profile.less b/plugins/Live/stylesheets/visitor_profile.less
index c47acc1186..2a13244de1 100644
--- a/plugins/Live/stylesheets/visitor_profile.less
+++ b/plugins/Live/stylesheets/visitor_profile.less
@@ -479,6 +479,13 @@ div.visitor-profile-navigation {
.visitor-profile-header {
position:relative;
+
+ > .reportDocumentationIcon {
+ display:none;
+ margin:0;
+ width:14px;
+ background-size:14px;
+ }
}
.visitor-profile-prev-visitor {
@@ -495,7 +502,7 @@ a.visitor-profile-next-visitor,a.visitor-profile-prev-visitor {
}
.visitor-profile-avatar:hover {
- .visitor-profile-next-visitor,.visitor-profile-prev-visitor {
+ .visitor-profile-next-visitor,.visitor-profile-prev-visitor,.reportDocumentationIcon {
display:inline-block;
}
}
diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig
index 678edfd039..f42db7a63b 100644
--- a/plugins/Live/templates/getVisitorProfilePopup.twig
+++ b/plugins/Live/templates/getVisitorProfilePopup.twig
@@ -19,6 +19,7 @@
<div class="visitor-profile-header">
{% if visitorData.previousVisitorId is not empty %}<a class="visitor-profile-prev-visitor" href="#" title="{{ 'Live_PreviousVisitor'|translate }}">&larr;</a>{% endif %}
<h1>{{ 'Live_VisitorProfile'|translate }} <img class="loadingPiwik" style="display:none;" src="plugins/Zeitgeist/images/loading-blue.gif"/></h1>
+ <a href="http://piwik.org/docs/user-profile/" class="reportDocumentationIcon" target="_blank" title="{{ 'General_ViewDocumentationFor'|translate("Live_VisitorProfile"|translate|ucwords) }}"></a>
{% if visitorData.nextVisitorId is not empty %}<a class="visitor-profile-next-visitor" href="#" title="{{ 'Live_NextVisitor'|translate }}">&rarr;</a>{% endif %}
</div>
<div class="visitor-profile-latest-visit">