svn: /phd/trunk/phpdotnet/phd/Package/Default/ BigXHTML.php ChunkedXHTML.php
| From: | Moacir de Oliveira Miranda Júnior | Date: | Thu, 20 Aug 2009 04:47:42 +0000 |
| Subject: | svn: /phd/trunk/phpdotnet/phd/Package/Default/ BigXHTML.php ChunkedXHTML.php | ||
| Groups: | php.doc.cvs | ||
| Request: | Send a blank email to doc-cvs+get-4723@lists.php.net to get a copy of this message | ||
moacir Thu, 20 Aug 2009 04:47:42 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=287491
Log:
using the root index to create the header
Changed paths:
U phd/trunk/phpdotnet/phd/Package/Default/BigXHTML.php
U phd/trunk/phpdotnet/phd/Package/Default/ChunkedXHTML.php
Modified: phd/trunk/phpdotnet/phd/Package/Default/BigXHTML.php
===================================================================
--- phd/trunk/phpdotnet/phd/Package/Default/BigXHTML.php 2009-08-20 04:40:43 UTC (rev 287490)
+++ phd/trunk/phpdotnet/phd/Package/Default/BigXHTML.php 2009-08-20 04:47:42 UTC (rev 287491)
@@ -35,13 +35,14 @@
}
public function header() {
+ $root = Format::getRootIndex();
return <<<HEADER
<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN"
"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
<html xmlns="http://www.w3.org/1999/xhtml"
xml:lang="en" lang="en">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
- <title>$this->getTitle()</title>
+ <title>{$root["ldesc"]}</title>
</head>
<body>
HEADER;
Modified: phd/trunk/phpdotnet/phd/Package/Default/ChunkedXHTML.php
===================================================================
--- phd/trunk/phpdotnet/phd/Package/Default/ChunkedXHTML.php 2009-08-20 04:40:43 UTC (rev 287490)
+++ phd/trunk/phpdotnet/phd/Package/Default/ChunkedXHTML.php 2009-08-20 04:47:42 UTC (rev 287491)
@@ -93,6 +93,7 @@
public function header($id) {
$title = $this->getLongDescription($id);
$lang = Config::language();
+ $root = Format::getRootIndex();
$prev = $next = $parent = array("href" => null, "desc" => null);
@@ -115,7 +116,7 @@
<html xmlns="http://www.w3.org/1999/xhtml"
xml:lang="' .$lang. '" lang="' .$lang. '">
<head>
<meta http-equiv="content-type" content="text/html; charset=UTF-8"/>
- <title>'.$this->getTitle().': '.$title.'</title>
+ <title>'.(($title != $root["ldesc"]) ? $root["ldesc"].':
' : "").$title.'</title>
</head>
<body>
<table width="100%">
@@ -128,7 +129,7 @@
'.($prevId ? '<div class="prev" style="text-align:
left; float: left;"><a href="' .$prev["href"]. '">'
.$prev["desc"]. '</a></div>' : '') .'
'.($nextId ? '<div class="next" style="text-align:
right; float: right;"><a href="' .$next["href"].
'">' .$next["desc"].'</a></div>' : '')
.'
'.($parentId ? '<div class="up"><a href="'
.$parent["href"]. '">' .$parent["desc"].
'</a></div>' : '') .'
- <div class="home"><a
href="index.html">'.$this->getTitle().'</a></div>
+ <div class="home"><a
href="'.$root["filename"].".".$this->getExt().'">'.$root["ldesc"].'</a></div>
</div><hr/>
';
}
@@ -138,6 +139,7 @@
}
protected function createNavBar($id) {
+ $root = Format::getRootIndex();
$navBar = '<style type="text/css">
#leftbar {
float: left;
@@ -174,7 +176,7 @@
}
</style>
<ul class="toc">
- <li class="header home"><a
href="index.'.$this->getExt().'">'.$this->getTitle().'</a></li>
+ <li class="header home"><a
href="'.$root["filename"].".".$this->getExt().'">'.$root["ldesc"].'</a></li>
';
// Fetch ancestors of the current node
$ancestors = array();