cvs: docweb / build-ops.in configure.in /include lib_general.inc.php lib_proj_lang.inc.php /templates/all/www/shared nav_projects.tpl.php
[email protected] ("Philip Olson")
| Newsgroups | php.doc.web |
|---|---|
| Message-ID | <cvsphilip1189819435@cvsserver> |
philip Sat Sep 15 01:23:55 2007 UTC
Modified files:
/docweb build-ops.in configure.in
/docweb/include lib_general.inc.php lib_proj_lang.inc.php
/docweb/templates/all/www/shared nav_projects.tpl.php
Log:
PhD in, Livedocs out.
http://cvs.php.net/viewvc.cgi/docweb/build-ops.in?r1=1.7&r2=1.8&diff_format=u
Index: docweb/build-ops.in
diff -u docweb/build-ops.in:1.7 docweb/build-ops.in:1.8
--- docweb/build-ops.in:1.7 Sat Jan 27 19:04:15 2007
+++ docweb/build-ops.in Sat Sep 15 01:23:54 2007
@@ -11,5 +11,5 @@
SRCDIR=@SRCDIR@
WWWUSER=@WWWUSER@
WWWGROUP=@WWWGROUP@
-LIVEDOCS=@LIVEDOCS@
+PHD=@PHD@
http://cvs.php.net/viewvc.cgi/docweb/configure.in?r1=1.8&r2=1.9&diff_format=u
Index: docweb/configure.in
diff -u docweb/configure.in:1.8 docweb/configure.in:1.9
--- docweb/configure.in:1.8 Sun Mar 5 18:06:43 2006
+++ docweb/configure.in Sat Sep 15 01:23:54 2007
@@ -1,5 +1,5 @@
## A configure script
-## $Id: configure.in,v 1.8 2006/03/05 18:06:43 sean Exp $
+## $Id: configure.in,v 1.9 2007/09/15 01:23:54 philip Exp $
AC_PREREQ(2.13)
AC_INIT()
@@ -86,9 +86,9 @@
[WWWGROUP="$withval"],
[WWWGROUP="`groups | cut -d" " -f1`"])
-AC_ARG_WITH(livedocs,[ --with-livedocs[=URL] URL to livedocs mirror [default=http://docs.php.net/]],
- [LIVEDOCS="$withval"],
- [LIVEDOCS="http://docs.php.net/"])
+AC_ARG_WITH(phd,[ --with-phd[=URL] URL to PhD mirror [default=http://docs.php.net/]],
+ [PHD="$withval"],
+ [PHD="http://docs.php.net/"])
DOCWEB=`pwd`
@@ -116,7 +116,7 @@
AC_SUBST(SRCDIR)
AC_SUBST(WWWUSER)
AC_SUBST(WWWGROUP)
-AC_SUBST(LIVEDOCS)
+AC_SUBST(PHD)
AC_OUTPUT(build-ops.php build-ops)
http://cvs.php.net/viewvc.cgi/docweb/include/lib_general.inc.php?r1=1.53&r2=1.54&diff_format=u
Index: docweb/include/lib_general.inc.php
diff -u docweb/include/lib_general.inc.php:1.53 docweb/include/lib_general.inc.php:1.54
--- docweb/include/lib_general.inc.php:1.53 Tue Jun 26 03:43:03 2007
+++ docweb/include/lib_general.inc.php Sat Sep 15 01:23:54 2007
@@ -18,7 +18,7 @@
| Gabor Hojtsy <[email protected]> |
| Sean Coates <[email protected]> |
+----------------------------------------------------------------------+
-$Id: lib_general.inc.php,v 1.53 2007/06/26 03:43:03 philip Exp $
+$Id: lib_general.inc.php,v 1.54 2007/09/15 01:23:54 philip Exp $
*/
require_once dirname(__FILE__) . '/lib_auth.inc.php';
@@ -54,13 +54,13 @@
$langdisplay = $GLOBALS['LANGUAGES'][LANGC];
$projdisplay = $GLOBALS['PROJECTS'][SITE][0];
// this will prevent 404 errors
- $project = (in_array(SITE, array('www', 'livedocs')) ? 'php' : SITE);
+ $project = (in_array(SITE, array('www', 'phd')) ? 'php' : SITE);
$locallinks = site_nav_provider();
$extlinks = ext_nav_provider();
$extra_style = '';
// prevent errors
- $guess_style = (in_array(SITE, array('www', 'livedocs')) ? '' : SITE . '.css');
+ $guess_style = (in_array(SITE, array('www', 'phd')) ? '' : SITE . '.css');
$styles = array_filter(($style ? array($style) : array($guess_style)));
// Set proper encoding with HTTP header first
@@ -269,14 +269,14 @@
.'&bug_age=0';
break;
- case 'livedocs':
+ case 'phd':
$RSS_URL = 'http://bugs.php.net/rss/search.php?boolean=0'
.'&limit=All&order_by=status&direction=ASC&cmd=display'
- .'&status=Open&bug_type%5B%5D=Livedocs+problem'
+ .'&status=Open&bug_type%5B%5D=Doc+Build+problem'
.'&bug_age=0';
$link = 'http://bugs.php.net/search.php?boolean=0'
.'&limit=All&order_by=status&direction=ASC&cmd=display'
- .'&status=Open&bug_type%5B%5D=Livedocs+problem'
+ .'&status=Open&bug_type%5B%5D=Doc+Build+problem'
.'&bug_age=0';
break;
http://cvs.php.net/viewvc.cgi/docweb/include/lib_proj_lang.inc.php?r1=1.10&r2=1.11&diff_format=u
Index: docweb/include/lib_proj_lang.inc.php
diff -u docweb/include/lib_proj_lang.inc.php:1.10 docweb/include/lib_proj_lang.inc.php:1.11
--- docweb/include/lib_proj_lang.inc.php:1.10 Tue Jun 26 04:00:10 2007
+++ docweb/include/lib_proj_lang.inc.php Sat Sep 15 01:23:54 2007
@@ -19,7 +19,7 @@
| Gabor Hojtsy <[email protected]> |
| Sean Coates <[email protected]> |
+----------------------------------------------------------------------+
-$Id: lib_proj_lang.inc.php,v 1.10 2007/06/26 04:00:10 philip Exp $
+$Id: lib_proj_lang.inc.php,v 1.11 2007/09/15 01:23:54 philip Exp $
*/
// split from lib_general.inc.php
@@ -32,7 +32,7 @@
'smarty' => array('Smarty', 'smarty/docs', 'smarty/docs/en'),
'pear' => array('PEAR Documentation', 'peardoc', 'peardoc/en'),
'gtk' => array('PHP-GTK Documentation', 'php-gtk-doc', 'php-gtk-doc/manual/en'),
- 'livedocs' => array('Livedocs', '', ''),
+ 'phd' => array('phd', '', ''),
);
// Supported languages
http://cvs.php.net/viewvc.cgi/docweb/templates/all/www/shared/nav_projects.tpl.php?r1=1.3&r2=1.4&diff_format=u
Index: docweb/templates/all/www/shared/nav_projects.tpl.php
diff -u docweb/templates/all/www/shared/nav_projects.tpl.php:1.3 docweb/templates/all/www/shared/nav_projects.tpl.php:1.4
--- docweb/templates/all/www/shared/nav_projects.tpl.php:1.3 Tue Jun 26 03:43:03 2007
+++ docweb/templates/all/www/shared/nav_projects.tpl.php Sat Sep 15 01:23:54 2007
@@ -3,4 +3,4 @@
<a href="<?php echo get_insite_address('pear'); ?>" class="logo logo-pear">&docweb.common.project.pear;</a>
<a href="<?php echo get_insite_address('gtk'); ?>" class="logo logo-gtk">&docweb.common.project.php-gtk;</a>
<a href="<?php echo get_insite_address('smarty'); ?>" class="logo logo-smarty">&docweb.common.project.smarty;</a>
- <a href="<?php echo get_insite_address('livedocs'); ?>" class="logo logo-livedocs">&docweb.common.project.livedocs;</a>
+ <a href="<?php echo get_insite_address('phd'); ?>" class="logo logo-phd">&docweb.common.project.phd;</a>