From bda8b79686b712537031884f96bd8ba39d41a19b Mon Sep 17 00:00:00 2001
From: Ben Keith <ben@benlk.com>
Date: Wed, 16 Mar 2016 22:03:09 -0400
Subject: [PATCH 01/15] create new options, remove option to include only
 chosen terms, include ability to exclude chosen terms, make the taxonomies
 option a select instead of a text field, improve docs inside and outside the
 plugin

---
 inc/widgets/largo-taxonomy-list.php | 165 +++++++++++++++++++++++-----
 1 file changed, 137 insertions(+), 28 deletions(-)

diff --git a/inc/widgets/largo-taxonomy-list.php b/inc/widgets/largo-taxonomy-list.php
index e4cf01828..168372234 100644
--- a/inc/widgets/largo-taxonomy-list.php
+++ b/inc/widgets/largo-taxonomy-list.php
@@ -1,9 +1,14 @@
 <?php
 /*
- * List all of the terms in a custom taxonomy
+ * List all of the terms in a custom taxonom
+ *
+ * This widget takes two primary forms: 1) a <select> element of terms, or 2) a customizable UL of terms.
  */
 class largo_taxonomy_list_widget extends WP_Widget {
 
+	/**
+	 * Constructor
+	 */
 	function __construct() {
 		$widget_ops = array(
 			'classname' 	=> 'largo-taxonomy-list',
@@ -12,6 +17,13 @@ function __construct() {
 		parent::__construct( 'largo-taxonomy-list-widget', __('Largo Taxonomy List', 'largo'), $widget_ops);
 	}
 
+	/**
+	 * Output the widget
+	 *
+	 * @param array $args Sidebar-related args
+	 * @param array $instance Instance-specific widget arguments
+	 * @link https://developer.wordpress.org/reference/functions/get_terms/
+	 */
 	function widget( $args, $instance ) {
 		extract( $args );
 
@@ -25,23 +37,34 @@ function widget( $args, $instance ) {
 		if ( $title )
 			echo $before_title . $title . $after_title;
 
-		/*
-		 * The widget
-		 */
-		$cat_args = array(
-			'orderby' => 'name',
+		// Set us up the term args
+		$term_args = array(
 			'taxonomy' => $instance['taxonomy'],
 			'number' => $instance['count'],
-			'include' => $instance['include'],
+			'exclude' => $instance['exclude'],
+			'orderby' => $instance['orderby'],
+			'order' => $instance['order'],
+		);
+		$defaults = array(
+			'taxonomy' => 'series',
+			'number' => 5,
+			'exclude' => null,
+			'orderby' => 'name',
+			'order' => 'ASC'
 		);
+		$term_args = wp_parse_args( $term_args, $defaults );
 
+		/*
+		 * The dropdown option
+		 */
 		if ( $is_dropdown ) {
-			$cats = get_categories($cat_args); ?>
+			$term_args['orderby'] = 'name';
+			$terms = get_categories($term_args); ?>
 
 			<select id="taxonomy-list-widget">
 				<option value=""><?php printf( __('Select %s', 'largo'), ucwords($instance['taxonomy']) ); ?></option>
-			<?php foreach ($cats as $cat) : ?>
-				<option value="<?php echo get_term_link($cat, $cat->taxonomy) ?>"><?php echo $cat->name ?></option>
+			<?php foreach ($terms as $term) : ?>
+				<option value="<?php echo get_term_link($term, $term->taxonomy) ?>"><?php echo $term->name ?></option>
 			<?php endforeach; ?>
 			</select>
 
@@ -53,11 +76,14 @@ function widget( $args, $instance ) {
 				});
 			</script>
 
-		<?php } else { 
+		<?php
+		/*
+		 * Not the dropdown option
+		 */
+		} else {
 			echo '<ul class="' . $instance['taxonomy'] . '">';
 
-			$cat_args['title_li'] = '';
-			$tax_items = get_categories($cat_args);
+			$tax_items = get_categories($term_args);
 
 			switch ($instance['taxonomy']) {
 				case 'series':
@@ -112,6 +138,7 @@ private function render_li($item, $thumbnail = '', $headline = '') {
 	 * @uses largo_taxonomy_list_widget::render_li
 	 * @uses largo_featured_thumbnail_in_post_array
 	 * @uses largo_first_headline_in_post_array
+	 * @since 0.5.3
 	 */
 	private function render_series_list($tax_items, $instance) {
 		foreach ($tax_items as $item) {
@@ -160,6 +187,7 @@ private function render_series_list($tax_items, $instance) {
 	 * @uses largo_taxonomy_list_widget::render_li
 	 * @uses largo_featured_thumbnail_in_post_array
 	 * @uses largo_first_headline_in_post_array
+	 * @since 0.5.3
 	 */
 	private function render_cat_list($tax_items, $instance) {
 		foreach ($tax_items as $item) {
@@ -190,6 +218,7 @@ private function render_cat_list($tax_items, $instance) {
 	 * @uses largo_taxonomy_list_widget::render_li
 	 * @uses largo_featured_thumbnail_in_post_array
 	 * @uses largo_first_headline_in_post_array
+	 * @since 0.5.3
 	 */
 	private function render_tag_list($tax_items, $instance) {
 		foreach ($tax_items as $item) {
@@ -220,6 +249,7 @@ private function render_tag_list($tax_items, $instance) {
 	 * @uses largo_taxonomy_list_widget::render_li
 	 * @uses largo_featured_thumbnail_in_post_array
 	 * @uses largo_first_headline_in_post_array
+	 * @since 0.5.3
 	 */
 	private function render_term_list($tax_items, $instance) {
 		foreach ($tax_items as $item) {
@@ -250,58 +280,137 @@ private function render_term_list($tax_items, $instance) {
 		}
 	}
 
+	/**
+	 * Sanitize and save widget arguments
+	 */
 	function update( $new_instance, $old_instance ) {
 		$instance = $old_instance;
 		$instance['title'] = sanitize_text_field($new_instance['title']);
-		$instance['taxonomy'] = strtolower(strip_tags($new_instance['taxonomy']));
+		$instance['taxonomy'] = isset($new_instance['taxonomy']) ? strtolower(strip_tags($new_instance['taxonomy'])) : 'series' ;
+		$instance['orderby'] = isset($new_instance['orderby']) ? strtolower(strip_tags($new_instance['orderby'])) : 'name' ;
+		$instance['order'] = isset($new_instance['order']) ? strtolower(strip_tags($new_instance['order'])) : 'ASC' ;
+		$instance['order'] = sanitize_text_field($new_instance['order']);
 		$instance['count'] = sanitize_text_field($new_instance['count']);
+
+		// Default is 5 as of 0.5.5, not infinite: see discussion on http://jira.inn.org/browse/HELPDESK-589
 		if ($instance['count'] == '' ) {
-			$instance['count'] = '';
+			$instance['count'] = 5;
 		} else if ($instance['count'] < 1) {
 			$instance['count'] = 1;
 		}
 
-		$instance['include'] = sanitize_text_field($new_instance['include']);
 		$instance['dropdown'] = !empty($new_instance['dropdown']) ? 1 : 0;
 		$instance['thumbnails'] = !empty($new_instance['thumbnails']) ? 1 : 0;
 		$instance['use_headline'] = !empty($new_instance['use_headline']) ? 1 : 0;
+		$instance['exclude'] = sanitize_text_field($new_instance['exclude']);
 
 		return $instance;
 	}
 
+	/**
+	 * Render the widget form
+	 */
 	function form( $instance ) {
 		//Defaults
 		$instance = wp_parse_args( (array) $instance, array( 'title' => '', 'taxonomy' => '' ) );
 		$title = esc_attr( $instance['title'] );
-		$taxonomy = esc_attr( $instance['taxonomy'] );
-		$count = $instance['count'];
-		$include = $instance['include'];
+		$count = isset($instance['count']) ? esc_attr( $instance['count'] ) : 5;
+		$orderby = esc_attr( $instance['orderby'] );
+		$order = esc_attr( $instance['order'] );
+		$instance['taxonomy'] = isset( $instance['taxonomy'] ) ? $instance['taxonomy'] : 'series';
 		$dropdown = isset( $instance['dropdown'] ) ? (bool) $instance['dropdown'] : false;
 		$thumbnails = isset( $instance['thumbnails'] ) ? (bool) $instance['thumbnails'] : false;
 		$use_headline = isset( $instance['use_headline'] ) ? (bool) $instance['use_headline'] : false;
+		$exclude = $instance['exclude'];
+
+		// Create <option>s of taxonomies for the <select>
+		$taxonomies = get_taxonomies(null, 'objects');
+		$taxonomies_options = '';
+		foreach ($taxonomies as $taxonomy) {
+			if ($taxonomy->public) {
+				$taxonomies_options .= sprintf(
+					'<option value="%1$s" %2$s>%3$s</option>',
+					$taxonomy->name,
+					selected( $instance['taxonomy'], $taxonomy->name, false ),
+					$taxonomy->label
+				);
+			}
+		}
+
+		// Create <option>s  of sort orderbys for the <select>
+		$sort_orderbys = array('name', 'slug', 'term_id', 'id', 'description', 'count'); // list from https://developer.wordpress.org/reference/functions/get_terms/
+		$sort_orderby_options = '';
+		foreach ( $sort_orderbys as $sort_orderby ) {
+			$sort_orderby_options .= sprintf(
+				'<option value="%1$s" %2$s>%3$s</option>',
+				$sort_orderby,
+				selected( $instance['orderby'], $sort_orderby, false ),
+				__(ucwords($sort_orderby), 'largo')
+			);
+		}
+
+		// Create <option>s of sort orders for the <select>
+		$sort_orders = array(
+			'ASC' => 'Ascending',
+			'DESC' => 'Descending'
+		); // list from https://developer.wordpress.org/reference/functions/get_terms/
+		$sort_order_options = '';
+		foreach ( $sort_orders as $order => $label ) {
+			$sort_order_options .= sprintf(
+				'<option value="%1$s" %2$s>%3$s</option>',
+				$order,
+				selected( $instance['order'], $order, false ),
+				__(ucwords($label), 'largo')
+			);
+		}
 
 		?>
-		<p><label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:', 'largo' ); ?></label>
-		<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo $title; ?>" /></p>
 
 		<p>
-			<label for="<?php echo $this->get_field_id('include'); ?>"><?php _e('Only display the terms in this comma-separated list of term IDs:', 'largo'); ?></label>
-			<input class="widefat" id="<?php echo $this->get_field_id('include'); ?>" name="<?php echo $this->get_field_name('include'); ?>" type="text" value="<?php echo $include; ?>" />
-			<small><?php _e('Find term IDs by examining the URL of the taxonomy when you click the "edit" button in the list', 'largo'); ?>.</small>
+			<label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:', 'largo' ); ?></label>
+			<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo $title; ?>" />
 		</p>
 
 		<p>
-			<label for"<?php echo $this->get_field_id('count'); ?>"><?php _e('Count: (leave blank to receive all items)', 'largo'); ?></label>
+			<label for="<?php echo $this->get_field_id('taxonomy'); ?>"><?php _e('Taxonomy:', 'largo'); ?></label>
+			<select class="widefat" id="<?php echo $this->get_field_id('taxonomy'); ?>" name="<?php echo $this->get_field_name('taxonomy'); ?>" type="text" value="<?php echo $instance['taxonomy'] ?>">
+				<?php echo $taxonomies_options; ?>
+			</select>
+		</p>
+
+		<p>
+			<label for="<?php echo $this->get_field_id('orderby'); ?>"><?php _e('Order results by:', 'largo'); ?></label>
+			<select class="widefat" id="<?php echo $this->get_field_id('orderby'); ?>" name="<?php echo $this->get_field_name('orderby'); ?>" type="text" value="<?php echo $instance['orderby'] ?>">
+				<?php echo $sort_orderby_options; ?>
+			</select>
+		</p>
+
+		<p>
+			<label for="<?php echo $this->get_field_id('order'); ?>"><?php _e('Order results in which direction?', 'largo'); ?></label>
+			<select class="widefat" id="<?php echo $this->get_field_id('order'); ?>" name="<?php echo $this->get_field_name('order'); ?>" type="text" value="<?php echo $instance['order'] ?>">
+				<?php echo $sort_order_options; ?>
+			</select>
+			<small><?php _e('Using the alphabet as an example, ascending order will sort it as <code>a b c d ... x y z</code>. Descending order will sort the alphabet as <code>z y x q ... c b a</code>. Using numbers, an ascending sort will go <code>1 2 234 593 20450</code> and a descending sort will go <code>20450 593 234 2 1</code>.', 'largo'); ?></small>
+		</p>
+
+		<p>
+			<label for="<?php echo $this->get_field_id('exclude'); ?>"><?php _e('Do not display the terms in this comma-separated list of term IDs:', 'largo'); ?></label>
+			<input class="widefat" id="<?php echo $this->get_field_id('exclude'); ?>" name="<?php echo $this->get_field_name('exclude'); ?>" type="text" value="<?php echo $exclude; ?>" />
+			<small><?php _e('Find term IDs by examining the URL of the taxonomy when you click the "Edit" button in the term\'s entry in the taxonomy list or on the term\'s archive page. This does not allow you to exclude individual posts. You can exclude the taxonomy that contains the post.', 'largo'); ?>.</small>
+		</p>
+
+		<p>
+			<label for"<?php echo $this->get_field_id('count'); ?>"><?php _e('Count: (must be greater than 1)', 'largo'); ?></label>
 			<input id="<?php echo $this->get_field_id('count'); ?>" name="<?php echo $this->get_field_name('count')?>" type="number" value="<?php echo $count; ?>" />
+			<small><?php _e('The minimum number of terms shown is 1. While the maximum number is the number of terms in the taxonomy, in practice this number should be no larger than 10.', 'largo'); ?></small>
 		</p>
 
 		<p>
-			<label for="<?php echo $this->get_field_id('taxonomy'); ?>"><?php _e('Taxonomy:', 'largo'); ?></label>
-			<input class="widefat" id="<?php echo $this->get_field_id('taxonomy'); ?>" name="<?php echo $this->get_field_name('taxonomy'); ?>" type="text" value="<?php echo $taxonomy; ?>" />
 		</p>
 
 		<p><input type="checkbox" class="checkbox ltlw-dropdown" id="<?php echo $this->get_field_id('dropdown'); ?>" name="<?php echo $this->get_field_name('dropdown'); ?>"<?php checked( $dropdown ); ?> />
-			<label for="<?php echo $this->get_field_id('dropdown'); ?>"><?php _e( 'Display as dropdown', 'largo' ); ?></label>
+			<label for="<?php echo $this->get_field_id('dropdown'); ?>"><?php _e( 'Display terms as dropdown', 'largo' ); ?></label>
+			<small><?php _e('If you choose to display terms as a dropdown, no thumbnails or headlines will be displayed.', 'largo'); ?></small>
 		</p>
 
 		<p><input type="checkbox" class="checkbox ltlw-thumbnails" id="<?php echo $this->get_field_id('thumbnails'); ?>" name="<?php echo $this->get_field_name('thumbnails'); ?>"<?php checked( $thumbnails ); ?> />

From 819cc157446b0ba934975b62af7adffac2b85b51 Mon Sep 17 00:00:00 2001
From: Ben Keith <ben@benlk.com>
Date: Wed, 16 Mar 2016 22:50:07 -0400
Subject: [PATCH 02/15] Change defaults to sort by ID, descending: The
 most-recently-created terms

---
 inc/widgets/largo-taxonomy-list.php | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/inc/widgets/largo-taxonomy-list.php b/inc/widgets/largo-taxonomy-list.php
index 168372234..611e6187b 100644
--- a/inc/widgets/largo-taxonomy-list.php
+++ b/inc/widgets/largo-taxonomy-list.php
@@ -49,8 +49,8 @@ function widget( $args, $instance ) {
 			'taxonomy' => 'series',
 			'number' => 5,
 			'exclude' => null,
-			'orderby' => 'name',
-			'order' => 'ASC'
+			'orderby' => 'id',
+			'order' => 'DESC'
 		);
 		$term_args = wp_parse_args( $term_args, $defaults );
 
@@ -287,8 +287,8 @@ function update( $new_instance, $old_instance ) {
 		$instance = $old_instance;
 		$instance['title'] = sanitize_text_field($new_instance['title']);
 		$instance['taxonomy'] = isset($new_instance['taxonomy']) ? strtolower(strip_tags($new_instance['taxonomy'])) : 'series' ;
-		$instance['orderby'] = isset($new_instance['orderby']) ? strtolower(strip_tags($new_instance['orderby'])) : 'name' ;
-		$instance['order'] = isset($new_instance['order']) ? strtolower(strip_tags($new_instance['order'])) : 'ASC' ;
+		$instance['orderby'] = isset($new_instance['orderby']) ? strtolower(strip_tags($new_instance['orderby'])) : 'id' ;
+		$instance['order'] = isset($new_instance['order']) ? strtolower(strip_tags($new_instance['order'])) : 'DESC' ;
 		$instance['order'] = sanitize_text_field($new_instance['order']);
 		$instance['count'] = sanitize_text_field($new_instance['count']);
 
@@ -338,7 +338,7 @@ function form( $instance ) {
 		}
 
 		// Create <option>s  of sort orderbys for the <select>
-		$sort_orderbys = array('name', 'slug', 'term_id', 'id', 'description', 'count'); // list from https://developer.wordpress.org/reference/functions/get_terms/
+		$sort_orderbys = array('id', 'name', 'slug', 'term_id', 'description', 'count'); // list from https://developer.wordpress.org/reference/functions/get_terms/
 		$sort_orderby_options = '';
 		foreach ( $sort_orderbys as $sort_orderby ) {
 			$sort_orderby_options .= sprintf(

From 7693c6b686aa4828b34f0992e9332db744dbd277 Mon Sep 17 00:00:00 2001
From: Ben Keith <ben@benlk.com>
Date: Wed, 16 Mar 2016 22:52:09 -0400
Subject: [PATCH 03/15] Prevent weird wrapping in the widget admin

---
 inc/widgets/largo-taxonomy-list.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/inc/widgets/largo-taxonomy-list.php b/inc/widgets/largo-taxonomy-list.php
index 611e6187b..f0c138e43 100644
--- a/inc/widgets/largo-taxonomy-list.php
+++ b/inc/widgets/largo-taxonomy-list.php
@@ -402,6 +402,7 @@ function form( $instance ) {
 		<p>
 			<label for"<?php echo $this->get_field_id('count'); ?>"><?php _e('Count: (must be greater than 1)', 'largo'); ?></label>
 			<input id="<?php echo $this->get_field_id('count'); ?>" name="<?php echo $this->get_field_name('count')?>" type="number" value="<?php echo $count; ?>" />
+			<br/>
 			<small><?php _e('The minimum number of terms shown is 1. While the maximum number is the number of terms in the taxonomy, in practice this number should be no larger than 10.', 'largo'); ?></small>
 		</p>
 

From a663ea57d05e7a1c77a5250d76a791f4db5a610e Mon Sep 17 00:00:00 2001
From: Ben Keith <ben@benlk.com>
Date: Wed, 16 Mar 2016 23:52:08 -0400
Subject: [PATCH 04/15] Simplify options to most-recently-created and
 alphabetical orders

---
 inc/widgets/largo-taxonomy-list.php | 53 +++++++++++------------------
 1 file changed, 20 insertions(+), 33 deletions(-)

diff --git a/inc/widgets/largo-taxonomy-list.php b/inc/widgets/largo-taxonomy-list.php
index f0c138e43..1f95d0abe 100644
--- a/inc/widgets/largo-taxonomy-list.php
+++ b/inc/widgets/largo-taxonomy-list.php
@@ -42,9 +42,18 @@ function widget( $args, $instance ) {
 			'taxonomy' => $instance['taxonomy'],
 			'number' => $instance['count'],
 			'exclude' => $instance['exclude'],
-			'orderby' => $instance['orderby'],
-			'order' => $instance['order'],
 		);
+		switch ($instance['sort']) {
+			case 'name_asc':
+				$term_args['orderby'] = 'name';
+				$term_args['order'] = 'ASC';
+				break;
+			default:
+				$term_args['orderby'] = 'id';
+				$term_args['order'] = 'DESC';
+				break;
+		}
+
 		$defaults = array(
 			'taxonomy' => 'series',
 			'number' => 5,
@@ -287,9 +296,7 @@ function update( $new_instance, $old_instance ) {
 		$instance = $old_instance;
 		$instance['title'] = sanitize_text_field($new_instance['title']);
 		$instance['taxonomy'] = isset($new_instance['taxonomy']) ? strtolower(strip_tags($new_instance['taxonomy'])) : 'series' ;
-		$instance['orderby'] = isset($new_instance['orderby']) ? strtolower(strip_tags($new_instance['orderby'])) : 'id' ;
-		$instance['order'] = isset($new_instance['order']) ? strtolower(strip_tags($new_instance['order'])) : 'DESC' ;
-		$instance['order'] = sanitize_text_field($new_instance['order']);
+		$instance['sort'] = isset($new_instance['sort']) ? strtolower(strip_tags($new_instance['sort'])) : 'id_desc' ;
 		$instance['count'] = sanitize_text_field($new_instance['count']);
 
 		// Default is 5 as of 0.5.5, not infinite: see discussion on http://jira.inn.org/browse/HELPDESK-589
@@ -315,8 +322,7 @@ function form( $instance ) {
 		$instance = wp_parse_args( (array) $instance, array( 'title' => '', 'taxonomy' => '' ) );
 		$title = esc_attr( $instance['title'] );
 		$count = isset($instance['count']) ? esc_attr( $instance['count'] ) : 5;
-		$orderby = esc_attr( $instance['orderby'] );
-		$order = esc_attr( $instance['order'] );
+		$sort = esc_attr( $instance['sort'] );
 		$instance['taxonomy'] = isset( $instance['taxonomy'] ) ? $instance['taxonomy'] : 'series';
 		$dropdown = isset( $instance['dropdown'] ) ? (bool) $instance['dropdown'] : false;
 		$thumbnails = isset( $instance['thumbnails'] ) ? (bool) $instance['thumbnails'] : false;
@@ -337,29 +343,17 @@ function form( $instance ) {
 			}
 		}
 
-		// Create <option>s  of sort orderbys for the <select>
-		$sort_orderbys = array('id', 'name', 'slug', 'term_id', 'description', 'count'); // list from https://developer.wordpress.org/reference/functions/get_terms/
-		$sort_orderby_options = '';
-		foreach ( $sort_orderbys as $sort_orderby ) {
-			$sort_orderby_options .= sprintf(
-				'<option value="%1$s" %2$s>%3$s</option>',
-				$sort_orderby,
-				selected( $instance['orderby'], $sort_orderby, false ),
-				__(ucwords($sort_orderby), 'largo')
-			);
-		}
-
 		// Create <option>s of sort orders for the <select>
 		$sort_orders = array(
-			'ASC' => 'Ascending',
-			'DESC' => 'Descending'
+			'name_asc' => 'Alphabetical order',
+			'id_desc' => 'Most-recently-created first'
 		); // list from https://developer.wordpress.org/reference/functions/get_terms/
 		$sort_order_options = '';
 		foreach ( $sort_orders as $order => $label ) {
 			$sort_order_options .= sprintf(
 				'<option value="%1$s" %2$s>%3$s</option>',
 				$order,
-				selected( $instance['order'], $order, false ),
+				selected( $instance['sort'], $order, false ),
 				__(ucwords($label), 'largo')
 			);
 		}
@@ -379,18 +373,10 @@ function form( $instance ) {
 		</p>
 
 		<p>
-			<label for="<?php echo $this->get_field_id('orderby'); ?>"><?php _e('Order results by:', 'largo'); ?></label>
-			<select class="widefat" id="<?php echo $this->get_field_id('orderby'); ?>" name="<?php echo $this->get_field_name('orderby'); ?>" type="text" value="<?php echo $instance['orderby'] ?>">
-				<?php echo $sort_orderby_options; ?>
-			</select>
-		</p>
-
-		<p>
-			<label for="<?php echo $this->get_field_id('order'); ?>"><?php _e('Order results in which direction?', 'largo'); ?></label>
-			<select class="widefat" id="<?php echo $this->get_field_id('order'); ?>" name="<?php echo $this->get_field_name('order'); ?>" type="text" value="<?php echo $instance['order'] ?>">
+			<label for="<?php echo $this->get_field_id('sort'); ?>"><?php _e('How should terms be sorted?', 'largo'); ?></label>
+			<select class="widefat" id="<?php echo $this->get_field_id('sort'); ?>" name="<?php echo $this->get_field_name('sort'); ?>" type="text" value="<?php echo $instance['sort'] ?>">
 				<?php echo $sort_order_options; ?>
 			</select>
-			<small><?php _e('Using the alphabet as an example, ascending order will sort it as <code>a b c d ... x y z</code>. Descending order will sort the alphabet as <code>z y x q ... c b a</code>. Using numbers, an ascending sort will go <code>1 2 234 593 20450</code> and a descending sort will go <code>20450 593 234 2 1</code>.', 'largo'); ?></small>
 		</p>
 
 		<p>
@@ -400,7 +386,7 @@ function form( $instance ) {
 		</p>
 
 		<p>
-			<label for"<?php echo $this->get_field_id('count'); ?>"><?php _e('Count: (must be greater than 1)', 'largo'); ?></label>
+			<label for"<?php echo $this->get_field_id('count'); ?>"><?php _e('Count (must be greater than 1):', 'largo'); ?></label>
 			<input id="<?php echo $this->get_field_id('count'); ?>" name="<?php echo $this->get_field_name('count')?>" type="number" value="<?php echo $count; ?>" />
 			<br/>
 			<small><?php _e('The minimum number of terms shown is 1. While the maximum number is the number of terms in the taxonomy, in practice this number should be no larger than 10.', 'largo'); ?></small>
@@ -411,6 +397,7 @@ function form( $instance ) {
 
 		<p><input type="checkbox" class="checkbox ltlw-dropdown" id="<?php echo $this->get_field_id('dropdown'); ?>" name="<?php echo $this->get_field_name('dropdown'); ?>"<?php checked( $dropdown ); ?> />
 			<label for="<?php echo $this->get_field_id('dropdown'); ?>"><?php _e( 'Display terms as dropdown', 'largo' ); ?></label>
+			<br/>
 			<small><?php _e('If you choose to display terms as a dropdown, no thumbnails or headlines will be displayed.', 'largo'); ?></small>
 		</p>
 

From 9d86a45400d5117c69c3694070a12b73aea05f5d Mon Sep 17 00:00:00 2001
From: Ben Keith <ben@benlk.com>
Date: Thu, 17 Mar 2016 00:14:07 -0400
Subject: [PATCH 05/15] Fix labels

---
 inc/widgets/largo-taxonomy-list.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/inc/widgets/largo-taxonomy-list.php b/inc/widgets/largo-taxonomy-list.php
index 1f95d0abe..eed7110b8 100644
--- a/inc/widgets/largo-taxonomy-list.php
+++ b/inc/widgets/largo-taxonomy-list.php
@@ -345,8 +345,8 @@ function form( $instance ) {
 
 		// Create <option>s of sort orders for the <select>
 		$sort_orders = array(
-			'name_asc' => 'Alphabetical order',
-			'id_desc' => 'Most-recently-created first'
+			'name_asc' => 'Alphabetically by term name',
+			'id_desc' => 'Most-recently-created term first'
 		); // list from https://developer.wordpress.org/reference/functions/get_terms/
 		$sort_order_options = '';
 		foreach ( $sort_orders as $order => $label ) {
@@ -354,7 +354,7 @@ function form( $instance ) {
 				'<option value="%1$s" %2$s>%3$s</option>',
 				$order,
 				selected( $instance['sort'], $order, false ),
-				__(ucwords($label), 'largo')
+				__($label, 'largo')
 			);
 		}
 

From 99e6e09b29839db65352c7f3823e7e9f00ae653d Mon Sep 17 00:00:00 2001
From: Adam Schweigert <aschweigert@gmail.com>
Date: Thu, 17 Mar 2016 08:25:48 -0400
Subject: [PATCH 06/15] simplify terminology

---
 inc/widgets/largo-taxonomy-list.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/inc/widgets/largo-taxonomy-list.php b/inc/widgets/largo-taxonomy-list.php
index eed7110b8..4cef46449 100644
--- a/inc/widgets/largo-taxonomy-list.php
+++ b/inc/widgets/largo-taxonomy-list.php
@@ -345,8 +345,8 @@ function form( $instance ) {
 
 		// Create <option>s of sort orders for the <select>
 		$sort_orders = array(
-			'name_asc' => 'Alphabetically by term name',
-			'id_desc' => 'Most-recently-created term first'
+			'name_asc' => 'Alphabetically',
+			'id_desc' => 'Most Recent'
 		); // list from https://developer.wordpress.org/reference/functions/get_terms/
 		$sort_order_options = '';
 		foreach ( $sort_orders as $order => $label ) {

From ac79643a066f3190d716d9b5b8349c42c4b65ea2 Mon Sep 17 00:00:00 2001
From: Ben Keith <ben@benlk.com>
Date: Thu, 17 Mar 2016 11:41:24 -0400
Subject: [PATCH 07/15] Improve the Largo Tax List Widget docs

---
 docs/users/sidebarswidgets.rst      | 24 +++++++++++++++++++-----
 inc/widgets/largo-taxonomy-list.php |  4 +---
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/docs/users/sidebarswidgets.rst b/docs/users/sidebarswidgets.rst
index 16f10ba18..6b274f0cd 100644
--- a/docs/users/sidebarswidgets.rst
+++ b/docs/users/sidebarswidgets.rst
@@ -170,15 +170,29 @@ Typically used in the Article Bottom widget area, this will display a list of ca
 Largo Taxonomy List
 -------------------
 
-List all of the terms in a given taxonomy with links to their archive pages. This is most commonly used to generate a list of series/projects with links to their project pages. To use this widget begin by entering in the Taxonomy field the slug of the taxonomy you want to use. For example, the slug for Categories is "category"; the slug for Tags is "post_tag"; the slug for Post Prominence is "prominence"; and the slug for Series is "series". You must enter one of these slugs for the widget to function correctly. 
+List all of the terms in a given taxonomy with links to their archive pages. This widget is most commonly used to generate a list of series/projects with links to their project pages. An explanation of the options:
 
-By default the widget will pull in *all* posts in the taxonomy, which could be a very large number of posts. Use the Count field to limit the number of posts displayed. You can also limit the display to specific terms in the taxonomy. To do this you must find the term's ID by visiting the list of terms in the taxonomy (under Posts in the dashboard), then hover over or click on the term and find the tag_ID number in the URL for that term. 
+	**Title**: This is what the widget will be named. Leave blank to have no title displayed.
 
-For example, in this URL for the term "Bacon" the term ID is 482:
+	**Taxonomy**: This dropdown allows you to configure the taxonomy from which terms will be drawn. Example taxonomies are Category, Tag, Post Prominence, and Series. This option defaults to Series.
 
-	``/wp-admin/edit-tags.php?action=edit&taxonomy=post_tag&tag_ID=482&post_type=post``
+	**Sort order**:
+		- Alphabetically: Terms will be sorted in alphabetical order by their name.
+		- Most Recent: Terms created more recently will appear first. Term sort order is determined by the term's ID, and newer terms always have higher ID values.
 
-After setting the taxonomy slug, count, and optionally limiting by term ID, you choose to display thumbnails and a headline of the most recent post in the taxonomy, or display the taxonomy list as as dropdown menu. The Title of the widget defaults to Categories, but you can override this with a title of your choice.
+	**Count**: By default the widget will pull in 5 posts from the taxonomy. Use the Count field to increase or decrease the number of posts displayed. The minimum number of terms displayed is 1. In theory you can display all terms in a taxonomy by setting the count to the number of posts in the taxonomy, but in practice you should not set the number higher than 10. Using a large count number in conjunction with the thumbnail or headline options will negatively affect your site's performance, and may cause your server to run out of memory.
+
+	**Exclude**: Entering a comma-separated list of term IDs will exclude those terms from displayed results. To do this, go to "Posts" in the dashboard. Under "Posts" will be a list of taxonomies. Click on the desired taxonomy entry. A list of taxonomy terms will appear. Find your term in the list, then hover over or click on the term and find the tag_ID number in the URL for that term.
+
+	For example, in this URL for the term "Bacon" the term ID is 482:
+
+		``/wp-admin/edit-tags.php?action=edit&taxonomy=post_tag&tag_ID=482&post_type=post``
+
+	**Display as dropdown**: This option causes the term results to be displayed as a plain dropdown. No thumbnails or recent posts will be displayed.
+
+	**Display thumbnails**: Check this option if you want to display thumbnails next to the term link. If the taxonomy is "Series" and a series landing page exists for the series term, the series landing page's featured image will be displayed if it is available. In all other cases, the featured media thumbnail image from the most-recent post in the term will be displayed.
+
+	**Display headline**: If checked, the headline of the most-recent post in the taxonomy term will be displayed.
 
 Largo Twitter Widget
 --------------------
diff --git a/inc/widgets/largo-taxonomy-list.php b/inc/widgets/largo-taxonomy-list.php
index 4cef46449..72228393a 100644
--- a/inc/widgets/largo-taxonomy-list.php
+++ b/inc/widgets/largo-taxonomy-list.php
@@ -27,7 +27,7 @@ function __construct() {
 	function widget( $args, $instance ) {
 		extract( $args );
 
-		$title = apply_filters('widget_title', empty( $instance['title'] ) ? __( 'Categories', 'largo' ) : $instance['title'], $instance, $this->id_base);
+		$title = apply_filters('widget_title', empty( $instance['title'] ) ? __( 'Series', 'largo' ) : $instance['title'], $instance, $this->id_base);
 		$is_dropdown = ! empty( $instance['dropdown'] ) ? '1' : '0';
 
 		/*
@@ -388,8 +388,6 @@ function form( $instance ) {
 		<p>
 			<label for"<?php echo $this->get_field_id('count'); ?>"><?php _e('Count (must be greater than 1):', 'largo'); ?></label>
 			<input id="<?php echo $this->get_field_id('count'); ?>" name="<?php echo $this->get_field_name('count')?>" type="number" value="<?php echo $count; ?>" />
-			<br/>
-			<small><?php _e('The minimum number of terms shown is 1. While the maximum number is the number of terms in the taxonomy, in practice this number should be no larger than 10.', 'largo'); ?></small>
 		</p>
 
 		<p>

From 20e97feb38968f4a208f428be4c598cbe70f5a67 Mon Sep 17 00:00:00 2001
From: Ben Keith <ben@benlk.com>
Date: Thu, 17 Mar 2016 11:49:26 -0400
Subject: [PATCH 08/15] Remove unnecessary render_tag_list and
 render_category_list methods; use generic render_term_list instead

---
 inc/widgets/largo-taxonomy-list.php | 68 ++---------------------------
 1 file changed, 4 insertions(+), 64 deletions(-)

diff --git a/inc/widgets/largo-taxonomy-list.php b/inc/widgets/largo-taxonomy-list.php
index 72228393a..1926116b2 100644
--- a/inc/widgets/largo-taxonomy-list.php
+++ b/inc/widgets/largo-taxonomy-list.php
@@ -23,6 +23,8 @@ function __construct() {
 	 * @param array $args Sidebar-related args
 	 * @param array $instance Instance-specific widget arguments
 	 * @link https://developer.wordpress.org/reference/functions/get_terms/
+	 * @uses largo_taxonomy_list_widget::render_series_list
+	 * @uses largo_taxonomy_list_widget::render_term_list
 	 */
 	function widget( $args, $instance ) {
 		extract( $args );
@@ -99,10 +101,10 @@ function widget( $args, $instance ) {
 					$this->render_series_list($tax_items, $instance);
 					break;
 				case 'category':
-					$this->render_cat_list($tax_items, $instance);
+					$this->render_term_list($tax_items, $instance);
 					break;
 				case 'post_tag':
-					$this->render_tag_list($tax_items, $instance);
+					$this->render_term_list($tax_items, $instance);
 					break;
 				default:
 					$this->render_term_list($tax_items, $instance);
@@ -189,68 +191,6 @@ private function render_series_list($tax_items, $instance) {
 		}
 	}
 
-	/**
-	 * Find the first thumbnailed post in the category and create an <li>
-	 *
-	 * @private
-	 * @uses largo_taxonomy_list_widget::render_li
-	 * @uses largo_featured_thumbnail_in_post_array
-	 * @uses largo_first_headline_in_post_array
-	 * @since 0.5.3
-	 */
-	private function render_cat_list($tax_items, $instance) {
-		foreach ($tax_items as $item) {
-			$headline = '';
-			$thumbnail = '';
-			$posts = array();
-
-			// Only get posts if we're going to use them.
-			if ($instance['thumbnails'] == '1' || $instance['use_headline'] == '1') {
-				$posts = get_posts(array(
-					'category_name' => $item->name,
-				));
-			}
-			if ($instance['thumbnails'] == '1') {
-				$thumbnail = largo_featured_thumbnail_in_post_array($posts);
-			}
-			if ($instance['use_headline'] == '1') {
-				$headline = largo_first_headline_in_post_array($posts);
-			}
-			$this->render_li($item, $thumbnail, $headline);
-		}
-	}
-
-	/**
-	 * For a tag, find the first thumbnailed post and create an <li>
-	 *
-	 * @private
-	 * @uses largo_taxonomy_list_widget::render_li
-	 * @uses largo_featured_thumbnail_in_post_array
-	 * @uses largo_first_headline_in_post_array
-	 * @since 0.5.3
-	 */
-	private function render_tag_list($tax_items, $instance) {
-		foreach ($tax_items as $item) {
-			$headline = '';
-			$thumbnail = '';
-			$posts = array();
-
-			// Only get posts if we're going to use them.
-			if ($instance['thumbnails'] == '1' || $instance['use_headline'] == '1') {
-				$posts = get_posts(array(
-					'tag' => $item->slug,
-				));
-			}
-			if ($instance['thumbnails'] == '1') {
-				$thumbnail = largo_featured_thumbnail_in_post_array($posts);
-			}
-			if ($instance['use_headline'] == '1') {
-				$headline = largo_first_headline_in_post_array($posts);
-			}
-			$this->render_li($item, $thumbnail, $headline);
-		}
-	}
-
 	/**
 	 * For a generic term in a taxonomy, find the first thumbnailed post in the term and create an <li>
 	 *

From 3f56903245ae1ffac3fa3cd0d9610d70cc29a2bc Mon Sep 17 00:00:00 2001
From: Ben Keith <ben@benlk.com>
Date: Thu, 17 Mar 2016 11:49:49 -0400
Subject: [PATCH 09/15] Make notes about alphabetical sort ordering

---
 docs/users/sidebarswidgets.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/users/sidebarswidgets.rst b/docs/users/sidebarswidgets.rst
index 6b274f0cd..a54d41d3d 100644
--- a/docs/users/sidebarswidgets.rst
+++ b/docs/users/sidebarswidgets.rst
@@ -177,7 +177,7 @@ List all of the terms in a given taxonomy with links to their archive pages. Thi
 	**Taxonomy**: This dropdown allows you to configure the taxonomy from which terms will be drawn. Example taxonomies are Category, Tag, Post Prominence, and Series. This option defaults to Series.
 
 	**Sort order**:
-		- Alphabetically: Terms will be sorted in alphabetical order by their name.
+		- Alphabetically: Terms will be sorted in alphabetical order by their name. Terms beginning with punctuation will come after terms beginning with letters. Terms beginning with numbers will come before terms beginning with letters.
 		- Most Recent: Terms created more recently will appear first. Term sort order is determined by the term's ID, and newer terms always have higher ID values.
 
 	**Count**: By default the widget will pull in 5 posts from the taxonomy. Use the Count field to increase or decrease the number of posts displayed. The minimum number of terms displayed is 1. In theory you can display all terms in a taxonomy by setting the count to the number of posts in the taxonomy, but in practice you should not set the number higher than 10. Using a large count number in conjunction with the thumbnail or headline options will negatively affect your site's performance, and may cause your server to run out of memory.

From 76d1a5949fd455d7ba19b06aa8228ddd37e3a9fa Mon Sep 17 00:00:00 2001
From: Ben Keith <ben@benlk.com>
Date: Thu, 17 Mar 2016 15:02:36 -0400
Subject: [PATCH 10/15] Move the post-type taxonomy registration into
 largo_custom_taxonomies(), improve its registration args when it's disabled.
 Remove unregister_post_types_taxonomy() and
 Largo_Term_Icons::register_taxonomy()

---
 inc/taxonomies.php | 59 +++++++++++++++++++++++++---------------------
 inc/term-icons.php | 25 --------------------
 2 files changed, 32 insertions(+), 52 deletions(-)

diff --git a/inc/taxonomies.php b/inc/taxonomies.php
index 555420e5f..4e251fc31 100644
--- a/inc/taxonomies.php
+++ b/inc/taxonomies.php
@@ -30,7 +30,7 @@ function largo_is_series_landing_enabled() {
  * @since 1.0
  */
 function largo_custom_taxonomies() {
-	if (!taxonomy_exists('prominence')) {
+	if ( !taxonomy_exists('prominence') ) {
 		register_taxonomy(
 			'prominence',
 			'post',
@@ -56,6 +56,37 @@ function largo_custom_taxonomies() {
 		);
 	}
 
+	/*
+	 * Replaces Largo_Term_Icons::register_post_type and unregister_series_taxonomy()
+	 * @since 0.5.5
+	 * @link https://github.com/INN/Largo/issues/1173
+	 */
+	if ( !taxonomy_exists('post-type') ) {
+		$enabled = ( ! of_get_option('post_types_enabled') == 0 );
+		register_taxonomy(
+			'post-type',
+			array( 'post' ),
+			array(
+				'label' => __( 'Post Types', 'largo' ),
+				'labels' => array(
+					'name' => __( 'Post Types', 'largo' ),
+					'singular_name' => __( 'Post Type', 'largo' ),
+					'all_items' => __( 'All Post Types', 'largo' ),
+					'edit_item' => __( 'Edit Post Type', 'largo' ),
+					'update_item' => __( 'Update Post Type', 'largo' ),
+					'view_item' => __( 'View Post Type', 'largo' ),
+					'add_new_item' => __( 'Add New Post Type', 'largo' ),
+					'new_item_name' => __( 'New Post Type Name', 'largo' ),
+					'search_items' => __( 'Search Post Type'),
+				),
+				'public' => $enabled,
+				'show_admin_column' => $enabled,
+				'show_in_nav_menus' => $enabled,
+				'hierarchical' => true,
+			)
+		);
+	}
+
 	$termsDefinitions = array(
 		array(
 			'name' => __('Sidebar Featured Widget', 'largo'),
@@ -443,29 +474,3 @@ function largo_first_headline_in_post_array($array) {
 
 	return $headline;
 }
-
-/**
- * If the option in Advanced Options is unchecked, unregister the "Series" taxonomy
- *
- * @uses largo_is_series_enabled
- * @since 0.4
- */
-function unregister_series_taxonomy() {
-	if ( !largo_is_series_enabled() ) {
-		register_taxonomy( 'series', array(), array('show_in_nav_menus' => false) );
-	}
-}
-add_action( 'init', 'unregister_series_taxonomy', 999 );
-
-/**
- * If the option in Advanced Options is unchecked, unregister the "Post Types" taxonomy
- *
- * @uses of_get_option
- * @since 0.4
- */
-function unregister_post_types_taxonomy() {
-	if ( of_get_option('post_types_enabled') == 0 ) {
-		register_taxonomy( 'post-type', array(), array('show_in_nav_menus' => false) );
-	}
-}
-add_action( 'init', 'unregister_post_types_taxonomy', 999 );
diff --git a/inc/term-icons.php b/inc/term-icons.php
index c0b8202eb..c4f6f2a94 100644
--- a/inc/term-icons.php
+++ b/inc/term-icons.php
@@ -22,31 +22,6 @@ function __construct() {
 		add_action( 'admin_enqueue_scripts', array( $this, 'admin_enqueue_scripts') );
 		add_action( 'edit_terms', array( $this, 'edit_terms' ) );
 		add_action( 'create_term', array( $this, 'edit_terms' ) );
-		add_action( 'init', array( $this, 'register_taxonomy' ) );
-	}
-
-
-	/**
-	 * Register the taxonomy post-type
-	 */
-	function register_taxonomy() {
-		register_taxonomy( 'post-type', array( 'post' ), array(
-			'label' => __( 'Post Types', 'largo' ),
-			'labels' => array(
-				'name' => __( 'Post Types', 'largo' ),
-				'singular_name' => __( 'Post Type', 'largo' ),
-				'all_items' => __( 'All Post Types', 'largo' ),
-				'edit_item' => __( 'Edit Post Type', 'largo' ),
-				'update_item' => __( 'Update Post Type', 'largo' ),
-				'view_item' => __( 'View Post Type', 'largo' ),
-				'add_new_item' => __( 'Add New Post Type', 'largo' ),
-				'new_item_name' => __( 'New Post Type Name', 'largo' ),
-				'search_items' => __( 'Search Post Type'),
-			),
-			'public' => true,
-			'show_admin_column' => true,
-			'hierarchical' => true,
-		) );
 	}
 
 	/**

From e12f12b113edbb2cc4b8652d9f1efc3950faf901 Mon Sep 17 00:00:00 2001
From: Ben Keith <ben@benlk.com>
Date: Thu, 17 Mar 2016 15:08:46 -0400
Subject: [PATCH 11/15] Don't write a test for largo_custom_taxonomies, but at
 least note what it needs to test.

---
 tests/inc/test-taxonomies.php | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/tests/inc/test-taxonomies.php b/tests/inc/test-taxonomies.php
index d42625119..93d0307a8 100644
--- a/tests/inc/test-taxonomies.php
+++ b/tests/inc/test-taxonomies.php
@@ -45,6 +45,14 @@ function test_largo_is_series_landing_enabled() {
 	}
 
 	function test_largo_custom_taxonomies(){
+		// unregister the taxonomies using register_taxonomy('slug', array());
+		// largo_custom_taxonomies();
+		// Test that taxonomy_exists('prominence')
+		// Test that taxonomy_exists('post-type')
+		// Test that post-type's 'public' property is equal to of_get_option('post_types_enabled')
+		// Test that prominence terms are registered
+		// Test that taxonomy_exists('series')
+
 		$this->markTestIncomplete('This test has not been implemented yet.');
 	}
 

From ac85e9986d9d16682ad54870fb7ffc898006d279 Mon Sep 17 00:00:00 2001
From: Ben Keith <ben@benlk.com>
Date: Thu, 24 Mar 2016 16:37:27 -0400
Subject: [PATCH 12/15] Conditionally register series after the same fashion as
 post-types

---
 inc/taxonomies.php | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/inc/taxonomies.php b/inc/taxonomies.php
index 4e251fc31..e58407e70 100644
--- a/inc/taxonomies.php
+++ b/inc/taxonomies.php
@@ -30,6 +30,10 @@ function largo_is_series_landing_enabled() {
  * @since 1.0
  */
 function largo_custom_taxonomies() {
+
+	/*
+	 * Register the "Post Prominence" taxonomy, which is used to determine where posts display
+	 */
 	if ( !taxonomy_exists('prominence') ) {
 		register_taxonomy(
 			'prominence',
@@ -57,7 +61,9 @@ function largo_custom_taxonomies() {
 	}
 
 	/*
-	 * Replaces Largo_Term_Icons::register_post_type and unregister_series_taxonomy()
+	 * Register the "Post Types" taxonomy, used for icons. This is not enabled by default in Largo.
+	 *
+	 * Replaces Largo_Term_Icons::register_post_type and unregister_post_types_taxonomy()
 	 * @since 0.5.5
 	 * @link https://github.com/INN/Largo/issues/1173
 	 */
@@ -147,6 +153,7 @@ function largo_custom_taxonomies() {
 	do_action('largo_after_create_prominence_taxonomy', $largoProminenceTerms);
 
 	if ( ! taxonomy_exists( 'series' ) ) {
+		$series_enabled = largo_is_series_enabled();
 		register_taxonomy(
 			'series',
 			'post',
@@ -166,6 +173,9 @@ function largo_custom_taxonomies() {
 					'new_item_name' => __( 'New Series Name' ),
 					'menu_name' => __( 'Series' ),
 				),
+				'public' => $series_enabled,
+				'show_admin_column' => $series_enabled,
+				'show_in_nav_menus' => $series_enabled,
 				'query_var' => true,
 				'rewrite' => true,
 			)

From 9b2dfc862765da0ce81017e701a2bfcc2b0612ae Mon Sep 17 00:00:00 2001
From: Ben Keith <ben@benlk.com>
Date: Thu, 24 Mar 2016 16:42:33 -0400
Subject: [PATCH 13/15] Reorder the main enqueue function to put the prominence
 stuff next to the prominence stuff.

---
 inc/taxonomies.php | 70 ++++++++++++++++++++++++----------------------
 1 file changed, 37 insertions(+), 33 deletions(-)

diff --git a/inc/taxonomies.php b/inc/taxonomies.php
index e58407e70..d778ef72a 100644
--- a/inc/taxonomies.php
+++ b/inc/taxonomies.php
@@ -60,39 +60,6 @@ function largo_custom_taxonomies() {
 		);
 	}
 
-	/*
-	 * Register the "Post Types" taxonomy, used for icons. This is not enabled by default in Largo.
-	 *
-	 * Replaces Largo_Term_Icons::register_post_type and unregister_post_types_taxonomy()
-	 * @since 0.5.5
-	 * @link https://github.com/INN/Largo/issues/1173
-	 */
-	if ( !taxonomy_exists('post-type') ) {
-		$enabled = ( ! of_get_option('post_types_enabled') == 0 );
-		register_taxonomy(
-			'post-type',
-			array( 'post' ),
-			array(
-				'label' => __( 'Post Types', 'largo' ),
-				'labels' => array(
-					'name' => __( 'Post Types', 'largo' ),
-					'singular_name' => __( 'Post Type', 'largo' ),
-					'all_items' => __( 'All Post Types', 'largo' ),
-					'edit_item' => __( 'Edit Post Type', 'largo' ),
-					'update_item' => __( 'Update Post Type', 'largo' ),
-					'view_item' => __( 'View Post Type', 'largo' ),
-					'add_new_item' => __( 'Add New Post Type', 'largo' ),
-					'new_item_name' => __( 'New Post Type Name', 'largo' ),
-					'search_items' => __( 'Search Post Type'),
-				),
-				'public' => $enabled,
-				'show_admin_column' => $enabled,
-				'show_in_nav_menus' => $enabled,
-				'hierarchical' => true,
-			)
-		);
-	}
-
 	$termsDefinitions = array(
 		array(
 			'name' => __('Sidebar Featured Widget', 'largo'),
@@ -152,6 +119,43 @@ function largo_custom_taxonomies() {
 
 	do_action('largo_after_create_prominence_taxonomy', $largoProminenceTerms);
 
+	/*
+	 * Register the "Post Types" taxonomy, used for icons. This is not enabled by default in Largo.
+	 *
+	 * Replaces Largo_Term_Icons::register_post_type and unregister_post_types_taxonomy()
+	 * @since 0.5.5
+	 * @link https://github.com/INN/Largo/issues/1173
+	 */
+	if ( !taxonomy_exists('post-type') ) {
+		$enabled = ( ! of_get_option('post_types_enabled') == 0 );
+		register_taxonomy(
+			'post-type',
+			array( 'post' ),
+			array(
+				'label' => __( 'Post Types', 'largo' ),
+				'labels' => array(
+					'name' => __( 'Post Types', 'largo' ),
+					'singular_name' => __( 'Post Type', 'largo' ),
+					'all_items' => __( 'All Post Types', 'largo' ),
+					'edit_item' => __( 'Edit Post Type', 'largo' ),
+					'update_item' => __( 'Update Post Type', 'largo' ),
+					'view_item' => __( 'View Post Type', 'largo' ),
+					'add_new_item' => __( 'Add New Post Type', 'largo' ),
+					'new_item_name' => __( 'New Post Type Name', 'largo' ),
+					'search_items' => __( 'Search Post Type'),
+				),
+				'public' => $enabled,
+				'show_admin_column' => $enabled,
+				'show_in_nav_menus' => $enabled,
+				'hierarchical' => true,
+			)
+		);
+	}
+
+	/**
+	 * Register the "Series" taxonomy, used to group posts together by ongoing coverage. This is not enabled by default in Largo.
+	 *
+	 */
 	if ( ! taxonomy_exists( 'series' ) ) {
 		$series_enabled = largo_is_series_enabled();
 		register_taxonomy(

From 4bc2b5d51fdba17cc2581ffb84f00437aced75cb Mon Sep 17 00:00:00 2001
From: Adam Schweigert <aschweigert@gmail.com>
Date: Thu, 31 Mar 2016 16:49:29 -0400
Subject: [PATCH 14/15] code style, docs

---
 inc/widgets/largo-taxonomy-list.php | 150 ++++++++++++++--------------
 1 file changed, 75 insertions(+), 75 deletions(-)

diff --git a/inc/widgets/largo-taxonomy-list.php b/inc/widgets/largo-taxonomy-list.php
index 1926116b2..4a8a68d4f 100644
--- a/inc/widgets/largo-taxonomy-list.php
+++ b/inc/widgets/largo-taxonomy-list.php
@@ -12,7 +12,7 @@ class largo_taxonomy_list_widget extends WP_Widget {
 	function __construct() {
 		$widget_ops = array(
 			'classname' 	=> 'largo-taxonomy-list',
-			'description' 	=> __('List all of the terms in a custom taxonomy with links', 'largo')
+			'description' 	=> __( 'List all (or some) of the terms in a given taxonomy. Optionally with links to recent stories in each term.', 'largo' )
 		);
 		parent::__construct( 'largo-taxonomy-list-widget', __('Largo Taxonomy List', 'largo'), $widget_ops);
 	}
@@ -29,7 +29,7 @@ function __construct() {
 	function widget( $args, $instance ) {
 		extract( $args );
 
-		$title = apply_filters('widget_title', empty( $instance['title'] ) ? __( 'Series', 'largo' ) : $instance['title'], $instance, $this->id_base);
+		$title = apply_filters( 'widget_title', empty( $instance['title'] ) ? __( 'Series', 'largo' ) : $instance['title'], $instance, $this->id_base );
 		$is_dropdown = ! empty( $instance['dropdown'] ) ? '1' : '0';
 
 		/*
@@ -45,7 +45,7 @@ function widget( $args, $instance ) {
 			'number' => $instance['count'],
 			'exclude' => $instance['exclude'],
 		);
-		switch ($instance['sort']) {
+		switch ( $instance['sort'] ) {
 			case 'name_asc':
 				$term_args['orderby'] = 'name';
 				$term_args['order'] = 'ASC';
@@ -70,12 +70,12 @@ function widget( $args, $instance ) {
 		 */
 		if ( $is_dropdown ) {
 			$term_args['orderby'] = 'name';
-			$terms = get_categories($term_args); ?>
+			$terms = get_categories( $term_args ); ?>
 
 			<select id="taxonomy-list-widget">
-				<option value=""><?php printf( __('Select %s', 'largo'), ucwords($instance['taxonomy']) ); ?></option>
-			<?php foreach ($terms as $term) : ?>
-				<option value="<?php echo get_term_link($term, $term->taxonomy) ?>"><?php echo $term->name ?></option>
+				<option value=""><?php printf( __( 'Select %s', 'largo' ), ucwords( $instance['taxonomy'] ) ); ?></option>
+			<?php foreach ( $terms as $term ) : ?>
+				<option value="<?php echo get_term_link( $term, $term->taxonomy ) ?>"><?php echo $term->name ?></option>
 			<?php endforeach; ?>
 			</select>
 
@@ -96,18 +96,18 @@ function widget( $args, $instance ) {
 
 			$tax_items = get_categories($term_args);
 
-			switch ($instance['taxonomy']) {
+			switch ( $instance['taxonomy'] ) {
 				case 'series':
-					$this->render_series_list($tax_items, $instance);
+					$this->render_series_list( $tax_items, $instance );
 					break;
 				case 'category':
-					$this->render_term_list($tax_items, $instance);
+					$this->render_term_list( $tax_items, $instance );
 					break;
 				case 'post_tag':
-					$this->render_term_list($tax_items, $instance);
+					$this->render_term_list( $tax_items, $instance );
 					break;
 				default:
-					$this->render_term_list($tax_items, $instance);
+					$this->render_term_list( $tax_items, $instance );
 			}
 
 			echo '</ul>';
@@ -129,13 +129,13 @@ function widget( $args, $instance ) {
 	 * @private
 	 * @since 0.5.3
 	 */
-	private function render_li($item, $thumbnail = '', $headline = '') {
+	private function render_li( $item, $thumbnail = '', $headline = '' ) {
 		echo sprintf(
 			'<li class="%s-%s %s"><a href="%s">%s <h5>%s</h5></a> %s</li>',
 			$item->taxonomy,
 			$item->term_id,
 			( $thumbnail != '' ) ? "has-thumbnail" : "no-thumbnail" ,
-			get_term_link($item),
+			get_term_link( $item ),
 			$thumbnail, // the image for the series
 			$item->cat_name,
 			$headline
@@ -152,12 +152,12 @@ private function render_li($item, $thumbnail = '', $headline = '') {
 	 * @since 0.5.3
 	 */
 	private function render_series_list($tax_items, $instance) {
-		foreach ($tax_items as $item) {
+		foreach ( $tax_items as $item ) {
 			$thumbnail = '';
 			$headline = '';
 			$posts = array();
 
-			if ($instance['thumbnails'] == '1' || $instance['use_headline'] == '1') {
+			if ( $instance['thumbnails'] == '1' || $instance['use_headline'] == '1' ) {
 				$query_args = array(
 					'tax_query' => array(
 						array(
@@ -167,27 +167,27 @@ private function render_series_list($tax_items, $instance) {
 						),
 					),
 				);
-				$posts = get_posts($query_args);
+				$posts = get_posts( $query_args );
 			}
 
-			if ($instance['thumbnails'] == '1' && largo_is_series_landing_enabled() ) {
-				$landing_array = largo_get_series_landing_page_by_series($item);
+			if ( $instance['thumbnails'] == '1' && largo_is_series_landing_enabled() ) {
+				$landing_array = largo_get_series_landing_page_by_series( $item );
 				
 				// Thumbnail shall be the one for the landing page post
-				foreach ($landing_array as $post) {
-					$thumbnail = get_the_post_thumbnail($post->ID);
+				foreach ( $landing_array as $post ) {
+					$thumbnail = get_the_post_thumbnail( $post->ID );
 				}
 			}
 
-			if ($thumbnail == '') {
-				$thumbnail = largo_featured_thumbnail_in_post_array($posts);
+			if ( $thumbnail == '' ) {
+				$thumbnail = largo_featured_thumbnail_in_post_array( $posts );
 			}
 
-			if ($instance['use_headline'] == '1') {
-				$headline = largo_first_headline_in_post_array($posts);
+			if ( $instance['use_headline'] == '1' ) {
+				$headline = largo_first_headline_in_post_array( $posts );
 			}
 
-			$this->render_li($item, $thumbnail, $headline);
+			$this->render_li( $item, $thumbnail, $headline );
 		}
 	}
 
@@ -200,14 +200,14 @@ private function render_series_list($tax_items, $instance) {
 	 * @uses largo_first_headline_in_post_array
 	 * @since 0.5.3
 	 */
-	private function render_term_list($tax_items, $instance) {
-		foreach ($tax_items as $item) {
+	private function render_term_list( $tax_items, $instance ) {
+		foreach ( $tax_items as $item ) {
 			$thumbnail = '';
 			$headline = '';
 			$posts = array();
 
 			// Only get posts if we're going to use them.
-			if ($instance['thumbnails'] == '1' || $instance['use_headline'] == '1') {
+			if ( $instance['thumbnails'] == '1' || $instance['use_headline'] == '1' ) {
 				$query_args = array(
 					'tax_query' => array(
 						array(
@@ -219,13 +219,13 @@ private function render_term_list($tax_items, $instance) {
 				);
 				$posts = get_posts($query_args);
 			}
-			if ($instance['thumbnails'] == '1') {
-				$thumbnail = largo_featured_thumbnail_in_post_array($posts);
+			if ( $instance['thumbnails'] == '1' ) {
+				$thumbnail = largo_featured_thumbnail_in_post_array( $posts );
 			}
-			if ($instance['use_headline'] == '1') {
-				$headline = largo_first_headline_in_post_array($posts);
+			if ( $instance['use_headline'] == '1' ) {
+				$headline = largo_first_headline_in_post_array( $posts );
 			}
-			$this->render_li($item, $thumbnail, $headline);
+			$this->render_li( $item, $thumbnail, $headline );
 		}
 	}
 
@@ -234,22 +234,22 @@ private function render_term_list($tax_items, $instance) {
 	 */
 	function update( $new_instance, $old_instance ) {
 		$instance = $old_instance;
-		$instance['title'] = sanitize_text_field($new_instance['title']);
-		$instance['taxonomy'] = isset($new_instance['taxonomy']) ? strtolower(strip_tags($new_instance['taxonomy'])) : 'series' ;
-		$instance['sort'] = isset($new_instance['sort']) ? strtolower(strip_tags($new_instance['sort'])) : 'id_desc' ;
-		$instance['count'] = sanitize_text_field($new_instance['count']);
+		$instance['title'] = sanitize_text_field( $new_instance['title'] );
+		$instance['taxonomy'] = isset( $new_instance['taxonomy'] ) ? strtolower( strip_tags( $new_instance['taxonomy'] ) ) : 'series';
+		$instance['sort'] = isset( $new_instance['sort'] ) ? strtolower( strip_tags( $new_instance['sort'] ) ) : 'id_desc';
+		$instance['count'] = sanitize_text_field( $new_instance['count'] );
 
-		// Default is 5 as of 0.5.5, not infinite: see discussion on http://jira.inn.org/browse/HELPDESK-589
-		if ($instance['count'] == '' ) {
+		// Default is 5 as of 0.5.5, not infinite
+		if ( $instance['count'] == '' ) {
 			$instance['count'] = 5;
-		} else if ($instance['count'] < 1) {
+		} else if ( $instance['count'] < 1 ) {
 			$instance['count'] = 1;
 		}
 
-		$instance['dropdown'] = !empty($new_instance['dropdown']) ? 1 : 0;
-		$instance['thumbnails'] = !empty($new_instance['thumbnails']) ? 1 : 0;
-		$instance['use_headline'] = !empty($new_instance['use_headline']) ? 1 : 0;
-		$instance['exclude'] = sanitize_text_field($new_instance['exclude']);
+		$instance['dropdown'] = !empty( $new_instance['dropdown'] ) ? 1 : 0;
+		$instance['thumbnails'] = !empty( $new_instance['thumbnails'] ) ? 1 : 0;
+		$instance['use_headline'] = !empty( $new_instance['use_headline'] ) ? 1 : 0;
+		$instance['exclude'] = sanitize_text_field( $new_instance['exclude'] );
 
 		return $instance;
 	}
@@ -261,7 +261,7 @@ function form( $instance ) {
 		//Defaults
 		$instance = wp_parse_args( (array) $instance, array( 'title' => '', 'taxonomy' => '' ) );
 		$title = esc_attr( $instance['title'] );
-		$count = isset($instance['count']) ? esc_attr( $instance['count'] ) : 5;
+		$count = isset( $instance['count'] ) ? esc_attr( $instance['count'] ) : 5;
 		$sort = esc_attr( $instance['sort'] );
 		$instance['taxonomy'] = isset( $instance['taxonomy'] ) ? $instance['taxonomy'] : 'series';
 		$dropdown = isset( $instance['dropdown'] ) ? (bool) $instance['dropdown'] : false;
@@ -270,10 +270,10 @@ function form( $instance ) {
 		$exclude = $instance['exclude'];
 
 		// Create <option>s of taxonomies for the <select>
-		$taxonomies = get_taxonomies(null, 'objects');
+		$taxonomies = get_taxonomies( null, 'objects' );
 		$taxonomies_options = '';
-		foreach ($taxonomies as $taxonomy) {
-			if ($taxonomy->public) {
+		foreach ( $taxonomies as $taxonomy ) {
+			if ( $taxonomy->public ) {
 				$taxonomies_options .= sprintf(
 					'<option value="%1$s" %2$s>%3$s</option>',
 					$taxonomy->name,
@@ -285,66 +285,66 @@ function form( $instance ) {
 
 		// Create <option>s of sort orders for the <select>
 		$sort_orders = array(
-			'name_asc' => 'Alphabetically',
-			'id_desc' => 'Most Recent'
+			'name_asc' => __( 'Alphabetically (A to Z)', 'largo' ),
+			'id_desc' => __( 'Most Recent First', 'largo' )
 		); // list from https://developer.wordpress.org/reference/functions/get_terms/
 		$sort_order_options = '';
 		foreach ( $sort_orders as $order => $label ) {
 			$sort_order_options .= sprintf(
 				'<option value="%1$s" %2$s>%3$s</option>',
-				$order,
-				selected( $instance['sort'], $order, false ),
-				__($label, 'largo')
+					$order,
+					selected( $instance['sort'], $order, false ),
+					$label
 			);
 		}
 
 		?>
 
 		<p>
-			<label for="<?php echo $this->get_field_id('title'); ?>"><?php _e( 'Title:', 'largo' ); ?></label>
-			<input class="widefat" id="<?php echo $this->get_field_id('title'); ?>" name="<?php echo $this->get_field_name('title'); ?>" type="text" value="<?php echo $title; ?>" />
+			<label for="<?php echo $this->get_field_id( 'title' ); ?>"><?php _e( 'Title:', 'largo' ); ?></label>
+			<input class="widefat" id="<?php echo $this->get_field_id( 'title' ); ?>" name="<?php echo $this->get_field_name( 'title' ); ?>" type="text" value="<?php echo $title; ?>" />
 		</p>
 
 		<p>
-			<label for="<?php echo $this->get_field_id('taxonomy'); ?>"><?php _e('Taxonomy:', 'largo'); ?></label>
-			<select class="widefat" id="<?php echo $this->get_field_id('taxonomy'); ?>" name="<?php echo $this->get_field_name('taxonomy'); ?>" type="text" value="<?php echo $instance['taxonomy'] ?>">
+			<label for="<?php echo $this->get_field_id( 'taxonomy' ); ?>"><?php _e( 'Taxonomy:', 'largo' ); ?></label>
+			<select class="widefat" id="<?php echo $this->get_field_id( 'taxonomy' ); ?>" name="<?php echo $this->get_field_name( 'taxonomy' ); ?>" type="text" value="<?php echo $instance['taxonomy'] ?>">
 				<?php echo $taxonomies_options; ?>
 			</select>
 		</p>
 
 		<p>
-			<label for="<?php echo $this->get_field_id('sort'); ?>"><?php _e('How should terms be sorted?', 'largo'); ?></label>
-			<select class="widefat" id="<?php echo $this->get_field_id('sort'); ?>" name="<?php echo $this->get_field_name('sort'); ?>" type="text" value="<?php echo $instance['sort'] ?>">
+			<label for="<?php echo $this->get_field_id( 'sort' ); ?>"><?php _e( 'How should the terms be ordered?', 'largo' ); ?></label>
+			<select class="widefat" id="<?php echo $this->get_field_id( 'sort' ); ?>" name="<?php echo $this->get_field_name( 'sort' ); ?>" type="text" value="<?php echo $instance['sort'] ?>">
 				<?php echo $sort_order_options; ?>
 			</select>
 		</p>
 
 		<p>
-			<label for="<?php echo $this->get_field_id('exclude'); ?>"><?php _e('Do not display the terms in this comma-separated list of term IDs:', 'largo'); ?></label>
-			<input class="widefat" id="<?php echo $this->get_field_id('exclude'); ?>" name="<?php echo $this->get_field_name('exclude'); ?>" type="text" value="<?php echo $exclude; ?>" />
-			<small><?php _e('Find term IDs by examining the URL of the taxonomy when you click the "Edit" button in the term\'s entry in the taxonomy list or on the term\'s archive page. This does not allow you to exclude individual posts. You can exclude the taxonomy that contains the post.', 'largo'); ?>.</small>
+			<label for"<?php echo $this->get_field_id( 'count' ); ?>"><?php _e( 'Number of terms to display (must be greater than 1):', 'largo' ); ?></label>
+			<input id="<?php echo $this->get_field_id( 'count' ); ?>" name="<?php echo $this->get_field_name('count')?>" type="number" value="<?php echo $count; ?>" />
 		</p>
-
+		
 		<p>
-			<label for"<?php echo $this->get_field_id('count'); ?>"><?php _e('Count (must be greater than 1):', 'largo'); ?></label>
-			<input id="<?php echo $this->get_field_id('count'); ?>" name="<?php echo $this->get_field_name('count')?>" type="number" value="<?php echo $count; ?>" />
+			<label for="<?php echo $this->get_field_id( 'exclude' ); ?>"><?php _e( 'Terms to exclude:', 'largo' ); ?></label>
+			<input class="widefat" id="<?php echo $this->get_field_id( 'exclude' ); ?>" name="<?php echo $this->get_field_name( 'exclude' ); ?>" type="text" value="<?php echo $exclude; ?>" />
+			<small><?php _e( 'Comma-separated list of term IDs', 'largo'); ?></small>
 		</p>
 
 		<p>
-		</p>
-
-		<p><input type="checkbox" class="checkbox ltlw-dropdown" id="<?php echo $this->get_field_id('dropdown'); ?>" name="<?php echo $this->get_field_name('dropdown'); ?>"<?php checked( $dropdown ); ?> />
-			<label for="<?php echo $this->get_field_id('dropdown'); ?>"><?php _e( 'Display terms as dropdown', 'largo' ); ?></label>
+			<input type="checkbox" class="checkbox ltlw-dropdown" id="<?php echo $this->get_field_id( 'dropdown' ); ?>" name="<?php echo $this->get_field_name( 'dropdown' ); ?>"<?php checked( $dropdown ); ?> />
+			<label for="<?php echo $this->get_field_id( 'dropdown' ); ?>"><?php _e( 'Display terms as dropdown', 'largo' ); ?></label>
 			<br/>
-			<small><?php _e('If you choose to display terms as a dropdown, no thumbnails or headlines will be displayed.', 'largo'); ?></small>
+			<small><?php _e( 'If you choose to display terms as a dropdown, no thumbnails or headlines will be displayed.', 'largo' ); ?></small>
 		</p>
 
-		<p><input type="checkbox" class="checkbox ltlw-thumbnails" id="<?php echo $this->get_field_id('thumbnails'); ?>" name="<?php echo $this->get_field_name('thumbnails'); ?>"<?php checked( $thumbnails ); ?> />
-			<label for="<?php echo $this->get_field_id('thumbnails'); ?>"><?php _e( 'Display thumbnails?', 'largo' ); ?></label>
+		<p>
+			<input type="checkbox" class="checkbox ltlw-thumbnails" id="<?php echo $this->get_field_id( 'thumbnails' ); ?>" name="<?php echo $this->get_field_name( 'thumbnails' ); ?>"<?php checked( $thumbnails ); ?> />
+			<label for="<?php echo $this->get_field_id( 'thumbnails' ); ?>"><?php _e( 'Display thumbnail images?', 'largo' ); ?></label>
 		</p>
 
-		<p><input type="checkbox" class="checkbox ltlw-headline" id="<?php echo $this->get_field_id('use_headline'); ?>" name="<?php echo $this->get_field_name('use_headline'); ?>"<?php checked( $use_headline ); ?> />
-			<label for="<?php echo $this->get_field_id('use_headline'); ?>"><?php _e( 'Display headline of most-recent post in taxonomy?', 'largo' ); ?></label>
+		<p>
+			<input type="checkbox" class="checkbox ltlw-headline" id="<?php echo $this->get_field_id( 'use_headline' ); ?>" name="<?php echo $this->get_field_name( 'use_headline' ); ?>"<?php checked( $use_headline ); ?> />
+			<label for="<?php echo $this->get_field_id( 'use_headline' ); ?>"><?php _e( 'Display headline of most-recent post in taxonomy?', 'largo' ); ?></label>
 		</p>
 
 		<script>

From 630934d89a5b8550153857b70619b18726761c5e Mon Sep 17 00:00:00 2001
From: Ben Keith <ben@benlk.com>
Date: Thu, 31 Mar 2016 16:57:56 -0400
Subject: [PATCH 15/15] replace case/switch with if/else

---
 inc/widgets/largo-taxonomy-list.php | 16 ++++------------
 1 file changed, 4 insertions(+), 12 deletions(-)

diff --git a/inc/widgets/largo-taxonomy-list.php b/inc/widgets/largo-taxonomy-list.php
index 4a8a68d4f..ce1445cff 100644
--- a/inc/widgets/largo-taxonomy-list.php
+++ b/inc/widgets/largo-taxonomy-list.php
@@ -96,18 +96,10 @@ function widget( $args, $instance ) {
 
 			$tax_items = get_categories($term_args);
 
-			switch ( $instance['taxonomy'] ) {
-				case 'series':
-					$this->render_series_list( $tax_items, $instance );
-					break;
-				case 'category':
-					$this->render_term_list( $tax_items, $instance );
-					break;
-				case 'post_tag':
-					$this->render_term_list( $tax_items, $instance );
-					break;
-				default:
-					$this->render_term_list( $tax_items, $instance );
+			if ( $instance['taxonomy'] === 'series' ) {
+				$this->render_series_list( $tax_items, $instance );
+			} else {
+				$this->render_term_list( $tax_items, $instance );
 			}
 
 			echo '</ul>';