Changeset 732

Timestamp:

11/13/08 23:10:52 (8 weeks ago)

Author:

Paul

Message:

See note to r.719

Somebody needs to start reviewing the hooks in the changed files (r.719 onwards). There won't be any other substantive updates of these files so its safe to do the final hook placements.

Location:

fluxbb/branches/fluxbb-1.3-dev/upload

Files:

• lang/English/misc.php (modified) (2 diffs)
• moderate.php (modified) (59 diffs)
• viewforum.php (modified) (1 diff)
• viewtopic.php (modified) (2 diffs)

fluxbb/branches/fluxbb-1.3-dev/upload/lang/English/misc.php

@@ -38 +38 @@
 'Moderate forum'                        =>      'Moderate forum',
 'Select'                                        =>      'Select',       // the header of a column of checkboxes
+'Cannot select'                         =>      'You cannot select the first post',
 'Move'                                          =>      'Move',
 'Merge'                                         =>      'Merge',
@@ -57 +58 @@
 'Delete topic'                          =>      'Delete topic',
 'Delete topics'                         =>      'Delete topics',
+'Select all forums title'       =>      'Select all forums on this page.',
 'To new forum'                          =>      'to a new forum',
 'Move to'                                       =>      'Destination forum:',

fluxbb/branches/fluxbb-1.3-dev/upload/moderate.php

@@ -115 +115 @@
         if ($tid < 1)
                 message($lang_common['Bad request']);
-        
+
         $forum_page['page'] = (!isset($_GET['p']) || $_GET['p'] <= 1) ? 1 : intval($_GET['p']);
-        
+
         // Check for use of incorrect URLs
         confirm_current_url($forum_page['page'] == 1 ? forum_link($forum_url['moderate_topic'], array($fid, $tid)) : forum_sublink($forum_url['moderate_topic'], $forum_url['page'], $forum_page['page'], array($fid, $tid)));
@@ -144 +144 @@
                 ($hook = get_hook('mr_delete_posts_form_submitted')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
+                unset($forum_page['page']);
+
                 $posts = isset($_POST['posts']) && !empty($_POST['posts']) ? $_POST['posts'] : array();
                 $posts = array_map('intval', (is_array($posts) ? $posts : explode(',', $posts)));
@@ -192 +194 @@
 
                 // Setup form
-                $forum_page['group_count'] = $forum_page['item_count'] = $forum_page['fld_count'] = 0;
+                $forum_page['fld_count'] = 0;
                 $forum_page['form_action'] = forum_link($forum_url['moderate_topic'], array($fid, $tid));
 
@@ -208 +210 @@
                 );
 
+                // Setup main heading
+                $forum_page['main_hd'] = end($forum_page['crumbs']);
+
                 ($hook = get_hook('mr_confirm_delete_posts_pre_header_load')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
@@ -213 +218 @@
                 require FORUM_ROOT.'header.php';
 
-                // START SUBST - <!-- forum_main -->
+                // START SUBST - <!-- forum_main_content -->
                 ob_start();
 
@@ -219 +224 @@
 
 ?>
-        <div class="main-content main-frm">
-                <form class="frm-form" method="post" accept-charset="utf-8" action="<?php echo $forum_page['form_action'] ?>">
+        <div class="content">
+                <div class="section section-1 datafrm">
+                <form method="post" accept-charset="utf-8" action="<?php echo $forum_page['form_action'] ?>">
                         <div class="hidden">
                                 <?php echo implode("\n\t\t\t\t", $forum_page['hidden_fields'])."\n" ?>
                         </div>
-<?php ($hook = get_hook('mr_confirm_delete_posts_pre_fieldset')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                        <fieldset class="frm-group group<?php echo ++$forum_page['group_count'] ?>">
-                                <legend class="group-legend"><strong><?php echo $lang_misc['Delete posts'] ?></strong></legend>
+<?php ($hook = get_hook('mr_confirm_delete_posts_pre_group')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
+                        <div class="frm-group frm-group-1">
 <?php ($hook = get_hook('mr_confirm_delete_posts_pre_confirm_checkbox')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                                <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>">
+                                <div class="sf-set frm-set frm-set-1">
                                         <div class="sf-box checkbox">
                                                 <span class="fld-input"><input type="checkbox" id="fld<?php echo ++$forum_page['fld_count'] ?>" name="req_confirm" value="1" checked="checked" /></span>
-                                                <label for="fld<?php echo $forum_page['fld_count'] ?>"><span><?php echo $lang_common['Please confirm'] ?></span> <?php echo $lang_misc['Confirm post delete'] ?>.</label>
+                                                <label for="fld<?php echo $forum_page['fld_count'] ?>"><span><?php echo $lang_common['Please confirm'] ?></span> <br /><small><?php echo $lang_misc['Confirm post delete'] ?></small></label>
                                         </div>
                                 </div>
-<?php ($hook = get_hook('mr_confirm_delete_posts_pre_fieldset_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
+<?php ($hook = get_hook('mr_confirm_delete_posts_pre_group_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
                         </fieldset>
-<?php ($hook = get_hook('mr_confirm_delete_posts_fieldset_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
+<?php ($hook = get_hook('mr_confirm_delete_posts_group_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
                         <div class="frm-buttons">
-                                <span class="submit"><input type="submit" name="delete_posts_comply" value="<?php echo $lang_common['Delete'] ?>" /></span>
-                                <span class="cancel"><input type="submit" name="cancel" value="<?php echo $lang_common['Cancel'] ?>" /></span>
+                                <p class="frm-actions"><span class="submit"><input type="submit" name="delete_posts_comply" value="<?php echo $lang_common['Delete'] ?>" /></span> <span class="cancel"><input type="submit" name="cancel" value="<?php echo $lang_common['Cancel'] ?>" /></span></p>
                         </div>
                 </form>
+                </div>
         </div>
 <?php
@@ -250 +255 @@
 
                 $tpl_temp = forum_trim(ob_get_contents());
-                $tpl_main = str_replace('<!-- forum_main -->', $tpl_temp, $tpl_main);
+                $tpl_main = str_replace('<!-- forum_main_content -->', $tpl_temp, $tpl_main);
                 ob_end_clean();
-                // END SUBST - <!-- forum_main -->
+                // END SUBST - <!-- forum_main_content -->
 
                 require FORUM_ROOT.'footer.php';
@@ -259 +264 @@
         {
                 ($hook = get_hook('mr_split_posts_form_submitted')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
+
+                unset($forum_page['page']);
 
                 $posts = isset($_POST['posts']) && !empty($_POST['posts']) ? $_POST['posts'] : array();
@@ -340 +347 @@
 
                 // Setup form
-                $forum_page['group_count'] = $forum_page['item_count'] = $forum_page['fld_count'] = 0;
+                $forum_page['fld_count'] = 0;
                 $forum_page['form_action'] = forum_link($forum_url['moderate_topic'], array($fid, $tid));
 
@@ -356 +363 @@
                 );
 
+                // Setup main heading
+                $forum_page['main_hd'] = end($forum_page['crumbs']);
+
                 ($hook = get_hook('mr_confirm_split_posts_pre_header_load')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
@@ -361 +371 @@
                 require FORUM_ROOT.'header.php';
 
-                // START SUBST - <!-- forum_main -->
+                // START SUBST - <!-- forum_main_content -->
                 ob_start();
 
@@ -367 +377 @@
 
 ?>
-        <div class="main-content main-frm">
-                <form class="frm-form" method="post" accept-charset="utf-8" action="<?php echo $forum_page['form_action'] ?>">
+        <div class="content">
+                <div class="content content-1 datafrm">
+                <form method="post" accept-charset="utf-8" action="<?php echo $forum_page['form_action'] ?>">
                         <div class="hidden">
                                 <?php echo implode("\n\t\t\t\t", $forum_page['hidden_fields'])."\n" ?>
                         </div>
 <?php ($hook = get_hook('mr_confirm_split_posts_pre_fieldset')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                        <fieldset class="frm-group group<?php echo ++$forum_page['group_count'] ?>">
-                                <legend class="group-legend"><strong><?php echo $lang_misc['Split posts'] ?></strong></legend>
-                                <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>">
+                        <div class="frm-group frm-group-1">
+                                <div class="sf-set frm-set frm-set-1">
 <?php ($hook = get_hook('mr_confirm_split_posts_pre_subject')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
                                         <div class="sf-box text required">
@@ -381 +391 @@
                                                 <span class="fld-input"><input type="text" id="fld<?php echo $forum_page['fld_count'] ?>" name="new_subject" value="" size="80" maxlength="70" /></span>
                                         </div>
+                                </div>
 <?php ($hook = get_hook('mr_confirm_split_posts_pre_confirm_checkbox')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
+                                <div class="sf-set frm-set">
                                         <div class="sf-box checkbox">
                                                 <span class="fld-input"><input type="checkbox" id="fld<?php echo ++$forum_page['fld_count'] ?>" name="req_confirm" value="1" checked="checked" /></span>
@@ -388 +400 @@
                                 </div>
 <?php ($hook = get_hook('mr_confirm_split_posts_pre_fieldset_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                        </fieldset>
+                        </div>
 <?php ($hook = get_hook('mr_confirm_split_posts_fieldset_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
                         <div class="frm-buttons">
-                                <span class="submit"><input type="submit" name="split_posts_comply" value="<?php echo $lang_common['Split'] ?>" /></span>
-                                <span class="cancel"><input type="submit" name="cancel" value="<?php echo $lang_common['Cancel'] ?>" /></span>
+                                <p class="frm-actions"><span class="submit"><input type="submit" name="split_posts_comply" value="<?php echo $lang_common['Split'] ?>" /></span> <span class="cancel"><input type="submit" name="cancel" value="<?php echo $lang_common['Cancel'] ?>" /></span></p>
                         </div>
                 </form>
+                </div>
         </div>
 <?php
@@ -403 +415 @@
 
                 $tpl_temp = forum_trim(ob_get_contents());
-                $tpl_main = str_replace('<!-- forum_main -->', $tpl_temp, $tpl_main);
+                $tpl_main = str_replace('<!-- forum_main_content -->', $tpl_temp, $tpl_main);
                 ob_end_clean();
-                // END SUBST - <!-- forum_main -->
+                // END SUBST - <!-- forum_main_content -->
 
                 require FORUM_ROOT.'footer.php';
@@ -424 +436 @@
         $forum_page['start_from'] = $forum_user['disp_posts'] * ($forum_page['page'] - 1);
         $forum_page['finish_at'] = min(($forum_page['start_from'] + $forum_user['disp_posts']), ($cur_topic['num_replies'] + 1));
-        $forum_page['items_info'] = generate_items_info($lang_misc['Posts'], ($forum_page['start_from'] + 1), ($cur_topic['num_replies'] + 1));
 
         // Generate paging links
@@ -456 +467 @@
 
         // Setup main heading
-        $forum_page['main_head'] = sprintf($lang_misc['Moderate topic head'], forum_htmlencode($cur_topic['subject']));
-
-        if ($forum_page['num_pages'] > 1)
-                $forum_page['main_head_pages'] = sprintf($lang_common['Page info'], $forum_page['page'], $forum_page['num_pages']);
+        $forum_page['main_hd'] = sprintf($lang_misc['Moderate topic head'], '<a class="permalink" href="'.forum_link($forum_url['topic'], array($tid, sef_friendly($cur_topic['subject']))).'" rel="bookmark" title="'.$lang_topic['Permalink topic'].'">'.forum_htmlencode($cur_topic['subject']).'</a>');
 
         ($hook = get_hook('mr_post_actions_pre_header_load')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
@@ -472 +480 @@
 
 ?>
-        <div class="main-pagehead">
-                <h2 class="hn"><span><?php echo $forum_page['items_info'] ?></span></h2>
-        </div>
         <form id="mr-post-actions-form" class="newform" method="post" accept-charset="utf-8" action="<?php echo $forum_page['form_action'] ?>">
-        <div class="main-content main-topic">
-                <div class="hidden">
-                        <input type="hidden" name="csrf_token" value="<?php echo generate_form_token($forum_page['form_action']) ?>" />
-                </div>
-
+        <div class="content topic">
+                <div class="setion section-1 posts">
+                        <div class="hidden">
+                                <input type="hidden" name="csrf_token" value="<?php echo generate_form_token($forum_page['form_action']) ?>" />
+                        </div>
+                        <div class="section-hd">
+                                <h2 class="hn"><span><?php echo $lang_topic['Posts'] ?></span></h2>
+                        </div>
 <?php
 
@@ -516 +524 @@
 
                 $forum_page['post_ident'] = array();
-                $forum_page['message'] = array();
                 $forum_page['author_title'] = '';
                 $forum_page['user_ident'] = array();
                 $cur_post['username'] = $cur_post['poster'];
+                $forum_page['post_options'] = array();
+                $forum_page['post_actions'] = array();
+                $forum_page['message'] = array();
 
                 // Generate the post heading
@@ -533 +543 @@
                 ($hook = get_hook('mr_row_pre_item_ident_merge')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
+                // Generate author identification
+                $forum_page['user_ident']['username'] = '<li class="username">'.(($cur_post['poster_id'] > '1') ? '<a title="'.sprintf($lang_topic['Go to profile'], forum_htmlencode($cur_post['username'])).'" href="'.forum_link($forum_url['user'], $cur_post['poster_id']).'">'.forum_htmlencode($cur_post['username']).'</a>' : '<strong>'.forum_htmlencode($cur_post['username']).'</strong>').'</li>';
+                $forum_page['user_ident']['usertitle'] = '<li class="usertitle"><span>'.get_title($cur_post).'</span></li>';
+
                 // Generate the checkbox field
                 if ($cur_post['id'] != $cur_topic['first_post_id'])
-                        $forum_page['item_select'] = '<p class="item-select"><input type="checkbox" id="fld'.$cur_post['id'].'" name="posts[]" value="'.$cur_post['id'].'" /> <label for="fld'.$cur_post['id'].'">'.$lang_misc['Select post'].' '.forum_number_format($forum_page['start_from'] + $forum_page['item_count']).'</label></p>';
-
-                // Generate author identification
-                $forum_page['author_ident']['username'] = '<li class="username">'.(($cur_post['poster_id'] > '1') ? '<a title="'.sprintf($lang_topic['Go to profile'], forum_htmlencode($cur_post['username'])).'" href="'.forum_link($forum_url['user'], $cur_post['poster_id']).'">'.forum_htmlencode($cur_post['username']).'</a>' : '<strong>'.forum_htmlencode($cur_post['username']).'</strong>').'</li>';
-                $forum_page['author_ident']['usertitle'] = '<li class="usertitle"><span>'.get_title($cur_post).'</span></li>';
+                        $forum_page['post_actions']['select'] = '<span class="select-post"><input type="checkbox" id="fld'.$cur_post['id'].'" name="posts[]" value="'.$cur_post['id'].'" /> <label for="fld'.$cur_post['id'].'">'.$lang_misc['Select post'].' '.forum_number_format($forum_page['start_from'] + $forum_page['item_count']).'</label></span>';
+                else
+                        $forum_page['post_actions']['no_select'] = '<span class="noselect-post">'.$lang_misc['Cannot select'].'</span>';
+
+                if (!empty($forum_page['post_actions']))
+                        $forum_page['post_options']['actions'] = '<p class="post-actions">'.implode(' ', $forum_page['post_actions']).'</p>';
 
                 // Give the post some class
                 $forum_page['item_status'] = array(
                         'post',
-                        ($forum_page['item_count'] % 2 != 0) ? 'odd' : 'even'
+                        ($forum_page['item_count'] % 2 != 0) ? 'oddpost' : 'evenpost'
                 );
 
@@ -577 +592 @@
                         <div class="<?php echo implode(' ', $forum_page['item_status']) ?>">
                                 <div id="p<?php echo $cur_post['id'] ?>" class="posthead">
-                                        <h3 class="hn post-ident"><?php echo implode(' ', $forum_page['post_ident']) ?></h3>
-<?php ($hook = get_hook('mr_post_actions_pre_item_select')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-<?php if (isset($forum_page['item_select'])) echo "\t\t\t\t".$forum_page['item_select']."\n" ?>
+                                        <div class="post-ident">
+                                                <h3 class="hn"><?php echo implode(' ', $forum_page['post_ident']) ?></h3>
 <?php ($hook = get_hook('mr_post_actions_new_post_head_option')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
+                                        </div>
                                 </div>
                                 <div class="postbody">
-                                        <div class="post-author">
-                                                <ul class="author-ident">
-                                                        <?php echo implode("\n\t\t\t\t\t\t", $forum_page['author_ident'])."\n" ?>
-                                                </ul>
+                                        <div class="post-content">
+                                                <div class="post-user">
+                                                        <ul class="user-ident">
+                                                                <?php echo implode("\n\t\t\t\t\t\t\t", $forum_page['user_ident'])."\n" ?>
+                                                        </ul>
 <?php ($hook = get_hook('mr_post_actions_new_user_ident_data')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                                        </div>
-                                        <div class="post-entry">
-                                                <h4 class="entry-title"><?php echo $forum_page['item_subject'] ?></h4>
-                                                <div class="entry-content">
-                                                        <?php echo implode("\n\t\t\t\t\t\t\t", $forum_page['message'])."\n" ?>
                                                 </div>
+                                                <div class="post-entry">
+                                                        <h4 class="entry-title"><?php echo $forum_page['item_subject'] ?></h4>
+                                                        <div class="entry-content">
+                                                                <?php echo implode("\n\t\t\t\t\t\t\t\t", $forum_page['message'])."\n" ?>
+                                                        </div>
 <?php ($hook = get_hook('mr_post_actions_new_post_entry_data')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
+                                                </div>
                                         </div>
                                 </div>
-                        </div>
+<?php if (!empty($forum_page['post_options'])): ?>                              <div class="postfoot">
+                                        <div class="post-options">
+                                                <?php echo implode("\n\t\t\t\t\t\t", $forum_page['post_options'])."\n" ?>
+                                        </div>
+                                </div>
+<?php endif; ?>                 </div>
 <?php
 
@@ -603 +625 @@
 
 ?>
+                </div>
         </div>
 <?php
@@ -614 +637 @@
 
 ?>
-        <div class="main-options mod-options gen-content">
-                <p id="select-all"><a href="#" onclick="return Forum.toggleCheckboxes(document.getElementById('mr-post-actions-form'))"><?php echo $lang_misc['Select all'] ?></a></p>
-                <p class="options"><?php echo implode(' ', $forum_page['mod_options']) ?></p>
+        <div id="mod-options" class="main-options">
+                <h2 class="hn"><span><?php echo $lang_topic['Moderator options'] ?></span></h2>
+                <p class="options"><span id="select-all"><a href="#" onclick="return Forum.toggleCheckboxes(document.getElementById('mr-post-actions-form'))"><?php echo $lang_misc['Select all'] ?></a></span> <?php echo implode(' ', $forum_page['mod_options']) ?></p>
         </div>
         </form>
@@ -626 +649 @@
 
         $tpl_temp = forum_trim(ob_get_contents());
-        $tpl_main = str_replace('<!-- forum_main -->', $tpl_temp, $tpl_main);
+        $tpl_main = str_replace('<!-- forum_main_content -->', $tpl_temp, $tpl_main);
         ob_end_clean();
         // END SUBST - <!-- forum_main -->
@@ -641 +664 @@
                 // Check for use of incorrect URLs
                 confirm_current_url(forum_link($forum_url['moderate_forum'], $fid));
-                
+
                 ($hook = get_hook('mr_confirm_move_topics_form_submitted')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
@@ -739 +762 @@
                 // Check for use of incorrect URLs
                 confirm_current_url(forum_link($forum_url['moderate_forum'], $fid));
-                
+
                 $topics = isset($_POST['topics']) && is_array($_POST['topics']) ? $_POST['topics'] : array();
                 $topics = array_map('intval', $topics);
@@ -754 +777 @@
                 if ($topics < 1)
                         message($lang_common['Bad request']);
-                
+
                 // Check for use of incorrect URLs
                 confirm_current_url(forum_link($forum_url['move'], array($fid, $topics)));
         }
-        
+
         if (is_array($topics))
         {
@@ -813 +836 @@
 
         // Setup form
-        $forum_page['group_count'] = $forum_page['item_count'] = $forum_page['fld_count'] = 0;
+        $forum_page['fld_count'] = 0;
         $forum_page['form_action'] = forum_link($forum_url['moderate_forum'], $fid);
 
@@ -831 +854 @@
 
         //Setup main heading
-        $forum_page['main_head'] = end($forum_page['crumbs']).' '.$lang_misc['To new forum'];
+        $forum_page['main_hd'] = end($forum_page['crumbs']).' '.$lang_misc['To new forum'];
 
         ($hook = get_hook('mr_move_topics_pre_header_load')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
@@ -838 +861 @@
         require FORUM_ROOT.'header.php';
 
-        // START SUBST - <!-- forum_main -->
+        // START SUBST - <!-- forum_main_content -->
         ob_start();
 
@@ -844 +867 @@
 
 ?>
-        <div class="main-content main-frm">
+        <div class="content">
+                <div class="section section-1 datafrm">
                 <form class="frm-form" method="post" accept-charset="utf-8" action="<?php echo $forum_page['form_action'] ?>">
                         <div class="hidden">
                                 <?php echo implode("\n\t\t\t\t", $forum_page['hidden_fields'])."\n" ?>
                         </div>
-<?php ($hook = get_hook('mr_move_topics_pre_fieldset')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                        <fieldset class="frm-group group<?php echo ++$forum_page['group_count'] ?>">
-                                <legend class="group-legend"><strong><?php echo $lang_misc['Move topic'] ?></strong></legend>
+<?php ($hook = get_hook('mr_move_topics_pre_group')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
+                        <div class="frm-group frm-group-1">
 <?php ($hook = get_hook('mr_move_topics_pre_move_to_forum')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                                <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>">
+                                <div class="sf-set frm-set frm-set-1">
                                         <div class="sf-box select">
                                                 <label for="fld<?php echo ++$forum_page['fld_count'] ?>"><span><?php echo $lang_misc['Move to'] ?></span></label><br />
@@ -881 +904 @@
                                 </div>
 <?php ($hook = get_hook('mr_move_topics_pre_redirect_checkbox')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                                <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>">
+                                <div class="sf-set frm-set">
                                         <div class="sf-box checkbox">
                                                 <span class="fld-input"><input type="checkbox" id="fld<?php echo (++$forum_page['fld_count']) ?>" name="with_redirect" value="1"<?php if ($action == 'single') echo ' checked="checked"' ?> /></span>
-                                                <label for="fld<?php echo $forum_page['fld_count'] ?>"><span><?php echo $lang_misc['Redirect topic'] ?></span> <?php echo ($action == 'single') ? $lang_misc['Leave redirect'] : $lang_misc['Leave redirects'] ?></label>
+                                                <label for="fld<?php echo $forum_page['fld_count'] ?>"><span><?php echo $lang_misc['Redirect topic'] ?></span> <br /><small><?php echo ($action == 'single') ? $lang_misc['Leave redirect'] : $lang_misc['Leave redirects'] ?></small></label>
                                         </div>
                                 </div>
 <?php ($hook = get_hook('mr_move_topics_pre_fieldset_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                        </fieldset>
+                        </div>
 <?php ($hook = get_hook('mr_move_topics_fieldset_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
                         <div class="frm-buttons">
-                                <span class="submit"><input type="submit" name="move_topics_to" value="<?php echo $lang_misc['Move'] ?>" /></span>
-                                <span class="cancel"><input type="submit" name="cancel" value="<?php echo $lang_common['Cancel'] ?>" /></span>
+                                <p class="frm-actions"><span class="submit"><input type="submit" name="move_topics_to" value="<?php echo $lang_misc['Move'] ?>" /></span> <span class="cancel"><input type="submit" name="cancel" value="<?php echo $lang_common['Cancel'] ?>" /></span></p>
                         </div>
                 </form>
+                </div>
         </div>
 <?php
@@ -903 +926 @@
 
         $tpl_temp = forum_trim(ob_get_contents());
-        $tpl_main = str_replace('<!-- forum_main -->', $tpl_temp, $tpl_main);
+        $tpl_main = str_replace('<!-- forum_main_content -->', $tpl_temp, $tpl_main);
         ob_end_clean();
-        // END SUBST - <!-- forum_main -->
+        // END SUBST - <!-- forum_main_content -->
 
         require FORUM_ROOT.'footer.php';
@@ -1004 +1027 @@
 
         // Setup form
-        $forum_page['group_count'] = $forum_page['item_count'] = $forum_page['fld_count'] = 0;
+        $forum_page['fld_count'] = 0;
         $forum_page['form_action'] = forum_link($forum_url['moderate_forum'], $fid);