Merge pull request #55 from AndreyIslentiev/CAM-3770-accessibility-im…

…provements [CAM-3770] Directory accessibility improvements
campuspress · Oct 12, 2023 · eb865df · eb865df
2 parents 7cf11e1 + 68471e2
commit eb865df
Showing 1 changed file with 7 additions and 5 deletions.
diff --git a/inc/plugins/cp-directory/cp-directory-files/blocks/cp-dir/template-parts/directory.php b/inc/plugins/cp-directory/cp-directory-files/blocks/cp-dir/template-parts/directory.php
@@ -21,7 +21,6 @@
 $taxonomies_filters = $data->get_taxonomy_filters();
 
 $posts_per_page = $data->get_posts_per_page( $entries_count );
-$aria_label     = apply_filters( 'cp_dir_directory_label', $label, $data );
 $filters_logic  = apply_filters( 'cp_dir_filters_logic', ( isset( $atts['filters_logic'] ) && $atts['filters_logic'] ) ? $atts['filters_logic'] : '' );
 $pagination     = apply_filters( 'cp_dir_pagination', ( $posts_per_page && isset( $atts['pagination'] ) && $atts['pagination'] ) ? true : false, $data );
 
@@ -30,7 +29,7 @@
 	$content_class .= ' cp-dir-content--no-results';
 }
 ?>
-<div class="<?php echo esc_attr( $class_name ); ?>" id="<?php echo esc_attr( $dir_id ); ?>" aria-label="<?php echo esc_attr( $aria_label ); ?>" data-source="<?php echo esc_attr( $data->post_type_object->name ); ?>" data-filters-logic="<?php echo esc_attr( $filters_logic ); ?>">
+<div class="<?php echo esc_attr( $class_name ); ?>" id="<?php echo esc_attr( $dir_id ); ?>" data-source="<?php echo esc_attr( $data->post_type_object->name ); ?>" data-filters-logic="<?php echo esc_attr( $filters_logic ); ?>">
 	<?php
 	if ( $filters || $taxonomies_filters ) {
 		?>
@@ -39,15 +38,18 @@
 				<legend class="cp-dir-sr-info screen-reader-text">
 					<?php echo apply_filters( 'cp_dir_directory_refresh_info', __( 'Items will instantly refresh upon filtering.', 'cp-dir' ), $data ); ?>
 				</legend>
-				
+
 				<?php include( apply_filters( 'cp_dir_path_directory_filters', $this->dir . '/cp-directory-files/blocks/cp-dir/template-parts/directory-filters.php', $data ) ); ?>
 			</fieldset>
 		</form>
 		<?php
 	}
 	?>
-	<div class="<?php echo esc_attr( apply_filters( 'cp_dir_content_class', $content_class, $data ) ); ?>" id="<?php echo esc_attr( $dir_id ); ?>-content" aria-label="<?php echo esc_attr( apply_filters( 'cp_dir_directory_entries_label', sprintf( __( '%s Entries', 'cp-dir' ), $label ), $data ) ); ?>">
-		<div class="cp-dir-sr-info cp-dir-sr-info-count screen-reader-text" aria-live="polite" aria-atomic="true" aria-relevant="all">
+	<div class="<?php echo esc_attr( apply_filters( 'cp_dir_content_class', $content_class, $data ) ); ?>" id="<?php echo esc_attr( $dir_id ); ?>-content">
+		<?php
+		$has_filters = $filters || $taxonomies_filters;
+		?>
+		<div class="cp-dir-sr-info cp-dir-sr-info-count screen-reader-text" <?php echo $has_filters || $pagination ? 'aria-live="polite"' : ''; ?> aria-atomic="true" aria-relevant="all">
 			<?php printf( __( '%s results found.', 'cp-dir' ), '<span class="cp-dir-sr-info-count-number">' . $entries_count . '</span>' ); ?>
 			<?php
 			if ( $posts_per_page ) {