diff options
author | diosmosis <benaka@piwik.pro> | 2014-11-27 07:01:59 +0300 |
---|---|---|
committer | diosmosis <benaka@piwik.pro> | 2014-11-27 07:01:59 +0300 |
commit | 1e9e585610d8e50708d971978a579839fe305fed (patch) | |
tree | 580b420b209554b4de1ef69432f2f77b39812d5d /plugins/Live | |
parent | eeb7e8d5a28968e72b9e9e74b7e09535e5aaa818 (diff) | |
parent | 935c3597ab0c4b1288f5ba82af634b342a75daaa (diff) |
Merge branch 'master' into processed_metrics_metadata
Conflicts:
plugins/Actions/Reports/GetSiteSearchKeywords.php
tests/PHPUnit/System/expected/test_ArchiveCronTest_archive_php_cron_output.txt
Diffstat (limited to 'plugins/Live')
-rw-r--r-- | plugins/Live/API.php | 4 | ||||
-rw-r--r-- | plugins/Live/templates/_actionsList.twig | 2 | ||||
-rw-r--r-- | plugins/Live/templates/_dataTableViz_visitorLog.twig | 6 | ||||
-rw-r--r-- | plugins/Live/templates/getLastVisitsStart.twig | 2 | ||||
-rw-r--r-- | plugins/Live/templates/getVisitorProfilePopup.twig | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/plugins/Live/API.php b/plugins/Live/API.php index dacee9834f..7a36822534 100644 --- a/plugins/Live/API.php +++ b/plugins/Live/API.php @@ -44,12 +44,12 @@ require_once PIWIK_INCLUDE_PATH . '/plugins/UserCountry/functions.php'; * browser, type of screen, resolution, supported browser plugins (flash, java, silverlight, pdf, etc.), various dates & times format to make * it easier for API users... and more! * - * With the parameter <a href='http://piwik.org/docs/analytics-api/segmentation/' target='_blank'>'&segment='</a> you can filter the + * With the parameter <a href='http://piwik.org/docs/analytics-api/segmentation/' rel='noreferrer' target='_blank'>'&segment='</a> you can filter the * returned visits by any criteria (visitor IP, visitor ID, country, keyword used, time of day, etc.). * * The method "getCounters" is used to return a simple counter: visits, number of actions, number of converted visits, in the last N minutes. * - * See also the documentation about <a href='http://piwik.org/docs/real-time/' target='_blank'>Real time widget and visitor level reports</a> in Piwik. + * See also the documentation about <a href='http://piwik.org/docs/real-time/' rel='noreferrer' target='_blank'>Real time widget and visitor level reports</a> in Piwik. * @method static \Piwik\Plugins\Live\API getInstance() */ class API extends \Piwik\Plugin\API diff --git a/plugins/Live/templates/_actionsList.twig b/plugins/Live/templates/_actionsList.twig index 8463d0e461..cc798f4f6e 100644 --- a/plugins/Live/templates/_actionsList.twig +++ b/plugins/Live/templates/_actionsList.twig @@ -101,7 +101,7 @@ and previousAction.url|default(false) == action.url %} {# For events, do not show (url) if the Event URL is the same as the URL last displayed #} {% else %} - <a href="{{ action.url }}" target="_blank" class="{% if action.eventCategory|default(false) is empty %}action-list-url{# don't put URL on new line for events #}{% endif %} truncated-text-line" + <a href="{{ action.url }}" rel="noreferrer" target="_blank" rel="noreferrer" class="{% if action.eventCategory|default(false) is empty %}action-list-url{# don't put URL on new line for events #}{% endif %} truncated-text-line" {% if overrideLinkStyle is not defined or overrideLinkStyle %}style="{% if action.type=='action' and action.pageTitle|default(false) is not empty %}margin-left: 9px;{% endif %}text-decoration:underline;"{% endif %}> {% if action.eventCategory|default(false) is not empty %} (url) diff --git a/plugins/Live/templates/_dataTableViz_visitorLog.twig b/plugins/Live/templates/_dataTableViz_visitorLog.twig index e91ee9a75a..922ed2057b 100644 --- a/plugins/Live/templates/_dataTableViz_visitorLog.twig +++ b/plugins/Live/templates/_dataTableViz_visitorLog.twig @@ -71,7 +71,7 @@ <div class="referrer"> {% if visitor.getColumn('referrerType') == 'website' %} {{ 'Referrers_ColumnWebsite'|translate }}: - <a href="{{ visitor.getColumn('referrerUrl') }}" target="_blank" title="{{ visitor.getColumn('referrerUrl') }}" + <a href="{{ visitor.getColumn('referrerUrl') }}" rel="noreferrer" target="_blank" title="{{ visitor.getColumn('referrerUrl') }}" style="text-decoration:underline;"> {{ visitor.getColumn('referrerName') }} </a> @@ -91,7 +91,7 @@ <span {% if not showKeyword %}title="{{ keywordNotDefined }}"{% endif %}>{{ visitor.getColumn('referrerName') }}</span> {% if showKeyword %}{{ 'Referrers_Keywords'|translate }}: <br/> - <a href="{{ visitor.getColumn('referrerUrl') }}" target="_blank" style="text-decoration:underline;"> + <a href="{{ visitor.getColumn('referrerUrl') }}" rel="noreferrer" target="_blank" style="text-decoration:underline;"> "{{ visitor.getColumn('referrerKeyword') }}"</a> {% endif %} {% set keyword %}{{ visitor.getColumn('referrerKeyword') }}{% endset %} @@ -134,7 +134,7 @@ GPS (lat/long): {{ visitor.getColumn('latitude') }},{{ visitor.getColumn('longit {% if visitor.getColumn('provider') %} <br/> {{ 'Provider_ColumnProvider'|translate }}: - <a href="{{ visitor.getColumn('providerUrl') }}" target="_blank" title="{{ visitor.getColumn('providerUrl') }}" style="text-decoration:underline;"> + <a href="{{ visitor.getColumn('providerUrl') }}" rel="noreferrer" target="_blank" title="{{ visitor.getColumn('providerUrl') }}" style="text-decoration:underline;"> {{ visitor.getColumn('providerName') }} </a> {% endif %} diff --git a/plugins/Live/templates/getLastVisitsStart.twig b/plugins/Live/templates/getLastVisitsStart.twig index c762688f58..7b9f6a4d9d 100644 --- a/plugins/Live/templates/getLastVisitsStart.twig +++ b/plugins/Live/templates/getLastVisitsStart.twig @@ -42,7 +42,7 @@ {% if visitor.referrerType is defined and visitor.referrerType != 'direct' %} {{ 'General_FromReferrer'|translate }} {% if visitor.referrerUrl is not empty %} - <a href="{{ visitor.referrerUrl }}" target="_blank"> + <a href="{{ visitor.referrerUrl }}" rel="noreferrer" target="_blank"> {% endif %} {% if visitor.searchEngineIcon is defined %} <img src="{{ visitor.searchEngineIcon }}" /> diff --git a/plugins/Live/templates/getVisitorProfilePopup.twig b/plugins/Live/templates/getVisitorProfilePopup.twig index 9e68dde96b..0a25de6a39 100644 --- a/plugins/Live/templates/getVisitorProfilePopup.twig +++ b/plugins/Live/templates/getVisitorProfilePopup.twig @@ -26,7 +26,7 @@ {%- if visitorData.userId is not empty %}: <span title="{{'General_UserId'|translate}}: {{ visitorData.userId|raw }}">{{ visitorData.userId|raw }}</span>{% endif -%} <img class="loadingPiwik" style="display:none;" src="plugins/Morpheus/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> + <a href="http://piwik.org/docs/user-profile/" class="reportDocumentationIcon" rel="noreferrer" 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 }}">→</a>{% endif %} </div> <div class="visitor-profile-latest-visit"> |