com web/php: Restore the previous and next links to their former glory.: include/header.inc include/shared-manual.inc styles/theme-base.css

Commit: 166ffb7b99d7084a18531988779752d59629828b Author: Adam Harvey <aharvey@php.net> Wed, 20 Nov 2013 12:17:42 -0800 Parents: 10ca6290c312699e9c96a604fac9cea732944427 Branches: master Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=166ffb7b99d7084a18531988779752d59629828b Log: Restore the previous and next links to their former glory. Squashed commit of the following: commit 6e788887da9dc91c6deb0e7fc81526592c0f60a5 Author: Adam Harvey <aharvey@php.net> Date: Wed Nov 20 11:47:11 2013 -0800 Move the prevnext-container into the breadcrumbs. commit d58a00dfbf61e7ff57cd350a64c57ab066141d81 Author: Adam Harvey <aharvey@php.net> Date: Wed Nov 20 11:40:09 2013 -0800 OK, this is minimally functional. commit 5b4c2e30a27d658d9b5bce4278823277554a2835 Author: Adam Harvey <aharvey@php.net> Date: Wed Nov 20 11:38:40 2013 -0800 Various fixups. commit 8bb763d18ac8c0d47094b1681e5acab8b6365b66 Author: Adam Harvey <aharvey@php.net> Date: Wed Nov 20 11:26:25 2013 -0800 Revert "Kill the next/prev page from the top & move lang chooser" This reverts commit f613c040783ce882cc3c008e9f5fdf3cb6306037. Conflicts: include/header.inc include/shared-manual.inc styles/theme.css Changed paths: M include/header.inc M include/shared-manual..inc M styles/theme-base.css Diff: diff --git a/include/header.inc b/include/header.inc index 35fc4c5..0156522 100755 --- a/include/header.inc +++ b/include/header.inc @@ -111,8 +111,19 @@ if (isset($shortname) && $shortname) { echo " <li><a href='{$crumb['link']}'>{$crumb['title']}</a> <span class='divider'>/</span></li>"; } echo " <li><a href='{$last['link']}'>{$last['title']}</a></li>"; + ?> </ul> + <div id="prevnext-container"> + <?php + if (isset($config['prev'])) { + echo "<a class='prev' href='{$config['prev'][0]}'>&laquo; {$config['prev'][1]}</a>"; + } + if (isset($config['next'])) { + echo "<a class='next' href='{$config['next'][0]}'>{$config['next'][1]} &raquo;</a>"; + } + ?> + </div> </div> </div> <?php endif; ?> @@ -146,5 +157,5 @@ if (isset($shortname) && $shortname) { </ul> </aside> <?php endif; ?> -<section id="layout-content" class="<?php echo $curr; ?> span<?php echo $config['layout_span']; ?>"> - + +<section id="layout-content" class="<?php echo $curr ?> span<?php echo $config['layout_span']; ?>"> diff --git a/include/shared-manual.inc b/include/shared-manual.inc index e2ac6a8..d239479 100644 --- a/include/shared-manual.inc +++ b/include/shared-manual.inc @@ -617,14 +617,15 @@ function manual_setup_beta($setup) { "prev" => $setup["prev"][0], "next" => $setup["next"][0], ), - "lang" => $setup["head"][1], - "thispage" => $setup["this"][0], + "lang" => $setup["head"][1], + "thispage" => $setup["this"][0], + "prev" => $setup["prev"], + "next" => $setup["next"], ); site_header($setup["this"][1] . " - Manual ", $config); echo '<div class="change-language">' . manual_language_chooser($config["lang"], $config["thispage"]) . '</div>'; - } function manual_language_chooser($currentlang, $currentpage) { global $ACTIVE_ONLINE_LANGUAGES; diff --git a/styles/theme-base.css b/styles/theme-base.css index eeb8a68..fd74f58 100755 --- a/styles/theme-base.css +++ b/styles/theme-base.css @@ -3116,6 +3116,10 @@ div.soft-deprecation-notice blockquote.sidebar { border-width:0; } +#prevnext-container .next { + float: right; +} + #mainmenu-toggle { display: none; }