diff options
| author | Rouslan Placella <rouslan@placella.com> | 2012-05-29 17:05:34 +0400 |
|---|---|---|
| committer | Rouslan Placella <rouslan@placella.com> | 2012-06-11 17:06:03 +0400 |
| commit | 05e7653f2add8e585324ba640123492ef8b56633 (patch) | |
| tree | e647df40e1e6561a6ad0a72b1498722f343cc2c6 /navigation.php | |
| parent | 0aee714983a57a9cbf062ebfdb0b94b6bc8c0738 (diff) | |
Use PMA_Header class in navigation.php
Diffstat (limited to 'navigation.php')
| -rw-r--r-- | navigation.php | 74 |
1 files changed, 14 insertions, 60 deletions
diff --git a/navigation.php b/navigation.php index 3a97eb3d66..6149a21b37 100644 --- a/navigation.php +++ b/navigation.php @@ -83,41 +83,12 @@ $db_start = $GLOBALS['db']; */ $cfgRelation = PMA_getRelationsParam(); -/** - * For re-usability, moved http-headers to a seperate file. - * It can now be included by libraries/header.inc.php, querywindow.php. - */ -require_once 'libraries/header_http.inc.php'; - -/* - * Displays the frame - */ -// xml declaration moves IE into quirks mode, making much trouble with CSS -/* echo '<?xml version="1.0" encoding="utf-8"?>'; */ -?> -<!DOCTYPE HTML> -<html lang="<?php echo $available_languages[$lang][1]; ?>" dir="<?php echo $GLOBALS['text_dir']; ?>"> - -<head> - <link rel="icon" href="favicon.ico" type="image/x-icon" /> - <link rel="shortcut icon" href="favicon.ico" type="image/x-icon" /> - <title>phpMyAdmin</title> - <meta charset="utf-8" /> - <base target="frame_content" /> - <link rel="stylesheet" type="text/css" - href="phpmyadmin.css.php?<?php echo PMA_generate_common_url('', ''); ?>&nocache=<?php echo $GLOBALS['PMA_Config']->getThemeUniqueValue(); ?>" /> - <?php - echo PMA_includeJS('jquery/jquery-1.6.2.js'); - echo PMA_includeJS('jquery/jquery-ui-1.8.16.custom.js'); - echo PMA_includeJS('jquery/jquery.qtip-1.0.0-rc3.js'); - echo PMA_includeJS('navigation.js'); - echo PMA_includeJS('functions.js'); - echo PMA_includeJS('messages.php'); - // Append the theme id to this url to invalidate the cache on a theme change - echo PMA_includeJS('get_image.js.php?theme=' . urlencode($_SESSION['PMA_Theme']->getId())); - ?> - <script type="text/javascript"> - // <![CDATA[ +$header = PMA_Header::getInstance(); +$header->disableMenu(); +$header->setBodyId('body_leftFrame'); +$scripts = $header->getScripts(); +$scripts->addFile('navigation.js'); +$scripts->addCode(' // INIT PMA_setFrameSize var onloadCnt = 0; var onLoadHandler = window.onload; @@ -128,8 +99,8 @@ require_once 'libraries/header_http.inc.php'; if (typeof(onLoadHandler) == "function") { onLoadHandler(); } - if (typeof(PMA_setFrameSize) != 'undefined' - && typeof(PMA_setFrameSize) == 'function' + if (typeof(PMA_setFrameSize) != "undefined" + && typeof(PMA_setFrameSize) == "function" ) { PMA_setFrameSize(); } @@ -140,32 +111,15 @@ require_once 'libraries/header_http.inc.php'; if (typeof(resizeHandler) == "function") { resizeHandler(); } - if (typeof(PMA_saveFrameSize) != 'undefined' - && typeof(PMA_saveFrameSize) == 'function' + if (typeof(PMA_saveFrameSize) != "undefined" + && typeof(PMA_saveFrameSize) == "function" ) { PMA_saveFrameSize(); } }; - // ]]> - </script> - <?php - /* - * remove horizontal scroll bar bug in IE 6 by forcing a vertical scroll bar - */ - ?> - <!--[if IE 6]> - <style type="text/css"> - /* <![CDATA[ */ - html { - overflow-y: scroll; - } - /* ]]> */ - </style> - <![endif]--> -</head> +'); +$header->display(); -<body id="body_leftFrame"> -<?php require 'libraries/navigation_header.inc.php'; // display recently used tables @@ -667,7 +621,7 @@ function PMA_displayTableList( ); // quick access icon next to each table name echo '<li>' . "\n"; - echo '<a class="tableicon" title="' + echo '<a target="frame_content" class="tableicon" title="' . htmlspecialchars($link_title) . ': ' . htmlspecialchars($table['Comment']) .' (' . PMA_formatNumber($table['Rows'], 0) . ' ' . __('Rows') . ')"' @@ -699,7 +653,7 @@ function PMA_displayTableList( $href = $GLOBALS['cfg']['DefaultTabTable'] . '?' .$GLOBALS['common_url_query'] . '&table=' .urlencode($table['Name']) . '&pos=0'; - echo '<a href="' . $href . '" title="' + echo '<a target="frame_content" href="' . $href . '" title="' . htmlspecialchars( PMA_getTitleForTarget($GLOBALS['cfg']['DefaultTabTable']) . ': ' . $table['Comment'] |