From 11623dd6718ec12504286db3dfcd042ccb4e3688 Mon Sep 17 00:00:00 2001
From: MateBartus <mate.bartus@gmail.com>
Date: Tue, 28 Apr 2015 22:33:04 +0200
Subject: [ticket/13740] Front facing files and controllers

[ci skip]

PHPBB3-13740
---
 phpBB/adm/style/installer_form.html | 52 +++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 phpBB/adm/style/installer_form.html

(limited to 'phpBB/adm/style/installer_form.html')

diff --git a/phpBB/adm/style/installer_form.html b/phpBB/adm/style/installer_form.html
new file mode 100644
index 0000000000..dbcf3c19f8
--- /dev/null
+++ b/phpBB/adm/style/installer_form.html
@@ -0,0 +1,52 @@
+<form id="<!-- IF FORM_ID -->{FORM_ID}<!-- ELSE -->install_install<!-- ENDIF -->" method="POST" action="{U_ACTION}">
+<!-- IF .options -->
+<fieldset>
+
+    <!-- BEGIN options -->
+        <!-- IF options.S_LEGEND -->
+            <!-- IF not options.S_FIRST_ROW -->
+            </fieldset>
+
+            <fieldset>
+            <!-- ENDIF -->
+        <legend>{options.LEGEND}</legend>
+        <!-- ELSE -->
+
+            <!-- IF options.TYPE <> 'submit' -->
+        <dl>
+            <dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+            <dd>
+                <!-- IF options.TYPE == 'text' -->
+                <input type="text" name="{options.KEY}" value="{options.DEFAULT}" />
+                <!-- ENDIF -->
+                <!-- IF options.TYPE == 'email' -->
+                <input type="email" name="{options.KEY}" value="{options.DEFAULT}" />
+                <!-- ENDIF -->
+                <!-- IF options.TYPE == 'password' -->
+                <input type="password" name="{options.KEY}" />
+                <!-- ENDIF -->
+                <!-- IF options.TYPE == 'select' -->
+                <select name="{options.KEY}">
+                    <!-- BEGIN options.OPTIONS -->
+                    <option value="{options.OPTIONS.value}"<!-- IF options.OPTIONS.selected --> selected<!-- ENDIF -->>{options.OPTIONS.label}</option>
+                    <!-- END options.OPTIONS -->
+                </select>
+                <!-- ENDIF -->
+                <!-- IF options.TYPE == 'radio' -->
+                    <!-- BEGIN options.OPTIONS -->
+                <input type="radio" name="{options.KEY}" value="{options.OPTIONS.value}" <!-- IF options.OPTIONS.selected -->checked<!-- ENDIF --> /> {options.OPTIONS.label}
+                    <!-- END options.OPTIONS -->
+                <!-- ENDIF -->
+            </dd>
+        </dl>
+            <!-- ELSE -->
+</fieldset>
+                <fieldset class="submit-buttons">
+                    <legend>{L_SUBMIT}</legend>
+                    <input class="button1" type="submit" name="{options.KEY}" value="{options.TITLE}" />
+                </fieldset>
+            <!-- ENDIF -->
+        <!-- ENDIF-->
+    <!-- END options -->
+<!-- ENDIF -->
+</form>
-- 
cgit v1.2.1


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/installer_form.html | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'phpBB/adm/style/installer_form.html')

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}" />
-- 
cgit v1.2.1


From b4552a8ba303881d53995d334cc22aa175d5c46f Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Fri, 24 Jul 2015 08:33:02 +0200
Subject: [ticket/13740] Replace more spaces with tabs

PHPBB3-13740
---
 phpBB/adm/style/installer_form.html | 86 ++++++++++++++++++-------------------
 1 file changed, 43 insertions(+), 43 deletions(-)

(limited to 'phpBB/adm/style/installer_form.html')

diff --git a/phpBB/adm/style/installer_form.html b/phpBB/adm/style/installer_form.html
index 3cb4185bc6..669f7aa834 100644
--- a/phpBB/adm/style/installer_form.html
+++ b/phpBB/adm/style/installer_form.html
@@ -4,53 +4,53 @@
 <fieldset>
 <!-- ENDIF -->
 
-    <!-- BEGIN options -->
-        <!-- IF options.S_LEGEND -->
-            <!-- IF not options.S_FIRST_ROW -->
-            </fieldset>
+	<!-- BEGIN options -->
+		<!-- IF options.S_LEGEND -->
+			<!-- IF not options.S_FIRST_ROW -->
+			</fieldset>
 
-            <fieldset>
-            <!-- ENDIF -->
-        <legend>{options.LEGEND}</legend>
-        <!-- ELSE -->
+			<fieldset>
+			<!-- ENDIF -->
+		<legend>{options.LEGEND}</legend>
+		<!-- ELSE -->
 
-            <!-- IF options.TYPE <> 'submit' -->
-        <dl>
-            <dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
-            <dd>
-                <!-- IF options.TYPE == 'text' -->
-                <input type="text" name="{options.KEY}" value="{options.DEFAULT}" />
-                <!-- ENDIF -->
-                <!-- IF options.TYPE == 'email' -->
-                <input type="email" name="{options.KEY}" value="{options.DEFAULT}" />
-                <!-- ENDIF -->
-                <!-- IF options.TYPE == 'password' -->
-                <input type="password" name="{options.KEY}" />
-                <!-- ENDIF -->
-                <!-- IF options.TYPE == 'select' -->
-                <select name="{options.KEY}">
-                    <!-- BEGIN options.OPTIONS -->
-                    <option value="{options.OPTIONS.value}"<!-- IF options.OPTIONS.selected --> selected<!-- ENDIF -->>{options.OPTIONS.label}</option>
-                    <!-- END options.OPTIONS -->
-                </select>
-                <!-- ENDIF -->
-                <!-- IF options.TYPE == 'radio' -->
-                    <!-- BEGIN options.OPTIONS -->
-                <input type="radio" name="{options.KEY}" value="{options.OPTIONS.value}" <!-- IF options.OPTIONS.selected -->checked<!-- ENDIF --> /> {options.OPTIONS.label}
-                    <!-- END options.OPTIONS -->
-                <!-- ENDIF -->
-            </dd>
-        </dl>
-            <!-- ELSE -->
+			<!-- IF options.TYPE <> 'submit' -->
+		<dl>
+			<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
+			<dd>
+				<!-- IF options.TYPE == 'text' -->
+				<input type="text" name="{options.KEY}" value="{options.DEFAULT}" />
+				<!-- ENDIF -->
+				<!-- IF options.TYPE == 'email' -->
+				<input type="email" name="{options.KEY}" value="{options.DEFAULT}" />
+				<!-- ENDIF -->
+				<!-- IF options.TYPE == 'password' -->
+				<input type="password" name="{options.KEY}" />
+				<!-- ENDIF -->
+				<!-- IF options.TYPE == 'select' -->
+				<select name="{options.KEY}">
+					<!-- BEGIN options.OPTIONS -->
+					<option value="{options.OPTIONS.value}"<!-- IF options.OPTIONS.selected --> selected<!-- ENDIF -->>{options.OPTIONS.label}</option>
+					<!-- END options.OPTIONS -->
+				</select>
+				<!-- ENDIF -->
+				<!-- IF options.TYPE == 'radio' -->
+					<!-- BEGIN options.OPTIONS -->
+				<input type="radio" name="{options.KEY}" value="{options.OPTIONS.value}" <!-- IF options.OPTIONS.selected -->checked<!-- ENDIF --> /> {options.OPTIONS.label}
+					<!-- END options.OPTIONS -->
+				<!-- ENDIF -->
+			</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}" />
-                </fieldset>
-            <!-- ENDIF -->
-        <!-- ENDIF-->
-    <!-- END options -->
+				<fieldset class="submit-buttons">
+					<legend>{L_SUBMIT}</legend>
+					<input class="button1" type="submit" name="{options.KEY}" value="{options.TITLE}" />
+				</fieldset>
+			<!-- ENDIF -->
+		<!-- ENDIF-->
+	<!-- END options -->
 <!-- ENDIF -->
 </form>
-- 
cgit v1.2.1


From 8f5a0ad6f73e7b7757b02c827436384c96069b5a Mon Sep 17 00:00:00 2001
From: Mate Bartus <mate.bartus@gmail.com>
Date: Fri, 24 Jul 2015 09:20:50 +0200
Subject: [ticket/14039] Revamp updater

PHPBB3-14039
---
 phpBB/adm/style/installer_form.html | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'phpBB/adm/style/installer_form.html')

diff --git a/phpBB/adm/style/installer_form.html b/phpBB/adm/style/installer_form.html
index 669f7aa834..cc5b041fa1 100644
--- a/phpBB/adm/style/installer_form.html
+++ b/phpBB/adm/style/installer_form.html
@@ -1,6 +1,6 @@
 <form id="<!-- IF FORM_ID -->{FORM_ID}<!-- ELSE -->install_install<!-- ENDIF -->" method="POST" action="{U_ACTION}">
 <!-- IF .options -->
-<!-- IF S_FORM_ELEM_COUNT > 1 -->
+<!-- IF S_NOT_ONLY_BUTTON_FORM -->
 <fieldset>
 <!-- ENDIF -->
 
@@ -13,8 +13,6 @@
 			<!-- ENDIF -->
 		<legend>{options.LEGEND}</legend>
 		<!-- ELSE -->
-
-			<!-- IF options.TYPE <> 'submit' -->
 		<dl>
 			<dt><label for="{options.KEY}">{options.TITLE}{L_COLON}</label><!-- IF options.S_EXPLAIN --><br /><span class="explain">{options.TITLE_EXPLAIN}</span><!-- ENDIF --></dt>
 			<dd>
@@ -41,16 +39,18 @@
 				<!-- ENDIF -->
 			</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}" />
-				</fieldset>
-			<!-- ENDIF -->
 		<!-- ENDIF-->
 	<!-- END options -->
+<!-- IF S_NOT_ONLY_BUTTON_FORM -->
+</fieldset>
+<!-- ENDIF -->
+<!-- ENDIF -->
+<!-- IF .submit_buttons -->
+<fieldset class="submit-buttons">
+	<legend>{L_SUBMIT}</legend>
+	<!-- BEGIN submit_buttons -->
+	<input class="button1" type="submit" name="{submit_buttons.KEY}" value="{submit_buttons.TITLE}" />
+	<!-- END submit_buttons -->
+</fieldset>
 <!-- ENDIF -->
 </form>
-- 
cgit v1.2.1


From d84834db88ea54bc33a323457236943a56399747 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 23 Jul 2017 21:09:30 +0200
Subject: [ticket/15293] Prevent continuing to database update on incomplete
 file update

PHPBB3-15293
---
 phpBB/adm/style/installer_form.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'phpBB/adm/style/installer_form.html')

diff --git a/phpBB/adm/style/installer_form.html b/phpBB/adm/style/installer_form.html
index cc5b041fa1..a38f33c7c2 100644
--- a/phpBB/adm/style/installer_form.html
+++ b/phpBB/adm/style/installer_form.html
@@ -49,7 +49,7 @@
 <fieldset class="submit-buttons">
 	<legend>{L_SUBMIT}</legend>
 	<!-- BEGIN submit_buttons -->
-	<input class="button1" type="submit" name="{submit_buttons.KEY}" value="{submit_buttons.TITLE}" />
+	<input class="button1<!-- IF submit_buttons.DISABLED --> disabled<!-- ENDIF -->" type="submit" name="{submit_buttons.KEY}" value="{submit_buttons.TITLE}"<!-- IF submit_buttons.DISABLED --> disabled="disabled"<!-- ENDIF --> />
 	<!-- END submit_buttons -->
 </fieldset>
 <!-- ENDIF -->
-- 
cgit v1.2.1


From f8f985c099225700a888a91c34f0481910e08378 Mon Sep 17 00:00:00 2001
From: Marc Alexander <admin@m-a-styles.de>
Date: Sun, 10 Sep 2017 12:50:06 +0200
Subject: [ticket/15353] Make sure users can continue update after merging file
 diff

PHPBB3-15353
---
 phpBB/adm/style/installer_form.html | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'phpBB/adm/style/installer_form.html')

diff --git a/phpBB/adm/style/installer_form.html b/phpBB/adm/style/installer_form.html
index a38f33c7c2..592d361d1e 100644
--- a/phpBB/adm/style/installer_form.html
+++ b/phpBB/adm/style/installer_form.html
@@ -1,3 +1,4 @@
+<!-- IF FORM_TITLE --><h1>{FORM_TITLE}</h1><!-- ENDIF -->
 <form id="<!-- IF FORM_ID -->{FORM_ID}<!-- ELSE -->install_install<!-- ENDIF -->" method="POST" action="{U_ACTION}">
 <!-- IF .options -->
 <!-- IF S_NOT_ONLY_BUTTON_FORM -->
@@ -8,9 +9,9 @@
 		<!-- IF options.S_LEGEND -->
 			<!-- IF not options.S_FIRST_ROW -->
 			</fieldset>
-
-			<fieldset>
 			<!-- ENDIF -->
+			<fieldset>
+
 		<legend>{options.LEGEND}</legend>
 		<!-- ELSE -->
 		<dl>
@@ -49,7 +50,7 @@
 <fieldset class="submit-buttons">
 	<legend>{L_SUBMIT}</legend>
 	<!-- BEGIN submit_buttons -->
-	<input class="button1<!-- IF submit_buttons.DISABLED --> disabled<!-- ENDIF -->" type="submit" name="{submit_buttons.KEY}" value="{submit_buttons.TITLE}"<!-- IF submit_buttons.DISABLED --> disabled="disabled"<!-- ENDIF --> />
+	<input class="<!-- IF not submit_buttons.IS_SECONDARY -->button1<!-- ELSE -->button2<!-- ENDIF --><!-- IF submit_buttons.DISABLED --> disabled<!-- ENDIF -->" type="submit" name="{submit_buttons.KEY}" value="{submit_buttons.TITLE}"<!-- IF submit_buttons.DISABLED --> disabled="disabled"<!-- ENDIF --> />
 	<!-- END submit_buttons -->
 </fieldset>
 <!-- ENDIF -->
-- 
cgit v1.2.1