cvs: php-gtk-web /include shared-manual.inc

sfox		Tue Mar 28 02:23:36 2006 UTC

  Modified files:              
    /php-gtk-web/include	shared-manual.inc 
  Log:
  revert shared-manual inc so we can see which file's being used
  
http://cvs.php.net/viewcvs.cgi/php-gtk-web/include/shared-manual.inc?r1=1.61&r2=1.62&diff_format=u
Index: php-gtk-web/include/shared-manual.inc
diff -u php-gtk-web/include/shared-manual.inc:1.61 php-gtk-web/include/shared-manual.inc:1.62
--- php-gtk-web/include/shared-manual.inc:1.61	Mon Mar 27 17:22:07 2006
+++ php-gtk-web/include/shared-manual.inc	Tue Mar 28 02:23:35 2006
@@ -40,8 +40,8 @@
 	global $NEXT, $PREV, $UP, $HOME, $TOC;
 	global $SIDEBAR_DATA;
 
-	$SIDEBAR_DATA = '<form method="get" action="/manual1-lookup.php">';
-	/* ALTER FOR LOCAL "../../php-gtk-web/manual1-lookup.php" */
+	$SIDEBAR_DATA = '<form method="get" action="/manual-lookup.php">';
+	/* ALTER FOR LOCAL "../../php-gtk-web/manual-lookup.php" */
 	$SIDEBAR_DATA.= '<table border="0" CELLPADDING="4" CELLSPACING="0" WIDTH="160">';
 
 	if(sizeof($TOC) > 1) {
@@ -111,7 +111,7 @@
 function navigationBar($title, $id, $loc) {
 	global $NEXT, $PREV, $tstamp;
 
-	echo '<table border="0" width="100%" bgcolor="#e0e0e0" cellpadding="0" cellspacing="4">';
+	echo '<table border="0" width="580" bgcolor="#e0e0e0" cellpadding="0" cellspacing="4">';
 
 	echo '<tr><td>';
 	if ($PREV[1]) {
@@ -187,16 +187,16 @@
 	echo '<td align="right" nowrap><small>';
 	if (isset($MAGIC_COOKIE) && $show_admin) {
 
-		print_link('/manual1/admin-notes.php?action=edit+' . $row['id'] . '&brief=1',
+		print_link('/manual/admin-notes.php?action=edit+' . $row['id'] . '&brief=1',
 			make_image('notes-edit.gif', 'edit note')
 		);
 		echo '&nbsp';
-		print_link('/manual1/admin-notes.php?action=reject+' . $row['id'] . '&brief=1&popup=1',
+		print_link('/manual/admin-notes.php?action=reject+' . $row['id'] . '&brief=1&popup=1',
 			make_image('notes-reject.gif', 'reject note'),
 			'admin'
 		);
 		echo '&nbsp';
-		print_link('/manual1/admin-notes.php?action=delete+' . $row['id'] . '&brief=1&popup=1',
+		print_link('/manual/admin-notes.php?action=delete+' . $row['id'] . '&brief=1&popup=1',
 			make_image('notes-delete.gif', 'delete note'),
 			'admin'
 		);
@@ -249,7 +249,7 @@
 
 function manualGetUserNotes($title, $id) {
 	// if we're gtk.php.net, get it from the local DB
-	// otherwise look in "/manual1/usernotes/$title.txt" (if present)
+	// otherwise look in "/manual/usernotes/$title.txt" (if present)
 	$notes = array();
 #	if(is_primary_site() || strstr($MYSITE,"localhost")) {
 
@@ -309,11 +309,11 @@
 	echo '<tr bgcolor="#d0d0d0" valign="top">';
 	echo '<td><small>User Contributed Notes<br></small><b>' . $title . '</b><br></td>';
 	echo '<td align="right">';
-	print_link('/manual1/add-note.php?sect='.$id.'&redirect='.$back_url,
+	print_link('/manual/add-note.php?sect='.$id.'&redirect='.$back_url,
 		make_image('notes-add.gif','add a note')
 	);
 	echo "&nbsp;";
-	print_link('/manual1/about-notes.php',
+	print_link('/manual/about-notes.php',
 		make_image('notes-about.gif', 'about notes')
 	);
 	echo "<br></td>\n";
@@ -325,7 +325,7 @@
 			echo '<tr valign="top">';
 			echo '<td bgcolor="#e0e0e0" colspan="2">';
 			echo 'User contributed notes are not available on this mirror site; try ';
-			print_link('http://gtk.php.net/manual1/'.$LANG.'/'.$id, 'here');
+			print_link('http://gtk.php.net/manual/'.$LANG.'/'.$id, 'here');
 			echo '.<br></td></tr>';
 		} else {
 			echo '<tr valign="top">';
@@ -342,11 +342,11 @@
 
 		echo "<tr bgcolor=\"#d0d0d0\" valign=\"top\">\n";
 		echo "<td colspan=\"2\" align=\"right\">\n";
-		print_link('/manual1/add-note.php?sect='.$id.'&redirect='.$back_url,
+		print_link('/manual/add-note.php?sect='.$id.'&redirect='.$back_url,
 			make_image('notes-add.gif','add a note')
 			);
 		echo "&nbsp;";
-		print_link('/manual1/about-notes.php',
+		print_link('/manual/about-notes.php',
 			make_image('notes-about.gif', 'about notes')
 			);
 		echo "<br></td>\n";
@@ -365,7 +365,7 @@
 	global $HTDIG;
 
 	makeBorderTOC($title);
-	commonHeader('PHP-GTK 1 Manual : '.$title);
+	commonHeader('Manual: '.$title);
 	# create links to plain html and other languages
 	if (!$HTDIG) {
 		navigationBar($title, $id, "top");