From 42c48a001e0a4cc99e85805bf8d514bbd4a097d3 Mon Sep 17 00:00:00 2001
From: saper <saper@saper.info>
Date: Sun, 18 Oct 2015 23:11:21 +0200
Subject: [PATCH] title, use toolbox

---
 Beagle.php | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/Beagle.php b/Beagle.php
index 4f15d06..22a6417 100644
--- a/Beagle.php
+++ b/Beagle.php
@@ -118,7 +118,7 @@ class BeagleTemplate extends BaseTemplate {
 
 	function ul_list( $source, $sel, $last_item = false ) { 
 		if ( $source && is_array( $source ) ) {
-			print "<ul" . $this->sel( $sel ) . ">\n";
+			print "<ul" . $this->sel( $sel ) . " role=\"navigation\">\n";
 			foreach( $source as $key => $action ) {
 				print "\t" . $this->makeListItem( $key, $action ) . "\n";
 			}
@@ -157,20 +157,8 @@ class BeagleTemplate extends BaseTemplate {
 	}
 
 	function special_pages_source() {
-		$source = array();
-		if( $this->data['notspecialpage']  ) {
-
-			foreach( array( 'whatlinkshere', 'recentchanges', 'recentchangeslinked', 'upload', 'specialpages' ) as $special ) {
-				if ( $special === 'recentchanges' ) {
-					$d = $this->recent_changes_link ();
-				} else {
-					$d = $this->data[ 'nav_urls' ][ $special ];
-				}
-				if ( $d ) 
-					$source[ $special ] = $d;
-
-			}
-		}
+		$source = $this->getToolbox();
+		$source [ 'recentchanges' ] = $this->recent_changes_link();
 		return $source;
 	}
 
@@ -207,7 +195,7 @@ class BeagleTemplate extends BaseTemplate {
 
 <!-- START subsection header and subnav -->
 <div id="header">
-	<h1>Beagle</h1>
+	<h1><?php $this->text( 'pagetitle' ) ?></h1>
 </div>
 <hr class="clear spacing" />
 <?php
@@ -216,7 +204,7 @@ class BeagleTemplate extends BaseTemplate {
 <div id="content" role="main">
 <div id="content-body">
 <div id="articleBody">
-<a name="top" id="contentTop"></a>
+<a id="top"></a>
 <?php		$this->div_html( 'sitenotice', '#siteNotice' ); ?>
 <div id="articleContent">
 <?php		
@@ -247,6 +235,7 @@ class BeagleTemplate extends BaseTemplate {
 		$this->nav_bottom( $this->data[ 'language_urls' ] );
 		$this->search_form();
 		$this->nav_bottom( $this->special_pages_source() );
+		wfRunHooks( 'SkinTemplateToolboxEnd', array( &$this ) );
 		$this->div_span_html( 'poweredbyico', 'poweredby', '#footer-poweredbyico' );
 		$this->div();
 		$this->dotted_spacing();
@@ -260,4 +249,3 @@ class BeagleTemplate extends BaseTemplate {
 <?php
 	}
 }
-
-- 
2.11.4.GIT