svn: /web/php/trunk/include/ layout.inc
| From: | Hannes Magnusson | Date: | Sat, 16 Apr 2011 14:26:16 +0000 |
| Subject: | svn: /web/php/trunk/include/ layout.inc | ||
| Groups: | php.webmaster | ||
| Request: | Send a blank email to php-webmaster+get-10849@lists.php.net to get a copy of this message | ||
bjori Sat, 16 Apr 2011 14:26:16 +0000
Revision: http://svn.php.net/viewvc?view=revision&revision=310263
Log:
Revert r307291, defeats the purpose of the megadropdown to have 'more' link
Changed paths:
U web/php/trunk/include/layout.inc
Modified: web/php/trunk/include/layout.inc
===================================================================
--- web/php/trunk/include/layout.inc 2011-04-16 13:57:07 UTC (rev 310262)
+++ web/php/trunk/include/layout.inc 2011-04-16 14:26:16 UTC (rev 310263)
@@ -869,19 +869,19 @@
$file = dirname(__FILE__) . "/../manual/en/toc/index.inc";
}
require dirname(__FILE__) . "/../manual/$lang/toc/index.inc";
+
echo "<dl>\n";
doc_toc_list($lang, $TOC, "getting-started");
- doc_toc_list($lang, $TOC, "features");
-
+ doc_toc_list($lang, $TOC, "langref");
echo "</dl>\n";
echo "<dl>\n";
- doc_toc_list($lang, $TOC, "langref", array('limit' => 13));
+ doc_toc_list($lang, $TOC, "security");
+ doc_toc_list($lang, $TOC, "features");
echo "</dl>\n";
echo "<dl>\n";
- doc_toc_list($lang, $TOC, "funcref", array('limit' => 5));
- doc_toc_list($lang, $TOC, "security", array('limit' => 5));
+ doc_toc_list($lang, $TOC, "funcref");
echo "</dl>\n";
echo "<ul>";
@@ -895,19 +895,12 @@
echo "</ul>\n";
}
-function doc_toc_list($lang, $index, $file, $options = null) {
+function doc_toc_list($lang, $index, $file) {
include dirname(__FILE__) . "/../manual/$lang/toc/$file.inc";
doc_toc_title($lang, $index, $file);
- $i = 0;
foreach($TOC as $entry) {
- // If a limit was passed in and we have exceeded that limit then stop outputting items.
- if($options !== null && isset($options['limit']) && $i >
$options['limit']) {
- echo "\t<dd><a href='/manual/$lang/$file.php'>View more
..</a></dd>\n";
- break;
- }
echo "\t<dd><a
href='/manual/$lang/{$entry[0]}'>{$entry[1]}</a></dd>\n";
- $i++;
}
}
function doc_toc_title($lang, $index, $file, $elm = "dt") {