Improve side navigation for translation tools

Author: jimwins

include/lib_general.inc.php

@@ -75,37 +75,28 @@ function site_footer($SECONDSCREEN = false)
     require __DIR__ . '/../shared/templates/footer.inc';
 }
 
-function nav_languages()
+function nav_languages($lang = null)
 {
     global $LANGUAGES;
     $out = '<div class="panel">';
-    $out .= '<p class="headline"><a href="revcheck.php">Translation status</a></p>';
+    $out .= '<p class="headline"><a href="/revcheck.php">Translation status</a></p>';
     $out .= '<div class="body">';
     $out .= '<ul>';
     foreach ($LANGUAGES as $code => $name)
     {
-        $out .='<li><a href="revcheck.php?lang='.$code.'">'.$name.'</a></li>';
+        $out .= '<li><a href="/revcheck.php?lang='.$code.'">'.$name.'</a>';
+        if ($lang === $code) {
+            $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 .= '</ul>';
+        }
+        $out .= '</li>';
     }
     $out .= '</ul></div></div>';
     return $out;
 }
-
-function nav_tools($lang)
-{
-    global $LANGUAGES;
-    $out = '<div class="panel">';
-    $out .= '<p class="headline">';
-    $out .= '<a href="revcheck.php?lang='.$lang.'">Tools ('.$LANGUAGES[$lang].' Manual)</a>';
-    $out .= '</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 .= '</ul>';
-    $out .= '</div></div>';
-    return $out;
-}

www/revcheck.php

@@ -298,14 +298,6 @@
      // we need a dir to browse
      $dirs = get_dirs($dbhandle, $lang);
      $users = get_translators($dbhandle, $lang);
-     /*
-     if (empty($dirs)) {
-         echo '<p>Error: no directories found in database.</p>';
-         $sidebar = nav_tools($lang);
-         site_footer($sidebar);
-         die;
-     }
-     */
      echo '<p>This tool allows you to check which files in your translation need updates. To show the list ';
      echo 'choose a directory (it doesn\'t work recursively) or translator.</p>';
      echo '<p>When you click on the filename you will see the plaintext diff showing changes between revisions, so ';
@@ -448,6 +440,6 @@
 }
 
 if ($lang != 'en') {
-    $sidebar = nav_tools($lang);
+    $sidebar = nav_languages($lang);
     site_footer($sidebar);
 }