diff options
| author | Nils Adermann <naderman@naderman.de> | 2006-06-20 19:00:30 +0000 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2006-06-20 19:00:30 +0000 |
| commit | 4448249a4433c9047b886efe2ec06dce6c4276f8 (patch) | |
| tree | c03475df6cdc346279f33f6931c5214055a8db93 /phpBB/adm | |
| parent | c125ae12761e99a0f11703bbbec0defb29ad90c4 (diff) | |
| download | forums-4448249a4433c9047b886efe2ec06dce6c4276f8.tar forums-4448249a4433c9047b886efe2ec06dce6c4276f8.tar.gz forums-4448249a4433c9047b886efe2ec06dce6c4276f8.tar.bz2 forums-4448249a4433c9047b886efe2ec06dce6c4276f8.tar.xz forums-4448249a4433c9047b886efe2ec06dce6c4276f8.zip | |
- correctly display subcategories
- use L_TRANSLATION_INFO [Bug #2357]
- always begin with ACL_UNSET in permission trace
- allow copy permissions when editing a forum
- default to parent forum for copying permissions
- no duplication of the breadcrumps on registration [Bug #2307]
git-svn-id: file:///svn/phpbb/trunk@6107 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm')
| -rw-r--r-- | phpBB/adm/style/acp_forums.html | 10 | ||||
| -rw-r--r-- | phpBB/adm/style/overall_footer.html | 3 | ||||
| -rw-r--r-- | phpBB/adm/style/simple_footer.html | 1 |
3 files changed, 7 insertions, 7 deletions
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index bf4434d972..e596ce73e7 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -100,12 +100,10 @@ <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_ADD_ACTION --> - <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_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> </fieldset> <div id="forum_cat_options"<!-- IF not S_FORUM_CAT --> style="display: none;"<!-- ENDIF -->> diff --git a/phpBB/adm/style/overall_footer.html b/phpBB/adm/style/overall_footer.html index 1ca5c4304e..44ff7ccd6a 100644 --- a/phpBB/adm/style/overall_footer.html +++ b/phpBB/adm/style/overall_footer.html @@ -19,8 +19,9 @@ <div id="page-footer"> <!-- IF S_COPYRIGHT_HTML --> Powered by phpBB {VERSION} © 2006 <a href="http://www.phpbb.com/">phpBB Group</a> + {L_TRANSLATION_INFO} <!-- ENDIF --> - + <!-- IF DEBUG_OUTPUT --> <!-- IF S_COPYRIGHT_HTML --><br /><!-- ENDIF --> {DEBUG_OUTPUT} diff --git a/phpBB/adm/style/simple_footer.html b/phpBB/adm/style/simple_footer.html index 8dbec6ace3..6ac945912d 100644 --- a/phpBB/adm/style/simple_footer.html +++ b/phpBB/adm/style/simple_footer.html @@ -17,6 +17,7 @@ <!-- IF S_COPYRIGHT_HTML --> <br />Powered by phpBB {VERSION} © 2006 <a href="http://www.phpbb.com/">phpBB Group</a> + {TRANSLATION_INFO} <!-- ENDIF --> <!-- IF DEBUG_OUTPUT --> |