From 4f10f171e86d559a96d44678db482a39be76043f Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov@git.wordpress.org>
Date: Wed, 4 Oct 2017 23:52:03 +0000
Subject: [PATCH] Bundled Themes: Change tag cloud format to a list (`<ul>`)
 for better semantics and accessibility.

List markup allows screen reader users to know in advance how many tags are within the list.

Props xkon, davidakennedy.
Fixes #40138.

git-svn-id: https://develop.svn.wordpress.org/trunk@41756 602fd350-edb4-49c9-b593-d223f7449a82
---
 .../themes/twentyeleven/functions.php         | 19 +++++++++++++++++
 src/wp-content/themes/twentyeleven/style.css  | 12 ++++++++---
 .../themes/twentyfifteen/functions.php        | 20 ++++++++++++++++++
 .../twentyfifteen/inc/template-tags.php       |  2 +-
 src/wp-content/themes/twentyfifteen/style.css |  7 +++++++
 .../themes/twentyfourteen/functions.php       | 21 +++++++++++++++++++
 .../themes/twentyfourteen/style.css           |  8 +++++++
 .../themes/twentyseventeen/functions.php      |  3 ++-
 .../twentyseventeen/inc/template-tags.php     |  2 +-
 .../themes/twentysixteen/functions.php        | 11 ++++++----
 .../twentysixteen/inc/template-tags.php       |  2 +-
 src/wp-content/themes/twentysixteen/rtl.css   |  4 ++++
 src/wp-content/themes/twentysixteen/style.css |  9 ++++++++
 src/wp-content/themes/twentyten/functions.php | 21 ++++++++++++++++++-
 src/wp-content/themes/twentyten/rtl.css       |  5 +++++
 src/wp-content/themes/twentyten/style.css     |  7 +++++++
 .../themes/twentythirteen/functions.php       | 19 +++++++++++++++++
 .../themes/twentythirteen/style.css           | 11 +++++++++-
 .../themes/twentytwelve/functions.php         | 20 ++++++++++++++++++
 src/wp-content/themes/twentytwelve/style.css  | 15 ++++++++++++-
 20 files changed, 204 insertions(+), 14 deletions(-)

diff --git a/src/wp-content/themes/twentyeleven/functions.php b/src/wp-content/themes/twentyeleven/functions.php
index bd5fef4356..4d6ab74e9e 100644
--- a/src/wp-content/themes/twentyeleven/functions.php
+++ b/src/wp-content/themes/twentyeleven/functions.php
@@ -743,3 +743,22 @@ function twentyeleven_get_gallery_images() {
 
 	return $images;
 }
+
+/**
+ * Modifies tag cloud widget arguments to display all tags in the same font size
+ * and use list format for better accessibility.
+ *
+ * @since Twenty Eleven 2.7
+ *
+ * @param array $args Arguments for tag cloud widget.
+ * @return array The filtered arguments for tag cloud widget.
+ */
+function twentyeleven_widget_tag_cloud_args( $args ) {
+	$args['largest']  = 22;
+	$args['smallest'] = 8;
+	$args['unit']     = 'pt';
+	$args['format']   = 'list';
+
+	return $args;
+}
+add_filter( 'widget_tag_cloud_args', 'twentyeleven_widget_tag_cloud_args' );
diff --git a/src/wp-content/themes/twentyeleven/style.css b/src/wp-content/themes/twentyeleven/style.css
index a5ed1ceb43..a863e21b67 100644
--- a/src/wp-content/themes/twentyeleven/style.css
+++ b/src/wp-content/themes/twentyeleven/style.css
@@ -1922,7 +1922,6 @@ section.ephemera .entry-title a span {
 }
 
 /* Calendar Widget */
-
 .widget_calendar #wp-calendar {
 	color: #555;
 	width: 95%;
@@ -1952,7 +1951,6 @@ section.ephemera .entry-title a span {
 }
 
 /* Text Widget */
-
 .widget_text ul,
 .widget_text ol {
 	margin: 0 0 1.625em 2.5em;
@@ -1964,6 +1962,15 @@ section.ephemera .entry-title a span {
 	margin-bottom: 0;
 }
 
+/* Tag Cloud Widget */
+.tagcloud ul {
+	list-style-type: none;
+}
+
+.tagcloud ul li {
+	display: inline-block;
+}
+
 /* =Comments
 ----------------------------------------------- */
 
@@ -2332,7 +2339,6 @@ p.comment-form-comment {
 	font-weight: bold;
 }
 
-
 /* =Responsive Structure
 ----------------------------------------------- */
 
diff --git a/src/wp-content/themes/twentyfifteen/functions.php b/src/wp-content/themes/twentyfifteen/functions.php
index 8ae7e1dacc..b6161927a1 100644
--- a/src/wp-content/themes/twentyfifteen/functions.php
+++ b/src/wp-content/themes/twentyfifteen/functions.php
@@ -385,6 +385,26 @@ function twentyfifteen_search_form_modify( $html ) {
 }
 add_filter( 'get_search_form', 'twentyfifteen_search_form_modify' );
 
+/**
+ * Modifies tag cloud widget arguments to display all tags in the same font size
+ * and use list format for better accessibility.
+ *
+ * @since Twenty Fifteen 1.9
+ *
+ * @param array $args Arguments for tag cloud widget.
+ * @return array The filtered arguments for tag cloud widget.
+ */
+function twentyfifteen_widget_tag_cloud_args( $args ) {
+	$args['largest']  = 22;
+	$args['smallest'] = 8;
+	$args['unit']     = 'pt';
+	$args['format']   = 'list';
+
+	return $args;
+}
+add_filter( 'widget_tag_cloud_args', 'twentyfifteen_widget_tag_cloud_args' );
+
+
 /**
  * Implement the Custom Header feature.
  *
diff --git a/src/wp-content/themes/twentyfifteen/inc/template-tags.php b/src/wp-content/themes/twentyfifteen/inc/template-tags.php
index f4de1d58bf..7b4ffeb711 100644
--- a/src/wp-content/themes/twentyfifteen/inc/template-tags.php
+++ b/src/wp-content/themes/twentyfifteen/inc/template-tags.php
@@ -97,7 +97,7 @@ function twentyfifteen_entry_meta() {
 		}
 
 		$tags_list = get_the_tag_list( '', _x( ', ', 'Used between list items, there is a space after the comma.', 'twentyfifteen' ) );
-		if ( $tags_list ) {
+		if ( $tags_list && ! is_wp_error( $tags_list ) ) {
 			printf( '<span class="tags-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
 				_x( 'Tags', 'Used before tag names.', 'twentyfifteen' ),
 				$tags_list
diff --git a/src/wp-content/themes/twentyfifteen/style.css b/src/wp-content/themes/twentyfifteen/style.css
index a30fa960d7..ce824e1d0b 100644
--- a/src/wp-content/themes/twentyfifteen/style.css
+++ b/src/wp-content/themes/twentyfifteen/style.css
@@ -1559,6 +1559,13 @@ img.aligncenter {
 	margin-left: 1.6em;
 }
 
+.tagcloud ul {
+	list-style-type: none;
+}
+
+.tagcloud ul li {
+	display: inline-block;
+}
 
 /**
  * 12.0 Content
diff --git a/src/wp-content/themes/twentyfourteen/functions.php b/src/wp-content/themes/twentyfourteen/functions.php
index b815e77e3a..2946d19ddb 100644
--- a/src/wp-content/themes/twentyfourteen/functions.php
+++ b/src/wp-content/themes/twentyfourteen/functions.php
@@ -527,6 +527,27 @@ function twentyfourteen_wp_title( $title, $sep ) {
 }
 add_filter( 'wp_title', 'twentyfourteen_wp_title', 10, 2 );
 
+
+/**
+ * Modifies tag cloud widget arguments to display all tags in the same font size
+ * and use list format for better accessibility.
+ *
+ * @since Twenty Fourteen 2.1
+ *
+ * @param array $args Arguments for tag cloud widget.
+ * @return array The filtered arguments for tag cloud widget.
+ */
+function twentyfourteen_widget_tag_cloud_args( $args ) {
+	$args['largest']  = 22;
+	$args['smallest'] = 8;
+	$args['unit']     = 'pt';
+	$args['format']   = 'list';
+
+	return $args;
+}
+add_filter( 'widget_tag_cloud_args', 'twentyfourteen_widget_tag_cloud_args' );
+
+
 // Implement Custom Header features.
 require get_template_directory() . '/inc/custom-header.php';
 
diff --git a/src/wp-content/themes/twentyfourteen/style.css b/src/wp-content/themes/twentyfourteen/style.css
index b0a35544f5..5f53425169 100644
--- a/src/wp-content/themes/twentyfourteen/style.css
+++ b/src/wp-content/themes/twentyfourteen/style.css
@@ -2583,6 +2583,14 @@ a.post-thumbnail:hover {
 	padding-bottom: 0;
 }
 
+.tagcloud ul {
+	list-style-type: none;
+}
+
+.tagcloud ul li {
+	display: inline-block;
+}
+
 /* Recent Posts Widget */
 
 .widget_recent_entries .post-date {
diff --git a/src/wp-content/themes/twentyseventeen/functions.php b/src/wp-content/themes/twentyseventeen/functions.php
index b09cf80c77..14e1a625da 100644
--- a/src/wp-content/themes/twentyseventeen/functions.php
+++ b/src/wp-content/themes/twentyseventeen/functions.php
@@ -542,7 +542,7 @@ function twentyseventeen_front_page_template( $template ) {
 add_filter( 'frontpage_template',  'twentyseventeen_front_page_template' );
 
 /**
- * Modify tag cloud widget arguments to display all tags in the same font size
+ * Modifies tag cloud widget arguments to display all tags in the same font size
  * and use list format for better accessibility.
  *
  * @since Twenty Seventeen 1.4
@@ -555,6 +555,7 @@ function twentyseventeen_widget_tag_cloud_args( $args ) {
 	$args['smallest'] = 1;
 	$args['unit']     = 'em';
 	$args['format']   = 'list';
+
 	return $args;
 }
 add_filter( 'widget_tag_cloud_args', 'twentyseventeen_widget_tag_cloud_args' );
diff --git a/src/wp-content/themes/twentyseventeen/inc/template-tags.php b/src/wp-content/themes/twentyseventeen/inc/template-tags.php
index 2b461109be..a99230d963 100644
--- a/src/wp-content/themes/twentyseventeen/inc/template-tags.php
+++ b/src/wp-content/themes/twentyseventeen/inc/template-tags.php
@@ -84,7 +84,7 @@ function twentyseventeen_entry_footer() {
 							echo '<span class="cat-links">' . twentyseventeen_get_svg( array( 'icon' => 'folder-open' ) ) . '<span class="screen-reader-text">' . __( 'Categories', 'twentyseventeen' ) . '</span>' . $categories_list . '</span>';
 						}
 
-						if ( $tags_list ) {
+						if ( $tags_list && ! is_wp_error( $tags_list ) ) {
 							echo '<span class="tags-links">' . twentyseventeen_get_svg( array( 'icon' => 'hashtag' ) ) . '<span class="screen-reader-text">' . __( 'Tags', 'twentyseventeen' ) . '</span>' . $tags_list . '</span>';
 						}
 
diff --git a/src/wp-content/themes/twentysixteen/functions.php b/src/wp-content/themes/twentysixteen/functions.php
index e70a9acf14..d6e58e1a92 100644
--- a/src/wp-content/themes/twentysixteen/functions.php
+++ b/src/wp-content/themes/twentysixteen/functions.php
@@ -415,17 +415,20 @@ function twentysixteen_post_thumbnail_sizes_attr( $attr, $attachment, $size ) {
 add_filter( 'wp_get_attachment_image_attributes', 'twentysixteen_post_thumbnail_sizes_attr', 10 , 3 );
 
 /**
- * Modifies tag cloud widget arguments to have all tags in the widget same font size.
+ * Modifies tag cloud widget arguments to display all tags in the same font size
+ * and use list format for better accessibility.
  *
  * @since Twenty Sixteen 1.1
  *
  * @param array $args Arguments for tag cloud widget.
- * @return array A new modified arguments.
+ * @return array The filtered arguments for tag cloud widget.
  */
 function twentysixteen_widget_tag_cloud_args( $args ) {
-	$args['largest'] = 1;
+	$args['largest']  = 1;
 	$args['smallest'] = 1;
-	$args['unit'] = 'em';
+	$args['unit']     = 'em';
+	$args['format']   = 'list'; 
+
 	return $args;
 }
 add_filter( 'widget_tag_cloud_args', 'twentysixteen_widget_tag_cloud_args' );
diff --git a/src/wp-content/themes/twentysixteen/inc/template-tags.php b/src/wp-content/themes/twentysixteen/inc/template-tags.php
index fa1ad8efed..9b8f1f3901 100644
--- a/src/wp-content/themes/twentysixteen/inc/template-tags.php
+++ b/src/wp-content/themes/twentysixteen/inc/template-tags.php
@@ -101,7 +101,7 @@ function twentysixteen_entry_taxonomies() {
 	}
 
 	$tags_list = get_the_tag_list( '', _x( ', ', 'Used between list items, there is a space after the comma.', 'twentysixteen' ) );
-	if ( $tags_list ) {
+	if ( $tags_list && ! is_wp_error( $tags_list ) ) {
 		printf( '<span class="tags-links"><span class="screen-reader-text">%1$s </span>%2$s</span>',
 			_x( 'Tags', 'Used before tag names.', 'twentysixteen' ),
 			$tags_list
diff --git a/src/wp-content/themes/twentysixteen/rtl.css b/src/wp-content/themes/twentysixteen/rtl.css
index 5456c70904..f88041a2c3 100644
--- a/src/wp-content/themes/twentysixteen/rtl.css
+++ b/src/wp-content/themes/twentysixteen/rtl.css
@@ -315,6 +315,10 @@ input[type="search"].search-field {
 	margin-left: 0.1875em;
 }
 
+.tagcloud ul {
+	margin-right: 0;
+}
+
 
 /**
  * 8.0 - Content
diff --git a/src/wp-content/themes/twentysixteen/style.css b/src/wp-content/themes/twentysixteen/style.css
index 7dcd14e16e..055fb8d12d 100644
--- a/src/wp-content/themes/twentysixteen/style.css
+++ b/src/wp-content/themes/twentysixteen/style.css
@@ -1514,6 +1514,15 @@ blockquote:after,
 	padding: 0.5625em 0.4375em 0.5em;
 }
 
+.tagcloud ul {
+	list-style-type: none;
+	margin-left: 0;
+}
+
+.tagcloud ul li {
+	display: inline-block;
+}
+
 .tagcloud a:hover,
 .tagcloud a:focus {
 	border-color: #007acc;
diff --git a/src/wp-content/themes/twentyten/functions.php b/src/wp-content/themes/twentyten/functions.php
index 847d54035d..3db0ab0ed7 100644
--- a/src/wp-content/themes/twentyten/functions.php
+++ b/src/wp-content/themes/twentyten/functions.php
@@ -536,7 +536,7 @@ if ( ! function_exists( 'twentyten_posted_in' ) ) :
 function twentyten_posted_in() {
 	// Retrieves tag list of current post, separated by commas.
 	$tag_list = get_the_tag_list( '', ', ' );
-	if ( $tag_list ) {
+	if ( $tag_list && ! is_wp_error( $tag_list ) ) {
 		$posted_in = __( 'This entry was posted in %1$s and tagged %2$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
 	} elseif ( is_object_in_taxonomy( get_post_type(), 'category' ) ) {
 		$posted_in = __( 'This entry was posted in %1$s. Bookmark the <a href="%3$s" title="Permalink to %4$s" rel="bookmark">permalink</a>.', 'twentyten' );
@@ -593,3 +593,22 @@ function twentyten_get_gallery_images() {
 
 	return $images;
 }
+
+/**
+ * Modifies tag cloud widget arguments to display all tags in the same font size
+ * and use list format for better accessibility.
+ *
+ * @since Twenty Ten 2.4
+ *
+ * @param array $args Arguments for tag cloud widget.
+ * @return array The filtered arguments for tag cloud widget.
+ */
+function twentyten_widget_tag_cloud_args( $args ) {
+	$args['largest']  = 22;
+	$args['smallest'] = 8;
+	$args['unit']     = 'pt';
+	$args['format']   = 'list';
+
+	return $args;
+}
+add_filter( 'widget_tag_cloud_args', 'twentyten_widget_tag_cloud_args' );
diff --git a/src/wp-content/themes/twentyten/rtl.css b/src/wp-content/themes/twentyten/rtl.css
index f6adb8cc3c..c458a544e4 100644
--- a/src/wp-content/themes/twentyten/rtl.css
+++ b/src/wp-content/themes/twentyten/rtl.css
@@ -270,6 +270,11 @@ div.menu li{
 	margin-right: 1.3em;
 }
 
+#main .widget-area .tagcloud ul,
+.widget-area .tagcloud ul {
+	margin-right: 0;
+}
+
 /* =Footer
 -------------------------------------------------------------- */
 #site-generator {
diff --git a/src/wp-content/themes/twentyten/style.css b/src/wp-content/themes/twentyten/style.css
index 021ab36a24..66d6bac69c 100644
--- a/src/wp-content/themes/twentyten/style.css
+++ b/src/wp-content/themes/twentyten/style.css
@@ -1238,6 +1238,13 @@ h3#reply-title {
 .widget_media_video video {
 	max-width: 100%;
 }
+.tagcloud ul {
+	list-style-type: none;
+	margin-left: 0 !important;
+}
+.tagcloud ul li {
+	display: inline-block;
+}
 
 /* Main sidebars */
 #main .widget-area ul {
diff --git a/src/wp-content/themes/twentythirteen/functions.php b/src/wp-content/themes/twentythirteen/functions.php
index d1f7d5b482..312dc63d75 100644
--- a/src/wp-content/themes/twentythirteen/functions.php
+++ b/src/wp-content/themes/twentythirteen/functions.php
@@ -615,3 +615,22 @@ function twentythirteen_customize_preview_js() {
 	wp_enqueue_script( 'twentythirteen-customizer', get_template_directory_uri() . '/js/theme-customizer.js', array( 'customize-preview' ), '20141120', true );
 }
 add_action( 'customize_preview_init', 'twentythirteen_customize_preview_js' );
+
+/**
+ * Modifies tag cloud widget arguments to display all tags in the same font size
+ * and use list format for better accessibility.
+ *
+ * @since Twenty Thirteen 2.3
+ *
+ * @param array $args Arguments for tag cloud widget.
+ * @return array The filtered arguments for tag cloud widget.
+ */
+function twentythirteen_widget_tag_cloud_args( $args ) {
+	$args['largest']  = 22;
+	$args['smallest'] = 8;
+	$args['unit']     = 'pt';
+	$args['format']   = 'list';
+
+	return $args;
+}
+add_filter( 'widget_tag_cloud_args', 'twentythirteen_widget_tag_cloud_args' );
diff --git a/src/wp-content/themes/twentythirteen/style.css b/src/wp-content/themes/twentythirteen/style.css
index 83722436c0..c46f809125 100644
--- a/src/wp-content/themes/twentythirteen/style.css
+++ b/src/wp-content/themes/twentythirteen/style.css
@@ -2562,7 +2562,6 @@ footer.entry-meta {
 }
 
 /* Text widget */
-
 .widget_text ul,
 .widget_text ol {
 	padding-left: 20px;
@@ -2586,6 +2585,16 @@ footer.entry-meta {
 	list-style: decimal;
 }
 
+/* Tag Cloud widget */
+.tagcloud ul {
+	list-style-type: none;
+}
+
+.tagcloud ul li {
+	display: inline-block;
+	padding: 0;
+}
+
 /**
  * 7.0 Footer
  * ----------------------------------------------------------------------------
diff --git a/src/wp-content/themes/twentytwelve/functions.php b/src/wp-content/themes/twentytwelve/functions.php
index 2dc2cd8bd7..68d44aaed0 100644
--- a/src/wp-content/themes/twentytwelve/functions.php
+++ b/src/wp-content/themes/twentytwelve/functions.php
@@ -559,3 +559,23 @@ function twentytwelve_customize_preview_js() {
 	wp_enqueue_script( 'twentytwelve-customizer', get_template_directory_uri() . '/js/theme-customizer.js', array( 'customize-preview' ), '20141120', true );
 }
 add_action( 'customize_preview_init', 'twentytwelve_customize_preview_js' );
+
+
+/**
+ * Modifies tag cloud widget arguments to display all tags in the same font size
+ * and use list format for better accessibility.
+ *
+ * @since Twenty Twelve 2.4
+ *
+ * @param array $args Arguments for tag cloud widget.
+ * @return array The filtered arguments for tag cloud widget.
+ */
+function twentytwelve_widget_tag_cloud_args( $args ) {
+	$args['largest']  = 22;
+	$args['smallest'] = 8;
+	$args['unit']     = 'pt';
+	$args['format']   = 'list';
+
+	return $args;
+}
+add_filter( 'widget_tag_cloud_args', 'twentytwelve_widget_tag_cloud_args' );
diff --git a/src/wp-content/themes/twentytwelve/style.css b/src/wp-content/themes/twentytwelve/style.css
index dd5dffbb39..0a6329c091 100644
--- a/src/wp-content/themes/twentytwelve/style.css
+++ b/src/wp-content/themes/twentytwelve/style.css
@@ -1450,6 +1450,20 @@ a.comment-edit-link:hover {
 	display: block;
 	text-align: right;
 }
+.tagcloud ul {
+	list-style-type: none;
+}
+
+.tagcloud ul li {
+	display: inline-block;
+}
+
+.widget-area .widget.widget_tag_cloud li {
+	line-height: 1;
+}
+.template-front-page .widget-area .widget.widget_tag_cloud li {
+	margin: 0;
+}
 
 /* =Plugins
 ----------------------------------------------- */
@@ -1460,7 +1474,6 @@ img#wpstats {
 	margin: 0 auto 1.714285714rem;
 }
 
-
 /* =Media queries
 -------------------------------------------------------------- */