web/include navigation.inc,1.13,1.14 template.inc,1.5,1.6

Greg DeKoenigsberg (gdk) fedora-extras-commits at redhat.com
Tue Nov 29 17:36:16 UTC 2005


Author: gdk

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

Modified Files:
	navigation.inc template.inc 
Log Message:
New navigation files for the content reorg, don't tag LIVE yet



Index: navigation.inc
===================================================================
RCS file: /cvs/fedora/web/include/navigation.inc,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -r1.13 -r1.14
--- navigation.inc	10 Nov 2005 21:36:53 -0000	1.13
+++ navigation.inc	29 Nov 2005 17:36:14 -0000	1.14
@@ -6,55 +6,35 @@
 
 $nav_list=array(
 	"Home"=>array("uri"=>"/"),
-	"Download"=>array("uri"=>"/download/","sub"=>array(
-	        "Test Releases"=>array("uri"=>"/download/test.php"),
+	"Download"=>array("uri"=>"/Download/","sub"=>array(
+		"Installation"=>array("uri"=>"/Download/install.php"),
+		"Mirrors"=>array("uri"=>"/Download/mirrors.php"),
+		"Vendors"=>array("uri"=>"/Download/vendors.php"),
+		"Updates"=>array("uri"=>"/Download/updates.php"),
 		"Download Server"=>array("uri"=>"http://download.fedora.redhat.com/pub/fedora/linux/"),
-		"Updates"=>array("uri"=>"/download/updates.php"),
-		"Mirrors"=>array("uri"=>"/download/mirrors.php"),
-		"Vendors"=>array("uri"=>"/download/vendors.php")
-		)),
-	"Updating and Installing Software"=>array("uri"=>"/docs/yum/","sub"=>array(
-		"Updating Your System"=>array("uri"=>"/docs/yum/sn-updating-your-system.php"),
-		"Managing Software"=>array("uri"=>"/docs/yum/sn-managing-packages.php"),
-		"Using Software Repositories"=>array("uri"=>"/docs/yum/sn-using-repositories.php")
 		)),
+	"News"=>array("uri"=>"/News/"),
 	"Documentation"=>array("uri"=>"/docs/","sub"=>array(
 		"Release Notes"=>array("uri"=>"/docs/release-notes/"),
-		"Installation Guide"=>array("uri"=>"/docs/fedora-install-guide-en/"),
-		"Managing Software With Yum"=>array("uri"=>"/docs/yum/index.php"),
 		"Jargon Buster"=>array("uri"=>"/docs/jargon-buster/"),
-                "SELinux FAQ"=>array("uri"=>"/docs/selinux-faq/")
-		)),
-	"Projects"=>array("uri"=>"/projects/","sub"=>array(
-		"Anaconda Installer"=>array("uri"=>"/projects/anaconda-installer/"),
-		"Artwork"=>array("uri"=>"/projects/artwork/"),
-		"Cluster"=>array("uri"=>"/projects/cluster/"),
-		"Desktop"=>array("uri"=>"/projects/desktop/"),
-		"Directory Server"=>array("uri"=>"http://directory.fedora.redhat.com/"),
-		"Docs"=>array("uri"=>"/projects/docs/"),
-		"Extras"=>array("uri"=>"/projects/extras/"),
-		"Internationalization"=>array("uri"=>"/projects/i18n/"),
-		"SELinux"=>array("uri"=>"/projects/selinux/"),
-		"Stateless Linux"=>array("uri"=>"/projects/stateless/"),
-		"SystemTap"=>array("uri"=>"/projects/systemtap/"),
-		"Translations"=>array("uri"=>"/projects/translations/"),
-		"Virtualization"=>array("uri"=>"/projects/virtualization/")
-		)),
-	"Participate"=>array("uri"=>"/participate/","sub"=>array(
-		"Communicate"=>array("uri"=>"/participate/communicate/"),
-		"Terminology"=>array("uri"=>"/participate/terminology.php"),
-		"Schedule"=>array("uri"=>"/participate/schedule/"),
-		"Roadmap"=>array("uri"=>"/participate/roadmap/"),
-		"Developer's Guide"=>array("uri"=>"/participate/developers-guide/"),
-		"Documentation Guide"=>array("uri"=>"/participate/documentation-guide/")
+                "SELinux FAQ"=>array("uri"=>"/docs/selinux-faq/"),
+                "Keeping Up to Date"=>array("uri"=>"/docs/updates/"),
+		"Developer's Guide"=>array("uri"=>"/docs/developers-guide/"),
+		"Documentation Guide"=>array("uri"=>"/docs/documentation-guide/"),
 		)),
-	"About"=>array("uri"=>"/about/","sub"=>array(
-		"FAQs"=>array("uri"=>"/about/faq/"),
-		"History"=>array("uri"=>"/about/history/"),
-		"Objectives"=>array("uri"=>"/about/objectives.php"),
-		"Product Relationship"=>array("uri"=>"/about/rhel.php"),
-		"Fedora Name"=>array("uri"=>"/about/name.php"),
-		"GPG Keys"=>array("uri"=>"/about/security/")
+	"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"=>"/About/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/"),
 		))
 	);
 ?>


Index: template.inc
===================================================================
RCS file: /cvs/fedora/web/include/template.inc,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- template.inc	15 Nov 2005 23:38:14 -0000	1.5
+++ template.inc	29 Nov 2005 17:36:14 -0000	1.6
@@ -64,14 +64,14 @@
 		<!-- header BEGIN -->
 		<div id="fedora-header">
 			<div id="fedora-header-logo">
-				<a href="/"><img src="/images/header-fedora_logo.png" alt="Fedora Project"></a>
+				<a href="/"><img src="/images/header-fedora_logo01.png" alt="Fedora Project"></a>
 			</div>
 
 			<div id="fedora-header-items">
 				<span class="fedora-header-icon">
-					<a href="/download/"><img src="/images/header-download.png" alt=" ">Download</a>
-					<a href="/projects/"><img src="/images/header-projects.png" alt=" ">Projects</a>
-					<a href="/about/faq/"><img src="/images/header-faq.png" alt=" ">FAQ</a></span>
+					<a href="/Download/"><img src="/images/header-download.png" alt=" ">Download</a>
+					<a href="/Contribute/"><img src="/images/header-projects.png" alt=" ">Projects</a>
+					<a href="/About/FAQ.php"><img src="/images/header-faq.png" alt=" ">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="/legal/">Legal</a> | <a href="/about/trademarks/">Trademark Guidelines</a>
+		print '<a href="/About/legal/">Legal</a> | <a href="/About/legal/trademarks/">Trademark Guidelines</a>
 			<br>';
 		if (!empty($date)) {
 			print '




More information about the fedora-extras-commits mailing list