diff --git a/moderate.php b/moderate.php index 12bf106b..cf9e0295 100644 --- a/moderate.php +++ b/moderate.php @@ -1585,13 +1585,18 @@ $forum_page['item_status']['closed'] = 'closed'; } - ($hook = get_hook('mr_topic_actions_moved_row_pre_item_title_status_merge')) ? eval($hook) : null; + ($hook = get_hook('mr_topic_loop_normal_topic_pre_item_title_status_merge')) ? eval($hook) : null; if (!empty($forum_page['item_title_status'])) - $forum_page['item_title']['status'] = ''.sprintf($lang_forum['Item status'], implode(' ', $forum_page['item_title_status'])).''; + $forum_page['item_title']['status'] = ''.sprintf($lang_forum['Item status'], implode(', ', $forum_page['item_title_status'])).''; $forum_page['item_title']['link'] = ''.forum_htmlencode($cur_topic['subject']).''; + ($hook = get_hook('mr_topic_loop_normal_topic_pre_item_title_merge')) ? eval($hook) : null; + + $forum_page['item_body']['subject']['title'] = '

'.forum_number_format($forum_page['start_from'] + $forum_page['item_count']).' '.implode(' ', $forum_page['item_title']).'

'; + + if (empty($forum_page['item_status'])) $forum_page['item_status']['normal'] = 'normal'; @@ -1607,13 +1612,11 @@ $forum_page['item_status']['new'] = 'new'; } + ($hook = get_hook('mr_topic_loop_normal_topic_pre_item_nav_merge')) ? eval($hook) : null; + if (!empty($forum_page['item_nav'])) $forum_page['item_subject']['nav'] = ''.sprintf($lang_forum['Topic navigation'], implode('  ', $forum_page['item_nav'])).''; - ($hook = get_hook('mr_topic_actions_moved_row_pre_item_title_merge')) ? eval($hook) : null; - - $forum_page['item_body']['subject']['title'] = '

'.forum_number_format($forum_page['start_from'] + $forum_page['item_count']).' '.implode(' ', $forum_page['item_title']).'

'; - // Assemble the Topic subject $forum_page['item_body']['info']['replies'] = '
  • '.forum_number_format($cur_topic['num_replies']).' '.(($cur_topic['num_replies'] == 1) ? $lang_forum['Reply'] : $lang_forum['Replies']).'
  • '; @@ -1629,6 +1632,8 @@ $forum_page['item_body']['subject']['desc'] = '

    '.implode(' ', $forum_page['item_subject']).'

    '; + ($hook = get_hook('mr_topic_actions_row_pre_item_status_merge')) ? eval($hook) : null; + $forum_page['item_style'] = (($forum_page['item_count'] % 2 != 0) ? ' odd' : ' even').(($forum_page['item_count'] == 1) ? ' main-first-item' : '').((!empty($forum_page['item_status'])) ? ' '.implode(' ', $forum_page['item_status']) : ''); ($hook = get_hook('mr_topic_actions_row_pre_display')) ? eval($hook) : null; diff --git a/search.php b/search.php index 34500632..e78012b9 100644 --- a/search.php +++ b/search.php @@ -191,7 +191,7 @@

    -
    +
    '.forum_htmlencode($cur_set['subject']).''; + ($hook = get_hook('se_results_topics_row_pre_item_title_merge')) ? eval($hook) : null; + + $forum_page['item_body']['subject']['title'] = '

    '.forum_number_format($forum_page['start_from'] + $forum_page['item_count']).' '.implode(' ', $forum_page['item_title']).'

    '; + $forum_page['item_pages'] = ceil(($cur_set['num_replies'] + 1) / $forum_user['disp_posts']); if ($forum_page['item_pages'] > 1) @@ -348,15 +352,11 @@ ($hook = get_hook('se_results_topics_row_pre_item_nav_merge')) ? eval($hook) : null; - if (!empty($forum_page['item_nav'])) - $forum_page['item_title']['nav'] = ''.sprintf($lang_forum['Topic navigation'], implode('  ', $forum_page['item_nav'])).''; - - ($hook = get_hook('se_results_topics_row_pre_item_title_merge')) ? eval($hook) : null; - - $forum_page['item_body']['subject']['title'] = '

    '.forum_number_format($forum_page['start_from'] + $forum_page['item_count']).' '.implode(' ', $forum_page['item_title']).'

    '; - $forum_page['item_subject']['starter'] = ''.sprintf($lang_forum['Topic starter'], ''.forum_htmlencode($cur_set['poster']).'').''; + if (!empty($forum_page['item_nav'])) + $forum_page['item_subject']['nav'] = ''.sprintf($lang_forum['Topic navigation'], implode('  ', $forum_page['item_nav'])).''; + ($hook = get_hook('se_results_topics_row_pre_item_subject_merge')) ? eval($hook) : null; $forum_page['item_body']['subject']['desc'] = '

    '.implode(' ', $forum_page['item_subject']).'

    '; diff --git a/style/Oxygen/Oxygen.css b/style/Oxygen/Oxygen.css index ae11be92..3cec132b 100644 --- a/style/Oxygen/Oxygen.css +++ b/style/Oxygen/Oxygen.css @@ -877,7 +877,7 @@ E - INDEX, FORUMS, SEARCH RESULTS, MODERATE FORUMS .brd .main-content .main-item li.info-views, .brd .main-content .main-item li.info-replies { width: 7em; - text-align:center; + text-align: center; } .brd .main-content .main-item li.info-forum { @@ -921,6 +921,16 @@ E - INDEX, FORUMS, SEARCH RESULTS, MODERATE FORUMS } .brd .forum-noview .main-item ul { + width: 27em; + right: -28em; + margin-left: -27em; + } + +.brd .forum-forums .main-item { + padding-right: 48em; + } + +.brd .forum-forums .main-item ul { width: 47em; right: -48em; margin-left: -47em; diff --git a/viewforum.php b/viewforum.php index 269ffd88..15585aa2 100644 --- a/viewforum.php +++ b/viewforum.php @@ -258,6 +258,8 @@ ($hook = get_hook('vf_topic_loop_normal_topic_pre_item_title_merge')) ? eval($hook) : null; + $forum_page['item_body']['subject']['title'] = '

    '.forum_number_format($forum_page['start_from'] + $forum_page['item_count']).' '.implode(' ', $forum_page['item_title']).'

    '; + if (empty($forum_page['item_status'])) $forum_page['item_status']['normal'] = 'normal'; @@ -278,12 +280,8 @@ if (!empty($forum_page['item_nav'])) $forum_page['item_subject']['nav'] = ''.sprintf($lang_forum['Topic navigation'], implode('  ', $forum_page['item_nav'])).''; - $forum_page['item_body']['subject']['title'] = '

    '.forum_number_format($forum_page['start_from'] + $forum_page['item_count']).' '.implode(' ', $forum_page['item_title']).'

    '; - // Assemble the Topic subject - ($hook = get_hook('vf_topic_loop_normal_topic_pre_item_subject_merge')) ? eval($hook) : null; - $forum_page['item_body']['info']['replies'] = '
  • '.forum_number_format($cur_topic['num_replies']).' '.(($cur_topic['num_replies'] == 1) ? $lang_forum['reply'] : $lang_forum['replies']).'
  • '; if ($forum_config['o_topic_views'] == '1') @@ -292,6 +290,8 @@ $forum_page['item_body']['info']['lastpost'] = '
  • '.$lang_forum['Last post'].' '.format_time($cur_topic['last_post']).' '.sprintf($lang_forum['by poster'], forum_htmlencode($cur_topic['last_poster'])).'
  • '; } + ($hook = get_hook('vf_row_pre_item_subject_merge')) ? eval($hook) : null; + $forum_page['item_body']['subject']['desc'] = '

    '.implode(' ', $forum_page['item_subject']).'

    '; ($hook = get_hook('vf_row_pre_item_status_merge')) ? eval($hook) : null;