2006-11-14 Mark Rowe <bdash@webkit.org>
authorbdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Nov 2006 21:44:01 +0000 (21:44 +0000)
committerbdash <bdash@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 14 Nov 2006 21:44:01 +0000 (21:44 +0000)
        Reviewed by Tim Hatcher.

        http://bugs.webkit.org/show_bug.cgi?id=9529
        Bug 9529: Navigation HTML duplicated on webkit.org web site

        * blog/wp-content/themes/webkit/sidebar.php: Include navigation from nav.inc rather than duplicating it here.
        * nav.inc: Generate WordPress archive list if included from within WordPress.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@17763 268f45cc-cd09-0410-ab3c-d52691b4dbfc

WebKitSite/ChangeLog
WebKitSite/blog/wp-content/themes/webkit/sidebar.php
WebKitSite/nav.inc

index 84132e2d21515ea9ae5f6ef14e9178aabf569776..073e581c17061205610a60f6a0b55e024c815325 100644 (file)
@@ -1,3 +1,13 @@
+2006-11-14  Mark Rowe  <bdash@webkit.org>
+
+        Reviewed by Tim Hatcher.
+
+        http://bugs.webkit.org/show_bug.cgi?id=9529
+        Bug 9529: Navigation HTML duplicated on webkit.org web site
+
+        * blog/wp-content/themes/webkit/sidebar.php: Include navigation from nav.inc rather than duplicating it here.
+        * nav.inc: Generate WordPress archive list if included from within WordPress.
+
 2006-11-07  Mark Rowe  <bdash@webkit.org>
 
         Reviewed by Dave Hyatt.
index 9ab421c3f90933f5b1737ec31b94f4cfbb53b42e..a7a4beeed175b4058b521463ea4158a4456dfa93 100644 (file)
@@ -1,48 +1,3 @@
-<div id="nav">
-    <ul id="navlist">
-        <li><a href="/">Home</a></li>
-        <li><a href="/blog">Surfin' Safari Blog</a></li>
-        <li><a href="/contact.html">Keeping in Touch</a></li>
-
-        <li class="subtitle">Working with the Code</li>
-
-        <li><a href="/building/checkout.html">Getting the Code</a></li>
-        <li><a href="/building/build.html">Building WebKit</a></li>
-        <li><a href="/coding/contributing.html">Contributing Code</a></li>
-
-        <li class="subtitle">Documentation</li>
-
-        <li><a href="/projects/">Projects</a></li>
-        <li><a href="/coding/coding-style.html">Code Style Guidelines</a></li>
-        <li><a href="http://trac.webkit.org/projects/webkit/wiki">Wiki</a></li>
-        <li><a href="http://trac.webkit.org/projects/webkit">Trac</a></li>
-
-        <li class="subtitle">Web Developers</li>
-
-        <li><a href="/webdevelopers/">Detecting WebKit</a></li>
-        
-        <li class="subtitle">Testing</li>
-
-        <li><a href="/quality/testing.html">Regression Testing</a></li>
-        <li><a href="/quality/leakhunting.html">Leak Hunting</a></li>
-        <li><a href="/quality/testwriting.html">Writing New Tests</a></li>
-
-        <li class="subtitle">Bugs</li>
-
-        <li><a href="/projects/compat/hitlist.html">Compatibility Hit List</a></li>
-        <li><a href="/quality/reporting.html">Reporting Bugs</a></li>
-        <li><a href="/quality/bugwriting.html">Bug Report Guidelines</a></li>
-        <li><a href="/quality/bugpriorities.html">Bug Prioritization</a></li>
-        <li><a href="/quality/reduction.html">Test Case Reduction</a></li>
-        <li><a href="/quality/lifecycle.html">Bug Life Cycle</a></li>
-        
-        <li class="subtitle">Archives</li>
-        <?php wp_get_archives('type=monthly'); ?>    
-    </ul>
-    <div id="notice">
-        WebKit is open source software with portions licensed under the
-        <a href="http://www.opensource.org/licenses/lgpl-license.php">LGPL</a> and
-        <a href="http://www.opensource.org/licenses/bsd-license.php">BSD licenses</a>.
-        Complete license and copyright information can be found within the code.
-    </div>
-</div>
+<?php
+    include ABSPATH . "/../nav.inc";
+?>
index d75b278d62451b69a2bc4ee2a94f9db405fc004c..df5e69b9d11b85b5f7292a2dd040af1148cf3ef5 100644 (file)
         <li><a href="/quality/bugpriorities.html">Bug Prioritization</a></li>
         <li><a href="/quality/reduction.html">Test Case Reduction</a></li>
         <li><a href="/quality/lifecycle.html">Bug Life Cycle</a></li>
+<?php
+        if (function_exists("wp_get_archives")) {
+            echo "<li class="subtitle">Archives</li>\n";
+            wp_get_archives('type=monthly');
+        }
+?>
     </ul>
     <div id="notice">
         WebKit is open source software with portions licensed under the