diff options
| author | Lukas Winkler <git@lw1.at> | 2020-06-04 14:47:54 +0300 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-04 14:47:54 +0300 |
| commit | a35070be5146539999fdd02d5323f466d314192b (patch) | |
| tree | a7f280e0f371f5b5370547b67ae63d142e341126 /plugins/Marketplace | |
| parent | 2851045e2ffd0f71fa1a56b2b6cab35cc7b1b4ab (diff) | |
Twig 3 upgrade (#15573)
* proof of concept of Twig 3 upgrade
* some for if template fixes
* potentially fix RenderTokenParser
* comment out RenderTokenParser
* clearCompiledTemplates() using unlinkRecursive()
* macro imported in block and used in subblock is not valid
twigphp/Twig#3090
* more template fixes
* remove non existing clearTemplateCache()
* add missing parameter to unlinkRecursive
* Use custom MethodCallExpression to fix RenderTokenParser
* increase minimum php version to 7.2.5
* submodule update
* fix twig loop filter
* updates expected UI files
* fix twig loop filter
* fix twig loop filter
* fix neutral evolution check
* fix macro usage
* convert some conditions to filters
* fix macro include
* remove debug code as default logging is good enough
* submodule updates
Co-authored-by: sgiehl <stefan@matomo.org>
Diffstat (limited to 'plugins/Marketplace')
| -rw-r--r-- | plugins/Marketplace/templates/overview.twig | 1 | ||||
| -rw-r--r-- | plugins/Marketplace/templates/plugin-details.twig | 10 | ||||
| -rw-r--r-- | plugins/Marketplace/templates/plugin-list.twig | 4 |
3 files changed, 6 insertions, 9 deletions
diff --git a/plugins/Marketplace/templates/overview.twig b/plugins/Marketplace/templates/overview.twig index 1eccd5d407..49c26637a3 100644 --- a/plugins/Marketplace/templates/overview.twig +++ b/plugins/Marketplace/templates/overview.twig @@ -1,5 +1,4 @@ {% extends inReportingMenu ? "empty.twig" : "admin.twig" %} -{% import '@CorePluginsAdmin/macros.twig' as pluginsMacro %} {% set title %}{{ 'Marketplace_Marketplace'|translate }}{% endset %} diff --git a/plugins/Marketplace/templates/plugin-details.twig b/plugins/Marketplace/templates/plugin-details.twig index e939f67164..a24cbb3e86 100644 --- a/plugins/Marketplace/templates/plugin-details.twig +++ b/plugins/Marketplace/templates/plugin-details.twig @@ -175,7 +175,7 @@ <br /> {% endif %} </div> - + {% if plugin.specialOffer is defined and plugin.specialOffer %}<p style="color: green;"><br />{{ plugin.specialOffer }}</p>{% endif %} <p><br /></p> @@ -213,9 +213,8 @@ </dd> {% endif %} <dt>{{ 'Marketplace_Authors'|translate }}</dt> - <dd>{% for author in plugin.authors if author.name %} - - {% spaceless %} + <dd>{% for author in plugin.authors|filter(author => author.name) %} + {% apply spaceless %} {% if author.homepage %} <a target="_blank" rel="noreferrer noopener" href="{{ author.homepage }}">{{ author.name }}</a> {% elseif author.email %} @@ -227,8 +226,7 @@ {% if loop.index < plugin.authors|length %} , {% endif %} - {% endspaceless %} - + {% endapply %} {% endfor %} </dd> {% endif %} diff --git a/plugins/Marketplace/templates/plugin-list.twig b/plugins/Marketplace/templates/plugin-list.twig index 9577b5c189..a8d13dcb87 100644 --- a/plugins/Marketplace/templates/plugin-list.twig +++ b/plugins/Marketplace/templates/plugin-list.twig @@ -1,11 +1,11 @@ -{% import '@Marketplace/macros.twig' as marketplaceMacro %} - {% if pluginsToShow|length > 0 %} <div class="pluginListContainer row"> {% for plugin in pluginsToShow %} <div class="col s12 m6 l4"> {% embed 'contentBlock.twig' with {'title': ''} %} {% block content %} + {% import '@Marketplace/macros.twig' as marketplaceMacro %} + {% import '@CorePluginsAdmin/macros.twig' as pluginsMacro %} <div class="plugin"> <h3 class="card-title" title="{{ 'General_MoreDetails'|translate }}"> <a href="#" piwik-plugin-name="{{ plugin.name }}">{{ plugin.displayName }}</a> |