fix more link

3 files changed, 17 insertions, 6 deletions

diff --git a/plugins/CorePluginsAdmin/javascripts/pluginDetail.js b/plugins/CorePluginsAdmin/javascripts/pluginDetail.js
index 2f95fe47dc..1183c12ed1 100755
--- a/plugins/CorePluginsAdmin/javascripts/pluginDetail.js
+++ b/plugins/CorePluginsAdmin/javascripts/pluginDetail.js
@@ -45,7 +45,12 @@ $(document).ready(function () {
     syncMaxHeight('.themeslist .plugin');
 
     $('.pluginslist').on('click', '.more', function (event) {
-        var pluginName = $( this ).text();
+        var pluginName = $( this ).attr('data-pluginName');
+
+        if (!pluginName) {
+            return;
+        }
+
         var url = 'module=CorePluginsAdmin&action=pluginDetails&pluginName=' + pluginName;
         Piwik_Popover.createPopupAndLoadUrl(url, 'plugin details');
     });
@@ -53,7 +58,7 @@ $(document).ready(function () {
     $('.themeslist').on('click', '.more', function (event) {
         var themeName = $( this ).text();
         var url = 'module=CorePluginsAdmin&action=themeDetails&pluginName=' + themeName;
-        Piwik_Popover.createPopupAndLoadUrl(url, 'plugin details');
+        Piwik_Popover.createPopupAndLoadUrl(url, 'theme details');
     });
 
 });
\ No newline at end of file
diff --git a/plugins/CorePluginsAdmin/templates/browsePlugins.twig b/plugins/CorePluginsAdmin/templates/browsePlugins.twig
index 3a48614c94..ee93538790 100644
--- a/plugins/CorePluginsAdmin/templates/browsePlugins.twig
+++ b/plugins/CorePluginsAdmin/templates/browsePlugins.twig
@@ -41,9 +41,12 @@
                                class="install">Install</a>
                         {% endif %}
 
-                        <h3 class="header"><a href="javascript:return;" class="more">{{ plugin.name }}</a></h3>
+                        <h3 class="header">
+                            <a href="javascript:return;" data-pluginName="{{ plugin.name }}" class="more">{{ plugin.name }}</a>
+                        </h3>
                         <p class="description">{{ plugin.description }}
-                            <br /><a href="javascript:return;" class="more">&gt;&gt; more</a>
+                            <br />
+                            <a href="javascript:return;" data-pluginName="{{ plugin.name }}" class="more">&gt;&gt; more</a>
                         </p>
                         {% if plugin.canBeUpdated %}
                             <p class="updateAvailableNotice">You can update this plugin to version {{ plugin.latestVersion }}</p>
diff --git a/plugins/CorePluginsAdmin/templates/browseThemes.twig b/plugins/CorePluginsAdmin/templates/browseThemes.twig
index 9d82de4ce3..3cee8d4dd0 100644
--- a/plugins/CorePluginsAdmin/templates/browseThemes.twig
+++ b/plugins/CorePluginsAdmin/templates/browseThemes.twig
@@ -40,10 +40,13 @@
                                class="install">Install</a>
                         {% endif %}
 
-                        <h3 class="header"><a href="javascript:return;" class="more">{{ plugin.name }}</a></h3>
+                        <h3 class="header">
+                            <a href="javascript:return;" data-pluginName="{{ plugin.name }}" class="more">{{ plugin.name }}</a>
+                        </h3>
                         <p class="description">{{ plugin.description }}</p>
 
-                        <a href="javascript:return;" class="more"><img class="preview" src="{{ plugin.screenshots|first }}?w=250&h=250"/></a>
+                        <a href="javascript:return;" data-pluginName="{{ plugin.name }}" class="more"><img
+                                    class="preview" src="{{ plugin.screenshots|first }}?w=250&h=250"/></a>
                         {% if plugin.canBeUpdated %}
                             <p class="updateAvailableNotice">You can update this theme to version {{ plugin.latestVersion }}</p>
                         {% endif %}