Ticket #36430: 36430.4.diff

src/wp-admin/css/common.css

@@ -2815 +2815 @@
         font-size: 13px;
 }
 
+/* button spacing for non-js plugin screen #36430 */
+.update-php .button.button-primary {
+        margin-right: 1em;
+}
+
 @media screen and ( max-width: 771px ) {
         #plugin-information-title.with-banner {
                 height: 100px;

src/wp-admin/includes/class-plugin-installer-skin.php

@@ -52 +52 @@
                 $from = isset($_GET['from']) ? wp_unslash( $_GET['from'] ) : 'plugins';
 
                 if ( 'import' == $from )
-                        $install_actions['activate_plugin'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;from=import&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin &amp; Run Importer' ) . '</a>';
+                        $install_actions['activate_plugin'] = '<a class="button button-primary" href="' . wp_nonce_url( 'plugins.php?action=activate&amp;from=import&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin &amp; Run Importer' ) . '</a>';
                 else
-                        $install_actions['activate_plugin'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>';
+                        $install_actions['activate_plugin'] = '<a class="button button-primary" href="' . wp_nonce_url( 'plugins.php?action=activate&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>';
 
                 if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) {
-                        $install_actions['network_activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Network Activate' ) . '</a>';
+                        $install_actions['network_activate'] = '<a class="button button-primary" href="' . wp_nonce_url( 'plugins.php?action=activate&amp;networkwide=1&amp;plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Network Activate' ) . '</a>';
                         unset( $install_actions['activate_plugin'] );
                 }
 
@@ -91 +91 @@
                 $install_actions = apply_filters( 'install_plugin_complete_actions', $install_actions, $this->api, $plugin_file );
 
                 if ( ! empty($install_actions) )
-                        $this->feedback(implode(' | ', (array)$install_actions));
+                        $this->feedback(implode(' ', (array)$install_actions));
         }
 }