From 65a364e3cab229fdca05163134521b0064878083 Mon Sep 17 00:00:00 2001
From: alistair3149 <alistair31494322@gmail.com>
Date: Thu, 4 Jun 2020 13:16:51 -0400
Subject: [PATCH] Fixed incorrect DOM structure

---
 includes/CitizenTemplate.php          | 5 +++--
 includes/templates/Bottombar.mustache | 4 +---
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/includes/CitizenTemplate.php b/includes/CitizenTemplate.php
index 00b63ddb..47c4f309 100644
--- a/includes/CitizenTemplate.php
+++ b/includes/CitizenTemplate.php
@@ -143,11 +143,12 @@ class CitizenTemplate extends BaseTemplate {
 			'html-input' => $this->makeSearchInput( [ 'id' => 'search-input' ] ),
 			'html-button-search' => $this->makeSearchButton(
 				'image',
-				[ 'id' => 'search-button',
+				[ 
+					'id' => 'search-button',
 					'src' => $this->getSkin()->getSkinStylePath( 'resources/images/icons/search.svg' ),
 				]
 			),
-			'msg-search' => $this->msg( 'search' ),
+			'msg-search' => $this->getMsg( 'search' )->text(),
 			'page-title' => SpecialPage::getTitleFor( 'Search' )->getPrefixedDBkey(),
 		];
 		return $props;
diff --git a/includes/templates/Bottombar.mustache b/includes/templates/Bottombar.mustache
index 8ffa606d..ae7462f0 100644
--- a/includes/templates/Bottombar.mustache
+++ b/includes/templates/Bottombar.mustache
@@ -7,9 +7,7 @@
 <aside class="mw-bottombar">
 	<nav class="mw-bottombar-buttons">
 		<div class="citizen-ui-icon" id="citizen-ui-button">
-			<a href="{{html-citizen-bottombar-button-href}}" title="{{html-citizen-bottombar-button-title}}" rel="noopener noreferrer" target="_blank">
-				{{html-citizen-bottombar-button-text}}
-			</a>
+			<a href="{{html-citizen-bottombar-button-href}}" title="{{html-citizen-bottombar-button-title}}" rel="noopener noreferrer" target="_blank">{{html-citizen-bottombar-button-text}}</a>
 		</div>
 	</nav>
 </aside>
\ No newline at end of file