Changeset 721

Timestamp:

11/08/08 21:24:28 (2 months ago)

Author:

Paul

Message:

See note to r.719

Location:

fluxbb/branches/fluxbb-1.3-dev/upload

Files:

• index.php (modified) (12 diffs)
• lang/English/common.php (modified) (3 diffs)
• lang/English/forum.php (modified) (2 diffs)
• lang/English/index.php (modified) (1 diff)
• style/Oxygen/Oxygen.php (modified) (1 diff)
• viewforum.php (modified) (8 diffs)

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

@@ -55 +55 @@
 }
 
-// Setup main heading
-$forum_page['main_head'] = forum_htmlencode($forum_config['o_board_title']);
+// Setup main section
+$forum_page['main_hd'] = forum_htmlencode($forum_config['o_board_title']);
 
 // Setup main options
@@ -97 +97 @@
 $result = $forum_db->query_build($query) or error(__FILE__, __LINE__);
 
-$forum_page['cur_category'] = $forum_page['cat_count'] = $forum_page['item_count'] = 0;
+?>
+        <div id="main-categories" class="content">
+<?php
+
+$forum_page['cur_category'] = $forum_page['cat_count'] = $forum_page['section_count'] = $forum_page['item_count'] = $forum_page['group_count'] = 0;
 
 while ($cur_forum = $forum_db->fetch_assoc($result))
@@ -104 +108 @@
 
         $forum_page['item_mods'] = '';
-        ++$forum_page['item_count'];
 
         if ($cur_forum['cid'] != $forum_page['cur_category'])   // A new category since last iteration?
         {
                 if ($forum_page['cur_category'] != 0)
-                        echo "\t".'</div>'."\n";
+                        echo  "\t\t\t".'</div>'."\n\t\t".'</div>'."\n";
 
                 ++$forum_page['cat_count'];
-                $forum_page['item_count'] = 1;
-
-                $forum_page['item_header'] = array();
-                $forum_page['item_header']['subject']['title'] = '<strong class="subject-title">'.$lang_index['Forums'].'</strong>';
-                $forum_page['item_header']['info']['topics'] = '<strong class="info-topics">'.$lang_index['topics'].'</strong>';
-                $forum_page['item_header']['info']['post'] = '<strong class="info-posts">'.$lang_index['posts'].'</strong>';
-                $forum_page['item_header']['info']['lastpost'] = '<strong class="info-lastpost">'.$lang_index['last post'].'</strong>';
+                ++$forum_page['section_count'];
+                $forum_page['item_count'] = 0;
+                $forum_page['group_count'] = 0;
+
 
                 ($hook = get_hook('in_forum_pre_cat_head')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
 ?>
-        <div class="main-subhead">
-                <h2 class="hn"><span><?php echo forum_htmlencode($cur_forum['cat_name']) ?></span></h2>
-                <p class="item-summary"><span><?php printf($lang_index['Category subtitle'], implode(' ', $forum_page['item_header']['subject']), implode(', ', $forum_page['item_header']['info'])) ?></span></p>
-        </div>
-        <div id="category<?php echo $forum_page['cat_count'] ?>" class="main-content main-category">
+                <div id="category<?php echo $forum_page['cat_count'] ?>" class="section<?php echo ($forum_page['section_count'] == 1) ? ' section-1' : '' ?> category">
+                        <div class="section-hd">
+                                <h2 class="hn"><span><?php echo forum_htmlencode($cur_forum['cat_name']) ?></span></h2>
+                        </div>
+<?php
+
+                ++$forum_page['group_count'];
+
+?>
+                        <div class="rep-group<?php echo ($forum_page['group_count'] == 1) ? ' rep-group-1' : '' ?>">
 <?php
 
@@ -134 +139 @@
 
         // Reset arrays and globals for each forum
-        $forum_page['item_status'] = $forum_page['item_subject'] = $forum_page['item_body'] = $forum_page['item_title'] = array();
+        ++$forum_page['item_count'];
+        $forum_page['item_status'] = $forum_page['item_subject'] = $forum_page['rep_item'] = $forum_page['item_title'] = array();
         $forum_page['item_indicator'] = '';
 
@@ -140 +146 @@
         if ($cur_forum['redirect_url'] != '')
         {
-                $forum_page['item_body']['subject']['title'] = '<h3 class="hn"><a class="external" href="'.forum_htmlencode($cur_forum['redirect_url']).'" title="'.sprintf($lang_index['Link to'], forum_htmlencode($cur_forum['redirect_url'])).'"><span>'.forum_htmlencode($cur_forum['forum_name']).'</span></a></h3>';
+                $forum_page['rep_item']['subject']['title'] = '<h3 class="hn"><a class="external" href="'.forum_htmlencode($cur_forum['redirect_url']).'" title="'.sprintf($lang_index['Link to'], forum_htmlencode($cur_forum['redirect_url'])).'"><span>'.forum_htmlencode($cur_forum['forum_name']).'</span></a></h3>';
                 $forum_page['item_status']['redirect'] = 'redirect';
 
@@ -151 +157 @@
 
                 if (!empty($forum_page['item_subject']))
-                        $forum_page['item_body']['subject']['desc'] = '<p>'.implode(' ', $forum_page['item_subject']).'</p>';
+                        $forum_page['rep_item']['subject']['desc'] = '<p>'.implode(' ', $forum_page['item_subject']).'</p>';
 
                 // Forum topic and post count
-                $forum_page['item_body']['info']['topics'] = '<li class="info-topics"><span class="label">'.$lang_index['No topic info'].'</span></li>';
-                $forum_page['item_body']['info']['posts'] = '<li class="info-posts"><span class="label">'.$lang_index['No post info'].'</span></li>';
-                $forum_page['item_body']['info']['lastpost'] = '<li class="info-lastpost"><span class="label">'.$lang_index['No lastpost info'].'</span></li>';
+                $forum_page['rep_item']['info']['topics'] = '<li class="info-stats"><span class="label">'.$lang_index['Topics label'].'<span>'.$lang_index['Info separator'].'</span></span> <strong>'.$lang_index['No information'].'</strong></li>';
+                $forum_page['rep_item']['info']['posts'] = '<li class="info-stats"><span class="label">'.$lang_index['Posts label'].'<span>'.$lang_index['Info separator'].'</span></span> <strong>'.$lang_index['No information'].'</strong></li>';
+                $forum_page['rep_item']['info']['lastpost'] = '<li class="info-data"><span class="label">'.$lang_index['Last post label'].'<span>'.$lang_index['Info separator'].'</span></span> <strong>'.$lang_index['No information'].'</strong></li>';
 
                 ($hook = get_hook('in_redirect_row_pre_display')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
@@ -183 +189 @@
                 ($hook = get_hook('in_normal_row_pre_item_title_merge')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
-                $forum_page['item_body']['subject']['title'] = '<h3 class="hn">'.implode(' ', $forum_page['item_title']).'</h3>';
-
+                $forum_page['rep_item']['subject']['title'] = '<h3 class="hn">'.implode(' ', $forum_page['item_title']).'</h3>';
 
                 // Setup the forum description and mod list
@@ -206 +211 @@
 
                 if (!empty($forum_page['item_subject']))
-                        $forum_page['item_body']['subject']['desc'] = '<p>'.implode(' ', $forum_page['item_subject']).'</p>';
-
+                        $forum_page['rep_item']['subject']['desc'] = '<p>'.implode(' ', $forum_page['item_subject']).'</p>';
 
                 // Setup forum topics, post count and last post
-                $forum_page['item_body']['info']['topics'] = '<li class="info-topics"><strong>'.forum_number_format($cur_forum['num_topics']).'</strong> <span class="label">'.(($cur_forum['num_topics'] == 1) ? $lang_index['topic'] : $lang_index['topics']).'</span></li>';
-                $forum_page['item_body']['info']['posts'] = '<li class="info-posts"><strong>'.forum_number_format($cur_forum['num_posts']).'</strong> <span class="label">'.(($cur_forum['num_posts'] == 1) ? $lang_index['post'] : $lang_index['posts']).'</span></li>';
+                $forum_page['rep_item']['info']['topics'] = '<li class="info-stats"><span class="label">'.$lang_index['Topics label'].'<span>'.$lang_index['Info separator'].'</span></span> <strong>'.forum_number_format($cur_forum['num_topics']).'</strong></li>';
+                $forum_page['rep_item']['info']['posts'] = '<li class="info-stats"><span class="label">'.$lang_index['Posts label'].'<span>'.$lang_index['Info separator'].'</span></span> <strong>'.forum_number_format($cur_forum['num_posts']).'</strong></li>';
 
                 if ($cur_forum['last_post'] != '')
-                        $forum_page['item_body']['info']['lastpost'] = '<li class="info-lastpost"><span class="label">'.$lang_index['Last post'].'</span> <strong><a href="'.forum_link($forum_url['post'], $cur_forum['last_post_id']).'">'.format_time($cur_forum['last_post']).'</a></strong> <cite>'.sprintf($lang_index['Last poster'], forum_htmlencode($cur_forum['last_poster'])).'</cite></li>';
+                        $forum_page['rep_item']['info']['lastpost'] = '<li class="info-data"><span class="label">'.$lang_index['Last post label'].'<span>'.$lang_index['Info separator'].'</span></span> <strong><a href="'.forum_link($forum_url['post'], $cur_forum['last_post_id']).'">'.format_time($cur_forum['last_post']).'</a></strong> <cite>'.sprintf($lang_index['Last poster'], forum_htmlencode($cur_forum['last_poster'])).'</cite></li>';
                 else
-                        $forum_page['item_body']['info']['lastpost'] = '<li class="info-lastpost"><strong>'.$lang_index['Forum is empty'].'</strong> <span><a href="'.forum_link($forum_url['new_topic'], $cur_forum['fid']).'">'.$lang_index['First post nag'].'</a></span></li>';
-
+                {
+                        $forum_page['rep_item']['info']['lastpost'] = '<li class="info-data"><span class="label">'.$lang_index['Last post label'].'<span>'.$lang_index['Info separator'].'</span></span> <strong>'.$lang_index['Never'].'</strong></li>';
+                        $forum_page['item_status']['empty'] = 'empty';
+                }
                 ($hook = get_hook('in_normal_row_pre_display')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
         }
 
         // Generate classes for this forum depending on its status
-        $forum_page['item_style'] = (($forum_page['item_count'] % 2 != 0) ? ' odd' : ' even').(($forum_page['item_count'] == 1) ? ' main-item1' : '').((!empty($forum_page['item_status'])) ? ' '.implode(' ', $forum_page['item_status']) : '');
+        $forum_page['item_style'] = (($forum_page['item_count'] == 1) ? ' rep-item-1' : '').(($forum_page['item_count'] % 2 != 0) ? ' rep-item-odd' : ' rep-item-even').((!empty($forum_page['item_status'])) ? ' '.implode(' ', $forum_page['item_status']) : '');
 
         ($hook = get_hook('in_row_pre_display')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
 ?>
-                <div id="forum<?php echo $cur_forum['fid'] ?>" class="main-item<?php echo $forum_page['item_style'] ?>">
-                        <span class="icon <?php echo implode(' ', $forum_page['item_status']) ?>"><!-- --></span>
-                        <div class="item-subject">
-                                <?php echo implode("\n\t\t\t\t", $forum_page['item_body']['subject'])."\n" ?>
-                        </div>
-                        <ul class="item-info">
-                                <?php echo implode("\n\t\t\t\t", $forum_page['item_body']['info'])."\n" ?>
-                        </ul>
-                </div>
+                                <div id="forum<?php echo $cur_forum['fid'] ?>" class="rep-item<?php echo $forum_page['item_style'] ?>">
+                                        <span class="icon <?php echo implode(' ', $forum_page['item_status']) ?>"><!-- --></span>
+                                        <div class="rep-subject">
+                                                <?php echo implode("\n\t\t\t\t\t\t", $forum_page['rep_item']['subject'])."\n" ?>
+                                        </div>
+                                        <ul class="rep-info">
+                                                <?php echo implode("\n\t\t\t\t\t\t", $forum_page['rep_item']['info'])."\n" ?>
+                                        </ul>
+                                </div>
 <?php
 
@@ -241 +247 @@
 // Did we output any categories and forums?
 if ($forum_page['cur_category'] > 0)
-        echo  "\t".'</div>'."\n";
+{
+
+?>
+                        </div>
+                </div>
+        </div>
+<?php
+
+}
 else
 {
 
 ?>
-        <div class="main-content message">
-                <p><?php echo $lang_index['Empty board'] ?></p>
+        <div class="content">
+                <div class="section message">
+                        <p><?php echo $lang_index['Empty board'] ?></p>
+                </div>
         </div>
 <?php
@@ -256 +272 @@
 
 $tpl_temp = 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 -->
@@ -306 +322 @@
 
 ?>
-<div id="brd-stats" class="gen-content">
-        <h2 class="hn"><span><?php echo $lang_index['Statistics'] ?></span></h2>
-        <ul>
-                <?php echo implode("\n\t\t", $stats_list)."\n" ?>
-        </ul>
-</div>
+<div id="brd-info" class="gen">
+        <div class="gen-hd">
+                <h2 class="hn"><span><?php echo $lang_index['Forum information'] ?></span></h2>
+        </div>
+        <div id="info-stats">
+                <div id="info-stats-hd">
+                        <h3 class="hn"><span><?php echo $lang_index['Statistics'] ?></span></h3>
+                </div>
+                <ul>
+                        <?php echo implode("\n\t\t\t", $stats_list)."\n" ?>
+                </ul>
+        </div>
 <?php
 
@@ -351 +373 @@
         ($hook = get_hook('in_users_online_pre_online_info_output')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 ?>
-<div id="brd-online" class="gen-content">
-        <h3 class="hn"><span><?php printf($lang_index['Currently online'], implode($lang_index['Online stats separator'], $forum_page['online_info'])) ?></span></h3>
-<?php if (!empty($users)): ?>   <p><?php echo implode($lang_index['Online list separator'], $users) ?></p>
+        <div id="info-online">
+                <div id="info-online-hd">
+                        <h3 class="hn"><span><?php printf($lang_index['Currently online'], implode($lang_index['Online stats separator'], $forum_page['online_info'])) ?></span></h3>
+                </div>
+<?php if (!empty($users)): ?>           <p><?php echo implode($lang_index['Online list separator'], $users) ?></p>
 <?php endif; ($hook = get_hook('in_new_online_data')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null; ?>
+        </div>
+<?php
+
+        ($hook = get_hook('in_users_online_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
+}
+
+?>
 </div>
 <?php
-
-        ($hook = get_hook('in_users_online_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
-}
 
 ($hook = get_hook('in_info_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;

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

@@ -56 +56 @@
 'Pages'                                                         =>      'Pages:',
 'Page'                                                          =>      'Page',
+'Title page'                                            =>      '(Page %s of %s)',
 'BBCode'                                                        =>      'BBCode',       // You probably shouldn't change this
 'Smilies'                                                       =>      'Smilies',
@@ -67 +68 @@
 'Write message legend'                          =>      'Compose your post',
 'Required information'                          =>      'Required information',
-'Reqmark'                                                       =>      '*',
 'Required'                                                      =>      '(Required)',
-'Required warn'                                         =>      'All fields labelled %s must be completed before the form is submitted.',
+'Required warn'                                         =>      'All fields marked %s must be completed before the form is submitted.',
 'Crumb separator'                                       =>      ' » ', // The character or text that separates links in breadcrumbs
 'Title separator'                                       =>      ' - ',
@@ -82 +82 @@
 'Help page'                                                     =>      'Help with: %s',
 'Re'                                                            =>      'Re:',
-'Page info'                                                     =>      '(Page %1$s of %2$s)',
+'Page info'                                                     =>      'Page (%1$s of %2$s)',
 'Item info single'                                      =>      '%s [ %s ]',
-'Item info plural'                                      =>      '%s [ %s to %s of %s ]', // e.g. Topics [ 10 to 20 of 30 ]
+'Item info plural'                                      =>      '%s ( %s to %s of %s )', // e.g. Topics [ 10 to 20 of 30 ]
 'Info separator'                                        =>      ' ', // e.g. 1 Page | 10 Topics
 'Powered by'                                            =>      'Powered by <strong>%s</strong>',

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

@@ -4 +4 @@
 $lang_forum = array(
 
-'Forum subtitle'                        =>      '%1$s in this forum with details of %2$s.',
-'Search subtitle'                       =>      '%1$s found with details of %2$s.',
+'Topics head'                           =>      'Topics',
 'Topics'                                        =>      'Topics',
-'topics'                                        =>      'topics',
-'Reply'                                         =>      'Reply',
-'Replies'                                       =>      'Replies',
-'reply'                                         =>      'reply',
-'replies'                                       =>      'replies',
-'View'                                          =>      'View',
-'Views'                                         =>      'Views',
-'views'                                         =>      'views',
-'view'                                          =>      'view',
-'Last post'                                     =>      'Last post',
-'last post'                                     =>      'last post',
+'Topics label'                          =>      'Topics',
+'Replies label'                         =>      'Replies',
+'Views label'                           =>      'Views',
+'Last post label'                       =>      'Last post',
+'Info separator'                        =>      ':',
 'Select topic'                          =>      'Select topic: %s.',
-'No replies info'                       =>      'No reply information',
-'No views info'                         =>      'No viewing information',
-'No lastpost info'                      =>      'No last post information',
+'No information'                        =>      'No information',
 'by poster'                                     =>      'by %s',
-'Item status'                           =>      '%s :',
-'Topic starter'                         =>      'Started by %s',
+'Topic starter'                         =>      'by %s',
 'New posts'                                     =>      'New posts',
 'Topic navigation'                      =>      '( %s )',
-'Location'                                      =>      'Found in forum : %s',
 'Pages'                                         =>      'Pages',
 'Post topic'                            =>      'Post new topic',
@@ -33 +22 @@
 'No permission'                         =>      'Sorry! no permission to post new topics',
 'Moved'                                         =>      'Moved:',
-'Sticky'                                        =>      'Sticky',
-'Closed'                                        =>      'Closed',
+'Sticky'                                        =>      '[Sticky]',
+'Closed'                                        =>      '[Closed]',
+'You have posted'                       =>      'You have posted in this topic.',
 'Empty forum'                           =>      'Empty forum',
-'No topics'                                     =>      'No topics have been posted',
-'First topic nag'                       =>      'Be the first to post a topic in this forum.',
-'You posted indicator'          =>      '·',
+'No topics posted'                      =>      '(No topics have been posted in this forum)',
+'Never'                                         =>      'Never',
+'Nobody posted'                         =>      '(Nobody has posted)',
 'Permalink forum'                       =>      'Permanent link to this forum.',
 'Forum options'                         =>      'Forum options',
 'Moderate forum'                        =>      'Moderate forum',
+'Moderator options'                     =>      'Moderator options',
 'Mark forum read'                       =>      'Mark forum as read',
 'RSS forum feed'                        =>      'RSS Forum Feed',
-'New posts info'                        =>      'Go to the first new post since your last visit.'
 
 );

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

@@ -6 +6 @@
 'Moderated by'                          =>  'Moderated by %s',
 'Link to'                                       =>      'Link to %s',   // As in "Link to http://www.fluxbb.org/"
-'Category subtitle'                     =>      '%1$s in this category with details of %2$s',
-'Forums'                                        =>      'Forums',
-'Topics'                                        =>      'Topics',
-'Posts'                                         =>      'Posts',
-'Last post'                                     =>      'Last post:',
-'last post'                                     =>      'last post',
-'topics'                                        =>      'topics',
-'topic'                                         =>      'topic',
-'post'                                          =>      'post',
-'posts'                                         =>      'posts',
-'No topic info'                         =>      'No topic information',
-'No post info'                          =>      'No post information',
-'No lastpost info'                      =>      'No last post information',
-'Forum is empty'                        =>      'This forum is empty',
-'First post nag'                        =>      'Be the first to post',
+'Topics label'                          =>      'Topics',
+'Posts label'                           =>      'Posts',
+'Last post label'                       =>      'Last post',
+'Info separator'                        =>      ':',
+'Never'                                         =>      'Never',
+'No information'                        =>      'No information',
 'Last poster'                           =>      'by %s',
 'Empty board'                           =>      'Board is empty',
+'Forum information'                     =>      'Forum information',
 'Newest user'                           =>      'Newest registered user: %s',
 'No of users'                           =>      'Total number of registered users: %s',

fluxbb/branches/fluxbb-1.3-dev/upload/style/Oxygen/Oxygen.php

@@ -1 @@
-// Holding file
+<!-- holding file -->

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

@@ -63 +63 @@
 $forum_page['start_from'] = $forum_user['disp_topics'] * ($forum_page['page'] - 1);
 $forum_page['finish_at'] = min(($forum_page['start_from'] + $forum_user['disp_topics']), ($cur_forum['num_topics']));
-$forum_page['items_info'] = generate_items_info($lang_forum['Topics'], ($forum_page['start_from'] + 1), $cur_forum['num_topics']);
+
+if ($forum_page['num_pages'] > 1)
+        $forum_page['page_info'] = generate_page_info($lang_forum['Topics label'], ($forum_page['start_from'] + 1), $cur_forum['num_topics']);
 
 // Check for use of incorrect URLs
@@ -149 +151 @@
 );
 
-// Setup main header
-$forum_page['main_head'] = '<a class="permalink" href="'.forum_link($forum_url['forum'], array($id, sef_friendly($cur_forum['forum_name']))).'" rel="bookmark" title="'.$lang_forum['Permalink forum'].'">'.forum_htmlencode($cur_forum['forum_name']).'</a>';
-
-if ($forum_page['num_pages'] > 1)
-        $forum_page['main_head_pages'] = sprintf($lang_common['Page info'], $forum_page['page'], $forum_page['num_pages']);
+// Setup main section
+$forum_page['main_hd'] = '<a class="permalink" href="'.forum_link($forum_url['forum'], array($id, sef_friendly($cur_forum['forum_name']))).'" rel="bookmark" title="'.$lang_forum['Permalink forum'].'">'.forum_htmlencode($cur_forum['forum_name']).'</a>';
 
 ($hook = get_hook('vf_pre_header_load')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
@@ -165 +164 @@
 ob_start();
 
-$forum_page['item_header'] = array();
-$forum_page['item_header']['subject']['title'] = '<strong class="subject-title">'.$lang_forum['Topics'].'</strong>';
-$forum_page['item_header']['info']['replies'] = '<strong class="info-replies">'.$lang_forum['replies'].'</strong>';
-
-if ($forum_config['o_topic_views'] == '1')
-        $forum_page['item_header']['info']['views'] = '<strong class="info-views">'.$lang_forum['views'].'</strong>';
-
-$forum_page['item_header']['info']['lastpost'] = '<strong class="info-lastpost">'.$lang_forum['last post'].'</strong>';
-
 ($hook = get_hook('vf_main_output_start')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
+
+?>
+        <div id="main-forum" class="content">
+                <div id="forum<?php echo $id ?>" class="section section-1<?php echo ($forum_config['o_topic_views'] == '1') ? ' vforum' : ' nvforum' ?>">
+                        <div class="section-hd">
+                                <h2 class="hn"><span><?php echo $lang_forum['Topics head'] ?></span></h2>
+                        </div>
+<?php
 
 // If there are topics in this forum
 if ($forum_db->num_rows($result))
 {
-
-?>
-        <div class="main-pagehead">
-                <h2 class="hn"><span><?php echo $forum_page['items_info'] ?></span></h2>
-        </div>
-        <div class="main-subhead">
-                <p class="item-summary<?php echo ($forum_config['o_topic_views'] == '1') ? ' forum-views' : ' forum-noview' ?>"><span><?php printf($lang_forum['Forum subtitle'], implode(' ', $forum_page['item_header']['subject']), implode(', ', $forum_page['item_header']['info'])) ?></span></p>
-        </div>
-        <div id="forum<?php echo $id ?>" class="main-content main-forum<?php echo ($forum_config['o_topic_views'] == '1') ? ' forum-views' : ' forum-noview' ?>">
-<?php
-
         ($hook = get_hook('vf_pre_topic_loop_start')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
         $forum_page['item_count'] = 0;
+        $forum_page['group_count'] = 0;
+        $forum_page['cur_sticky'] = '2';
 
         while ($cur_topic = $forum_db->fetch_assoc($result))
@@ -198 +187 @@
                 ($hook = get_hook('vf_topic_loop_start')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
+                if ($forum_page['cur_sticky'] != $cur_topic['sticky'])
+                {
+                        ++$forum_page['group_count'];
+
+                        if (($forum_page['cur_sticky'] != '2') && ($forum_page['item_count'] != 0))
+                                echo "\t\t\t".'</div>'."\n";
+
+?>
+                        <div class="rep-group<?php echo ($forum_page['group_count'] == 1) ? ' rep-group-1' : '' ?><?php echo ($cur_topic['sticky'] == '1') ? ' rep-group-sticky' : '' ?>">
+<?php
+
+                        $forum_page['cur_sticky'] = $cur_topic['sticky'];
+                        $forum_page['item_count'] = 0;
+                }
+
                 ++$forum_page['item_count'];
 
                 // Start from scratch
-                $forum_page['item_subject'] = $forum_page['item_body'] = $forum_page['item_status'] = $forum_page['item_nav'] = $forum_page['item_title'] = $forum_page['item_title_status'] = array();
+                $forum_page['item_subject'] = $forum_page['rep_item'] = $forum_page['item_status'] = $forum_page['item_nav'] = $forum_page['item_title'] = $forum_page['item_title_status'] = array();
                 $forum_page['item_indicator'] = '';
 
@@ -209 +213 @@
                 if ($cur_topic['moved_to'] != null)
                 {
+                        $forum_page['item_title']['num'] = '<span class="item-num">'.($forum_page['item_count'] + $forum_page['start_from']).'</span>';
+
                         $forum_page['item_status']['moved'] = 'moved';
-                        $forum_page['item_title']['link'] = '<a href="'.forum_link($forum_url['topic'], array($cur_topic['moved_to'], sef_friendly($cur_topic['subject']))).'"><span>'.$lang_forum['Moved'].'</span> '.forum_htmlencode($cur_topic['subject']).'</a>';
+                        $forum_page['item_title']['link'] = '<strong><a href="'.forum_link($forum_url['topic'], array($cur_topic['moved_to'], sef_friendly($cur_topic['subject']))).'">'.$lang_forum['Moved'].' '.forum_htmlencode($cur_topic['subject']).'</a></strong>';
+                        $forum_page['item_title']['starter'] = '<cite class="item-starter">'.sprintf($lang_forum['Topic starter'], forum_htmlencode($cur_topic['poster'])).'</cite>';
 
                         // Combine everything