6 files changed, 90 insertions, 10 deletions
diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 9d0f9a56de..8debfc69c0 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -15,14 +15,10 @@
 		<h1>{L_INSTALL_PANEL}</h1>
 		<p id="skip"><a href="#acp">{L_SKIP}</a></p>
 		<!-- IF S_LANG_SELECT -->
-		<form method="post" action="#" id="language_selector">
+		<form method="post" action="#">
 			<fieldset class="nobg">
 				<label for="language">{L_SELECT_LANG}{L_COLON}</label>
-				<select  id="language" name="language">
-                    <!-- BEGIN language_select_item -->
-                    <option value="{language_select_item.VALUE}"<!-- IF language_select_item.SELECTED --> selected="selected"<!-- ENDIF -->>{language_select_item.NAME}</option>
-                    <!-- END language_select_item -->
-                </select>
+                {S_LANG_SELECT}
 				<input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />
 			</fieldset>
 		</form>
@@ -47,7 +43,7 @@
 							<li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li>
 						<!-- END l_block1 -->
 						<!-- BEGIN l_block2 -->
-							<li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF --> id="installer-stage-{l_block2.STAGE_NAME}">{l_block2.L_TITLE}</span></li>
+                            <li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF -->>{l_block2.L_TITLE}</span></li>
 						<!-- END l_block2 -->
 						</ul>
 						</div>
diff --git a/phpBB/adm/style/installer_footer.html b/phpBB/adm/style/installer_footer.html
new file mode 100644
index 0000000000..2c70d4d5d3
--- /dev/null
+++ b/phpBB/adm/style/installer_footer.html
@@ -0,0 +1,21 @@
+                    </div>
+                </div><!-- /#main -->
+            </div>
+        </div><!-- /#acp -->
+    </div>
+
+    <div id="page-footer">
+        <div class="copyright">
+            Powered by <a href="https://www.phpbb.com/">phpBB</a>&reg; Forum Software &copy; phpBB Limited
+        </div>
+    </div>
+</div>
+
+<script type="text/javascript" src="{T_JQUERY_LINK}"></script>
+<!-- IF S_ALLOW_CDN --><script type="text/javascript">window.jQuery || document.write(unescape('%3Cscript src="{T_ASSETS_PATH}/javascript/jquery.min.js" type="text/javascript"%3E%3C/script%3E'));</script><!-- ENDIF -->
+<script type="text/javascript" src="{T_ASSETS_PATH}/javascript/core.js?assets_version={T_ASSETS_VERSION}"></script>
+<!-- INCLUDEJS admin.js -->
+{$SCRIPTS}
+
+</body>
+</html>
diff --git a/phpBB/adm/style/installer_header.html b/phpBB/adm/style/installer_header.html
new file mode 100644
index 0000000000..ada6553aec
--- /dev/null
+++ b/phpBB/adm/style/installer_header.html
@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html dir="{S_CONTENT_DIRECTION}" lang="{S_USER_LANG}">
+<head>
+    <meta charset="utf-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <!-- IF META -->{META}<!-- ENDIF -->
+    <title>{PAGE_TITLE}</title>
+
+    <link href="{T_TEMPLATE_PATH}/admin.css" rel="stylesheet" type="text/css" media="screen" />
+</head>
+
+<body class="{S_CONTENT_DIRECTION} nojs">
+<div id="wrap">
+    <div id="page-header">
+        <h1>{L_INSTALL_PANEL}</h1>
+        <p id="skip"><a href="#acp">{L_SKIP}</a></p>
+        <!-- IF S_LANG_SELECT -->
+        <form method="post" action="#" id="language_selector">
+            <fieldset class="nobg">
+                <label for="language">{L_SELECT_LANG}{L_COLON}</label>
+                <select  id="language" name="language">
+                    <!-- BEGIN language_select_item -->
+                    <option value="{language_select_item.VALUE}"<!-- IF language_select_item.SELECTED --> selected="selected"<!-- ENDIF -->>{language_select_item.NAME}</option>
+                    <!-- END language_select_item -->
+                </select>
+                <input class="button1" type="submit" id="change_lang" name="change_lang" value="{L_CHANGE}" />
+            </fieldset>
+        </form>
+        <!-- ENDIF -->
+    </div>
+
+    <div id="page-body">
+        <div id="tabs">
+            <ul>
+                <!-- BEGIN t_block1 -->
+                <li class="tab<!-- IF t_block1.S_SELECTED --> activetab<!-- ENDIF -->"><a href="{t_block1.U_TITLE}">{t_block1.L_TITLE}</a></li>
+                <!-- END t_block1 -->
+            </ul>
+        </div>
+
+        <div id="acp">
+            <div id="content">
+                <div id="menu">
+                    <div class="menu-block no-header">
+                        <ul>
+                            <!-- BEGIN l_block1 -->
+                            <li<!-- IF l_block1.S_SELECTED --> id="activemenu"<!-- ENDIF -->><a href="{l_block1.U_TITLE}"><span>{l_block1.L_TITLE}</span></a></li>
+                            <!-- END l_block1 -->
+                            <!-- BEGIN l_block2 -->
+                            <li<!-- IF l_block2.S_SELECTED --> id="activemenu"<!-- ENDIF -->><span<!-- IF l_block2.S_COMPLETE --> class="completed"<!-- ENDIF --> id="installer-stage-{l_block2.STAGE_NAME}">{l_block2.L_TITLE}</span></li>
+                            <!-- END l_block2 -->
+                        </ul>
+                    </div>
+                </div>
+
+                <div id="main" class="install-body">
+                    <div class="main">
diff --git a/phpBB/adm/style/installer_install.html b/phpBB/adm/style/installer_install.html
index 7700c79036..175c6eac67 100644
--- a/phpBB/adm/style/installer_install.html
+++ b/phpBB/adm/style/installer_install.html
@@ -1,4 +1,4 @@
-<!-- INCLUDE install_header.html -->
+<!-- INCLUDE installer_header.html -->
 <h1>{TITLE}</h1>
 <p>{CONTENT}</p>
 <!-- IF SHOW_INSTALL_START_FORM -->
@@ -10,4 +10,4 @@
 </form>
 <!-- ENDIF -->
 <!-- INCLUDEJS {T_ASSETS_PATH}/javascript/installer.js -->
-<!-- INCLUDE install_footer.html -->
+<!-- INCLUDE installer_footer.html -->
diff --git a/phpBB/adm/style/installer_main.html b/phpBB/adm/style/installer_main.html
new file mode 100644
index 0000000000..ed65da8a68
--- /dev/null
+++ b/phpBB/adm/style/installer_main.html
@@ -0,0 +1,6 @@
+<!-- INCLUDE installer_header.html -->
+
+    <h1>{TITLE}</h1>
+    <p>{BODY}</p>
+
+<!-- INCLUDE installer_footer.html -->
diff --git a/phpBB/phpbb/install/controller/installer_index.php b/phpBB/phpbb/install/controller/installer_index.php
index 0a1855f4e5..8e1874984b 100644
--- a/phpBB/phpbb/install/controller/installer_index.php
+++ b/phpBB/phpbb/install/controller/installer_index.php
@@ -74,6 +74,6 @@ class installer_index
 			'BODY'	=> $body,
 		));
 
-		return $this->helper->render('install_main.html', $title, true);
+		return $this->helper->render('installer_main.html', $title, true);
 	}
 }