svn: /web/php/trunk/ include/shared-manual.inc styles/doc.css

wojak Sun, 16 Oct 2011 19:15:46 +0000 Revision: http://svn.php.net/viewvc?view=revision&revision=318149 Log: Aded language selector to TOC box Changed paths: U web/php/trunk/include/shared-manual.inc U web/php/trunk/styles/doc.css Modified: web/php/trunk/include/shared-manual.inc =================================================================== --- web/php/trunk/include/shared-manual.inc 2011-10-16 17:55:08 UTC (rev 318148) +++ web/php/trunk/include/shared-manual.inc 2011-10-16 19:15:46 UTC (rev 318149) @@ -550,14 +550,14 @@ site_header($setup["this"][1] . " - Manual ", $config); echo ' <aside id="quicktoc"> + <div class="language">'.manual_language_chooser($setup['head'][1], $setup['this'][0]).'</div> <div class="content"></div> <div class="links"> <a title="Report a bug" href="http://bugs.php.net/report.php?bug_type=Documentation+problem&amp;manpage=' . $PGI['this'][0] . '">Report a bug</a> <a title="Edit this page" href="https://edit.php.net/?project=PHP&amp;perm=' . $PGI['head'][1] . '/' . $PGI['this'][0] . '">Edit this page</a> </div> </aside>'; - - manual_language_chooser($setup['head'][1], $setup['this'][0]); + echo '</aside>'; } function manual_language_chooser($currentlang, $currentpage) { global $ACTIVE_ONLINE_LANGUAGES; @@ -570,24 +570,18 @@ } // Print out the form with all the options - echo <<< FORM -<form action="/manual/change.php" method="get" id="changelang"> - <fieldset> - <select name="page" id="changelang-langs"> -FORM; + $rt = '<h5>Language</h5>'. + '<form action="/manual/change.php" method="get" id="changelang" name="changelang">'. + '<fieldset>'. + '<select onchange="document.changelang.submit()" name="page" id="changelang-langs">'; foreach ($links as $link) { - echo "<option value='{$link[0]}' " .($link[2] == $currentlang ? "selected" : ""). ">{$link[1]}</option>\n"; + $rt.= "<option value='{$link[0]}' " .($link[2] == $currentlang ? "selected" : ""). ">{$link[1]}</option>\n"; } - echo <<< FORM - <option value="help-translate.php">Other</option> - </select> - <input type="submit" - value="Go" - id="changelang-submit" - class="submit" /> - </fieldset> -</form> -FORM; + $rt.= '<option value="help-translate.php">Other</option>'. + '</select>'. + '</fieldset>'. + '</form>'; + return $rt; } function manual_header_beta(){} Modified: web/php/trunk/styles/doc.css =================================================================== --- web/php/trunk/styles/doc.css 2011-10-16 17:55:08 UTC (rev 318148) +++ web/php/trunk/styles/doc.css 2011-10-16 19:15:46 UTC (rev 318149) @@ -13,7 +13,7 @@ right: 0px; } -#quicktoc .content { +#quicktoc .content, #quicktoc .language { padding: 10px 0 10px 10px; } @@ -283,7 +283,7 @@ } #changelang { - display: none; /* Temporarly removed until we do not find a suitable place for the element */ + border: 0; } @@ -362,3 +362,8 @@ .docs #layout .layout-content, .docs #layout #usernotes { margin-left: 272px; } +#changelang-langs { + width:120px; + font-size:12px; + margin-right: 6px; +}