refs #4967 display missing requirements a bit more consistent

matomo-org · Apr 9, 2014 · 681e655 · 681e655
1 parent d836040
commit 681e655
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 8 deletions.
diff --git a/lang/en.json b/lang/en.json
@@ -736,7 +736,6 @@
         "Inactive": "Inactive",
         "Deactivate": "Deactivate",
         "Activate": "Activate",
-        "ActivationNotPossible": "Activation of %s is not possible",
         "PluginRequirement": "%1$s requires %2$s.",
         "EmailToEnquireUpdatedVersion": "Please email %1$s and enquire an updated version of %2$s.",
         "MenuPlatform": "Platform",

diff --git a/plugins/CorePluginsAdmin/stylesheets/marketplace.less b/plugins/CorePluginsAdmin/stylesheets/marketplace.less
@@ -15,6 +15,15 @@
      color: red;
   }
 
+  .plugin-desc-missingrequirements {
+    font-weight:bold;
+    font-style: italic;
+    a {
+      text-decoration: underline !important;
+      color: black;
+    }
+  }
+
   .settingsLink {
     text-align: right;
     width: 100%;

diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig
@@ -171,8 +171,16 @@
                         {% endif %}
                     </td>
                     <td class="desc">
+                        <div class="plugin-desc-missingrequirements">
+                            {% if plugin.missingRequirements is defined and plugin.missingRequirements %}
+                                {{ _self.missingRequirementsInfo(name, plugin.info, plugin.missingRequirements, marketplacePluginNames) }}
+                                <br />
+                            {% endif %}
+                        </div>
                         <div class="plugin-desc-text">
+
                             {{ plugin.info.description|raw|nl2br }}
+
                             {% if plugin.info.homepage|default is not empty and plugin.info.homepage not in [
                                   'http://piwik.org', 'http://www.piwik.org', 'http://piwik.org/', 'http://www.piwik.org/'
                             ] %}
@@ -229,13 +237,7 @@
                             {% if plugin.activated %}
                                 <a href='index.php?module=CorePluginsAdmin&action=deactivate&pluginName={{ name }}&nonce={{ deactivateNonce }}'>{{ 'CorePluginsAdmin_Deactivate'|translate }}</a>
                             {% elseif plugin.missingRequirements %}
-                                <a ng-click="{{ name }}.outdated=true" >{{ 'CorePluginsAdmin_Activate'|translate }}</a>
-                                <span ng-init="{{ name }}.outdated" piwik-dialog="{{ name }}.outdated" class="ui-confirm">
-                                    <h2>{{ 'CorePluginsAdmin_ActivationNotPossible'|translate(name) }}</h2>
-                                    <p style="text-align: center">
-                                    {{ _self.missingRequirementsInfo(name, plugin.info, plugin.missingRequirements, marketplacePluginNames) }}
-                                    </p>
-                                </span>
+                                -
                             {% else %}
                                 <a href='index.php?module=CorePluginsAdmin&action=activate&pluginName={{ name }}&nonce={{  activateNonce }}'>{{ 'CorePluginsAdmin_Activate'|translate }}</a>
                             {% endif %}