diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-09 22:35:19 -0400 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-05-09 22:35:19 -0400 |
| commit | 7faabfb532677caadfeee07158a8d14f2e4468e7 (patch) | |
| tree | b163d27e3adb0ddfd50b83bb65dc8f985645522b | |
| parent | 820ed7a17d646f473579c26261ecf0387cb24ce4 (diff) | |
| parent | 2d35e6044300293916f26df4495af542b24c63a8 (diff) | |
| download | forums-7faabfb532677caadfeee07158a8d14f2e4468e7.tar forums-7faabfb532677caadfeee07158a8d14f2e4468e7.tar.gz forums-7faabfb532677caadfeee07158a8d14f2e4468e7.tar.bz2 forums-7faabfb532677caadfeee07158a8d14f2e4468e7.tar.xz forums-7faabfb532677caadfeee07158a8d14f2e4468e7.zip | |
Merge remote-tracking branch 'bantu/ticket/10154' into develop-olympus
* bantu/ticket/10154:
[ticket/10154] Move "copy permissions from" to below "parent" on forum creation
| -rw-r--r-- | phpBB/adm/style/acp_forums.html | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index d27cea28f7..9201736085 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -140,6 +140,12 @@ <dt><label for="parent">{L_FORUM_PARENT}:</label></dt> <dd><select id="parent" name="forum_parent_id"><option value="0"<!-- IF not S_FORUM_PARENT_ID --> selected="selected"<!-- ENDIF -->>{L_NO_PARENT}</option>{S_PARENT_OPTIONS}</select></dd> </dl> + <!-- IF S_CAN_COPY_PERMISSIONS --> + <dl> + <dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt> + <dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd> + </dl> + <!-- ENDIF --> <dl> <dt><label for="forum_name">{L_FORUM_NAME}:</label></dt> <dd><input class="text medium" type="text" id="forum_name" name="forum_name" value="{FORUM_NAME}" maxlength="255" /></dd> @@ -176,12 +182,6 @@ <dt><label for="forum_style">{L_FORUM_STYLE}:</label></dt> <dd><select id="forum_style" name="forum_style"><option value="0">{L_DEFAULT_STYLE}</option>{S_STYLES_OPTIONS}</select></dd> </dl> - <!-- IF S_CAN_COPY_PERMISSIONS --> - <dl> - <dt><label for="forum_perm_from">{L_COPY_PERMISSIONS}:</label><br /><span>{L_COPY_PERMISSIONS_EXPLAIN}</span></dt> - <dd><select id="forum_perm_from" name="forum_perm_from"><option value="0">{L_NO_PERMISSIONS}</option>{S_FORUM_OPTIONS}</select></dd> - </dl> - <!-- ENDIF --> </fieldset> <div id="forum_cat_options"> |