Merge lp:~mthaddon/wordpress/wp-theme-xubuntu-website into lp:~canonical-sysadmins/wordpress/wp-theme-xubuntu-website

[Tom Haddon]

Merge per u#29426: Update Xubuntu.org themes

[Gareth Woolridge (moon127)]

+1

review: Approve

=== modified file 'xubuntu-fifteen/content-release.php'
--- xubuntu-fifteen/content-release.php	2016-12-14 23:41:34 +0000
+++ xubuntu-fifteen/content-release.php	2016-12-16 13:23:31 +0000
@@ -1,58 +1,71 @@
 <?php
+	//  Get release information
 	$release = get_term_by( 'slug', get_query_var( 'release' ), 'release', OBJECT );
 	$release_meta = get_option( 'taxonomy_term_' . $release->term_id );
 
+	//  Get release timestamp
 	if( isset( $release_meta['release_date'] ) && $release_meta['release_date'] > 0 ) {
 		list( $year, $month, $day ) = explode( '-', $release_meta['release_date'] );
 		$release_time = gmmktime( 0, 0, 0, $month, $day, $year );
 	}
+	//  Get EOL timestamp
 	if( isset( $release_meta['release_eol'] ) && $release_meta['release_eol'] > 0 ) {
 		list( $year, $month, $day ) = explode( '-', $release_meta['release_eol'] );
 		$eol_time = gmmktime( 0, 0, 1, $month, $day, $year );
 	}
-
-	echo '<h1 class="post-title">Xubuntu ' . single_term_title( '', false ) . '</h1>';
-	if( strlen( $release_meta['release_codename'] ) > 0 || isset( $release_time ) || isset( $eol_time ) ) {
+?>
+
+<h1 class="post-title">Xubuntu <?php echo single_term_title( '', false ); ?></h1>
+<?php echo wpautop( $release->description ); ?>
+
+<?php
+	//  Release information
+	$info = '';
+	if( strlen( $release_meta['release_codename'] ) > 0 ) {
+		$info .= '<dt>' . __( 'Codename', 'xubuntu' ) . '</dt><dd>' . $release_meta['release_codename'] . '</dd>';
+	}
+	if( isset( $release_time ) ) {
+		$info .= '<dt>' . __( 'Release Date', 'xubuntu' ) . '</dt><dd>' . gmdate( 'F j, Y', $release_time ) . '</dd>';
+	}
+	if( isset( $eol_time ) ) {
+		$info .= '<dt>' . __( 'End of Life', 'xubuntu' ) . '</dt><dd>' . gmdate( 'F j, Y', $eol_time ) . '</dd>';
+	}
+
+	//  Release links
+	if( isset( $release_meta['release_torrent_64bit'] ) ) {
+		$info_links[] = '<strong><a href="' . $release_meta['release_torrent_64bit'] . '">' . __( 'Torrent download for 64-bit systems', 'xubuntu' ) . '</a></strong>';
+	}
+	if( isset( $release_meta['release_torrent_32bit'] ) ) {
+		$info_links[] = '<strong><a href="' . $release_meta['release_torrent_32bit'] . '">' . __( 'Torrent download for 32-bit systems', 'xubuntu' ) . '</a></strong>';
+	}
+	if( isset( $release_meta['release_documentation_link'] ) ) {
+		$info_links[] = '<a href="' . $release_meta['release_documentation_link'] . '">' . __( 'Online Documentation', 'xubuntu' ) . '</a>';
+	}
+	if( isset( $info_links ) ) {
+		$info .= '<dt>' . __( 'Release Links', 'xubuntu' ) . '</dt><dd>' . implode( $info_links, '<br />' ) . '</dd>';
+	}
+
+	if( strlen( $info ) > 0 ) {
 		echo '<dl class="release-info group">';
-		if( strlen( $release_meta['release_codename'] ) > 0 ) {
-			echo '<dt>' . __( 'Codename', 'xubuntu' ) . '</dt><dd>' . $release_meta['release_codename'] . '</dd>';
-		}
-		if( isset( $release_time ) ) {
-			echo '<dt>' . __( 'Release Date', 'xubuntu' ) . '</dt><dd>' . gmdate( 'F j, Y', $release_time ) . '</dd>';
-		}
-		if( isset( $eol_time ) ) {
-			echo '<dt>' . __( 'End of Life', 'xubuntu' ) . '</dt><dd>' . gmdate( 'F j, Y', $eol_time ) . '</dd>';
-		}
+		echo $info;
 		echo '</dl>';
 	}
-
-	echo wpautop( $release->description );
 ?>
 
 <?php
-	$official_links = release_link_list( array( 'official', 'official-expiring' ), $release->term_id );
-
-	if( $official_links ) {
-		$output_links = array( );
-
-		foreach( $official_links as $official_link ) {
-			$meta = get_post_meta( $official_link->ID );
-			if( ( $meta['link_type'][0] == 'official-expiring' && time( ) <= $eol_time ) || $meta['link_type'][0] == 'official' ) {
-				$output_links[] = '<li><strong><a href="' . $meta['link_url'][0] . '">' . $official_link->post_title . '</a></strong></li>';
-			}
-		}
-	
-		if( count( $output_links ) > 0 ) {
-			echo '<h2>' . __( 'Official Links', 'xubuntu' ) . '</h2>';
-			echo '<ul class="link-list">';
-			foreach( $output_links as $link ) {
-				echo $link;
-			}
-			echo '</ul>';
+	//  Direct download links
+	if( $eol_time > time( ) ) {
+		if( shortcode_exists( 'mirrors' ) )  {
+			$mirrors = do_shortcode( '[mirrors release=' . $release->name . ']' );
+			if( isset( $mirrors ) ) {
+				echo '<h2>' . __( 'Direct Downloads', 'xubuntu' ) . '</h2>';
+				echo $mirrors;
+			}
 		}
 	}
 ?>
 
+<?php //  Articles  ?>
 <?php if( have_posts( ) ) { ?>
 	<h2><?php _e( 'Articles', 'xubuntu' ); ?></h2>
 	<ul class="posts-list">
@@ -69,6 +82,7 @@
 <?php } ?>
 
 <?php
+	//  Press links
 	$press_links = release_link_list( 'press', $release->term_id );
 	if( $press_links ) {
 		echo '<h2>' . __( 'In the Press', 'xubuntu' ) . '</h2>';
@@ -77,6 +91,7 @@
 ?>
 
 <?php
+	//  Attachments, usually screenshots
 	$attachments = get_posts( array(
 		'post_type' => 'attachment',
 		'posts_per_page' => -1,
@@ -99,4 +114,4 @@
 		echo '<h2>' . __( 'Screenshots', 'xubuntu' ) . '</h2>';
 		echo do_shortcode( '[gallery size="xubuntu_split_to_3" link="file" ids="' . $gallery_ids . '"]' );
 	}
-?>
+?>
\ No newline at end of file

=== added file 'xubuntu-fifteen/content-releases-landing.php'
--- xubuntu-fifteen/content-releases-landing.php	1970-01-01 00:00:00 +0000
+++ xubuntu-fifteen/content-releases-landing.php	2016-12-16 13:23:31 +0000
@@ -0,0 +1,40 @@
+<?php while( have_posts( ) ) { ?>
+	<?php the_post( ); ?>
+	<div <?php post_class( 'group' ) ?> id="post-<?php the_ID( ); ?>">
+		<?php	if( !is_front_page( ) ) { ?>
+			<?php if( !is_page( ) ) { ?>
+				<h1 class="post-title"><a href="<?php the_permalink( ); ?>"><?php the_title( ); ?></a></h1>
+			<?php } else { ?>
+				<h1 class="post-title"><?php the_title( ); ?></h1>
+			<?php } ?>
+		<?php } ?>
+
+		<div class="post-post">
+			<div class="post-entry entry">
+				<?php the_content( __( 'Read the rest of this entry »', 'xubuntu' ) ); ?>
+			</div>
+		</div>
+	</div>
+<?php } ?>
+
+<?php
+	$releases = release_taxonomy_get_releases_sorted( );
+
+	if( is_array( $releases ) ) {
+		$date_now = new DateTime( 'now' );
+		foreach( $releases as $release ) {
+			$release_meta = get_option( 'taxonomy_term_' . $release->term_id );
+			$date_release = new DateTime( $release_meta['release_date'] );
+
+			if( strlen( $release_meta['release_codename'] ) > 0 ) {
+				$release->name .= ' (' . $release_meta['release_codename'] . ')';
+			}
+			if( $release->release_is_eol == 0 && $date_release->format( 'Ymd' ) <= $date_now->format( 'Ymd' ) ) {
+				$date_eol = new DateTime( $release_meta['release_eol'] );
+				echo '<h2>Xubuntu ' . $release->name . '</h2>';
+				echo wpautop( $release->description );
+				echo '<p><a class="button primary" href="' . get_term_link( $release ) . '">' . __( 'Visit the release page', 'xubuntu' ) . '</a></p>';
+			}
+		}
+	}
+?>
\ No newline at end of file

=== modified file 'xubuntu-fifteen/functions-features-release-links.php'
--- xubuntu-fifteen/functions-features-release-links.php	2016-12-14 23:41:34 +0000
+++ xubuntu-fifteen/functions-features-release-links.php	2016-12-16 13:23:31 +0000
@@ -49,7 +49,6 @@
 	add_meta_box( 'release_link_type', _x( 'Link Type', 'meta box title', 'xubuntu' ), 'release_link_meta_box_link_type', 'release_link', 'normal', 'high' );	
 	add_meta_box( 'release_link_link', _x( 'Link', 'meta box title', 'xubuntu' ), 'release_link_meta_box_link', 'release_link', 'normal', 'high' );
 	add_meta_box( 'release_link_author', _x( 'Author', 'meta box title', 'xubuntu' ), 'release_link_meta_box_author', 'release_link', 'normal' );
-
 }
 
 function release_link_meta_box_link_type( $post, $box ) {
@@ -74,7 +73,6 @@
 
 	echo '<p><input type="text" class="widefat" name="link_title" placeholder="' . _x( 'Review of the latest Xubuntu release – awesome!', 'placeholder text', 'xubuntu' ) . '" value="' . $link_title . '" /></p>';
 	echo '<p><input type="text" class="widefat" name="link_url" placeholder="' . _x( 'http://example.com/xubuntu-review/', 'placeholder text', 'xubuntu' ) . '" value="' . $link_url . '" /></p>';
-	echo '</label></p>';
 }
 
 function release_link_meta_box_author( $post, $box ) {
@@ -237,6 +235,7 @@
 	}
 
 	$releases = get_terms( 'release', $args );
+	usort( $releases, 'release_taxonomy_release_usort' );
 	$navi = '';
 	$links_out = '';
 
@@ -245,7 +244,11 @@
 		if( count( $links ) > 0 ) {
 			$release_meta = get_option( 'taxonomy_term_' . $release->term_id );
 			$navi .= '<a class="button" href="#' . $release->slug . '">' . $release->name . '</a>';
-			$links_out .= '<h2 id="' . $release->slug . '">' . $release->name . ' (' . $release_meta['release_codename'] . ')</h2>' . release_link_press_output( $links );
+			$links_out .= '<h2 id="' . $release->slug . '">' . $release->name;
+			if( strlen( $release_meta['release_codename'] ) > 0 ) {
+				$links_out .= ' (' . $release_meta['release_codename'] . ')';
+			}
+			$links_out .= '</h2>' . release_link_press_output( $links );
 		}
 	}
 

=== added file 'xubuntu-fifteen/functions-features-release-mirrors.php'
--- xubuntu-fifteen/functions-features-release-mirrors.php	1970-01-01 00:00:00 +0000
+++ xubuntu-fifteen/functions-features-release-mirrors.php	2016-12-16 13:23:31 +0000
@@ -0,0 +1,216 @@
+<?php
+
+/*
+ *  Register the release download mirror post type
+ *
+ */
+
+add_action( 'init', 'release_download_mirror_register' );
+
+function release_download_mirror_register( ) {
+	register_post_type(
+		'download_mirror',
+		array(
+			'label' => _x( 'Download Mirrors', 'post type label', 'xubuntu' ),
+			'labels' => array(
+				'name' => _x( 'Download Mirrors', 'post type label: name', 'xubuntu' ),
+				'singular_name' => _x( 'Download Mirror', 'post type label: singular_name', 'xubuntu' ),
+				'add_new_item' => _x( 'Add New Download Mirror', 'post type label: add_new_item', 'xubuntu' ),
+				'edit_item' => _x( 'Edit Download Mirror', 'post type label: edit_item', 'xubuntu' ),
+				'view_item' => _x( 'View Download Mirror', 'post type label: view_item', 'xubuntu' ),
+				'search_items' => _x( 'Search Download Mirrors', 'post type label: search_items', 'xubuntu' ),
+				'not_found' => _x( 'No download mirrors found.', 'post type label: not_found', 'xubuntu' ),
+				'all_items' => _x( 'All Download Mirrors', 'post type label: all_items', 'xubuntu' ),
+				'menu_name' => _x( 'DL Mirrors', 'post type label: menu_name', 'xubuntu' ),
+			),
+			'description' => _x( 'Xubuntu Download Mirrors', 'post type description', 'xubuntu' ),
+			'public' => false,
+			'show_ui' => true,
+			'show_in_menu' => true,
+			'menu_position' => 21,
+			'menu_icon' => 'dashicons-download',
+			'supports' => false,
+			/* 'taxonomies' => array(
+				'release'
+			), */
+			'rewrite' => false,
+			'query_var' => false
+		)
+	);
+}
+
+/*
+ *  Add meta boxes for the post type
+ *
+ */
+
+add_action( 'add_meta_boxes', 'release_download_mirror_add_meta_boxes' );
+
+function release_download_mirror_add_meta_boxes( ) {
+	add_meta_box( 'release_download_mirror_info', _x( 'Mirror Information', 'meta box title', 'xubuntu' ), 'release_download_mirror_meta_box_info', 'download_mirror', 'normal', 'high' );
+	add_meta_box( 'release_download_mirror_location', _x( 'Mirror Location', 'meta box title', 'xubuntu' ), 'release_download_mirror_meta_box_location', 'download_mirror', 'normal' );
+	add_meta_box( 'release_download_mirror_link_template', _x( 'Mirror Link Template', 'meta box title', 'xubuntu' ), 'release_download_mirror_meta_box_link_template', 'download_mirror', 'normal' );
+	add_meta_box( 'release_download_mirror_activity', _x( 'Activity', 'meta box title', 'xubuntu' ), 'release_download_mirror_meta_box_activity', 'download_mirror', 'side' );
+}
+
+function release_download_mirror_meta_box_info( $post, $box ) {
+	$mirror_name = get_post_meta( $post->ID, 'mirror_name', true );
+	$mirror_lp_url = get_post_meta( $post->ID, 'mirror_lp_url', true );
+
+	echo '<p><input type="text" class="widefat" name="mirror_name" placeholder="' . _x( 'University of Mirrors', 'placeholder text', 'xubuntu' ) . '" value="' . $mirror_name . '" /></p>';
+	echo '<p><input type="text" class="widefat" name="mirror_lp_url" placeholder="' . _x( 'https://launchpad.net/ubuntu/+mirror/ubuntu.mirror.university-release', 'placeholder text', 'xubuntu' ) . '" value="' . $mirror_lp_url . '" /></p>';
+}
+
+function release_download_mirror_meta_box_location( $post, $box ) {
+	$mirror_area = get_post_meta( $post->ID, 'mirror_area', true );
+	$mirror_country = get_post_meta( $post->ID, 'mirror_country', true );
+
+	$mirror_areas = array(
+		'unknown' => __( 'Unknown or Other', 'xubuntu' ),
+		'africa' => __( 'Africa', 'xubuntu' ),
+		'americas' => __( 'Americas', 'xubuntu' ),
+		'asia' => __( 'Asia', 'xubuntu' ),
+		'europe' => __( 'Europe', 'xubuntu' ),
+		'oceania' => __( 'Oceania', 'xubuntu' ),
+	);
+
+	echo '<select class="widefat" name="mirror_area">';
+	foreach( $mirror_areas as $value => $name ) {
+		echo '<option value="' . $value . '" ' . selected( $mirror_area, $value, false ) . '>' . $name . '</option>';
+	}
+	echo '</select>';
+
+	echo '<p><input type="text" class="widefat" name="mirror_country" placeholder="' . _x( 'Finland', 'placeholder text', 'xubuntu' ) . '" value="' . $mirror_country . '" /></p>';
+}
+
+function release_download_mirror_meta_box_link_template( $post, $box ) {
+	$mirror_http_template = get_post_meta( $post->ID, 'mirror_http_template', true );
+
+	echo '<p><input type="text" class="widefat" name="mirror_http_template" placeholder="' . _x( 'http://ubuntu.mirror.university/releases/VERSION/', 'placeholder text', 'xubuntu' ) . '" value="' . $mirror_http_template . '" /></p>';
+	echo '<p>' . __( 'The tag <code>VERSION</code> in the mirror template will be replaced by the appropriate version number (eg. <em>16.04</em>)', 'xubuntu' ) . '</p>';
+}
+
+function release_download_mirror_meta_box_activity( $post, $box ) {
+	$mirror_main = get_post_meta( $post->ID, 'mirror_main', true );
+	$mirror_active = get_post_meta( $post->ID, 'mirror_active', true );
+
+	echo '<ul>';
+	echo '<li><label class="selectit">';
+	echo '<input type="checkbox" name="mirror_active" ' . checked( $mirror_active, 1, false ) . '/>';
+	echo _x( 'Is active?', 'release mirror activity', 'xubuntu' );
+	echo '</label></li>';
+	echo '<li><label class="selectit">';
+	echo '<input type="checkbox" name="mirror_main" ' . checked( $mirror_main, 1, false ) . '/>';
+	echo __( 'Is a main download mirror?', 'release mirror status', 'xubuntu' );
+	echo '</label></li>';
+	echo '</ul>';
+}
+
+/*
+ *  Handle saving the link data
+ *
+ */
+
+add_action( 'save_post_download_mirror', 'release_download_mirror_save_post' );
+
+function release_download_mirror_save_post( $post_id ) {
+	global $wpdb;
+
+	$fields_to_save = array(
+		'mirror_name',
+		'mirror_lp_url',
+		'mirror_area',
+		'mirror_country',
+		'mirror_http_template',
+	);
+
+	foreach( $fields_to_save as $field ) {
+		if( isset( $_POST[$field] ) ) {
+			update_post_meta( $post_id, $field, sanitize_text_field( $_POST[$field] ) );
+		}
+	}
+
+	$bool_fields_to_save = array(
+		'mirror_active',
+		'mirror_main',
+	);
+
+	foreach( $bool_fields_to_save as $field ) {
+		if( $_POST[$field] != 'on' ) { // TODO
+			update_post_meta( $post_id, $field, 0 );
+		} else {
+			update_post_meta( $post_id, $field, 1 );
+		}
+	}
+
+	if( isset( $_POST['mirror_name'] ) ) {
+		$wpdb->update( $wpdb->posts, array( 'post_title' => $_POST['mirror_name'] ), array( 'ID' => $post_id ) );
+	}
+}
+
+/*
+ *  Add a shortcode to print the list of mirrors
+ *
+ */
+
+add_shortcode( 'mirrors', 'release_download_mirror_shortcode_downloads' );
+
+function release_download_mirror_shortcode_downloads( $atts ) {
+	$atts = shortcode_atts(
+		array(
+			'release' => false,
+		),
+		$atts,
+		'mirrors'
+	);
+
+	if( strlen( $atts['release'] ) < 1 ) {
+		return;
+	}
+
+	$args = array(
+		'post_type' => 'download_mirror',
+		'posts_per_page' => -1,
+		'orderby' => 'meta_value',
+		'order' => 'ASC',
+		'meta_key' => 'mirror_country',
+		'meta_query' => array(
+			array(
+				'key' => 'mirror_active',
+				'value' => 1,
+				'compare' => '='
+			),
+		),
+	);
+	$mirrors = get_posts( $args );
+
+	if( count( $mirrors ) > 0 ) {
+		$out = '<ul class="columnlist mirrors">';
+		foreach( $mirrors as $mirror ) {
+			$mirror_meta = get_post_meta( $mirror->ID );
+			if( $mirror_meta['mirror_main'][0] == 1 ) {
+				$class = 'main';
+			} else {
+				$class = 'secondary';
+			}
+
+			$out .= '<li class="' . $class . '"><a href="' . release_download_url( $mirror_meta['mirror_http_template'][0], $atts['release'] ) . '" title="' . $mirror->post_title . ', ' . $mirror_meta['mirror_country'][0] . '">' . $mirror_meta['mirror_country'][0] . '</a>';
+			if( strlen( $mirror_meta['mirror_lp_url'][0] ) > 0 ) {
+				$out .= '<span class="mirror-lp-url"><a href="' . $mirror_meta['mirror_lp_url'][0] . '">' . _x( 'Info', 'Link to download mirror information on Launchpad', 'xubuntu' ) . '</a></span>';
+			}
+			$out .= '</li>';
+		}
+		$out .= '<li class="nobullet show-on-js"><a class="show-all" href="#show-all">' . __( 'Show all mirrors with full information', 'xubuntu' ) . '</a></li>';
+		$out .= '</ul>';
+
+		return $out;
+	}
+}
+
+function release_download_url( $template, $release_slug ) {
+	$release = get_term_by( 'slug', $release_slug, 'release' );
+
+	return str_replace( 'VERSION', $release->name, $template );
+}
+
+?>
\ No newline at end of file

=== modified file 'xubuntu-fifteen/functions-features-releases.php'
--- xubuntu-fifteen/functions-features-releases.php	2016-08-29 12:39:20 +0000
+++ xubuntu-fifteen/functions-features-releases.php	2016-12-16 13:23:31 +0000
@@ -58,12 +58,29 @@
 	),
 	'release_date' => array(
 		'label' => __( 'Release Date', 'xubuntu' ),
-		'type' => 'date'
+		'type' => 'date',
+		'description' => __( 'Date in YYYY-MM-DD format.', 'xubuntu' )
 	),
 	'release_eol' => array(
 		'label' => __( 'Release End of Life', 'xubuntu' ),
-		'type' => 'date'
-	)
+		'type' => 'date',
+		'description' => __( 'Date in YYYY-MM-DD format.', 'xubuntu' )
+	),
+	'release_torrent_32bit' => array(
+		'label' => __( 'Torrent download link (32-bit)', 'xubuntu' ),
+		'type' => 'url',
+		'description' => __( 'The download link for the 32-bit image; for LTS, always use the latest point release link. Will be hidden after the release goes EOL.', 'xubuntu' )
+	),
+	'release_torrent_64bit' => array(
+		'label' => __( 'Torrent download link (64-bit)', 'xubuntu' ),
+		'type' => 'url',
+		'description' => __( 'The download link for the 64-bit image; for LTS, always use the latest point release link. Will be hidden after the release goes EOL.', 'xubuntu' )
+	),
+	'release_documentation_link' => array(
+		'label' => __( 'Online Documentation', 'xubuntu' ),
+		'type' => 'url',
+		'description' => __( 'URL for the online documentation for the release. Will be hidden after the release goes EOL.', 'xubuntu' )
+	),
 );
 
 add_action( 'release_edit_form_fields', 'release_taxonomy_custom_fields_edit', 10, 2 );
@@ -81,9 +98,13 @@
 		echo '<label for="' . $id . '">' . $field['label'] . '</label>';
 		echo '</th>';
 		echo '<td>';
-		echo '<input name="term_meta[' . $id . ']" id="' . $id . '" value="' . $term_meta[$id] . '" type="' . $field['type'] . '" />';
-		if( 'date' == $field['type'] ) {
-			echo '<p class="description">Date in YYYY-MM-DD format.</p>';
+		if( isset( $term_meta[$id] ) ) {
+			echo '<input name="term_meta[' . $id . ']" id="' . $id . '" value="' . $term_meta[$id] . '" type="' . $field['type'] . '" />';
+		} else {
+			echo '<input name="term_meta[' . $id . ']" id="' . $id . '" value="" type="' . $field['type'] . '" />';
+		}
+		if( isset( $field['description'] ) ) {
+			echo '<p class="description">' . $field['description'] . '</p>';
 		}
 		echo '</td>';
 		echo '</tr>';
@@ -130,7 +151,7 @@
 		}  
 
 		update_option( 'taxonomy_term_' . $term_id, $term_meta );
-	}  
+	}
 }
 
 /*
@@ -147,7 +168,7 @@
 		foreach( $releases as $release ) {
 			$release_meta = get_option( 'taxonomy_term_' . $release->term_id );
 			if( $class != 'eol' && $release->release_is_eol == 1 ) {
-				echo '<li class="nobullet show-on-js"><a class="show-eol" href="#show-eol">Show EOL releases</a></li>';
+				echo '<li class="nobullet show-on-js"><a class="show-eol" href="#show-eol">' . __( 'Show EOL releases', 'xubuntu' ) . '</a></li>';
 				$class = 'eol';
 			}
 
@@ -293,11 +314,11 @@
 		}
 	}
 
-	usort( $releases, 'release_taxonomy_release_usort' );
+	usort( $releases, 'release_taxonomy_release_usort_eol_last' );
 	return $releases;
 }
 
-function release_taxonomy_release_usort( $a, $b ) {
+function release_taxonomy_release_usort_eol_last( $a, $b ) {
 	$eolcmp = strnatcmp( $a->release_is_eol, $b->release_is_eol );
 
 	if( $eolcmp != 0 ) {
@@ -307,4 +328,76 @@
 	}
 }
 
+function release_taxonomy_release_usort( $a, $b ) {
+	return strnatcmp( $b->name, $a->name );
+}
+
+/*
+ *  Add a shortcode to print the torrent link buttons
+ *
+ */
+
+add_shortcode( 'torrents', 'release_torrent_links' );
+
+function release_torrent_links( $atts ) {
+	$atts = shortcode_atts(
+		array(
+			'release' => false,
+		),
+		$atts,
+		'torrents'
+	);
+
+	if( strlen( $atts['release'] ) < 1 ) {
+		return;
+	}
+
+	$release = get_term_by( 'slug', $atts['release'], 'release' );
+	$release_meta = get_option( 'taxonomy_term_' . $release->term_id );
+	$out = '';
+
+	if( isset( $release_meta['release_torrent_64bit'] ) ) {
+		$out .= '<a class="button primary" href="' . $release_meta['release_torrent_64bit'] . '">' . _x( '<strong>64-bit</strong> systems', 'torrent download link', 'xubuntu' ) . '</a>';
+	}
+	if( isset( $release_meta['release_torrent_32bit'] ) ) {
+		$out .= '<a class="button" href="' . $release_meta['release_torrent_32bit'] . '">' . __( '<strong>32-bit</strong> systems', 'torrent download link', 'xubuntu' ) . '</a>';
+	}
+
+	if( strlen( $out ) > 0 ) {
+		return '<p>' . $out . '</p>';
+	}
+}
+
+/*
+ *  Add a shortcode to list all online documentation links for released, non-EOL releases
+ *
+ */
+
+add_shortcode( 'documentation_links', 'release_documentation_links' );
+
+function release_documentation_links( $atts ) {
+	$releases = release_taxonomy_get_releases_sorted( );
+
+	if( is_array( $releases ) ) {
+		$date_now = new DateTime( 'now' );
+		$out = '<ul>';
+		foreach( $releases as $release ) {
+			$release_meta = get_option( 'taxonomy_term_' . $release->term_id );
+			$date_release = new DateTime( $release_meta['release_date'] );
+
+			if( strlen( $release_meta['release_codename'] ) > 0 ) {
+				$release->name .= ' (' . $release_meta['release_codename'] . ')';
+			}
+			if( $release->release_is_eol == 0 && $date_release->format( 'Ymd' ) <= $date_now->format( 'Ymd' ) ) {
+				$date_eol = new DateTime( $release_meta['release_eol'] );
+				$out .= '<li><strong><a href="' . $release_meta['release_documentation_link'] . '">Xubuntu ' . $release->name . '</a></strong>, supported until ' . $date_eol->format( 'F Y' ) . '</li>';
+			}
+		}
+		$out .= '</ul>';
+
+		return $out;
+	}
+}
+
+
 ?>
\ No newline at end of file

=== modified file 'xubuntu-fifteen/functions.php'
--- xubuntu-fifteen/functions.php	2016-09-02 20:08:49 +0000
+++ xubuntu-fifteen/functions.php	2016-12-16 13:23:31 +0000
@@ -15,6 +15,7 @@
 include 'functions-features-articles.php';
 include 'functions-features-releases.php';
 include 'functions-features-release-links.php';
+include 'functions-features-release-mirrors.php';
 
 /*
  *  Configuration options

=== modified file 'xubuntu-fifteen/header.php'
--- xubuntu-fifteen/header.php	2016-09-02 20:08:49 +0000
+++ xubuntu-fifteen/header.php	2016-12-16 13:23:31 +0000
@@ -18,7 +18,7 @@
 
 <header>
 	<div id="logo">
-		<a href="<?php echo home_url( '/' ); ?>"><img src="<?php bloginfo( 'stylesheet_directory' ); ?>/images/xubuntu-logo-45.png" alt="Xubuntu" /></a>
+		<a href="<?php echo home_url( '/' ); ?>"><img src="<?php echo get_stylesheet_directory_uri( ); ?>/images/xubuntu-logo-45.png" alt="Xubuntu" /></a>
 	</div>
 
 	<div id="navi">

=== modified file 'xubuntu-fifteen/index.php'
--- xubuntu-fifteen/index.php	2016-09-02 20:08:49 +0000
+++ xubuntu-fifteen/index.php	2016-12-16 13:23:31 +0000
@@ -10,6 +10,8 @@
 					get_template_part( 'content', 'release' );
 				} elseif( is_attachment( ) ) {
 					get_template_part( 'content', 'attachment' );
+				} elseif( is_page_template( 'template-releases-landing.php' ) ) {
+					get_template_part( 'content', 'releases-landing' );
 				} elseif( have_posts( ) && !is_404( ) ) {
 					if( is_archive( ) ) {
 						get_template_part( 'content', 'archive' );
@@ -27,7 +29,7 @@
 			?>
 		</main>
 		<?php
-			if( is_tax( 'release' ) ) {
+			if( is_tax( 'release' ) || is_page_template( 'template-releases-landing.php' ) ) {
 				get_template_part( 'widgets', 'release' );
 			} elseif( is_blog( ) || is_search( ) ) {
 				get_template_part( 'widgets', 'blog' );

=== modified file 'xubuntu-fifteen/script-releases.js'
--- xubuntu-fifteen/script-releases.js	2016-08-29 12:39:20 +0000
+++ xubuntu-fifteen/script-releases.js	2016-12-16 13:23:31 +0000
@@ -1,12 +1,21 @@
 jQuery( function( ) {
 	jQuery( '.show-on-js' ).show( );
 
+	/* Release list */
 	jQuery( '.releases .eol' ).hide( );
 	jQuery( '.releases .show-eol' ).click( function( ) {
 		jQuery( this ).hide( );
 		jQuery( '.releases .eol' ).fadeIn( );
 	} );
 
-	/* Admin */
+	/* Release list (admin) */
 	jQuery( '.releases .eol input:checked' ).closest( '.eol' ).show( );
+
+	/* Mirror list */
+	jQuery( '.mirrors .secondary' ).hide( );
+	jQuery( '.mirrors .show-all' ).click( function( ) {
+		jQuery( this ).hide( );
+		jQuery( this ).closest( '.mirrors' ).addClass( 'expanded' );
+		jQuery( this ).closest( '.mirrors' ).children( '.secondary' ).fadeIn( );
+	} );
 } );
\ No newline at end of file

=== modified file 'xubuntu-fifteen/style-admin.css'
--- xubuntu-fifteen/style-admin.css	2016-08-28 23:39:44 +0000
+++ xubuntu-fifteen/style-admin.css	2016-12-16 13:23:31 +0000
@@ -8,4 +8,12 @@
 body.post-type-release_link .misc-pub-post-status,
 body.post-type-release_link .misc-pub-visibility {
 	display: none;
+}
+
+body.post-type-download_mirror #post-body-content,
+body.post-type-download_mirror #save-action,
+body.post-type-download_mirror #preview-action,
+body.post-type-download_mirror .misc-pub-post-status,
+body.post-type-download_mirror .misc-pub-visibility {
+	display: none;
 }
\ No newline at end of file

=== modified file 'xubuntu-fifteen/style-common.css'
--- xubuntu-fifteen/style-common.css	2016-09-02 20:08:49 +0000
+++ xubuntu-fifteen/style-common.css	2016-12-16 13:23:31 +0000
@@ -146,12 +146,14 @@
 li { list-style-position: inside; }
 	main li { margin-bottom: 0.2em; list-style-position: outside; margin-left: 1.2em; }
 	main ul li { list-style-type: disc; }
+	main ul.mirrors li,
 	main ul.link-list li,
 	main .post-list ul li,
 	main .post-post ul li {
 		list-style-type: none;
 		margin-left: 1em;
 	}
+		main ul.mirrors li:before,
 		main ul.link-list li:before,
 		main .post-list ul li:before,
 		main .post-post ul li:before {

=== modified file 'xubuntu-fifteen/style.css'
--- xubuntu-fifteen/style.css	2016-09-02 20:26:40 +0000
+++ xubuntu-fifteen/style.css	2016-12-16 13:23:31 +0000
@@ -6,7 +6,7 @@
  *  Author: Pasi Lallinaho
  *  Author URI: http://open.knome.fi/
  *
- *  Version: 2016-sept (r118)
+ *  Version: 2016-dec (r120)
  *
  */
 
@@ -542,6 +542,32 @@
 	color: rgba( 0, 0, 0, 0.5 );
 }
 
+/*  Mirror lists  (code)  */
+
+.mirrors .main {
+	font-weight: 600;
+}
+
+.mirrors .mirror-lp-url {
+	display: none;
+	margin-right: 1em;
+	float: right;
+}
+	.mirrors.expanded .mirror-lp-url {
+		display: inline-block;
+	}
+	.mirrors .mirror-lp-url a {
+		font-size: 80%;
+		color: rgba( 0, 0, 0, 0.5 );
+	}
+
+.mirrors .nobullet a {
+	font-size: 90%;
+}
+	.mirrors .nobullet::before {
+		content: " " !important;
+	}
+
 /*  Search form  */
 
 .search-form {

=== added file 'xubuntu-fifteen/template-releases-landing.php'
--- xubuntu-fifteen/template-releases-landing.php	1970-01-01 00:00:00 +0000
+++ xubuntu-fifteen/template-releases-landing.php	2016-12-16 13:23:31 +0000
@@ -0,0 +1,2 @@
+<?php /* Template Name: Releases landing page */ ?>
+<?php include get_stylesheet_directory( ) . '/index.php'; ?>
\ No newline at end of file