Merged branch official/master. Resolved merge conflicts introduced due to merging of Piotr and Martynas's branches
This commit is contained in:
@@ -2,9 +2,7 @@
|
||||
/**
|
||||
* Menu items
|
||||
*
|
||||
* @package phpMyAdmin-setup
|
||||
* @license http://www.gnu.org/licenses/gpl.html GNU GPL 2.0
|
||||
* @version $Id$
|
||||
* @package phpMyAdmin-setup
|
||||
*/
|
||||
|
||||
if (!defined('PHPMYADMIN')) {
|
||||
@@ -15,9 +13,10 @@ $separator = PMA_get_arg_separator('html');
|
||||
?>
|
||||
<ul>
|
||||
<li><a href="index.php"><?php echo __('Overview') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=features"><?php echo __('Features') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=left_frame"><?php echo __('Navigation frame') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=main_frame"><?php echo __('Main frame') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=import"><?php echo __('Import') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=export"><?php echo __('Export') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=Features"><?php echo __('Features') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=Sql_queries"><?php echo __('SQL queries') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=Left_frame"><?php echo __('Navigation frame') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=Main_frame"><?php echo __('Main frame') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=Import"><?php echo __('Import') ?></a></li>
|
||||
<li><a href="?page=form<?php echo $separator ?>formset=Export"><?php echo __('Export') ?></a></li>
|
||||
</ul>
|
||||
|
Reference in New Issue
Block a user