Changeset 33180

Timestamp:

07/12/2015 07:42:24 PM (10 years ago)

Author:

obenland

Message:

Site Icon: Improve a11y in Settings.

Props afercia.
Fixes #32970.

Location:

trunk/src/wp-admin

Files:

• css/site-icon.css (modified) (1 diff)
• custom-header.php (modified) (1 diff)
• includes/class-wp-site-icon.php (modified) (3 diffs)
• options-general.php (modified) (3 diffs)

trunk/src/wp-admin/css/site-icon.css

@@ -27 +27 @@
 }
 
-.site-icon-crop-preview-shell h3 {
-    margin-top: 0;
+.site-icon-crop-preview-shell h2 {
+    padding-top: 0;
 }
 

trunk/src/wp-admin/custom-header.php

@@ -760 +760 @@
 <form method="post" action="<?php echo esc_url(add_query_arg('step', 3)); ?>">
     <p class="hide-if-no-js"><?php _e('Choose the part of the image you want to use as your header.'); ?></p>
-    <p class="hide-if-js"><strong><?php _e( 'You need Javascript to choose a part of the image.'); ?></strong></p>
+    <p class="hide-if-js"><strong><?php _e( 'You need JavaScript to choose a part of the image.'); ?></strong></p>
 
     <div id="crop_image" style="position: relative">

trunk/src/wp-admin/includes/class-wp-site-icon.php

@@ -267 +267 @@
                 <form action="options-general.php" method="post" enctype="multipart/form-data">
                     <p class="hide-if-no-js description"><?php _e('Choose the part of the image you want to use as your site icon.'); ?></p>
-                    <p class="hide-if-js description"><strong><?php _e( 'You need Javascript to choose a part of the image.'); ?></strong></p>
+                    <p class="hide-if-js description"><strong><?php _e( 'You need JavaScript to choose a part of the image.'); ?></strong></p>
 
                     <div class="site-icon-crop-wrapper">
@@ -274 +274 @@
 
                     <div class="site-icon-crop-preview-shell hide-if-no-js">
-                        <h3><?php _e( 'Preview' ); ?></h3>
+                        <h2><?php _e( 'Preview' ); ?></h2>
                         <strong><?php _e( 'As a browser icon' ); ?></strong>
                         <div class="site-icon-crop-favicon-preview-shell">
-                            <img src="images/browser.png" class="site-icon-browser-preview" width="182" height="" alt="<?php esc_attr_e( 'Browser Chrome' ); ?>"/>
+                            <img src="images/browser.png" class="site-icon-browser-preview" width="182" height="" alt=""/>
 
                             <div class="site-icon-crop-preview-favicon">
-                                <img src="<?php echo esc_url( $url ); ?>" id="preview-favicon" alt="<?php esc_attr_e( 'Preview Favicon' ); ?>"/>
+                                <img src="<?php echo esc_url( $url ); ?>" id="preview-favicon" alt="<?php esc_attr_e( 'Preview as a browser icon' ); ?>"/>
                             </div>
                             <span class="site-icon-browser-title"><?php bloginfo( 'name' ); ?></span>
@@ -287 +287 @@
                         <strong><?php _e( 'As an app icon' ); ?></strong>
                         <div class="site-icon-crop-preview-homeicon">
-                            <img src="<?php echo esc_url( $url ); ?>" id="preview-homeicon" alt="<?php esc_attr_e( 'Preview Home Icon' ); ?>"/>
+                            <img src="<?php echo esc_url( $url ); ?>" id="preview-homeicon" alt="<?php esc_attr_e( 'Preview as an app icon' ); ?>"/>
                         </div>
                     </div>

trunk/src/wp-admin/options-general.php

@@ -126 +126 @@
 </tr>
 <tr>
-<th scope="row"><label for="site_icon"><?php _e( 'Site Icon' ); ?></label></th>
+<th scope="row"><?php _e( 'Site Icon' ); ?></th>
 <td>
     <?php
@@ -144 +144 @@
     ?>
 
-    <img class="avatar avatar-150" src="<?php site_icon_url( null, 150 ); ?>" height="150" width="150" />
+    <img class="avatar avatar-150" src="<?php site_icon_url( null, 150 ); ?>" height="150" width="150" alt="" />
     <p class="hide-if-no-js">
-        <label class="screen-reader-text" for="choose-from-library-link"><?php _e( 'Choose an image from your media library:' ); ?></label>
         <button type="button" id="choose-from-library-link" class="button" data-size="<?php echo absint( $GLOBALS['wp_site_icon']->min_size ); ?>" data-update-link="<?php echo esc_attr( $update_url ); ?>" data-choose="<?php esc_attr_e( 'Choose a Site Icon' ); ?>" data-update="<?php esc_attr_e( 'Set as Site Icon' ); ?>"><?php _e( 'Update Site Icon' ); ?></button>
         <a href="<?php echo esc_url( $remove_url ); ?>"><?php _e( 'Remove Site Icon' ); ?></a>
@@ -158 +157 @@
 
     <p class="hide-if-no-js">
-        <label class="screen-reader-text" for="choose-from-library-link"><?php _e( 'Choose an image from your media library:' ); ?></label>
-        <button type="button" id="choose-from-library-link" class="button" data-size="<?php echo absint( $GLOBALS['wp_site_icon']->min_size ); ?>" data-update-link="<?php echo esc_attr( $update_url ); ?>" data-choose="<?php esc_attr_e( 'Choose a Site Icon' ); ?>" data-update="<?php esc_attr_e( 'Set as Site Icon' ); ?>"><?php _e( 'Choose Image' ); ?></button>
+        <button type="button" id="choose-from-library-link" class="button" data-size="<?php echo absint( $GLOBALS['wp_site_icon']->min_size ); ?>" data-update-link="<?php echo esc_attr( $update_url ); ?>" data-choose="<?php esc_attr_e( 'Choose a Site Icon' ); ?>" data-update="<?php esc_attr_e( 'Set as Site Icon' ); ?>" aria-label="<?php esc_attr_e( 'Choose an image from your media library' ); ?>" aria-describedby="site-icon-description"><?php _e( 'Choose Image' ); ?></button>
     </p>
     <a class="button hide-if-js" href="<?php echo esc_url( $upload_url ); ?>"><?php _e( 'Add a Site Icon' ); ?></a>
 
     <?php endif; ?>
-    <p class="description"><?php _e( 'The Site Icon is used as a browser and app icon for your site.' ); ?></p>
+    <p id="site-icon-description" class="description"><?php _e( 'The Site Icon is used as a browser and app icon for your site.' ); ?></p>
 </td>
 </tr>