Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Plugins: style the primary action link in the non-js "Installing Plugin" page.

Browse Source 
Props curdin, ericlewis, melchoyce, karmatosed.
Fixes #36430.

Built from https://develop.svn.wordpress.org/trunk@38617


git-svn-id: http://core.svn.wordpress.org/trunk@38560 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Andrea Fercia 2016-09-17 16:23:27 +00:00
parent 576bdf9f8c
commit ea69657b59
6 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-admin/css/common-rtl.css
View File

@ -2817,6 +2817,11 @@ div.action-links {
font-size: 13px;
}
/* For non-js plugin installation screen ticket #36430. */
.update-php .button.button-primary {
margin-left: 1em;
}
@media screen and ( max-width: 771px ) {
#plugin-information-title.with-banner {
height: 100px;

2
wp-admin/css/common-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

5
wp-admin/css/common.css
View File

@ -2817,6 +2817,11 @@ div.action-links {
font-size: 13px;
}
/* For non-js plugin installation screen ticket #36430. */
.update-php .button.button-primary {
margin-right: 1em;
}
@media screen and ( max-width: 771px ) {
#plugin-information-title.with-banner {
height: 100px;

2
wp-admin/css/common.min.css vendored
View File

File diff suppressed because one or more lines are too long

11
wp-admin/includes/class-plugin-installer-skin.php
View File

@ -52,12 +52,12 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin {
$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'] );
}
@ -90,7 +90,8 @@ class Plugin_Installer_Skin extends WP_Upgrader_Skin {
*/
$install_actions = apply_filters( 'install_plugin_complete_actions', $install_actions, $this->api, $plugin_file );
if ( ! empty($install_actions) )
$this->feedback(implode(' | ', (array)$install_actions));
if ( ! empty( $install_actions ) ) {
$this->feedback( implode( ' ', (array) $install_actions ) );
}
}
}

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.7-alpha-38616';
$wp_version = '4.7-alpha-38617';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.