bjori           Mon Jun 25 15:17:15 2007 UTC

  Modified files:              
    /livedocs/themes/php.net    html_format.php 
  Log:
   - Sync with phpweb
   - Use phpwebs footer
  
  
http://cvs.php.net/viewvc.cgi/livedocs/themes/php.net/html_format.php?r1=1.17&r2=1.18&diff_format=u
Index: livedocs/themes/php.net/html_format.php
diff -u livedocs/themes/php.net/html_format.php:1.17 
livedocs/themes/php.net/html_format.php:1.18
--- livedocs/themes/php.net/html_format.php:1.17        Wed Jun 20 01:26:46 2007
+++ livedocs/themes/php.net/html_format.php     Mon Jun 25 15:17:15 2007
@@ -18,7 +18,7 @@
 // | headers and footers for the HTML rendering                           |
 // +----------------------------------------------------------------------+
 //  
-// $Id: html_format.php,v 1.17 2007/06/20 01:26:46 curt Exp $
+// $Id: html_format.php,v 1.18 2007/06/25 15:17:15 bjori Exp $
 
 // in livedoc_funcs.php
 define('NAV_START', '<div id="manualtoc">');
@@ -63,14 +63,14 @@
  <div id="headmenu">
   <a href="/downloads.php">downloads</a> |
   <a href="/docs.php">documentation</a> |
-  <a href="/FAQ.php">faq</a> |
+  <a href="/manual/faq">faq</a> |
   <a href="/support.php">getting help</a> |
   <a href="/mailing-lists.php">mailing lists</a> |
   <a href="http://bugs.php.net/";>reporting bugs</a> |
   <a href="/sites.php">php.net sites</a> |
   <a href="/links.php">links</a> |
+  <a href="/conferences/">conferences</a> |
   <a href="/my.php">my php.net</a>
-
  </div>
 </div>
 
@@ -85,13 +85,18 @@
    <span>in the</span>
    <select name="show">
     <option value="quickref" selected="selected">function list</option>
-    <option value="wholesite">whole site</option>
-    <option value="manual"   >online documentation [en]</option>
+    <option value="all"      >all php.net sites</option>
+    <option value="local"    >this mirror only</option>
+    <option value="manual"   >online documentation</option>
     <option value="bugdb"    >bug database</option>
-
+    <option value="news_archive">Site News Archive</option>
+    <option value="changelogs">All Changelogs</option>
+    <option value="pear"     >just pear.php.net</option>
+    <option value="pecl"     >just pecl.php.net</option>
+    <option value="talks"    >just talks.php.net</option>
     <option value="maillist" >general mailing list</option>
     <option value="devlist"  >developer mailing list</option>
-    <option value="phpdoc"   >documentation mailing list </option>
+    <option value="phpdoc"   >documentation mailing list</option>
    </select>
    <input type="image"
           src="/themes/php.net/images/small_submit_white.gif"
@@ -119,7 +124,8 @@
        if (PHPNET) {
                manual_setup(array('this' => array($current_page . '.php', 
$title)));
 
-               @manual_notes(); // broken in phpweb...
+               manual_footer();
+               return;
        }
 
        $mirror_name = MIRROR_NAME;

Reply via email to