diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-18 16:27:35 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2006-11-18 16:27:35 +0000 |
| commit | e264a62b731d29389ba0a4a3548070e259e373c0 (patch) | |
| tree | 8b4c935deb992a577cedd8123a46b2fcaf128d6d /phpBB/adm/style/acp_forums.html | |
| parent | 5f788b4d08838dec5e8168f2efd515859224a3a4 (diff) | |
| download | forums-e264a62b731d29389ba0a4a3548070e259e373c0.tar forums-e264a62b731d29389ba0a4a3548070e259e373c0.tar.gz forums-e264a62b731d29389ba0a4a3548070e259e373c0.tar.bz2 forums-e264a62b731d29389ba0a4a3548070e259e373c0.tar.xz forums-e264a62b731d29389ba0a4a3548070e259e373c0.zip | |
- a handful of mcp fixed, the most important one is the change for check_ids() - it is now supporting ids from more than one forum too, making it possible to use some mcp features as designed initially. We really need to get our moderator team testing the mcp extensively.
- fixed some other tiny glitches
- if a forum category with subforums get changed to a link type forum give options of what to do with the subforums (#5334)
- other bugfixes
git-svn-id: file:///svn/phpbb/trunk@6601 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/adm/style/acp_forums.html')
| -rw-r--r-- | phpBB/adm/style/acp_forums.html | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/phpBB/adm/style/acp_forums.html b/phpBB/adm/style/acp_forums.html index d46753c2a0..6025629ce1 100644 --- a/phpBB/adm/style/acp_forums.html +++ b/phpBB/adm/style/acp_forums.html @@ -23,6 +23,17 @@ } <!-- ENDIF --> + <!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS --> + if (value == {FORUM_LINK}) + { + dE('cat_to_link_actions', 1); + } + else + { + dE('cat_to_link_actions', -1); + } + <!-- ENDIF --> + if (value == {FORUM_POST}) { dE('forum_post_options', 1); @@ -58,6 +69,12 @@ <!-- ENDIF --> <!-- ENDIF --> + <!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS --> + <!-- IF S_FORUM_CAT --> + dE('cat_to_link_actions', -1); + <!-- ENDIF --> + <!-- ENDIF --> + <!-- IF not S_FORUM_POST --> dE('forum_post_options', -1); <!-- ENDIF --> @@ -108,6 +125,18 @@ </dl> </div> <!-- ENDIF --> + <!-- IF not S_ADD_ACTION and S_FORUM_ORIG_CAT and S_HAS_SUBFORUMS --> + <div id="cat_to_link_actions"> + <dl> + <dt><label for="action_subforums">{L_DECIDE_MOVE_DELETE_SUBFORUMS}:</label></dt> + <!-- IF S_FORUMS_LIST --> + <dd><input type="radio" class="radio" name="action_subforums" value="move" checked="checked" /> {L_MOVE_SUBFORUMS_TO} <select name="subforums_to_id">{S_FORUMS_LIST}</select></dd> + <!-- ELSE --> + <dd><input type="radio" class="radio" id="action_subforums" name="action_subforums" value="delete" checked="checked" /> {L_DELETE_SUBFORUMS}</dd> + <!-- ENDIF --> + </dl> + </div> + <!-- ENDIF --> <dl> <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> |