com web/doc: Correct HTML markup for main and second screen: include/lib_general.inc.php www/index.php www/revch eck.php

Commit: 306f3372fb4d94b3bca7a07d2828beb6e7919826 Author: Sobak <msobaczewski@gmail.com> Fri, 9 May 2014 21:46:23 +0200 Parents: 93098b83799550a9875c6040316165aacc236666 Branches: master Link: http://git.php.net/?p=web/doc.git;a=commitdiff;h=306f3372fb4d94b3bca7a07d2828beb6e7919826 Log: Correct HTML markup for main and second screen Changed paths: M include/lib_general.inc.php M www/index.php M www/revcheck.php Diff: diff --git a/include/lib_general.inc.php b/include/lib_general.inc.php index 036bf28..d60179d 100644 --- a/include/lib_general.inc.php +++ b/include/lib_general.inc.php @@ -27,12 +27,12 @@ function get_svn_dir($project) return $GLOBALS['PROJECTS'][$project][1] . '/'; } -function site_header($has_sidebar = false) +function site_header() { - $TITLE = 'Documentation Tools'; - $SUBDOMAIN = 'doc'; - $CSS = array('/styles/doc.css'); - $LINKS = array( + $TITLE = 'Documentation Tools'; + $SUBDOMAIN = 'doc'; + $CSS = array('/styles/doc.css'); + $LINKS = array( array('href' => '/revcheck.php', 'text' => 'Documentation Tools'), array('href' => '/dochowto/', 'text' => 'Documentation Howto'), array('href' => '/phd.php', 'text' => 'PhD Homepage'), @@ -40,12 +40,7 @@ function site_header($has_sidebar = false) require __DIR__ . '/../shared/templates/header.inc'; - if ($has_sidebar) { - echo '<section class="mainscreen">'; - } - else { - echo '<section class="fullscreen">'; - } + echo '<section class="mainscreen">'; } function site_footer($SECONDSCREEN = false) @@ -72,17 +67,17 @@ function nav_languages() function nav_tools($lang) { global $LANGUAGES; - $out = '<div class="panel">'; + $out = '<div class="panel">'; $out .= '<p class="headline">Tools ('.$LANGUAGES[$lang].' Manual)</p>'; $out .= '<div class="body">'; - $out .= '<ul>'; - $out .= '<li><a href="revcheck.php?p=translators&amp;lang='.$lang.'">Translators</a></li>'; - $out .= '<li><a href="revcheck.php?p=filesummary&amp;lang='.$lang.'">File summary</a></li>'; - $out ..= '<li><a href="revcheck.php?p=files&amp;lang='.$lang.'">Outdated files</a></li>'; - $out .= '<li><a href="revcheck.php?p=misstags&amp;lang='.$lang.'">Missing revision numbers</a></li>'; - $out .= '<li><a href="revcheck.php?p=missfiles&amp;lang='.$lang.'">Untranslated files</a></li>'; - $out .= '<li><a href="revcheck.php?p=oldfiles&amp;lang='.$lang.'">Not in EN tree</a></li>'; - $out .= '<li><a href="revcheck.php?p=graph&amp;lang='.$lang.'">Graph</a></li>'; - $out .= '</ul></div></div>'; + $out .= '<ul>'; + $out .= '<li><a href="revcheck.php?p=translators&amp;lang='.$lang.'">Translators</a></li>'; + $out .= '<li><a href="revcheck.php?p=filesummary&amp;lang='.$lang.'">File summary</a></li>'; + $out .= '<li><a href="revcheck.php?p=files&amp;lang='.$lang.'">Outdated files</a></li>'; + $out .= '<li><a href="revcheck.php?p=misstags&amp;lang='.$lang.'">Missing revision numbers</a></li>'; + $out .= '<li><a href="revcheck.php?p=missfiles&amp;lang='.$lang.'">Untranslated files</a></li>'; + $out .= '<li><a href="revcheck.php?p=oldfiles&amp;lang='.$lang.'">Not in EN tree</a></li>'; + $out .= '<li><a href="revcheck.php?p=graph&amp;lang='.$lang.'">Graph</a></li>'; + $out .= '</ul></div></div>'; return $out; } \ No newline at end of file diff --git a/www/index.php b/www/index.php index 36b6dc0..73d30ca 100644 --- a/www/index.php +++ b/www/index.php @@ -1,7 +1,7 @@ <?php include_once '../include/init.inc.php'; -site_header(true); +site_header(); ?> <h2>What is this site?</h2> diff --git a/www/revcheck.php b/www/revcheck.php index d899c46..3ded2fa 100644 --- a/www/revcheck.php +++ b/www/revcheck.php @@ -42,7 +42,7 @@ else { die; } -site_header(true); +site_header(); switch($tool) { case 'translators': $translators = get_translators($dbhandle, $lang);