diff options
| author | Máté Bartus <mate.bartus@gmail.com> | 2017-11-15 21:44:53 +0100 |
|---|---|---|
| committer | Máté Bartus <mate.bartus@gmail.com> | 2017-11-15 21:44:53 +0100 |
| commit | 1a1a2dc0466f6283c5c3a4c6a0ed4ca7c84b4777 (patch) | |
| tree | b830298e992483edc0b1274eeef17563b01b8514 /phpBB/adm/style | |
| parent | 44d5bde61604979ea6f89951e78edf352f8a9bb5 (diff) | |
| parent | f57e3778470ad7df2e69b839fd329e53eb524481 (diff) | |
| download | forums-1a1a2dc0466f6283c5c3a4c6a0ed4ca7c84b4777.tar forums-1a1a2dc0466f6283c5c3a4c6a0ed4ca7c84b4777.tar.gz forums-1a1a2dc0466f6283c5c3a4c6a0ed4ca7c84b4777.tar.bz2 forums-1a1a2dc0466f6283c5c3a4c6a0ed4ca7c84b4777.tar.xz forums-1a1a2dc0466f6283c5c3a4c6a0ed4ca7c84b4777.zip | |
Merge pull request #4949 from marc1706/ticket/15353
[ticket/15353] Make sure users can continue update after merging file diff
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 --> |