Adding upstream version 6.6.1+dfsg1.upstream/6.6.1+dfsg1upstream

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 49 insertions, 39 deletions

diff --git a/wp-includes/customize/class-wp-customize-nav-menu-item-control.php b/wp-includes/customize/class-wp-customize-nav-menu-item-control.php
index 8915824..2b28e48 100644
--- a/wp-includes/customize/class-wp-customize-nav-menu-item-control.php
+++ b/wp-includes/customize/class-wp-customize-nav-menu-item-control.php
@@ -77,10 +77,22 @@ class WP_Customize_Nav_Menu_Item_Control extends WP_Customize_Control {
 				</span>
 				<span class="item-controls">
 					<button type="button" class="button-link item-edit" aria-expanded="false"><span class="screen-reader-text">
-					<?php
-						/* translators: 1: Title of a menu item, 2: Type of a menu item. */
-						printf( __( 'Edit menu item: %1$s (%2$s)' ), '{{ data.title || data.original_title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.item_type_label }}' );
-					?>
+					<# if ( 0 === data.depth ) { #>
+						<?php
+						/* translators: 1: Title of a menu item, 2: Type of a menu item. 3: Item index, 4: Total items. */
+						printf( __( 'Edit %1$s (%2$s, %3$d of %4$d)' ), '{{ data.title || data.original_title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.item_type_label }}', '', '' );
+						?>
+					<# } else if ( 1 === data.depth ) { #>
+						<?php
+							/* translators: 1: Title of a menu item, 2: Type of a menu item, 3, Item index, 4, Total items, 5: Item parent. */
+							printf( __( 'Edit %1$s (%2$s, sub-item %3$d of %4$d under %5$s)' ), '{{ data.title || data.original_title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.item_type_label }}', '', '', '' );
+						?>
+					<# } else { #>
+						<?php
+							/* translators: 1: Title of a menu item, 2: Type of a menu item, 3, Item index, 4, Total items, 5: Item parent, 6: Item depth. */
+							printf( __( 'Edit %1$s (%2$s, sub-item %3$d of %4$d under %5$s, level %6$s)' ), '{{ data.title || data.original_title || wp.customize.Menus.data.l10n.untitled }}', '{{ data.item_type_label }}', '', '', '', '{{data.depth}}' );
+						?>
+					<# } #>
 					</span><span class="toggle-indicator" aria-hidden="true"></span></button>
 					<button type="button" class="button-link item-delete submitdelete deletion"><span class="screen-reader-text">
 					<?php
diff --git a/wp-includes/customize/class-wp-customize-themes-section.php b/wp-includes/customize/class-wp-customize-themes-section.php
index 9d33a68..5340734 100644
--- a/wp-includes/customize/class-wp-customize-themes-section.php
+++ b/wp-includes/customize/class-wp-customize-themes-section.php
@@ -124,21 +124,35 @@ class WP_Customize_Themes_Section extends WP_Customize_Section {
 		<button type="button" class="button button-primary customize-section-back customize-themes-mobile-back"><?php _e( 'Go to theme sources' ); ?></button>
 		<# if ( 'wporg' === data.action ) { #>
 			<div class="search-form">
-				<label for="wp-filter-search-input-{{ data.id }}" class="screen-reader-text">
-					<?php
-					/* translators: Hidden accessibility text. */
-					_e( 'Search themes&hellip;' );
-					?>
-				</label>
-				<input type="search" id="wp-filter-search-input-{{ data.id }}" placeholder="<?php esc_attr_e( 'Search themes&hellip;' ); ?>" aria-describedby="{{ data.id }}-live-search-desc" class="wp-filter-search">
-				<div class="search-icon" aria-hidden="true"></div>
-				<span id="{{ data.id }}-live-search-desc" class="screen-reader-text">
-					<?php
-					/* translators: Hidden accessibility text. */
-					_e( 'The search results will be updated as you type.' );
-					?>
-				</span>
+				<label for="wp-filter-search-input-{{ data.id }}"><?php _e( 'Search themes' ); ?></label>
+				<div class="search-form-input">
+					<input type="search" id="wp-filter-search-input-{{ data.id }}" aria-describedby="{{ data.id }}-live-search-desc" class="wp-filter-search">
+					<div class="search-icon" aria-hidden="true"></div>
+					<span id="{{ data.id }}-live-search-desc" class="screen-reader-text">
+						<?php
+						/* translators: Hidden accessibility text. */
+						_e( 'The search results will be updated as you type.' );
+						?>
+					</span>
+				</div>
+			</div>
+		<# } else { #>
+			<div class="themes-filter-container">
+				<label for="{{ data.id }}-themes-filter"><?php _e( 'Search themes' ); ?></label>
+				<div class="search-form-input">
+					<input type="search" id="{{ data.id }}-themes-filter" aria-describedby="{{ data.id }}-live-search-desc" class="wp-filter-search wp-filter-search-themes" />
+					<div class="search-icon" aria-hidden="true"></div>
+					<span id="{{ data.id }}-live-search-desc" class="screen-reader-text">
+						<?php
+						/* translators: Hidden accessibility text. */
+						_e( 'The search results will be updated as you type.' );
+						?>
+					</span>
+				</div>
 			</div>
+		<# } #>
+		<div class="filter-themes-wrapper">
+			<# if ( 'wporg' === data.action ) { #>
 			<button type="button" class="button feature-filter-toggle">
 				<span class="filter-count-0"><?php _e( 'Filter themes' ); ?></span><span class="filter-count-filters">
 					<?php
@@ -147,31 +161,15 @@ class WP_Customize_Themes_Section extends WP_Customize_Section {
 					?>
 				</span>
 			</button>
-		<# } else { #>
-			<div class="themes-filter-container">
-				<label for="{{ data.id }}-themes-filter" class="screen-reader-text">
+			<# } #>
+			<div class="filter-themes-count">
+				<span class="themes-displayed">
 					<?php
-					/* translators: Hidden accessibility text. */
-					_e( 'Search themes&hellip;' );
-					?>
-				</label>
-				<input type="search" id="{{ data.id }}-themes-filter" placeholder="<?php esc_attr_e( 'Search themes&hellip;' ); ?>" aria-describedby="{{ data.id }}-live-search-desc" class="wp-filter-search wp-filter-search-themes" />
-				<div class="search-icon" aria-hidden="true"></div>
-				<span id="{{ data.id }}-live-search-desc" class="screen-reader-text">
-					<?php
-					/* translators: Hidden accessibility text. */
-					_e( 'The search results will be updated as you type.' );
+					/* translators: %s: Number of themes displayed. */
+					printf( __( '%s themes' ), '<span class="theme-count">0</span>' );
 					?>
 				</span>
 			</div>
-		<# } #>
-		<div class="filter-themes-count">
-			<span class="themes-displayed">
-				<?php
-				/* translators: %s: Number of themes displayed. */
-				printf( __( '%s themes' ), '<span class="theme-count">0</span>' );
-				?>
-			</span>
 		</div>
 		<?php
 	}