[Phpbb-checkins] CVS: phpBB2 common.php,1.64,1.65 viewforum.php,1.105,1.106 viewtopic.php,1.142,1.143

[Bart v. B. <ba...@us...>]

Update of /cvsroot/phpbb/phpBB2
In directory usw-pr-cvs1:/tmp/cvs-serv22343

Modified Files:
	common.php viewforum.php viewtopic.php 
Log Message:
Implemented Navigation bar in Mozilla

Index: common.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/common.php,v
retrieving revision 1.64
retrieving revision 1.65
diff -C2 -r1.64 -r1.65
*** common.php	2001/10/16 11:12:27	1.64
--- common.php	2001/11/26 12:09:37	1.65
***************
*** 119,122 ****
--- 119,144 ----
  
  //
+ // Mozilla navigation bar
+ // Default items that should be valid on all pages.
+ // Defined here and not in page_header.php so they can be redefined in the code
+ //
+ $nav_links['top'] = array ( 
+ 	'url' => append_sid($phpbb_root_dir."index.".$phpEx),
+ 	'title' => sprintf($lang['Forum_Index'], $board_config['sitename'])
+ );
+ $nav_links['search'] = array ( 
+ 	'url' => append_sid($phpbb_root_dir."search.".$phpEx),
+ 	'title' => $lang['Search']
+ );
+ $nav_links['help'] = array ( 
+ 	'url' => append_sid($phpbb_root_dir."faq.".$phpEx),
+ 	'title' => $lang['FAQ']
+ );
+ $nav_links['author'] = array ( 
+ 	'url' => append_sid($phpbb_root_dir."memberlist.".$phpEx),
+ 	'title' => $lang['Memberlist']
+ );
+ 
+ //
  // Obtain and encode users IP
  //
***************
*** 163,165 ****
  }
  
! ?>
\ No newline at end of file
--- 185,187 ----
  }
  
! ?>

Index: viewforum.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewforum.php,v
retrieving revision 1.105
retrieving revision 1.106
diff -C2 -r1.105 -r1.106
*** viewforum.php	2001/11/24 15:57:31	1.105
--- viewforum.php	2001/11/26 12:09:37	1.106
***************
*** 612,615 ****
--- 612,623 ----
  
  //
+ // Mozilla navigation bar
+ //
+ $nav_links['up'] = array(
+ 	'url' => append_sid("index.".$phpEx),
+ 	'title' => sprintf($lang['Forum_Index'], $board_config['sitename'])
+ );
+ 
+ //
  // Dump out the page header and load viewforum template
  //
***************
*** 627,629 ****
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>
\ No newline at end of file
--- 635,637 ----
  include($phpbb_root_path . 'includes/page_tail.'.$phpEx);
  
! ?>

Index: viewtopic.php
===================================================================
RCS file: /cvsroot/phpbb/phpBB2/viewtopic.php,v
retrieving revision 1.142
retrieving revision 1.143
diff -C2 -r1.142 -r1.143
*** viewtopic.php	2001/11/24 17:17:06	1.142
--- viewtopic.php	2001/11/26 12:09:37	1.143
***************
*** 420,423 ****
--- 420,456 ----
  
  //
+ // Post, reply and other URL generation for
+ // templating vars
+ //
+ $new_topic_url = append_sid("posting.$phpEx?mode=newtopic&" . POST_FORUM_URL . "=$forum_id");
+ $reply_topic_url = append_sid("posting.$phpEx?mode=reply&" . POST_TOPIC_URL . "=$topic_id");
+ 
+ $view_forum_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id");
+ 
+ $view_prev_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=previous");
+ $view_next_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=next");
+ 
+ //
+ // Mozilla navigation bar
+ //
+ $nav_links['prev'] = array(
+ 	'url' => $view_prev_topic_url,
+ 	'title' => $lang['View_previous_topic']
+ );
+ $nav_links['next'] = array(
+ 	'url' => $view_next_topic_url,
+ 	'title' => $lang['View_next_topic']
+ );
+ $nav_links['up'] = array(
+ 	'url' => $view_forum_url,
+ 	'title' => $forum_name
+ );
+ 
+ $reply_img = ( $forum_row['forum_status'] == FORUM_LOCKED || $forum_row['topic_status'] == TOPIC_LOCKED ) ? $images['reply_locked'] : $images['reply_new'];
+ $reply_alt = ( $forum_row['forum_status'] == FORUM_LOCKED || $forum_row['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['Reply_to_topic'];
+ $post_img = ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $images['post_locked'] : $images['post_new'];
+ $post_alt = ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['Post_new_topic'];
+ 
+ //
  // Dump out the page header and load viewtopic body template
  //
***************
*** 426,431 ****
  setcookie('phpbb2_' . $forum_id . '_' . $topic_id, time(), 0, $board_config['cookie_path'], $board_config['cookie_domain'], $board_config['cookie_secure']);
  
- $page_title = $lang['View_topic'] ." - $topic_title";
- include($phpbb_root_path . 'includes/page_header.'.$phpEx);
  
  $template->set_filenames(array(
--- 459,462 ----
***************
*** 460,483 ****
  
  );
! //
! // End header
! //
  
  //
! // Post, reply and other URL generation for
! // templating vars
  //
- $new_topic_url = append_sid("posting.$phpEx?mode=newtopic&" . POST_FORUM_URL . "=$forum_id");
- $reply_topic_url = append_sid("posting.$phpEx?mode=reply&" . POST_TOPIC_URL . "=$topic_id");
- 
- $view_forum_url = append_sid("viewforum.$phpEx?" . POST_FORUM_URL . "=$forum_id");
- 
- $view_prev_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=previous");
- $view_next_topic_url = append_sid("viewtopic.$phpEx?" . POST_TOPIC_URL . "=$topic_id&view=next");
- 
- $reply_img = ( $forum_row['forum_status'] == FORUM_LOCKED || $forum_row['topic_status'] == TOPIC_LOCKED ) ? $images['reply_locked'] : $images['reply_new'];
- $reply_alt = ( $forum_row['forum_status'] == FORUM_LOCKED || $forum_row['topic_status'] == TOPIC_LOCKED ) ? $lang['Topic_locked'] : $lang['Reply_to_topic'];
- $post_img = ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $images['post_locked'] : $images['post_new'];
- $post_alt = ( $forum_row['forum_status'] == FORUM_LOCKED ) ? $lang['Forum_locked'] : $lang['Post_new_topic'];
  
  //
--- 491,501 ----
  
  );
! 
! $page_title = $lang['View_topic'] ." - $topic_title";
! include($phpbb_root_path . 'includes/page_header.'.$phpEx);
  
  //
! // End header
  //
  
  //