Changeset 726

Timestamp:

11/12/08 13:54:58 (2 months ago)

Author:

Paul

Message:

See note to r.719

Location:

fluxbb/branches/fluxbb-1.3-dev/upload

Files:

• edit.php (modified) (13 diffs)
• include/template/main.tpl (modified) (1 diff)
• lang/English/common.php (modified) (2 diffs)
• lang/English/post.php (modified) (3 diffs)
• lang/English/topic.php (modified) (1 diff)
• post.php (modified) (23 diffs)
• viewtopic.php (modified) (15 diffs)

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

@@ -176 +176 @@
 
 // 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['edit'], $id);
 $forum_page['form_attributes'] = array();
@@ -185 +185 @@
 );
 
-// Setup help
-$forum_page['main_head_options'] = array();
+// Setup post features
+$forum_page['message_options'] = array();
 if ($forum_config['p_message_bbcode'] == '1')
-        $forum_page['text_options']['bbcode'] = '<span'.(empty($forum_page['text_options']) ? ' class="item1"' : '').'><a class="exthelp" href="'.forum_link($forum_url['help'], 'bbcode').'" title="'.sprintf($lang_common['Help page'], $lang_common['BBCode']).'">'.$lang_common['BBCode'].'</a></span>';
+{
+        $forum_page['compose_options']['enabled']['bbcode'] = '<span'.(empty($forum_page['compose_options']) ? ' class="item1"' : '').'>'.$lang_common['BBCode enabled'].'</span>';
+        $forum_page['compose_options']['help']['bbcode'] = '<span'.(empty($forum_page['compose_options']) ? ' class="item1"' : '').'><a class="exthelp" href="'.forum_link($forum_url['help'], 'bbcode').'" title="'.sprintf($lang_common['Help page'], $lang_common['BBCode help']).'">'.$lang_common['BBCode help'].'</a></span>';
+}
 if ($forum_config['p_message_img_tag'] == '1')
-        $forum_page['text_options']['img'] = '<span'.(empty($forum_page['text_options']) ? ' class="item1"' : '').'><a class="exthelp" href="'.forum_link($forum_url['help'], 'img').'" title="'.sprintf($lang_common['Help page'], $lang_common['Images']).'">'.$lang_common['Images'].'</a></span>';
+{
+        $forum_page['compose_options']['enabled']['img'] = '<span'.(empty($forum_page['compose_options']) ? ' class="item1"' : '').'>'.$lang_common['Images enabled'].'</span>';
+        $forum_page['compose_options']['help']['img'] = '<span'.(empty($forum_page['compose_options']) ? ' class="item1"' : '').'><a class="exthelp" href="'.forum_link($forum_url['help'], 'img').'" title="'.sprintf($lang_common['Help page'], $lang_common['Images help']).'">'.$lang_common['Images help'].'</a></span>';
+}
 if ($forum_config['o_smilies'] == '1')
-        $forum_page['text_options']['smilies'] = '<span'.(empty($forum_page['text_options']) ? ' class="item1"' : '').'><a class="exthelp" href="'.forum_link($forum_url['help'], 'smilies').'" title="'.sprintf($lang_common['Help page'], $lang_common['Smilies']).'">'.$lang_common['Smilies'].'</a></span>';
-
+{
+        $forum_page['compose_options']['enabled']['smilies'] = '<span'.(empty($forum_page['compose_options']) ? ' class="item1"' : '').'>'.$lang_common['Smilies enabled'].'</span>';
+        $forum_page['compose_options']['help']['smilies'] = '<span'.(empty($forum_page['compose_options']) ? ' class="item1"' : '').'><a class="exthelp" href="'.forum_link($forum_url['help'], 'smilies').'" title="'.sprintf($lang_common['Help page'], $lang_common['Smilies help']).'">'.$lang_common['Smilies help'].'</a></span>';
+}
 
 // Setup breadcrumbs
@@ -203 +211 @@
 );
 
+// Setup main heading
+$forum_page['main_hd'] = end($forum_page['crumbs']);
+
 ($hook = get_hook('ed_pre_header_load')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
@@ -213 +224 @@
 ($hook = get_hook('ed_main_output_start')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
+?>
+        <div class="content">
+<?php
+
 // If preview selected and there are no errors
 if (isset($_POST['preview']) && empty($forum_page['errors']))
@@ -219 +234 @@
                 require FORUM_ROOT.'include/parser.php';
 
-        // Generate the post heading
-        $forum_page['post_ident'] = array();
-        $forum_page['post_ident']['num'] = '<span class="post-num">#</span>';
-        $forum_page['post_ident']['byline'] = '<span class="post-byline">'.sprintf((($id == $cur_post['first_post_id']) ? $lang_post['Topic byline'] : $lang_post['Reply byline']), '<strong>'.forum_htmlencode($cur_post['poster']).'</strong>').'</span>';
-        $forum_page['post_ident']['link'] = '<span class="post-link">'.format_time(time()).'</span>';
-
         $forum_page['preview_message'] = parse_message($message, $hide_smilies);
 
@@ -230 +239 @@
 
 ?>
-        <div class="main-subhead">
-                <h2 class="hn"><span><?php echo $id == $cur_post['first_post_id'] ? $lang_post['Preview edited topic'] : $lang_post['Preview edited reply'] ?></span></h2>
-        </div>
-        <div id="post-preview" class="main-content main-frm">
-                <div class="post singlepost">
-                        <div class="posthead">
-                                <h3 class="hn"><?php echo implode(' ', $forum_page['post_ident']) ?></h3>
-<?php ($hook = get_hook('ed_preview_new_post_head_option')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                        </div>
-                        <div class="postbody">
-                                <div class="post-entry">
-                                        <div class="entry-content">
-                                                <?php echo $forum_page['preview_message']."\n" ?>
-                                        </div>
+                <div id="post-preview" class="section section-1 datafrm">
+                        <div class="section-hd">
+                                <h2 class="hn"><span><?php echo $id == $cur_post['first_post_id'] ? $lang_post['Preview edited topic'] : $lang_post['Preview edited reply'] ?></span></h2>
+                        </div>
+                        <div class="post-entry">
+                                <div class="entry-content">
+                                        <?php echo $forum_page['preview_message']."\n" ?>
+                                </div>
 <?php ($hook = get_hook('ed_preview_new_post_entry_data')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                                </div>
                         </div>
                 </div>
-        </div>
-<?php
-
-}
-
-?>
-        <div class="main-subhead">
-                <h2 class="hn"><span><?php echo ($id != $cur_post['first_post_id']) ? $lang_post['Compose edited reply'] : $lang_post['Compose edited topic'] ?></span></h2>
-        </div>
-        <div id="post-form" class="main-content main-frm">
-<?php
-
-        if (!empty($forum_page['text_options']))
-                echo "\t\t".'<p class="ct-options options">'.sprintf($lang_common['You may use'], implode(' ', $forum_page['text_options'])).'</p>'."\n";
+<?php
+
+}
+
+?>
+                <div id="post-form" class="section<?php echo (isset($_POST['preview']) && empty($errors)) ? '' : ' section-1' ?> postfrm">
+                        <div class="section-hd">
+                                <h2 class="hn"><span><?php echo ($id != $cur_post['first_post_id']) ? $lang_post['Compose edited reply'] : $lang_post['Compose edited topic'] ?></span></h2>
+                        </div>
+                        <form id="afocus" method="post" accept-charset="utf-8" action="<?php echo $forum_page['form_action'] ?>"<?php if (!empty($forum_page['form_attributes'])) echo ' '.implode(' ', $forum_page['form_attributes']) ?>>
+                        <div class="hidden">
+                                <?php echo implode("\n\t\t\t\t", $forum_page['hidden_fields'])."\n" ?>
+                        </div>
+<?php
 
 // If there were any errors, show them
@@ -268 +270 @@
 
 ?>
-                <div class="ct-box error-box">
-                        <h3 class="warn hn"><span><?php echo $lang_post['Post errors'] ?></span></h3>
-                        <ul class="error-list">
-                                <?php echo implode("\n\t\t\t\t", $forum_page['errors'])."\n" ?>
-                        </ul>
-                </div>
-<?php
-
-}
-
-?>
-                <div id="req-msg" class="req-warn ct-box error-box">
-                        <p><?php printf($lang_common['Required warn'], '<em>'.$lang_common['Required'].'</em>') ?></p>
-                </div>
-                <form id="afocus" class="frm-form" method="post" accept-charset="utf-8" action="<?php echo $forum_page['form_action'] ?>"<?php if (!empty($forum_page['form_attributes'])) echo ' '.implode(' ', $forum_page['form_attributes']) ?>>
-                        <div class="hidden">
-                                <?php echo implode("\n\t\t\t\t", $forum_page['hidden_fields'])."\n" ?>
-                        </div>
-<?php ($hook = get_hook('ed_pre_main_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_post['Edit post legend'] ?></strong></legend>
+                        <div class="error-box">
+                                <h3 class="warn hn"><span><?php echo $lang_post['Post errors'] ?></span></h3>
+                                <ul class="error-list">
+                                        <?php echo implode("\n\t\t\t\t\t", $forum_page['errors'])."\n" ?>
+                                </ul>
+                        </div>
+<?php
+
+}
+
+?>
+                        <div id="req-msg" class="req-warn error-box">
+                                <p><?php printf($lang_common['Required warn'], '<em>'.$lang_common['Required'].'</em>') ?></p>
+                        </div>
+<?php ($hook = get_hook('ed_pre_main_group')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
+                        <div class="frm-group frm-group-1">
 <?php ($hook = get_hook('ed_pre_subject')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-<?php if ($can_edit_subject): ?>                                <div class="sf-set set<?php echo ++$forum_page['item_count'] ?>">
+<?php if ($can_edit_subject): ?>                                <div class="sf-set frm-set frm-set-1">
                                         <div class="sf-box text required">
                                                 <label for="fld<?php echo ++ $forum_page['fld_count'] ?>"><span><?php echo $lang_post['Topic subject'] ?>  <em><?php echo $lang_common['Required'] ?></em></span></label><br />
@@ -296 +293 @@
                                         </div>
                                 </div>
-<?php endif; ($hook = get_hook('ed_pre_message_box')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>                         <div class="txt-set set<?php echo ++$forum_page['item_count'] ?>">
-                                        <div class="txt-box textarea required">
-                                                <label for="fld<?php echo ++ $forum_page['fld_count'] ?>"><span><?php echo $lang_post['Write message'] ?>  <em><?php echo $lang_common['Required'] ?></em></span></label>
-                                                <div class="txt-input"><span class="fld-input"><textarea id="fld<?php echo $forum_page['fld_count'] ?>" name="req_message" rows="14" cols="95"><?php echo forum_htmlencode(isset($_POST['req_message']) ? $message : $cur_post['message']) ?></textarea></span></div>
+<?php endif; ($hook = get_hook('ed_pre_message_box')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>                         <div class="tf-set frm-set<?php echo ($can_edit_subject) ? '' : ' frm-set-1'  ?>">
+                                        <div class="tf-box textarea required">
+                                                <label for="fld<?php echo ++ $forum_page['fld_count'] ?>"><span><?php echo $lang_post['Write message'] ?>  <em><?php echo $lang_common['Required'] ?></em></span><?php echo (!empty($forum_page['compose_options']['enabled'])) ? ' <br /><small class="compose-options">'.implode(' <br />',$forum_page['compose_options']['enabled']).'</small>' : '' ?></label>
+                                                <div class="tf-item"><span class="fld-input"><textarea id="fld<?php echo $forum_page['fld_count'] ?>" name="req_message" rows="14" cols="95"><?php echo forum_htmlencode(isset($_POST['req_message']) ? $message : $cur_post['message']) ?></textarea></span></div>
                                         </div>
                                 </div>
@@ -308 +305 @@
 {
         if (isset($_POST['hide_smilies']) || $cur_post['hide_smilies'] == '1')
-                $forum_page['checkboxes']['hide_smilies'] = '<div class="mf-item"><span class="fld-input"><input type="checkbox" id="fld'.(++$forum_page['fld_count']).'" name="hide_smilies" value="1" checked="checked" /></span> <label for="fld'.$forum_page['fld_count'].'">'.$lang_post['Hide smilies'].'</label></div>';
+                $forum_page['checkboxes']['hide_smilies'] = '<div class="gf-item"><span class="fld-input"><input type="checkbox" id="fld'.(++$forum_page['fld_count']).'" name="hide_smilies" value="1" checked="checked" /></span> <label for="fld'.$forum_page['fld_count'].'">'.$lang_post['Hide smilies'].'</label></div>';
         else
-                $forum_page['checkboxes']['hide_smilies'] = '<div class="mf-item"><span class="fld-input"><input type="checkbox" id="fld'.(++$forum_page['fld_count']).'" name="hide_smilies" value="1" /></span> <label for="fld'.$forum_page['fld_count'].'">'.$lang_post['Hide smilies'].'</label></div>';
+                $forum_page['checkboxes']['hide_smilies'] = '<div class="gf-item"><span class="fld-input"><input type="checkbox" id="fld'.(++$forum_page['fld_count']).'" name="hide_smilies" value="1" /></span> <label for="fld'.$forum_page['fld_count'].'">'.$lang_post['Hide smilies'].'</label></div>';
 }
 
@@ -316 +313 @@
 {
         if ((isset($_POST['form_sent']) && isset($_POST['silent'])) || !isset($_POST['form_sent']))
-                $forum_page['checkboxes']['silent'] = '<div class="mf-item"><span class="fld-input"><input type="checkbox" id="fld'.(++$forum_page['fld_count']).'" name="silent" value="1" checked="checked" /></span> <label for="fld'.$forum_page['fld_count'].'">'.$lang_post['Silent edit'].'</label></div>';
+                $forum_page['checkboxes']['silent'] = '<div class="gf-item"><span class="fld-input"><input type="checkbox" id="fld'.(++$forum_page['fld_count']).'" name="silent" value="1" checked="checked" /></span> <label for="fld'.$forum_page['fld_count'].'">'.$lang_post['Silent edit'].'</label></div>';
         else
-                $forum_page['checkboxes']['silent'] = '<div class="mf-item"><span class="fld-input"><input type="checkbox" id="fld'.(++$forum_page['fld_count']).'" name="silent" value="1" /></span> <label for="fld'.$forum_page['fld_count'].'">'.$lang_post['Silent edit'].'</label></div>';
+                $forum_page['checkboxes']['silent'] = '<div class="gf-item"><span class="fld-input"><input type="checkbox" id="fld'.(++$forum_page['fld_count']).'" name="silent" value="1" /></span> <label for="fld'.$forum_page['fld_count'].'">'.$lang_post['Silent edit'].'</label></div>';
 }
 
@@ -327 +324 @@
 
 ?>
-                                <fieldset class="mf-set set<?php echo ++$forum_page['item_count'] ?>">
+                                <fieldset class="gf-set frm-set">
                                         <legend><span><?php echo $lang_post['Post settings'] ?></span></legend>
-                                        <div class="mf-box checkbox">
+                                        <div class="gf-box checkbox">
                                                 <?php echo implode("\n\t\t\t\t\t", $forum_page['checkboxes'])."\n"; ?>
                                         </div>
@@ -338 +335 @@
 }
 
-($hook = get_hook('ed_pre_main_fieldset_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
-
-?>
-                        </fieldset>
-<?php
-
-($hook = get_hook('ed_main_fieldset_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
+($hook = get_hook('ed_pre_main_group_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
+
+?>
+                        </div>
+<?php
+
+($hook = get_hook('ed_main_group_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
 ?>
                         <div class="frm-buttons">
-                                <span class="submit"><input type="submit" name="submit" value="<?php echo ($id != $cur_post['first_post_id']) ? $lang_post['Submit reply'] : $lang_post['Submit topic'] ?>" /></span>
-                                <span class="submit"><input type="submit" name="preview" value="<?php echo ($id != $cur_post['first_post_id']) ? $lang_post['Preview reply'] : $lang_post['Preview topic'] ?>" /></span>
-                        </div>
-                </form>
+                                <p class="frm-actions"><span class="submit"><input type="submit" name="submit" value="<?php echo ($id != $cur_post['first_post_id']) ? $lang_post['Submit reply'] : $lang_post['Submit topic'] ?>" /></span> <span class="submit"><input type="submit" name="preview" value="<?php echo ($id != $cur_post['first_post_id']) ? $lang_post['Preview reply'] : $lang_post['Preview topic'] ?>" /></span></p>
+                                <p class="form-help"><?php echo (!empty($forum_page['compose_options']['help'])) ? implode(' ', $forum_page['compose_options']['help']) : '' ?></p>
+                        </div>
+                        </form>
+                </div>
         </div>
 <?php
@@ -360 +358 @@
 
 $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 -->

fluxbb/branches/fluxbb-1.3-dev/upload/include/template/main.tpl

@@ -45 +45 @@
 
 <!-- forum_crumbs_end -->
+
 <!-- forum_qpost -->
-
+<!-- forum_topicreview -->
 <!-- forum_info -->
 

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

@@ -51 +51 @@
 'Username'                                                      =>      'Username',
 'Registered'                                            =>      'Registered',
-'Write message'                                         =>      'Write message:',
 'Forum'                                                         =>      'Forum',
 'Posts'                                                         =>      'Posts',
@@ -57 +56 @@
 'Page'                                                          =>      'Page',
 'Title page'                                            =>      '(Page %s of %s)',
-'BBCode'                                                        =>      'BBCode',       // You probably shouldn't change this
-'Smilies'                                                       =>      'Smilies',
-'Images'                                                        =>      'Images',
-'You may use'                                           =>      'You may use: %s',
+'BBCode enabled'                                        =>      'BBCode enabled',
+'Images enabled'                                        =>      'Images enabled',
+'Smilies enabled'                                       =>      'Smilies enabled',
+'BBCode help'                                           =>      'BBCode help',  // You probably shouldn't change this
+'Smilies help'                                          =>      'Smilies help',
+'Images help'                                           =>      'Images help',
 'and'                                                           =>      'and',
 'Image link'                                            =>      'image',        // This is displayed (i.e. <image>) instead of images when "Show images" is disabled in the profile

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

@@ -19 +19 @@
 'Compose edited reply'  =>      'Compose and post your edited reply',
 'Compose edited topic'  =>      'Compose and post your edited topic',
-'Guest post legend'             =>      'Required information for guests',
 'Post errors'                   =>      '<strong>Warning!</strong> The following errors must be corrected before your message can be posted:',
-'Guest name'                    =>      'Guest name:',  // For guests (instead of Username)
-'Guest e-mail'                  =>      'Guest e-mail:',
+'Guest name'                    =>      'Guest name',   // For guests (instead of Username)
+'Guest e-mail'                  =>      'Guest e-mail',
 'Post redirect'                 =>      'Post entered. Redirecting 
',
 'Post reply'                    =>      'Post new reply',
 'Post new topic'                =>      'Post new topic',
-'Topic subject'                 =>      'Topic subject:',
-'Write message'                 =>      'Write message:',
+'Topic subject'                 =>      'Topic subject',
+'Write message'                 =>      'Write message',
 'Hide smilies'                  =>      'Never show smilies as icons (images) for this post.',
 'Subscribe'                             =>      'Subscribe to this topic.',
@@ -34 +33 @@
 'Flood'                                 =>      'At least %s seconds have to pass between posts. Please wait a while and try posting again.',
 'Permalink post'                =>      'Permanent link to this post',
-'Post settings'                 =>      'Optional post settings:',
+'Post settings'                 =>      'Optional post settings',
 'Preview reply'                 =>      'Preview your new reply',
 'Preview new topic'             =>      'Preview your new topic',
@@ -44 +43 @@
 'Topic byline'                  =>      '<span>Topic by </span>%s',
 'Reply byline'                  =>      '<span>Reply by </span>%s',
-'Post posted'                   =>      '<span>Posted </span>%s',
-
-
-
 
 // Edit post

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

@@ -35 +35 @@
 'RSS topic feed'                =>      'RSS Topic Feed',
 'Quick post'                    =>      'Quick reply to this topic',
+'Write message'                 =>      'Write message',
 'Post'                                  =>      'Post',
 'Permalink post'                =>      'Permanent link to this post',

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

@@ -111 +111 @@
         if (($forum_user['is_guest'] && $_POST['form_user'] != 'Guest') || (!$forum_user['is_guest'] && $_POST['form_user'] != $forum_user['username']))
                 message($lang_common['Bad request']);
-        
+
         // Check for use of incorrect URLs
         confirm_current_url($fid ? forum_link($forum_url['new_topic'], $fid) : forum_link($forum_url['new_reply'], $tid));
@@ -251 +251 @@
         if ($qid < 1)
                 message($lang_common['Bad request']);
-        
+
         // Check for use of incorrect URLs
         confirm_current_url(forum_link($forum_url['quote'], array($tid, $qid)));
@@ -302 +302 @@
 
 // Setup form
-$forum_page['group_count'] = $forum_page['item_count'] = $forum_page['fld_count'] = 0;
+$forum_page['fld_count'] = 0;
 $forum_page['form_action'] = ($tid ? forum_link($forum_url['new_reply'], $tid) : forum_link($forum_url['new_topic'], $fid));
 $forum_page['form_attributes'] = array();
@@ -312 +312 @@
 );
 
-// Setup help
-$forum_page['text_options'] = array();
+// Setup post features
+$forum_page['message_options'] = array();
 if ($forum_config['p_message_bbcode'] == '1')
-        $forum_page['text_options']['bbcode'] = '<span'.(empty($forum_page['text_options']) ? ' class="item1"' : '').'><a class="exthelp" href="'.forum_link($forum_url['help'], 'bbcode').'" title="'.sprintf($lang_common['Help page'], $lang_common['BBCode']).'">'.$lang_common['BBCode'].'</a></span>';
+{
+        $forum_page['compose_options']['enabled']['bbcode'] = '<span'.(empty($forum_page['compose_options']) ? ' class="item1"' : '').'>'.$lang_common['BBCode enabled'].'</span>';
+        $forum_page['compose_options']['help']['bbcode'] = '<span'.(empty($forum_page['compose_options']) ? ' class="item1"' : '').'><a class="exthelp" href="'.forum_link($forum_url['help'], 'bbcode').'" title="'.sprintf($lang_common['Help page'], $lang_common['BBCode help']).'">'.$lang_common['BBCode help'].'</a></span>';
+}
 if ($forum_config['p_message_img_tag'] == '1')
-        $forum_page['text_options']['img'] = '<span'.(empty($forum_page['text_options']) ? ' class="item1"' : '').'><a class="exthelp" href="'.forum_link($forum_url['help'], 'img').'" title="'.sprintf($lang_common['Help page'], $lang_common['Images']).'">'.$lang_common['Images'].'</a></span>';
+{
+        $forum_page['compose_options']['enabled']['img'] = '<span'.(empty($forum_page['compose_options']) ? ' class="item1"' : '').'>'.$lang_common['Images enabled'].'</span>';
+        $forum_page['compose_options']['help']['img'] = '<span'.(empty($forum_page['compose_options']) ? ' class="item1"' : '').'><a class="exthelp" href="'.forum_link($forum_url['help'], 'img').'" title="'.sprintf($lang_common['Help page'], $lang_common['Images help']).'">'.$lang_common['Images help'].'</a></span>';
+}
 if ($forum_config['o_smilies'] == '1')
-        $forum_page['text_options']['smilies'] = '<span'.(empty($forum_page['text_options']) ? ' class="item1"' : '').'><a class="exthelp" href="'.forum_link($forum_url['help'], 'smilies').'" title="'.sprintf($lang_common['Help page'], $lang_common['Smilies']).'">'.$lang_common['Smilies'].'</a></span>';
+{
+        $forum_page['compose_options']['enabled']['smilies'] = '<span'.(empty($forum_page['compose_options']) ? ' class="item1"' : '').'>'.$lang_common['Smilies enabled'].'</span>';
+        $forum_page['compose_options']['help']['smilies'] = '<span'.(empty($forum_page['compose_options']) ? ' class="item1"' : '').'><a class="exthelp" href="'.forum_link($forum_url['help'], 'smilies').'" title="'.sprintf($lang_common['Help page'], $lang_common['Smilies help']).'">'.$lang_common['Smilies help'].'</a></span>';
+}
 
 // Setup breadcrumbs
@@ -328 +337 @@
 $forum_page['crumbs'][] = $tid ? $lang_post['Post reply'] : $lang_post['Post new topic'];
 
+// Setup main heading
+$forum_page['main_hd'] = end($forum_page['crumbs']);
+
 ($hook = get_hook('po_pre_header_load')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
@@ -333 +345 @@
 require FORUM_ROOT.'header.php';
 
-// START SUBST - <!-- forum_main -->
+// START SUBST - <!-- forum_main_content -->
 ob_start();
 
 ($hook = get_hook('po_main_output_start')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
+
+?>
+        <div class="content">
+<?php
 
 // If preview selected and there are no errors
@@ -346 +362 @@
         $forum_page['preview_message'] = parse_message(forum_trim($message), $hide_smilies);
 
-        // Generate the post heading
-        $forum_page['post_ident'] = array();
-        $forum_page['post_ident']['num'] = '<span class="post-num">#</span>';
-        $forum_page['post_ident']['byline'] = '<span class="post-byline">'.sprintf((($tid) ? $lang_post['Reply byline'] : $lang_post['Topic byline']), '<strong>'.forum_htmlencode($forum_user['username']).'</strong>').'</span>';
-        $forum_page['post_ident']['link'] = '<span class="post-link">'.format_time(time()).'</span>';
-
         ($hook = get_hook('po_preview_pre_display')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
 ?>
-        <div class="main-subhead">
-                <h2 class="hn"><span><?php echo $tid ? $lang_post['Preview reply'] : $lang_post['Preview new topic']; ?></span></h2>
-        </div>
-        <div id="post-preview" class="main-content main-frm">
-                <div class="post singlepost">
-                        <div class="posthead">
-                                <h3 class="hn"><?php echo implode(' ', $forum_page['post_ident']) ?></h3>
-<?php ($hook = get_hook('po_preview_new_post_head_option')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                        </div>
-                        <div class="postbody">
-                                <div class="post-entry">
-                                        <div class="entry-content">
-                                                <?php echo $forum_page['preview_message']."\n" ?>
-                                        </div>
+                <div id="post-preview" class="section section-1 datafrm">
+                        <div class="section-hd">
+                                <h2 class="hn"><span><?php echo $tid ? $lang_post['Preview reply'] : $lang_post['Preview new topic']; ?></span></h2>
+                        </div>
+                        <div class="post-entry">
+                                <div class="entry-content">
+                                        <?php echo $forum_page['preview_message']."\n" ?>
+                                </div>
 <?php ($hook = get_hook('po_preview_new_post_entry_data')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
-                                </div>
                         </div>
                 </div>
-        </div>
-<?php
-
-}
-
-?>
-        <div class="main-subhead">
-                <h2 class="hn"><span><?php echo ($tid) ? $lang_post['Compose your reply'] : $lang_post['Compose your topic'] ?></span></h2>
-        </div>
-        <div id="post-form" class="main-content main-frm">
-<?php
-
-        if (!empty($forum_page['text_options']))
-                echo "\t\t".'<p class="ct-options options">'.sprintf($lang_common['You may use'], implode(' ', $forum_page['text_options'])).'</p>'."\n";
+<?php
+
+}
+
+?>
+                <div id="post-form" class="section<?php echo (isset($_POST['preview']) && empty($errors)) ? '' : ' section-1' ?> postfrm">
+                        <div class="section-hd">
+                                <h2 class="hn"><span><?php echo ($tid) ? $lang_post['Compose your reply'] : $lang_post['Compose your topic'] ?></span></h2>
+                        </div>
+                        <form id="afocus" method="post" accept-charset="utf-8" action="<?php echo $forum_page['form_action'] ?>"<?php if (!empty($forum_page['form_attributes'])) echo ' '.implode(' ', $forum_page['form_attributes']) ?>>
+                        <div class="hidden">
+                                <?php echo implode("\n\t\t\t\t", $forum_page['hidden_fields'])."\n" ?>
+                        </div>
+<?php