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:
authorThomas Steur <thomas.steur@gmail.com>2015-01-12 03:10:52 +0300
committerThomas Steur <thomas.steur@gmail.com>2015-01-15 05:59:27 +0300
commit2d3c709c6129241bea360fb83383327e1fea7154 (patch)
treeef35c98317457a8e9acf490edc1f1e1daa55243b /plugins/CorePluginsAdmin/templates
parent11b56513c260533c89fbef709817944227189e93 (diff)
show a menu in the user area, lots of improvements to be more consistent
Diffstat (limited to 'plugins/CorePluginsAdmin/templates')
-rw-r--r--plugins/CorePluginsAdmin/templates/browsePlugins.twig2
-rw-r--r--plugins/CorePluginsAdmin/templates/macros.twig2
-rw-r--r--plugins/CorePluginsAdmin/templates/plugins.twig5
3 files changed, 7 insertions, 2 deletions
diff --git a/plugins/CorePluginsAdmin/templates/browsePlugins.twig b/plugins/CorePluginsAdmin/templates/browsePlugins.twig
index 9259081a0c..068d9e80ab 100644
--- a/plugins/CorePluginsAdmin/templates/browsePlugins.twig
+++ b/plugins/CorePluginsAdmin/templates/browsePlugins.twig
@@ -1,4 +1,4 @@
-{% extends 'admin.twig' %}
+{% extends mode is defined and mode == 'user' ? "user.twig" : "admin.twig" %}
{% import '@CorePluginsAdmin/macros.twig' as pluginsMacro %}
{% block content %}
diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig
index 3f6ad112c0..6eda0a2d31 100644
--- a/plugins/CorePluginsAdmin/templates/macros.twig
+++ b/plugins/CorePluginsAdmin/templates/macros.twig
@@ -166,7 +166,7 @@
{% if name in pluginNamesHavingSettings %}
<br /><br />
- <a href="{{ linkTo({'module':'CoreAdminHome', 'action': 'pluginSettings'}) }}#{{ name|e('html_attr') }}" class="settingsLink">{{ 'General_Settings'|translate }}</a>
+ <a href="{{ linkTo({'module':'CoreAdminHome', 'action': 'adminPluginSettings'}) }}#{{ name|e('html_attr') }}" class="settingsLink">{{ 'General_Settings'|translate }}</a>
{% endif %}
</td>
<td class="desc">
diff --git a/plugins/CorePluginsAdmin/templates/plugins.twig b/plugins/CorePluginsAdmin/templates/plugins.twig
index 4c4b6b1192..fd265aeda5 100644
--- a/plugins/CorePluginsAdmin/templates/plugins.twig
+++ b/plugins/CorePluginsAdmin/templates/plugins.twig
@@ -22,6 +22,11 @@
<br/>{{ 'CorePluginsAdmin_DoMoreContactPiwikAdmins'|translate }}
{% endif %}
+
+ {% if isMarketplaceEnabled %}
+ <br />
+ {{ 'CorePluginsAdmin_FindMorePluginsViaMarketplace'|translate('<a href="' ~ linkTo({'action': 'browsePlugins'}) ~'">', '</a>')|raw }}
+ {% endif %}
</p>
{{ plugins.pluginsFilter(false, isMarketplaceEnabled) }}