com web/php: Kill the next/prev page from the top & move lang chooser: include/header.inc include/shared-manual.inc styles/theme.css

Commit: f613c040783ce882cc3c008e9f5fdf3cb6306037 Author: Hannes Magnusson <bjori@10gen.com> Tue, 25 Jun 2013 11:26:23 -0700 Parents: 11a281e0e656447ee5c35b7403ac2c758436eb9b Branches: master Link: http://git.php.net/?p=web/php.git;a=commitdiff;h=f613c040783ce882cc3c008e9f5fdf3cb6306037 Log: Kill the next/prev page from the top & move lang chooser The next/prev page takes way to much space there and isn't very important feature to have such promonently in-your-face, creating imbalance at the top. Moved the language chooser to just above the version info Changed paths: M include/header.inc M include/shared-manual.inc M styles/theme.css Diff: diff --git a/include/header.inc b/include/header.inc index 554c864..6e3c21e 100644 --- a/include/header.inc +++ b/include/header.inc @@ -268,7 +268,14 @@ if (isset($shortname) && $shortname) { </aside> <?php endif; ?> +<?php if(!empty($config["thispage"])): ?> +<div class="change-language"> + <?php echo manual_language_chooser($config["lang"], $config["thispage"]); ?> +</div> +<?php endif; ?> + <?php include 'uservoice.inc' ?> + <section class="layout-content <?php echo $curr ?>"> diff --git a/include/shared-manual.inc b/include/shared-manual.inc index 2565153..a0c33fa 100644 --- a/include/shared-manual.inc +++ b/include/shared-manual.inc @@ -616,36 +616,11 @@ function manual_setup_beta($setup) { "prev" => $setup["prev"][0], "next" => $setup["next"][0], ), - "lang" => $setup["head"][1], + "lang" => $setup["head"][1], + "thispage" => $setup["this"][0], ); site_header($setup["this"][1] . " - Manual ", $config); - echo '<div class="manualnavbar">'; - - if(isset($setup['prev']) || isset($setup['next'])) { - - - $prevNextHtml = '<div class="prevnext-container">'; - if(isset($setup['prev'])) { - $prevNextHtml .= sprintf('<a href="%s" title="%s" class="prev">&laquo; %s</a>', - $setup['prev'][0], $setup['prev'][1], $setup['prev'][1] - ); - } - if(isset($setup['next'])) { - $prevNextHtml .= sprintf('<a href="%s" title="%s" class="next">%s &raquo;</a>', - $setup['next'][0], $setup['next'][1], $setup['next'][1] - ); - } - $prevNextHtml .= '</div>'; - echo $prevNextHtml; - } - - echo '<div class="change-language">' . - manual_language_chooser($setup['head'][1], $setup['this'][0]). - '</p></div>'; - - echo '</div> <!-- /.manualnavbar -->'; - diff --git a/styles/theme.css b/styles/theme.css index da83010..954710f 100755 --- a/styles/theme.css +++ b/styles/theme.css @@ -236,6 +236,10 @@ hr { cursor: pointer; } +.change-language { + float: right; + margin: -25px -10px; +} .change-language .select { border-radius: 0; }