refs #4338 make icons reusable, display piwik owner icon in plugin de…

…tails as well
matomo-org · Nov 26, 2013 · c0a4473 · c0a4473
1 parent 0188596
commit c0a4473
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 3 deletions.
diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig
@@ -41,6 +41,17 @@
 
 {% endmacro %}
 
+{% macro pluginDeveloper(owner) %}
+    {% if 'piwik' == owner %}<img title="Piwik" alt="Piwik" style="padding-bottom:2px;height:11px;" src="/plugins/Zeitgeist/images/logo-marketplace.png"/>{% else %}<strong>{{ owner }}</strong>{% endif %}
+{% endmacro %}
+
+{% macro featuredIcon() %}
+    <img class="featuredIcon"
+         title="Featured plugin"
+         src="/plugins/CorePluginsAdmin/images/rating_important.png"
+         align="right" />
+{% endmacro %}
+
 {% macro pluginsFilter(isTheme, isMarketplaceEnabled) %}
 
     <p class="pluginsFilter entityContainer">

diff --git a/plugins/CorePluginsAdmin/templates/pluginDetails.twig b/plugins/CorePluginsAdmin/templates/pluginDetails.twig
@@ -205,7 +205,7 @@
                         <dt>Downloads</dt>
                         <dd title="Latest version: {{ plugin.versions[plugin.versions|length - 1].numDownloads|number_format }} Downloads">{{ plugin.numDownloads }}</dd>
                         <dt>Developer</dt>
-                        <dd>{{ plugin.owner }}</dd>
+                        <dd>{% if 'piwik' == plugin.owner %}<img title="Piwik" alt="Piwik" style="padding-bottom:2px;height:11px;" src="/plugins/Zeitgeist/images/logo-marketplace.png"/>{% else %}<strong>{{ plugin.owner }}</strong>{% endif %}</dd>
                         <dt>Authors</dt>
                         <dd>{% for author in plugin.authors if author.name %}
 

diff --git a/plugins/CorePluginsAdmin/templates/pluginMetadata.twig b/plugins/CorePluginsAdmin/templates/pluginMetadata.twig
@@ -1,11 +1,13 @@
+{% import '@CorePluginsAdmin/macros.twig' as plugins %}
+
 {% if plugin.featured %}
-    <img class="featuredIcon" title="Featured plugin" src="/plugins/CorePluginsAdmin/images/rating_important.png" align="right" />
+    {{ plugins.featuredIcon() }}
 {% endif %}
 
 <hr class="metadataSeparator"/>
 <ul class="metadata">
     <li class="odd">{{ 'CorePluginsAdmin_Version'|translate }}: <strong>{{ plugin.latestVersion }}</strong></li>
     <li class="even">Updated: <strong>{{ plugin.lastUpdated }}</strong></li>
     <li class="odd">{{ 'General_Downloads'|translate }}: <strong>{{ plugin.numDownloads }}</strong></li>
-    <li class="even">Developer: {% if 'piwik' == plugin.owner %}<img title="Piwik" alt="Piwik" style="padding-bottom:2px;" src="/plugins/Zeitgeist/images/logo-marketplace.png" height="11"/>{% else %}<strong>{{ plugin.owner }}</strong>{% endif %}</li>
+    <li class="even">Developer: {{ plugins.pluginDeveloper(plugin.owner) }}</li>
 </ul>