Changeset 35315

Timestamp:

10/21/2015 03:50:19 AM (10 years ago)

Author:

wonderboymusic

Message:

Plugins/Updates: in request_filesystem_credentials(), alter the heading HTML tag based on the current screen for improved semantics.

Props afercia.
Fixes #34267.

Location:

trunk/src/wp-admin

Files:

• css/forms.css (modified) (1 diff)
• includes/file.php (modified) (5 diffs)

trunk/src/wp-admin/css/forms.css

@@ -958 +958 @@
 }
 
+#request-filesystem-credentials-title {
+    font-size: 1.3em;
+    margin: 1em 0;
+}
+
+.request-filesystem-credentials-form legend {
+    font-size: 1em;
+    padding: 1.33em 0;
+    font-weight: 600;
+}
+
 .request-filesystem-credentials-form input[type="text"],
 .request-filesystem-credentials-form input[type="password"] {

trunk/src/wp-admin/includes/file.php

@@ -1002 +1002 @@
  * @todo Properly mark optional arguments as such
  *
+ * @global string $pagenow
+ *
  * @param string $form_post    the URL to post the form to
  * @param string $type         the chosen Filesystem method in use
@@ -1011 +1013 @@
  */
 function request_filesystem_credentials($form_post, $type = '', $error = false, $context = false, $extra_fields = null, $allow_relaxed_file_ownership = false ) {
+    global $pagenow;
 
     /**
@@ -1142 +1145 @@
 <form action="<?php echo esc_url( $form_post ) ?>" method="post">
 <div id="request-filesystem-credentials-form" class="request-filesystem-credentials-form">
-<h3 id="request-filesystem-credentials-title"><?php _e( 'Connection Information' ) ?></h3>
+<?php
+// Print a H1 heading in the FTP credentials modal dialog, default is a H2.
+$heading_tag = 'h2';
+if ( 'plugins.php' === $pagenow || 'plugin-install.php' === $pagenow ) {
+    $heading_tag = 'h1';
+}
+echo "<$heading_tag id='request-filesystem-credentials-title'>" . __( 'Connection Information' ) . "</$heading_tag>";
+?>
 <p id="request-filesystem-credentials-desc"><?php
     $label_user = __('Username');
@@ -1180 +1190 @@
 </div>
 <?php if ( isset($types['ssh']) ) : ?>
-<h4><?php _e('Authentication Keys') ?></h4>
+<fieldset>
+<legend><?php _e( 'Authentication Keys' ); ?></legend>
 <label for="public_key">
     <span class="field-title"><?php _e('Public Key:') ?></span>
@@ -1189 +1200 @@
     <input name="private_key" type="text" id="private_key" value="<?php echo esc_attr($private_key) ?>"<?php disabled( defined('FTP_PRIKEY') ); ?> />
 </label>
+</fieldset>
 <span id="auth-keys-desc"><?php _e('Enter the location on the server where the public and private keys are located. If a passphrase is needed, enter that in the password field above.') ?></span>
 <?php endif; ?>
-<h4><?php _e('Connection Type') ?></h4>
-<fieldset><legend class="screen-reader-text"><span><?php _e('Connection Type') ?></span></legend>
+<fieldset>
+<legend><?php _e( 'Connection Type' ); ?></legend>
 <?php
     $disabled = disabled( (defined('FTP_SSL') && FTP_SSL) || (defined('FTP_SSH') && FTP_SSH), true, false );