From db4cfa7df62d5911bc5a0edcdc59236c39aede08 Mon Sep 17 00:00:00 2001
From: CHItA <mate.bartus@gmail.com>
Date: Thu, 11 Jun 2015 19:32:11 +0200
Subject: [ticket/13740] Add navigation bar support for the installer

Also added various UI elements and texts.
[ci skip]

PHPBB3-13740
---
 phpBB/adm/style/install_header.html    | 2 +-
 phpBB/adm/style/installer_form.html    | 4 ++++
 phpBB/adm/style/installer_install.html | 6 +++---
 3 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'phpBB/adm')

diff --git a/phpBB/adm/style/install_header.html b/phpBB/adm/style/install_header.html
index 6f7f129d39..b162fa3e89 100644
--- a/phpBB/adm/style/install_header.html
+++ b/phpBB/adm/style/install_header.html
@@ -43,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 -->>{l_block2.L_TITLE}</span></li>
+							<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>
diff --git a/phpBB/adm/style/installer_form.html b/phpBB/adm/style/installer_form.html
index dbcf3c19f8..3cb4185bc6 100644
--- a/phpBB/adm/style/installer_form.html
+++ b/phpBB/adm/style/installer_form.html
@@ -1,6 +1,8 @@
 <form id="<!-- IF FORM_ID -->{FORM_ID}<!-- ELSE -->install_install<!-- ENDIF -->" method="POST" action="{U_ACTION}">
 <!-- IF .options -->
+<!-- IF S_FORM_ELEM_COUNT > 1 -->
 <fieldset>
+<!-- ENDIF -->
 
     <!-- BEGIN options -->
         <!-- IF options.S_LEGEND -->
@@ -40,7 +42,9 @@
             </dd>
         </dl>
             <!-- ELSE -->
+<!-- IF S_FORM_ELEM_COUNT > 1 -->
 </fieldset>
+<!-- ENDIF -->
                 <fieldset class="submit-buttons">
                     <legend>{L_SUBMIT}</legend>
                     <input class="button1" type="submit" name="{options.KEY}" value="{options.TITLE}" />
diff --git a/phpBB/adm/style/installer_install.html b/phpBB/adm/style/installer_install.html
index 7d62075c62..7700c79036 100644
--- a/phpBB/adm/style/installer_install.html
+++ b/phpBB/adm/style/installer_install.html
@@ -1,11 +1,11 @@
 <!-- INCLUDE install_header.html -->
-<h1>{L_INSTALL}</h1>
-{CONTENT}
+<h1>{TITLE}</h1>
+<p>{CONTENT}</p>
 <!-- IF SHOW_INSTALL_START_FORM -->
 <form id="install_install" method="post" action="{U_ACTION}">
     <fieldset class="submit-buttons">
         <legend>{L_SUBMIT}</legend>
-        <input name="install" type="submit" value="{L_INSTALL}" />
+        <input class="button1" name="install" type="submit" value="{L_INSTALL}" />
     </fieldset>
 </form>
 <!-- ENDIF -->
-- 
cgit v1.2.1