Changeset 565

Timestamp:

08/28/08 13:31:24 (4 months ago)

Author:

Paul

Message:

First stage of simplification of headings and paginated pages.

Location:

fluxbb/branches/fluxbb-1.3-dev/upload

Files:

• header.php (modified) (1 diff)
• include/functions.php (modified) (2 diffs)
• include/search_functions.php (modified) (7 diffs)
• lang/English/common.php (modified) (1 diff)
• moderate.php (modified) (6 diffs)
• search.php (modified) (3 diffs)
• style/Oxygen/Oxygen.css (modified) (1 diff)
• userlist.php (modified) (3 diffs)
• viewforum.php (modified) (3 diffs)
• viewtopic.php (modified) (3 diffs)

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

@@ -277 +277 @@
 
 // Main section heading
-$main_elements['<!-- forum_main_head -->'] =  '<div class="main-head">'."\n\t".'<h1 class="hn"><span>'.((isset($forum_page['main_head'])) ? $forum_page['main_head'] : end($forum_page['crumbs'])).'</span></h1>'."\n".'</div>';
+$main_elements['<!-- forum_main_head -->'] =  '<div class="main-head">'."\n\t".'<h1 class="hn"><span>'.((isset($forum_page['main_head'])) ? $forum_page['main_head'] : end($forum_page['crumbs'])).(isset($forum_page['main_head_pages']) ? ' <small>'.$forum_page['main_head_pages'].'</small>' : '').'</span></h1>'."\n".'</div>';
 
 // Top pagination and post links

fluxbb/branches/fluxbb-1.3-dev/upload/include/functions.php

@@ -1796 +1796 @@
 // Generate a string with page and item information for multipage headings
 //
-function generate_page_info($label, $first, $total)
+function generate_items_info($label, $first, $total)
 {
         global $forum_page, $lang_common;
@@ -1805 +1805 @@
 
         if ($forum_page['num_pages'] == 1)
-        {
-                $page_info = '';
                 $item_info =  '<span class="item-info">'.sprintf($lang_common['Item info single'], $label, forum_number_format($total)).'</span>';
-        }
         else
-        {
-                $page_info = '<span class="page-info">'.sprintf($lang_common['Page info'], forum_number_format($forum_page['page']), forum_number_format($forum_page['num_pages'])).$lang_common['Info separator'].'</span>';
                 $item_info = '<span class="item-info">'.sprintf($lang_common['Item info plural'], $label, forum_number_format($first), forum_number_format($forum_page['finish_at']), forum_number_format($total)).'</span>';
-        }
 
         ($hook = get_hook('fn_generate_page_info_end')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
-        return $page_info.$item_info;
+        return $item_info;
 }
 

fluxbb/branches/fluxbb-1.3-dev/upload/include/search_functions.php

@@ -774 +774 @@
                 case 'show_new':
                         $forum_page['crumbs'][] = $lang_search['Topics with new'];
-                        $forum_page['results_info'] = generate_page_info($lang_search['Topics found'], ($forum_page['start_from'] + 1), $num_hits);
+                        $forum_page['items_info'] = generate_items_info($lang_search['Topics found'], ($forum_page['start_from'] + 1), $num_hits);
                         $forum_page['main_options']['defined_search'] = '<span'.(empty($forum_page['main_options']) ? ' class="item1"' : '').'><a href="'.forum_link($forum_url['search']).'">'.$lang_search['User defined search'].'</a></span>';
                         $forum_page['main_options']['mark_all'] = '<span'.(empty($forum_page['main_options']) ? ' class="item1"' : '').'><a href="'.forum_link($forum_url['mark_read'], generate_form_token('markread'.$forum_user['id'])).'">'.$lang_common['Mark all as read'].'</a></span>';
@@ -781 +781 @@
                 case 'show_recent':
                         $forum_page['crumbs'][] = $lang_search['Recently active topics'];
-                        $forum_page['results_info'] = generate_page_info($lang_search['Topics found'], ($forum_page['start_from'] + 1), $num_hits);
+                        $forum_page['items_info'] = generate_items_info($lang_search['Topics found'], ($forum_page['start_from'] + 1), $num_hits);
                         $forum_page['main_options']['defined_search'] = '<span'.(empty($forum_page['main_options']) ? ' class="item1"' : '').'><a href="'.forum_link($forum_url['search']).'">'.$lang_search['User defined search'].'</a></span>';
                         break;
@@ -787 +787 @@
                 case 'show_unanswered':
                         $forum_page['crumbs'][] = $lang_search['Unanswered topics'];
-                        $forum_page['results_info'] = generate_page_info($lang_search['Topics found'], ($forum_page['start_from'] + 1), $num_hits);
+                        $forum_page['items_info'] = generate_items_info($lang_search['Topics found'], ($forum_page['start_from'] + 1), $num_hits);
                         $forum_page['main_options']['defined_search'] = '<span'.(empty($forum_page['main_options']) ? ' class="item1"' : '').'><a href="'.forum_link($forum_url['search']).'">'.$lang_search['User defined search'].'</a></span>';
                         break;
@@ -793 +793 @@
                 case 'show_user_posts':
                         $forum_page['crumbs'][] = sprintf($lang_search['Posts by'], $search_set[0]['pposter'], ($forum_page['start_from'] + 1), $num_hits);
-                        $forum_page['results_info'] = generate_page_info($lang_search['Posts found'], ($forum_page['start_from'] + 1), $num_hits);
+                        $forum_page['items_info'] = generate_items_info($lang_search['Posts found'], ($forum_page['start_from'] + 1), $num_hits);
                         $forum_page['main_options']['user_topics'] = '<span'.(empty($forum_page['main_options']) ? ' class="item1"' : '').'><a href="'.forum_link($forum_url['search_user_topics'], $search_id).'">'.sprintf($lang_search['Topics by'], $search_set[0]['pposter']).'</a></span>';
                         $forum_page['main_options']['defined_search'] = '<span'.(empty($forum_page['main_options']) ? ' class="item1"' : '').'><a href="'.forum_link($forum_url['search']).'">'.$lang_search['User defined search'].'</a></span>';
@@ -800 +800 @@
                 case 'show_user_topics':
                         $forum_page['crumbs'][] = sprintf($lang_search['Topics by'], $search_set[0]['poster']);
-                        $forum_page['results_info'] = generate_page_info($lang_search['Topics found'], ($forum_page['start_from'] + 1), $num_hits);
+                        $forum_page['items_info'] = generate_items_info($lang_search['Topics found'], ($forum_page['start_from'] + 1), $num_hits);
                         $forum_page['main_options']['user_posts'] =  '<span'.(empty($forum_page['main_options']) ? ' class="item1"' : '').'><a href="'.forum_link($forum_url['search_user_posts'], $search_id).'">'.sprintf($lang_search['Posts by'], $search_set[0]['poster']).'</a></span>';
                         $forum_page['main_options']['defined_search'] = '<span'.(empty($forum_page['main_options']) ? ' class="item1"' : '').'><a href="'.forum_link($forum_url['search']).'">'.$lang_search['User defined search'].'</a></span>';
@@ -807 +807 @@
                 case 'show_subscriptions':
                         $forum_page['crumbs'][] = $lang_search['Subscriptions'];
-                        $forum_page['results_info'] = generate_page_info($lang_search['Topics found'], ($forum_page['start_from'] + 1), $num_hits);
+                        $forum_page['items_info'] = generate_items_info($lang_search['Topics found'], ($forum_page['start_from'] + 1), $num_hits);
                         $forum_page['main_options']['defined_search'] = '<span'.(empty($forum_page['main_options']) ? ' class="item1"' : '').'><a href="'.forum_link($forum_url['search']).'">'.$lang_search['User defined search'].'</a></span>';
                         break;
@@ -813 +813 @@
                 default:
                         $forum_page['crumbs'][] = $lang_search['Search results'];
-                        $forum_page['results_info'] = generate_page_info((($show_as == 'topics') ? $lang_search['Topics found'] : $lang_search['Posts found']), ($forum_page['start_from'] + 1), $num_hits);
+                        $forum_page['items_info'] = generate_items_info((($show_as == 'topics') ? $lang_search['Topics found'] : $lang_search['Posts found']), ($forum_page['start_from'] + 1), $num_hits);
                         $forum_page['main_options']['new_search'] = '<span'.(empty($forum_page['main_options']) ? ' class="item1"' : '').'><a href="'.forum_link($forum_url['search']).'">'.$lang_search['Perform new search'].'</a></span>';
                         break;

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

@@ -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 ]

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

@@ -417 +417 @@
         $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['page_info'] = generate_page_info($lang_misc['Posts'], ($forum_page['start_from'] + 1), ($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
@@ -451 +451 @@
         $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']);
+
         ($hook = get_hook('mr_post_actions_pre_header_load')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
@@ -463 +466 @@
 ?>
         <div class="main-pagehead">
-                <h2 class="hn"><span><?php echo $forum_page['page_info'] ?></span></h2>
+                <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'] ?>">
@@ -1393 +1396 @@
 $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['page_info'] = generate_page_info($lang_misc['Topics'], ($forum_page['start_from'] + 1), $cur_forum['num_topics']);
+$forum_page['items_info'] = generate_items_info($lang_misc['Topics'], ($forum_page['start_from'] + 1), $cur_forum['num_topics']);
 
 // Select topics
@@ -1446 +1449 @@
 );
 
+// Setup main heading
+if ($forum_page['num_pages'] > 1)
+        $forum_page['main_head_pages'] = sprintf($lang_common['Page info'], $forum_page['page'], $forum_page['num_pages']);
+
 ($hook = get_hook('mr_topic_actions_pre_header_load')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
@@ -1467 +1474 @@
 ?>
         <div class="main-pagehead">
-                <h2 class="hn"><span><?php echo $forum_page['page_info'] ?></span></h2>
+                <h2 class="hn"><span><?php echo $forum_page['items_info'] ?></span></h2>
         </div>
         <div class="main-subhead">

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

@@ -148 +148 @@
         }
 
+        // Setup main heading
+        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 options header
         $forum_page['main_options_head'] = $lang_search['Search options'];
@@ -176 +180 @@
 ?>
         <div class="main-pagehead">
-                <h2 class="hn"><span><?php echo $forum_page['results_info'] ?></span></h2>
+                <h2 class="hn"><span><?php echo $forum_page['items_info'] ?></span></h2>
         </div>
         <div class="main-subhead">
@@ -192 +196 @@
 ?>
         <div class="main-pagehead">
-                <h2 class="hn"><span><?php echo $forum_page['results_info'] ?></span></h2>
+                <h2 class="hn"><span><?php echo $forum_page['items_info'] ?></span></h2>
         </div>
         <div class="main-content main-topic">

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

@@ -109 +109 @@
 .brd .post-options a span,
 .brd .main-options .hn,
+.brd .main-head .hn small,
 .brd .entry-title,
 .brd .menu-page .main-head,

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

@@ -64 +64 @@
 
 if ($forum_page['num_users'] != 0)
-        $forum_page['page_info'] = generate_page_info( (($forum_page['users_searched']) ? $lang_ul['Users found'] : $lang_ul['Users']), ($forum_page['start_from'] + 1), $forum_page['num_users']);
+        $forum_page['items_info'] = generate_items_info( (($forum_page['users_searched']) ? $lang_ul['Users found'] : $lang_ul['Users']), ($forum_page['start_from'] + 1), $forum_page['num_users']);
 else
-        $forum_page['page_info'] = $lang_ul['No users found'];
+        $forum_page['items_info'] = $lang_ul['No users found'];
 
 // Generate paging links
@@ -98 +98 @@
 );
 
+// Setup main heading
+if ($forum_page['num_pages'] > 1)
+        $forum_page['main_head_pages'] = sprintf($lang_common['Page info'], $forum_page['page'], $forum_page['num_pages']);
+
 ($hook = get_hook('ul_pre_header_load')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
@@ -114 +118 @@
 ?>
         <div class="main-pagehead">
-                <h2 class="hn"><span><?php echo $forum_page['page_info'] ?></span></h2>
+                <h2 class="hn"><span><?php echo $forum_page['items_info'] ?></span></h2>
         </div>
         <div class="main-content main-frm">

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

@@ -74 +74 @@
 $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['page_info'] = generate_page_info($lang_forum['Topics'], ($forum_page['start_from'] + 1), $cur_forum['num_topics']);
+$forum_page['items_info'] = generate_items_info($lang_forum['Topics'], ($forum_page['start_from'] + 1), $cur_forum['num_topics']);
 
 ($hook = get_hook('vf_modify_page_details')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
@@ -149 +149 @@
 $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']);
+
 ($hook = get_hook('vf_pre_header_load')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
@@ -178 +181 @@
 ?>
         <div class="main-pagehead">
-                <h2 class="hn"><span><?php echo $forum_page['page_info'] ?></span></h2>
+                <h2 class="hn"><span><?php echo $forum_page['items_info'] ?></span></h2>
         </div>
         <div class="main-subhead">

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

@@ -165 +165 @@
 $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['page_info'] =  generate_page_info($lang_topic['Posts'], ($forum_page['start_from'] + 1), ($cur_topic['num_replies'] + 1));
+$forum_page['items_info'] =  generate_items_info($lang_topic['Posts'], ($forum_page['start_from'] + 1), ($cur_topic['num_replies'] + 1));
 
 ($hook = get_hook('vt_modify_page_details')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
@@ -228 +228 @@
 $forum_page['main_head'] = (($cur_topic['closed'] == '1') ? $lang_topic['Topic closed'].' ' : '').'<a class="permalink" href="'.forum_link($forum_url['topic'], array($id, sef_friendly($cur_topic['subject']))).'" rel="bookmark" title="'.$lang_topic['Permalink topic'].'">'.forum_htmlencode($cur_topic['subject']).'</a>';
 
+if ($forum_page['num_pages'] > 1)
+        $forum_page['main_head_pages'] = sprintf($lang_common['Page info'], $forum_page['page'], $forum_page['num_pages']);
+
 ($hook = get_hook('vt_pre_header_load')) ? (defined('FORUM_USE_INCLUDE') ? include $hook : eval($hook)) : null;
 
@@ -244 +247 @@
 ?>
         <div class="main-pagehead">
-                <h2 class="hn"><span><?php echo $forum_page['page_info'] ?></span></h2>
+                <h2 class="hn"><span><?php echo $forum_page['items_info'] ?></span></h2>
         </div>
         <div id="forum<?php echo $cur_topic['forum_id'] ?>" class="main-content main-topic">