web/include navigation.inc,1.21,1.22 template.inc,1.13,1.14

[Karsten Wade (kwade)]

Author: kwade

Update of /cvs/fedora/web/include
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv10373/include

Modified Files:
	navigation.inc template.inc 
Log Message:
updating includes to match new details


Index: navigation.inc
===================================================================
RCS file: /cvs/fedora/web/include/navigation.inc,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- navigation.inc	12 Oct 2006 14:21:04 -0000	1.21
+++ navigation.inc	19 Mar 2007 21:39:13 -0000	1.22
@@ -5,37 +5,16 @@
    A trailing slash for directories is ALSO REQUIRED. */
 
 $nav_list=array(
-	"Home"=>array("uri"=>"/"),
-	"Download"=>array("uri"=>"/Download/","sub"=>array(
-		"Installation"=>array("uri"=>"http://fedoraproject.org/wiki/Distribution/Download"),
-		"Mirrors"=>array("uri"=>"/Download/mirrors.php"),
-		"Vendors"=>array("uri"=>"http://fedoraproject.org/wiki/Distribution/OnlineVendors"),
-		"Updates"=>array("uri"=>"/Download/updates.php"),
-		"Download Server"=>array("uri"=>"http://download.fedora.redhat.com/pub/fedora/linux/")
-		)),
-	"News"=>array("uri"=>"/News/"),
-	"Documentation"=>array("uri"=>"/docs/","sub"=>array(
+	"Documentation"=>array("uri"=>"/","sub"=>array(
 		"Release Notes"=>array("uri"=>"/docs/release-notes/"),
 		"Installation Guide"=>array("uri"=>"/docs/install-guide/"),
+		"Desktop User Guide"=>array("uri"=>"http://fedoraproject.org/wiki/Docs/DesktopUserGuide"),
 		"Managing Software With Yum"=>array("uri"=>"/docs/yum/"),
-		"Jargon Buster"=>array("uri"=>"/docs/jargon-buster/"),
-                "SELinux FAQ"=>array("uri"=>"/docs/selinux-faq/"),
-		"Developer's Guide"=>array("uri"=>"/docs/developers-guide/"),
-		"Documentation Guide"=>array("uri"=>"/docs/documentation-guide/")
 		)),
-	"Contribute"=>array("uri"=>"/Contribute/"),
-	"About"=>array("uri"=>"/About/","sub"=>array(
-		"Projects"=>array("uri"=>"/About/Projects/"),
-		"Contact"=>array("uri"=>"/About/contact.php"),
-		//"Terminology"=>array("uri"=>"/About/terminology.php"),
-		"Fedora Core Schedule"=>array("uri"=>"http://fedoraproject.org/wiki/Core/Schedule"),
-		//"History"=>array("uri"=>"/About/history/"),
-		//"Leadership"=>array("uri"=>"/About/leadership.php"),
-		//"Objectives"=>array("uri"=>"/about/objectives.php"),
-		//"Product Relationship"=>array("uri"=>"/about/rhel.php"),
-		//"Fedora Name"=>array("uri"=>"/about/name.php"),
-		"Legal"=>array("uri"=>"/About/legal/"),
-		"GPG Keys"=>array("uri"=>"/About/security/")
-		))
+	"Download Fedora"=>array("uri"=>"http://download.fedoraproject.org"),
+	"Join"=>array("uri"=>"http://fedoraproject.org/wiki/Join"),
+	"Contribute to the Documentation Project"=>array("uri"=>"http://fedoraproject.org/wiki/DocsProject/Join"),
+	"Fedora Schedule"=>array("uri"=>"http://fedoraproject.org/wiki/Schedule"),
+	"Documentation Schedule"=>array("uri"=>"http://fedoraproject.org/wiki/DocsProject/Schedule")
 	);
 ?>


Index: template.inc
===================================================================
RCS file: /cvs/fedora/web/include/template.inc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- template.inc	5 Jan 2007 17:25:05 -0000	1.13
+++ template.inc	19 Mar 2007 21:39:13 -0000	1.14
@@ -69,9 +69,9 @@
 
 			<div id="fedora-header-items">
 				<span class="fedora-header-icon">
-					<a href="/Download/"><img src="/images/header-download.png" alt=" ">Download</a>
-					<a href="/About/Projects/"><img src="/images/header-projects.png" alt=" ">Projects</a>
-					<a href="/About/FAQ.php"><img src="/images/header-faq.png" alt=" ">FAQ</a></span>
+					<a href="http://download.fedoraproject.org"><img src="/images/header-download.png" alt="download">Download</a>
+					<a href="http://fedoraproject.org"><img src="/images/fedoralogo-64x23.png" alt="Fedora home">Fedora Home</a>
+					<a href="http://fedoraproject.org/wiki/FAQ"><img src="/images/header-faq.png" alt="FAQ">FAQ</a></span>
 			</div>
 		</div>
 
@@ -138,7 +138,7 @@
 			print 'Red Hat, Inc. is not responsible for the content of other sites. 
 			<br>';
 		}
-		print '<a href="/About/legal/">Legal</a> | <a href="/About/legal/trademarks/">Trademark Guidelines</a>
+		print '<a href="http://fedoraproject.org/wiki/Legal">Legal</a> | <a href="http://fedoraproject.org/wiki/Legal/TrademarkGuidelines">Trademark Guidelines</a>
 			<br>';
 		if (!empty($date)) {
 			print '