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:
authorLukas Winkler <Findus23@users.noreply.github.com>2017-10-16 02:07:26 +0300
committerStefan Giehl <stefan@piwik.org>2017-10-16 02:07:26 +0300
commitc1422b533fef97b63b434befe57856ee348c1e46 (patch)
tree62adee00b541053e113c024af10c400233812755 /plugins/SitesManager
parent3a2bc010b1dfebb9424e090dab595c66cd613926 (diff)
Even more HTTPS links (#12161)
* http://piwik.org -> https://piwik.org * more HTTPS URLs * some more HTTPS URLs * test README * don't show "Plugin Hompage" for Piwik plugins * fix tests * compile minified js (hope I didn't break anything) * some more small changes * fix UI test * comment length in piwik.js changed due to https links * fix test * update ui file * update submodule
Diffstat (limited to 'plugins/SitesManager')
-rw-r--r--plugins/SitesManager/templates/_displayJavascriptCode.twig4
-rw-r--r--plugins/SitesManager/templates/sites-manager-header.html2
-rw-r--r--plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml2
3 files changed, 4 insertions, 4 deletions
diff --git a/plugins/SitesManager/templates/_displayJavascriptCode.twig b/plugins/SitesManager/templates/_displayJavascriptCode.twig
index a400c316ad..6425e1fc41 100644
--- a/plugins/SitesManager/templates/_displayJavascriptCode.twig
+++ b/plugins/SitesManager/templates/_displayJavascriptCode.twig
@@ -3,7 +3,7 @@
<div class='trackingHelp'>
<p>{{ 'Installation_JSTracking_Intro'|translate }}</p>
- <p>{{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="http://piwik.org/integrate/" rel="noreferrer" target="_blank">','</a>')|raw }}</p>
+ <p>{{ 'CoreAdminHome_JSTrackingIntro3b'|translate('<a href="https://piwik.org/integrate/" rel="noreferrer" target="_blank">','</a>')|raw }}</p>
<h3>{{ 'General_JsTrackingTag'|translate }}</h3>
@@ -11,7 +11,7 @@
<pre piwik-select-on-focus>{{ jsTag|raw }}</pre>
- <p>{{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a rel="noreferrer" target="_blank" href="http://piwik.org/docs/javascript-tracking/">','</a>')|raw }}</p>
+ <p>{{ 'CoreAdminHome_JSTrackingIntro5'|translate('<a rel="noreferrer" target="_blank" href="https://piwik.org/docs/javascript-tracking/">','</a>')|raw }}</p>
{% if isInstall is defined %}
<p>{{ 'Installation_JSTracking_EndNote'|translate('', '')|raw }}</p>
diff --git a/plugins/SitesManager/templates/sites-manager-header.html b/plugins/SitesManager/templates/sites-manager-header.html
index 4a7a1c08cb..a677cc1968 100644
--- a/plugins/SitesManager/templates/sites-manager-header.html
+++ b/plugins/SitesManager/templates/sites-manager-header.html
@@ -2,7 +2,7 @@
<h2
ng-show="availableTypes"
piwik-enriched-headline
- help-url="http://piwik.org/docs/manage-websites/"
+ help-url="https://piwik.org/docs/manage-websites/"
feature-name="{{ 'SitesManager_WebsitesManagement'|translate }}">
{{ 'SitesManager_XManagement'|translate:(availableTypes.length > 1 ? ('General_Measurables'|translate) : ('SitesManager_Sites'|translate)) }}
</h2>
diff --git a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml
index 21672ff427..a0aa7be1ac 100644
--- a/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml
+++ b/plugins/SitesManager/tests/System/expected/test_SitesManager__SitesManager.getSiteSettings.xml
@@ -210,7 +210,7 @@
<row>Ecommerce enabled</row>
</availableValues>
<description />
- <inlineHelp>When enabled, the &quot;Goals&quot; report will have a new &quot;Ecommerce&quot; section.&lt;br /&gt;Piwik allows for advanced Ecommerce Analytics tracking &amp; reporting. Learn more about &lt;a href='http://piwik.org/docs/ecommerce-analytics/' target='_blank'&gt; Ecommerce Analytics&lt;/a&gt;.</inlineHelp>
+ <inlineHelp>When enabled, the &quot;Goals&quot; report will have a new &quot;Ecommerce&quot; section.&lt;br /&gt;Piwik allows for advanced Ecommerce Analytics tracking &amp; reporting. Learn more about &lt;a href='https://piwik.org/docs/ecommerce-analytics/' target='_blank'&gt; Ecommerce Analytics&lt;/a&gt;.</inlineHelp>
<templateFile />
<introduction />
<condition />