1 files changed, 21 insertions, 13 deletions
diff --git a/setup/frames/menu.inc.php b/setup/frames/menu.inc.php
index 0ca99109a9..74f46bca0f 100644
--- a/setup/frames/menu.inc.php
+++ b/setup/frames/menu.inc.php
@@ -10,19 +10,27 @@ if (!defined('PHPMYADMIN')) {
     exit;
 }
 
+$formset_id = filter_input(INPUT_GET, 'formset');
+
 $separator = PMA_URL_getArgSeparator('html');
 echo '<ul>';
-echo '<li><a href="index.php">' . __('Overview') . '</a></li>';
-echo '<li><a href="?page=form' . $separator . 'formset=Features">'
-    . __('Features') . '</a></li>';
-echo '<li><a href="?page=form' . $separator . 'formset=Sql_queries">'
-    . __('SQL queries') . '</a></li>';
-echo '<li><a href="?page=form' . $separator . 'formset=Navi_panel">'
-    . __('Navigation panel') . '</a></li>';
-echo '<li><a href="?page=form' . $separator . 'formset=Main_panel">'
-    . __('Main panel') . '</a></li>';
-echo '<li><a href="?page=form' . $separator . 'formset=Import">'
-    . __('Import') . '</a></li>';
-echo '<li><a href="?page=form' . $separator . 'formset=Export">'
-    . __('Export') . '</a></li>';
+echo '<li><a href="index.php"'
+    . ($formset_id === null ? ' class="active' : '')
+    .'">' . __('Overview') . '</a></li>';
+
+$formsets = array(
+    'Features'    => __('Features'),
+    'Sql_queries' => __('SQL queries'),
+    'Navi_panel'  => __('Navigation panel'),
+    'Main_panel'  => __('Main panel'),
+    'Import'      => __('Import'),
+    'Export'      => __('Export')
+);
+
+foreach ($formsets as $formset => $label) {
+    echo '<li><a href="?page=form' . $separator . 'formset=' . $formset . '" '
+        . ($formset_id === $formset ? ' class="active' : '')
+        .'">' . $label . '</a></li>';
+}
+
 echo '</ul>';