diff --git a/lang/en.json b/lang/en.json index e0bdeed492d5fb65394ccffcc6125ecf31bb06d9..6aefd3199d8201b2eb5259f52e762c78895bfb43 100644 --- a/lang/en.json +++ b/lang/en.json @@ -718,7 +718,7 @@ "MenuExtend": "Extend", "PluginNotCompatibleWith": "%1$s plugin is not compatible with %2$s.", "PluginAskDevToUpdate": "If you enjoyed this plugin, maybe you can ask the developers to update it to work on the latest Piwik. ", - "UninstallConfirm": "You are about to uninstall a plugin. The plugin will be completely removed from your platform and it won't be recoverable. Are you sure you want to do this?" + "UninstallConfirm": "You are about to uninstall a plugin %s. The plugin will be completely removed from your platform and it won't be recoverable. Are you sure you want to do this?" }, "CoreUpdater": { "PluginDescription": "Piwik updating mechanism", diff --git a/plugins/CorePluginsAdmin/javascripts/pluginOverview.js b/plugins/CorePluginsAdmin/javascripts/pluginOverview.js index 28b4915dd733f9a0c959c8a005deeab60c9bcd7e..8160ddf1efe96db576f9e0f6529c27f098f3bbe9 100644 --- a/plugins/CorePluginsAdmin/javascripts/pluginOverview.js +++ b/plugins/CorePluginsAdmin/javascripts/pluginOverview.js @@ -7,15 +7,26 @@ $(document).ready(function () { + var uninstallConfirmMessage = ''; + $('#plugins .uninstall').click(function (event) { event.preventDefault(); var link = $(this).attr('href'); - - if (!link) { + var pluginName = $(this).attr('data-pluginName'); + + if (!link || !pluginName) { return; } + if (!uninstallConfirmMessage) { + uninstallConfirmMessage = $('#uninstallPluginConfirm').text(); + } + + var messageToDisplay = uninstallConfirmMessage.replace('%s', pluginName); + + $('#uninstallPluginConfirm').text(messageToDisplay); + piwikHelper.modalConfirm('#confirmUninstallPlugin', { yes: function () { window.location = link; diff --git a/plugins/CorePluginsAdmin/templates/macros.twig b/plugins/CorePluginsAdmin/templates/macros.twig index be90e4e20ce59009e2b3ee50ba90a9d2d9e673e3..8f44cca87272ab2578b2b305458e220b88607056 100644 --- a/plugins/CorePluginsAdmin/templates/macros.twig +++ b/plugins/CorePluginsAdmin/templates/macros.twig @@ -92,7 +92,7 @@ {{ 'CorePluginsAdmin_Active'|translate }} {% else %} {{ 'CorePluginsAdmin_Inactive'|translate }} <br/> - - {% if plugin.uninstallable %}<a class="uninstall" href='index.php?module=CorePluginsAdmin&action=uninstall&pluginName={{ name }}&nonce={{ + - {% if plugin.uninstallable %}<a data-pluginName="{{ name|escape('html_attr') }}" class="uninstall" href='index.php?module=CorePluginsAdmin&action=uninstall&pluginName={{ name }}&nonce={{ uninstallNonce }}'>uninstall</a>{% endif %} {% endif %} </td>