diff --git src/wp-admin/css/forms.css src/wp-admin/css/forms.css
index 8a1bf22..161d256 100644
|
|
input[type="radio"].disabled:checked:before { |
329 | 329 | line-height: 2; |
330 | 330 | } |
331 | 331 | |
| 332 | .wp-admin .button + .button-cancel { |
| 333 | margin-left: 1em; |
| 334 | } |
| 335 | |
332 | 336 | .meta-box-sortables select { |
333 | 337 | max-width: 100%; |
334 | 338 | } |
diff --git src/wp-admin/includes/class-plugin-installer-skin.php src/wp-admin/includes/class-plugin-installer-skin.php
index 34b2020..3fad24f 100644
|
|
class Plugin_Installer_Skin extends WP_Upgrader_Skin { |
52 | 52 | $from = isset($_GET['from']) ? wp_unslash( $_GET['from'] ) : 'plugins'; |
53 | 53 | |
54 | 54 | if ( 'import' == $from ) |
55 | | $install_actions['activate_plugin'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&from=import&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin & Run Importer' ) . '</a>'; |
| 55 | $install_actions['activate_plugin'] = '<a class="button button-primary" href="' . wp_nonce_url( 'plugins.php?action=activate&from=import&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin & Run Importer' ) . '</a>'; |
56 | 56 | else |
57 | | $install_actions['activate_plugin'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>'; |
| 57 | $install_actions['activate_plugin'] = '<a class="button button-primary" href="' . wp_nonce_url( 'plugins.php?action=activate&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Activate Plugin' ) . '</a>'; |
58 | 58 | |
59 | 59 | if ( is_multisite() && current_user_can( 'manage_network_plugins' ) ) { |
60 | | $install_actions['network_activate'] = '<a href="' . wp_nonce_url( 'plugins.php?action=activate&networkwide=1&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Network Activate' ) . '</a>'; |
| 60 | $install_actions['network_activate'] = '<a class="button button-primary" href="' . wp_nonce_url( 'plugins.php?action=activate&networkwide=1&plugin=' . urlencode( $plugin_file ), 'activate-plugin_' . $plugin_file ) . '" target="_parent">' . __( 'Network Activate' ) . '</a>'; |
61 | 61 | unset( $install_actions['activate_plugin'] ); |
62 | 62 | } |
63 | 63 | |
64 | 64 | if ( 'import' == $from ) { |
65 | | $install_actions['importers_page'] = '<a href="' . admin_url( 'import.php' ) . '" target="_parent">' . __( 'Return to Importers' ) . '</a>'; |
| 65 | $install_actions['importers_page'] = '<a class="button-cancel" href="' . admin_url( 'import.php' ) . '" target="_parent">' . __( 'Return to Importers' ) . '</a>'; |
66 | 66 | } elseif ( $this->type == 'web' ) { |
67 | | $install_actions['plugins_page'] = '<a href="' . self_admin_url( 'plugin-install.php' ) . '" target="_parent">' . __( 'Return to Plugin Installer' ) . '</a>'; |
| 67 | $install_actions['plugins_page'] = '<a class="button-cancel" href="' . self_admin_url( 'plugin-install.php' ) . '" target="_parent">' . __( 'Return to Plugin Installer' ) . '</a>'; |
68 | 68 | } elseif ( 'upload' == $this->type && 'plugins' == $from ) { |
69 | | $install_actions['plugins_page'] = '<a href="' . self_admin_url( 'plugin-install.php' ) . '">' . __( 'Return to Plugin Installer' ) . '</a>'; |
| 69 | $install_actions['plugins_page'] = '<a class="button-cancel" href="' . self_admin_url( 'plugin-install.php' ) . '">' . __( 'Return to Plugin Installer' ) . '</a>'; |
70 | 70 | } else { |
71 | | $install_actions['plugins_page'] = '<a href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>'; |
| 71 | $install_actions['plugins_page'] = '<a class="button-cancel" href="' . self_admin_url( 'plugins.php' ) . '" target="_parent">' . __( 'Return to Plugins page' ) . '</a>'; |
72 | 72 | } |
73 | 73 | |
74 | 74 | if ( ! $this->result || is_wp_error($this->result) ) { |
… |
… |
class Plugin_Installer_Skin extends WP_Upgrader_Skin { |
91 | 91 | $install_actions = apply_filters( 'install_plugin_complete_actions', $install_actions, $this->api, $plugin_file ); |
92 | 92 | |
93 | 93 | if ( ! empty($install_actions) ) |
94 | | $this->feedback(implode(' | ', (array)$install_actions)); |
| 94 | $this->feedback(implode(' ', (array)$install_actions)); |
95 | 95 | } |
96 | 96 | } |