From 9f2c40f814664ad7cb2f229e21b448334ddf1642 Mon Sep 17 00:00:00 2001
From: albertlast <mathiaspapealbert@hotmail.com>
Date: Sun, 9 Aug 2026 14:11:14 +0200
Subject: [PATCH] Reads out the page links before the buttons beside them

A .pagesection holds the page links and a row of buttons, one floated to
each side. The markup put the buttons first, so anything reading the page
in source order - a screen reader, or the tab key - met them before the
page links they sit next to, which is the opposite of what is on screen.

The message index is the clearest case: it draws a .pagesection above the
topic list and another below it, and the two disagreed. The top one already
put the page links first; only the bottom one was the other way round.

Both are floated and .pagesection is a plain block, so the rendering does
not move. Measured on the message index, where both sections are visible at
once: page links at x=72 and the button strip at x=709 before and after, in
both sections. Same on the memberlist. Only the order in the document
changes.

Signed-off-by: Mathias Alberts <mathiaspapealbert@hotmail.com>
Signed-off-by: albertlast <mathiaspapealbert@hotmail.com>
---
 Themes/default/Memberlist.template.php       |  2 +-
 Themes/default/MessageIndex.template.php     |  4 ++--
 Themes/default/ModerationCenter.template.php | 14 +++++++-------
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Themes/default/Memberlist.template.php b/Themes/default/Memberlist.template.php
index 1fdfdceb159..7b1239d0b7a 100644
--- a/Themes/default/Memberlist.template.php
+++ b/Themes/default/Memberlist.template.php
@@ -23,8 +23,8 @@ function template_main()
 	echo '
 	<div class="main_section" id="memberlist">
 		<div class="pagesection">
-			', template_button_strip(Utils::$context['memberlist_buttons'], 'right'), '
 			<div class="pagelinks floatleft">', Utils::$context['page_index'], '</div>
+			', template_button_strip(Utils::$context['memberlist_buttons'], 'right'), '
 		</div>
 		<div class="cat_bar">
 			<h3 class="catbg">
diff --git a/Themes/default/MessageIndex.template.php b/Themes/default/MessageIndex.template.php
index 74c75452b50..00fb805d6fd 100644
--- a/Themes/default/MessageIndex.template.php
+++ b/Themes/default/MessageIndex.template.php
@@ -341,12 +341,12 @@ function template_main()
 
 		echo '
 	<div class="pagesection">
-		', template_button_strip(Utils::$context['normal_buttons'], 'right'), '
 		', Utils::$context['menu_separator'], '
 		<div class="pagelinks floatleft">
 			<a href="#main_content_section" class="button" id="bot">', Lang::getTxt('go_up', file: 'General'), '</a>
 			', Utils::$context['page_index'], '
-		</div>';
+		</div>
+		', template_button_strip(Utils::$context['normal_buttons'], 'right');
 
 		// Mobile action buttons (bottom)
 		if (!empty(Utils::$context['normal_buttons'])) {
diff --git a/Themes/default/ModerationCenter.template.php b/Themes/default/ModerationCenter.template.php
index 2add96ce401..c12bf011190 100644
--- a/Themes/default/ModerationCenter.template.php
+++ b/Themes/default/ModerationCenter.template.php
@@ -383,7 +383,8 @@ function template_unapproved_posts()
 			</div>';
 	} else {
 		echo '
-			<div class="pagesection">';
+			<div class="pagesection">
+				<div class="pagelinks">', Utils::$context['page_index'], '</div>';
 
 		if (!empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1) {
 			echo '
@@ -395,7 +396,6 @@ function template_unapproved_posts()
 		}
 
 		echo '
-				<div class="pagelinks">', Utils::$context['page_index'], '</div>
 			</div>';
 
 	}
@@ -439,6 +439,11 @@ function template_unapproved_posts()
 	echo '
 			<div class="pagesection">';
 
+	if (!empty(Utils::$context['unapproved_items'])) {
+		echo '
+				<div class="pagelinks">', Utils::$context['page_index'], '</div>';
+	}
+
 	if (!empty(Theme::$current->options['display_quick_mod']) && Theme::$current->options['display_quick_mod'] == 1) {
 		echo '
 				<div class="floatright">
@@ -454,11 +459,6 @@ function template_unapproved_posts()
 				</div>';
 	}
 
-	if (!empty(Utils::$context['unapproved_items'])) {
-		echo '
-				<div class="pagelinks">', Utils::$context['page_index'], '</div>';
-	}
-
 	echo '
 			</div><!-- .pagesection -->
 		<input type="hidden" name="', Utils::$context['session_var'], '" value="', Utils::$context['session_id'], '">