Move some more page tools to 'page tools'

Extensions:
* Cite
* Wikibase
* Collection

Change-Id: If3f1627f91d398596d8e4e9c648688e42377b64d

includes/TimelessTemplate.php

@@ -15,6 +15,9 @@ class TimelessTemplate extends BaseTemplate {
 	/** @var array|null */
 	protected $otherProjects;
 
+	/** @var array|null */
+	protected $collectionPortlet;
+
 	/**
 	 * Outputs the entire contents of the page
 	 */
@@ -28,6 +31,11 @@ class TimelessTemplate extends BaseTemplate {
 			$this->otherProjects = $this->sidebar['wikibase-otherprojects'];
 			unset( $this->sidebar['wikibase-otherprojects'] );
 		}
+		// Collection sidebar thing
+		if ( isset( $this->sidebar['coll-print_export'] ) ) {
+			$this->collectionPortlet = $this->sidebar['coll-print_export'];
+			unset( $this->sidebar['coll-print_export'] );
+		}
 
 		// Open html, body elements, etc
 		$html = $this->get( 'headelement' );
@@ -481,6 +489,12 @@ class TimelessTemplate extends BaseTemplate {
 			$this->pileOfTools['page-secondary'],
 			'timeless-pageactions'
 		);
+		if ( isset( $this->collectionPortlet ) ) {
+			$pageTools .= $this->getPortlet(
+				'coll-print_export',
+				$this->collectionPortlet['content']
+			);
+		}
 		$pageTools .= $this->getPortlet(
 			'userpagetools',
 			$this->pileOfTools['user'],
@@ -739,7 +753,9 @@ class TimelessTemplate extends BaseTemplate {
 				'info',
 				'pagelog',
 				'recentchangeslinked',
-				'permalink'
+				'permalink',
+				'wikibase',
+				'cite'
 			] ) ) {
 				$currentSet = 'page-tertiary';
 			} elseif ( in_array( $navKey, [