refs #4338 display featured icon in details page as well

matomo-org · Nov 26, 2013 · f3d7b9f · f3d7b9f
1 parent e47af48
commit f3d7b9f
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 7 deletions.
diff --git a/plugins/CorePluginsAdmin/images/rating_important.png b/plugins/CorePluginsAdmin/images/rating_important.png
diff --git a/plugins/CorePluginsAdmin/stylesheets/marketplace.less b/plugins/CorePluginsAdmin/stylesheets/marketplace.less
@@ -131,8 +131,8 @@
     .featuredIcon {
       margin-right: 6px;
       margin-bottom: 6px;
-      height: 32px;
-      width: 32px;
+      height: 24px;
+      width: 24px;
     }
 
     .footer {

diff --git a/plugins/CorePluginsAdmin/templates/browsePlugins.twig b/plugins/CorePluginsAdmin/templates/browsePlugins.twig
@@ -34,7 +34,7 @@
 
                     <div class="footer" data-pluginName="{{ plugin.name }}">
                         {% if plugin.featured %}
-                            {{ pluginsMacro.featuredIcon() }}
+                            {{ pluginsMacro.featuredIcon('right') }}
                         {% endif %}
                         {% include "@CorePluginsAdmin/pluginMetadata.twig" %}
                     </div>

diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig
@@ -45,11 +45,11 @@
     {% 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() %}
+{% macro featuredIcon(align='') %}
     <img class="featuredIcon"
          title="Featured plugin"
          src="/plugins/CorePluginsAdmin/images/rating_important.png"
-         align="right" />
+         align="{{ align }}" />
 {% endmacro %}
 
 {% macro pluginsFilter(isTheme, isMarketplaceEnabled) %}

diff --git a/plugins/CorePluginsAdmin/templates/pluginDetails.twig b/plugins/CorePluginsAdmin/templates/pluginDetails.twig
@@ -1,3 +1,4 @@
+{% import '@CorePluginsAdmin/macros.twig' as pluginsMacro %}
 
 {% block content %}
 
@@ -101,12 +102,23 @@
                     margin-left: 10px;
                     line-height: 20px;
                 }
+
+                .pluginDetails .featuredIcon {
+                    height: 16px;
+                    width: 16px;
+                    margin-right: 6px;
+                }
             </style>
 
             <div class="header">
                 <div class="intro" style="width:75%;float:left;">
                     <h2>{{ plugin.name }}</h2>
-                    <p class="description">{{ plugin.description }}</p>
+                    <p class="description">
+                        {% if plugin.featured %}
+                            {{ pluginsMacro.featuredIcon('left') }}
+                        {% endif %}
+                        {{ plugin.description }}
+                    </p>
                 </div>
                 <div class="width:25%;float:left;">
 

diff --git a/plugins/CorePluginsAdmin/templates/themeOverview.twig b/plugins/CorePluginsAdmin/templates/themeOverview.twig
@@ -17,7 +17,7 @@
     <a href="javascript:return;" class="more">{{ plugin.name }}</a>
 </h3>
 
-<p class="description">{% if plugin.featured %}{{ plugins.featuredIcon() }}{% endif %}{{ plugin.description }}</p>
+<p class="description">{% if plugin.featured %}{{ plugins.featuredIcon('right') }}{% endif %}{{ plugin.description }}</p>
 
 <a href="javascript:return;" class="more"><img  title="Click for more details"
             class="preview" src="{{ plugin.screenshots|first }}?w=250&h=250"/></a>