Changeset 57602

Timestamp:

02/12/2024 09:55:44 PM (10 months ago)

Author:

jorbin

Message:

General: Add an option to configure the site icon in general settings.

This restores the site icon setting to its original home on the settings page where it lives with the title and tagline.

The base for this code was originally added in [32994] and then removed in [33329]. The majority of the modification to that version are to remove the no-js pieces and make the workflow completely inline rather than putting the cropping on a separate page.

Additionally, since image crops rely on the ability to upload an image, this setting is gated by the upload_files capability.

Follow-up to: [32994], [33329].

Props jorbin, audrasjb, mukesh27, joedolson, afercia, kebbet, swissspidy, obenland, jameskoster, kjellr, andraganescu, stacimc, mikeschroder, h71, krupajnanda, huzaifaalmesbah.
Fixes #54370.
See #16434.

Location:

trunk

Files:

• Gruntfile.js (modified) (1 diff)
• src/js/_enqueues/admin/site-icon.js (added)
• src/wp-admin/css/forms.css (modified) (1 diff)
• src/wp-admin/css/site-icon.css (modified) (2 diffs)
• src/wp-admin/options-general.php (modified) (1 diff)
• src/wp-admin/options.php (modified) (1 diff)
• src/wp-includes/css/media-views.css (modified) (3 diffs)
• src/wp-includes/script-loader.php (modified) (1 diff)

trunk/Gruntfile.js

@@ -333 +333 @@
                     [ WORKING_DIR + 'wp-admin/js/tags.js' ]: [ './src/js/_enqueues/admin/tags.js' ],
                     [ WORKING_DIR + 'wp-admin/js/site-health.js' ]: [ './src/js/_enqueues/admin/site-health.js' ],
+                    [ WORKING_DIR + 'wp-admin/js/site-icon.js' ]: [ './src/js/_enqueues/admin/site-icon.js' ],
                     [ WORKING_DIR + 'wp-admin/js/privacy-tools.js' ]: [ './src/js/_enqueues/admin/privacy-tools.js' ],
                     [ WORKING_DIR + 'wp-admin/js/theme-plugin-editor.js' ]: [ './src/js/_enqueues/wp/theme-plugin-editor.js' ],

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

@@ -790 +790 @@
 }
 
+.button-add-site-icon{
+    width: 100%;
+    cursor: pointer;
+    text-align: center;
+    border: 1px dashed #c3c4c7;
+    box-sizing: border-box;
+    padding: 9px 0;
+    line-height: 1.6;
+    max-width: 270px;
+}
+
+.button-add-site-icon:focus,
+.button-add-site-icon:hover{
+    background: white;
+}
+
+.site-icon-section .favicon-preview{
+    float: left;
+}
+.site-icon-section .app-icon-preview{
+    float: left;
+    margin: 0 20px;
+}
+
+.site-icon-section .site-icon-preview img{
+    max-width: 100%;
+}
+
+.button-ad-site-icon:focus{
+    background-color: #fff;
+    border-color: #3582c4;
+    border-style: solid;
+    box-shadow: 0 0 0 1px #3582c4;
+    outline: 2px solid transparent;
+}
+
 /*------------------------------------------------------------------------------
   15.0 - Comments Screen

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

@@ -8 +8 @@
     position: relative;
     max-width: 180px;
+    float: left;
 }
 
@@ -53 +54 @@
     margin-top: 9px;
 }
+
+.site-icon-section button.reset {
+    color: #b32d2e;
+    text-decoration: none;
+    border-color: transparent;
+    box-shadow: none;
+    background: transparent;
+    margin: 0 10px;
+}
+
+.site-icon-section button.reset:focus,
+.site-icon-section button.reset:hover {
+    background: #b32d2e;
+    color: #fff;
+    border-color: #b32d2e;
+    box-shadow: 0 0 0 1px #b32d2e;
+}

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

@@ -98 +98 @@
 </tr>
 
-<?php
+<?php if ( current_user_can( 'upload_files' ) ) : ?>
+<tr class="hide-if-no-js site-icon-section">
+<th scope="row"><?php _e( 'Site Icon' ); ?></th>
+<td>
+    <?php
+    wp_enqueue_media();
+    wp_enqueue_script( 'site-icon' );
+
+    $classes_for_upload_button = 'upload-button button-add-media button-add-site-icon';
+    $classes_for_update_button = 'button';
+
+    $classes_for_avatar = 'avatar avatar-150';
+    if ( has_site_icon() ) {
+        $classes_for_avatar          .= ' has-site-icon';
+        $classes_for_button           = $classes_for_update_button;
+        $classes_for_button_on_change = $classes_for_upload_button;
+    } else {
+        $classes_for_avatar          .= ' hidden';
+        $classes_for_button           = $classes_for_upload_button;
+        $classes_for_button_on_change = $classes_for_update_button;
+    }
+
+
+    ?>
+    <div id="site-icon-preview" class="site-icon-preview wp-clearfix <?php echo esc_attr( $classes_for_avatar ); ?>">
+        <div class="favicon-preview">
+            <img src="<?php echo esc_url( admin_url( 'images/' . ( is_rtl() ? 'browser-rtl.png' : 'browser.png' ) ) ); ?>" class="browser-preview" width="182" alt="">
+            <div class="favicon">
+                <img src="<?php site_icon_url(); ?>" alt="Preview as a browser icon">
+            </div>
+            <span class="browser-title" aria-hidden="true"><?php echo get_bloginfo( 'name' ); ?></span>
+        </div>
+        <img class="app-icon-preview" src="<?php site_icon_url(); ?>" alt="Preview as an app icon">
+    </div>
+    <input type="hidden" name="site_icon" id="site_icon_hidden_field" value="<?php form_option( 'site_icon' ); ?>" />
+    <p>
+        <button type="button"
+            id="choose-from-library-link"
+            type="button"
+            class="<?php echo esc_attr( $classes_for_button ); ?>"
+            data-alt-classes="<?php echo esc_attr( $classes_for_button_on_change ); ?>"
+            data-size="512"
+            data-choose-text="<?php esc_attr_e( 'Choose a Site Icon' ); ?>"
+            data-update-text="<?php esc_attr_e( 'Change Site Icon' ); ?>"
+            data-update="<?php esc_attr_e( 'Set as Site Icon' ); ?>"
+            data-state="<?php echo esc_attr( has_site_icon() ); ?>"
+
+        >
+            <?php if ( has_site_icon() ) : ?>
+                <?php _e( 'Change Site Icon' ); ?>
+            <?php else : ?>
+                <?php _e( 'Choose a Site Icon' ); ?>
+            <?php endif; ?>
+        </button>
+        <button
+            id="js-remove-site-icon"
+            type="button"
+            <?php echo has_site_icon() ? 'class="button button-secondary reset"' : 'class="button button-secondary reset hidden"'; ?>
+        >
+            <?php _e( 'Remove Site Icon' ); ?>
+        </button>
+    </p>
+
+    <p class="description" id="site-icon-description">
+        <?php _e( 'Site Icons are what you see in browser tabs, bookmark bars, and within the WordPress mobile apps. Upload one here!' ); ?>
+    </p>
+    <p class="description" id="site-icon-further-description">
+        <?php
+            /* translators: %s: Site Icon size in pixels. */
+            printf( __( 'Site Icons should be square and at least %s pixels.' ), '<strong>512 &times; 512</strong>' );
+        ?>
+    </p>
+
+</td>
+</tr>
+
+    <?php
+endif;
+    /* End Site Icon */
+
 if ( ! is_multisite() ) {
     $wp_site_url_class = '';

trunk/src/wp-admin/options.php

@@ -91 +91 @@
         'blogname',
         'blogdescription',
+        'site_icon',
         'gmt_offset',
         'date_format',

trunk/src/wp-includes/css/media-views.css

@@ -850 +850 @@
 }
 
+.options-general-php .crop-content.site-icon,
 .wp-customizer:not(.mobile) .media-frame-content .crop-content.site-icon {
     margin-right: 300px;
@@ -2559 +2560 @@
     .media-sidebar {
         width: 230px;
+    }
+
+    .options-general-php .crop-content.site-icon {
+        margin-right: 262px;
     }
 
@@ -2828 +2833 @@
     }
 
+    .options-general-php .crop-content.site-icon {
+        margin-right: 0;
+    }
+
     .media-sidebar {
         z-index: 1900;

trunk/src/wp-includes/script-loader.php

@@ -849 +849 @@
 
     $scripts->add( 'wp-lists', "/wp-includes/js/wp-lists$suffix.js", array( 'wp-ajax-response', 'jquery-color' ), false, 1 );
+
+    $scripts->add( 'site-icon', '/wp-admin/js/site-icon.js', array( 'jquery', 'jcrop' ), false, 1 );
 
     // WordPress no longer uses or bundles Prototype or script.aculo.us. These are now pulled from an external source.