diff options
author | Marc Alexander <admin@m-a-styles.de> | 2017-09-10 12:50:06 +0200 |
---|---|---|
committer | Marc Alexander <admin@m-a-styles.de> | 2017-09-10 12:52:12 +0200 |
commit | f8f985c099225700a888a91c34f0481910e08378 (patch) | |
tree | 14fac4d7f747b99a27ed2def90bb04ba1e831d0b /phpBB/adm/style | |
parent | 954af4f18009740bdf3f15b6a2518162e0638c05 (diff) | |
download | forums-f8f985c099225700a888a91c34f0481910e08378.tar forums-f8f985c099225700a888a91c34f0481910e08378.tar.gz forums-f8f985c099225700a888a91c34f0481910e08378.tar.bz2 forums-f8f985c099225700a888a91c34f0481910e08378.tar.xz forums-f8f985c099225700a888a91c34f0481910e08378.zip |
[ticket/15353] Make sure users can continue update after merging file diff
PHPBB3-15353
Diffstat (limited to 'phpBB/adm/style')
-rw-r--r-- | phpBB/adm/style/installer_form.html | 7 |
1 files changed, 4 insertions, 3 deletions
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 --> |