From 35dab58bf5c6532bb62800fca02874c0f809466e Mon Sep 17 00:00:00 2001 From: Ashutosh Dhundhara Date: Tue, 12 Aug 2014 01:47:20 +0530 Subject: [PATCH] RFE#1492: Remove the distinct query window. Signed-off-by: Ashutosh Dhundhara --- doc/config.rst | 43 ---- js/common.js | 13 +- js/functions.js | 2 +- js/querywindow.js | 25 --- libraries/Header.class.php | 2 - libraries/Util.class.php | 7 +- libraries/common.inc.php | 1 - libraries/config.default.php | 30 --- libraries/config.values.php | 8 - libraries/config/messages.inc.php | 9 - libraries/config/setup.forms.php | 8 +- libraries/config/user_preferences.forms.php | 4 - .../navigation/NavigationHeader.class.php | 12 - libraries/sql_query_form.lib.php | 84 ++----- querywindow.php | 208 ------------------ test/libraries/PMA_server_privileges_test.php | 2 - .../core/PMA_checkPageValidity_test.php | 1 - themes/original/css/common.css.php | 23 -- themes/original/layout.inc.php | 8 - themes/pmahomme/css/common.css.php | 23 -- themes/pmahomme/layout.inc.php | 8 - 21 files changed, 20 insertions(+), 501 deletions(-) delete mode 100644 js/querywindow.js delete mode 100644 querywindow.php diff --git a/doc/config.rst b/doc/config.rst index d71d6687d7..0e834614b3 100644 --- a/doc/config.rst +++ b/doc/config.rst @@ -2512,54 +2512,16 @@ Various display setting Repeat the headers every X cells, or 0 to deactivate. -.. config:option:: $cfg['EditInWindow'] - - :type: boolean - :default: true - -.. config:option:: $cfg['QueryWindowWidth'] - - :type: integer - :default: 550 - -.. config:option:: $cfg['QueryWindowHeight'] - - :type: integer - :default: 310 - .. config:option:: $cfg['QueryHistoryDB'] :type: boolean :default: false -.. config:option:: $cfg['QueryWindowDefTab'] - - :type: string - :default: ``'sql'`` - .. config:option:: $cfg['QueryHistoryMax'] :type: integer :default: 25 - All those variables affect the query window feature. A :term:`SQL` link or - icon is always displayed in the navigation panel. If JavaScript is enabled - in your browser, a click on this opens a distinct query window, which is a - direct interface to enter :term:`SQL` queries. Otherwise, the right panel - changes to display a query box. - - The size of this query window can be customized with - :config:option:`$cfg['QueryWindowWidth']` and - :config:option:`$cfg['QueryWindowHeight']` - both integers for the size in - pixels. Note that normally, those parameters will be modified in - :file:`layout.inc.php`` for the theme you are using. - - If :config:option:`$cfg['EditInWindow']` is set to true, a click on [Edit] - from the results page (in the :guilabel:`Showing Rows` section) opens the - query window and puts the current query inside it. If set to false, - clicking on the link puts the :term:`SQL` query - in the right panel's query box. - If :config:option:`$cfg['QueryHistoryDB']` is set to ``true``, all your Queries are logged to a table, which has to be created by you (see :config:option:`$cfg['Servers'][$i]['history']`). If set to false, all your @@ -2582,11 +2544,6 @@ Various display setting specify the amount of saved history items using :config:option:`$cfg['QueryHistoryMax']`. - The query window also has a custom tabbed look to group the features. - Using the variable :config:option:`$cfg['QueryWindowDefTab']` you can - specify the default tab to be used when opening the query window. It can be - set to either ``sql``, ``files``, ``history`` or ``full``. - .. config:option:: $cfg['BrowseMIME'] :type: boolean diff --git a/js/common.js b/js/common.js index ff6f997802..5b29e4c59c 100644 --- a/js/common.js +++ b/js/common.js @@ -1,17 +1,6 @@ /* vim: set expandtab sw=4 ts=4 sts=4: */ -/** - * Functionality for communicating with the querywindow - */ -$(function () { - /** - * Event handler for click on the open query window link - * in the top menu of the navigation panel - */ - $('#pma_open_querywindow').click(function (event) { - event.preventDefault(); - PMA_querywindow.focus(); - }); +$(function () { checkNumberOfFields(); }); diff --git a/js/functions.js b/js/functions.js index e6c4df7f94..ff9a321bba 100644 --- a/js/functions.js +++ b/js/functions.js @@ -10,7 +10,7 @@ var $table_clone = false; /** - * @var sql_box_locked lock for the sqlbox textarea in the querybox/querywindow + * @var sql_box_locked lock for the sqlbox textarea in the querybox */ var sql_box_locked = false; diff --git a/js/querywindow.js b/js/querywindow.js deleted file mode 100644 index d10069ce1b..0000000000 --- a/js/querywindow.js +++ /dev/null @@ -1,25 +0,0 @@ -/* vim: set expandtab sw=4 ts=4 sts=4: */ -function PMA_queryAutoCommit() -{ - var sqlqueryform = document.getElementById('sqlqueryform'); - sqlqueryform.target = window.opener.frame_content.name; - sqlqueryform.submit(); - return; -} - -function PMA_querywindowCommit(tab) -{ - var $hiddenqueryform = $('#hiddenqueryform'); - $hiddenqueryform.find("input[name='querydisplay_tab']").val(tab); - $hiddenqueryform.addClass('disableAjax').submit(); - return false; -} - -function PMA_querywindowSetFocus() -{ - $('#sqlquery').focus(); -} - -$(function () { - $('#topmenucontainer').css('padding', 0); -}); diff --git a/libraries/Header.class.php b/libraries/Header.class.php index 0097e7993d..8438c55df2 100644 --- a/libraries/Header.class.php +++ b/libraries/Header.class.php @@ -221,8 +221,6 @@ class PMA_Header 'common_query' => PMA_URL_getCommon('', '', '&'), 'opendb_url' => $GLOBALS['cfg']['DefaultTabDatabase'], 'safari_browser' => PMA_USR_BROWSER_AGENT == 'SAFARI' ? 1 : 0, - 'querywindow_height' => $GLOBALS['cfg']['QueryWindowHeight'], - 'querywindow_width' => $GLOBALS['cfg']['QueryWindowWidth'], 'collation_connection' => $GLOBALS['collation_connection'], 'lang' => $GLOBALS['lang'], 'server' => $GLOBALS['server'], diff --git a/libraries/Util.class.php b/libraries/Util.class.php index 7e3e83b075..688a2adc8b 100644 --- a/libraries/Util.class.php +++ b/libraries/Util.class.php @@ -1176,12 +1176,7 @@ class PMA_Util // even if the query is big and was truncated, offer the chance // to edit it (unless it's enormous, see linkOrButton() ) if (! empty($cfg['SQLQuery']['Edit'])) { - if ($cfg['EditInWindow'] == true) { - $onclick = 'PMA_querywindow.focus(\'' - . PMA_jsFormat($sql_query, false) . '\'); return false;'; - } else { - $onclick = ''; - } + $onclick = ''; $edit_link .= PMA_URL_getCommon($url_params) . '#querybox'; $edit_link = ' [' diff --git a/libraries/common.inc.php b/libraries/common.inc.php index 79dbd92d08..c86667b3b0 100644 --- a/libraries/common.inc.php +++ b/libraries/common.inc.php @@ -380,7 +380,6 @@ $goto_whitelist = array( 'pdf_pages.php', 'pdf_schema.php', //'phpinfo.php', - 'querywindow.php', 'server_binlog.php', 'server_collations.php', 'server_databases.php', diff --git a/libraries/config.default.php b/libraries/config.default.php index 64000e727e..9aa77b7fc8 100644 --- a/libraries/config.default.php +++ b/libraries/config.default.php @@ -2635,28 +2635,6 @@ $cfg['ShowDisplayDirection'] = false; */ $cfg['RepeatCells'] = 100; -/** - * Set to true if Edit link should open the query to edit in the query window - * and to false if we should edit in the right panel - * - * @global boolean $cfg['EditInWindow'] - */ -$cfg['EditInWindow'] = true; - -/** - * Width of Query window - * - * @global integer $cfg['QueryWindowWidth'] - */ -$cfg['QueryWindowWidth'] = 550; - -/** - * Height of Query window - * - * @global integer $cfg['QueryWindowHeight'] - */ -$cfg['QueryWindowHeight'] = 310; - /** * Set to true if you want DB-based query history.If false, this utilizes * JS-routines to display query history (lost by window close) @@ -2665,14 +2643,6 @@ $cfg['QueryWindowHeight'] = 310; */ $cfg['QueryHistoryDB'] = false; -/** - * which tab to display in the querywindow on startup - * (sql|files|history|full) - * - * @global string $cfg['QueryWindowDefTab'] - */ -$cfg['QueryWindowDefTab'] = 'sql'; - /** * When using DB-based query history, how many entries should be kept? * diff --git a/libraries/config.values.php b/libraries/config.values.php index b8012291db..0a205ff51c 100644 --- a/libraries/config.values.php +++ b/libraries/config.values.php @@ -102,12 +102,6 @@ $cfg_db['DefaultTabTable'] = array( 'tbl_change.php', // insert row page 'sql.php' // browse page ); -$cfg_db['QueryWindowDefTab'] = array( - 'sql', // SQL - 'files', // Import files - 'history', // SQL history - 'full' // All (SQL and SQL history) -); $cfg_db['InitialSlidersState'] = array( 'open' => __('Open'), 'closed' => __('Closed'), @@ -234,8 +228,6 @@ $cfg_db['_validators'] = array( 'MemoryLimit' => array(array('validateByRegex', '/^(-1|(\d+(?:[kmg])?))$/i')), 'NavigationTreeTableLevel' => 'validatePositiveNumber', 'QueryHistoryMax' => 'validatePositiveNumber', - 'QueryWindowWidth' => 'validatePositiveNumber', - 'QueryWindowHeight' => 'validatePositiveNumber', 'RepeatCells' => 'validateNonNegativeNumber', 'Server' => 'validateServer', 'Server_pmadb' => 'validatePMAStorage', diff --git a/libraries/config/messages.inc.php b/libraries/config/messages.inc.php index a1dbfc453e..69004963b3 100644 --- a/libraries/config/messages.inc.php +++ b/libraries/config/messages.inc.php @@ -97,8 +97,6 @@ $strConfigDisableMultiTableMaintenance_desc = __( . 'the selected tables of a database.' ); $strConfigDisableMultiTableMaintenance_name = __('Disable multi table maintenance'); -$strConfigEditInWindow_desc = __('Edit SQL queries in popup window.'); -$strConfigEditInWindow_name = __('Edit in window'); $strConfigError_Handler_display_name = __('Display errors'); $strConfigExecTimeLimit_desc = __( 'Set the number of seconds a script is allowed to run ([kbd]0[/kbd] for no ' @@ -518,13 +516,6 @@ $strConfigQueryHistoryDB_name = __('Permanent query history'); $strConfigQueryHistoryMax_cmt = __('Users cannot set a higher value'); $strConfigQueryHistoryMax_desc = __('How many queries are kept in history.'); $strConfigQueryHistoryMax_name = __('Query history length'); -$strConfigQueryWindowDefTab_desc - = __('Tab displayed when opening a new query window.'); -$strConfigQueryWindowDefTab_name = __('Default query window tab'); -$strConfigQueryWindowHeight_desc = __('Query window height (in pixels).'); -$strConfigQueryWindowHeight_name = __('Query window height'); -$strConfigQueryWindowWidth_desc = __('Query window width (in pixels).'); -$strConfigQueryWindowWidth_name = __('Query window width'); $strConfigRecodingEngine_desc = __('Select which functions will be used for character set conversion.'); $strConfigRecodingEngine_name = __('Recoding engine'); diff --git a/libraries/config/setup.forms.php b/libraries/config/setup.forms.php index d91e4ffb52..a55fb93911 100644 --- a/libraries/config/setup.forms.php +++ b/libraries/config/setup.forms.php @@ -154,10 +154,6 @@ $forms['Sql_queries']['Sql_queries'] = array( 'QueryHistoryMax', 'IgnoreMultiSubmitErrors', 'MaxCharactersInDisplayedSQL', - 'EditInWindow', - //'QueryWindowWidth', // overridden in theme - //'QueryWindowHeight', - 'QueryWindowDefTab', 'RetainQueryBox', 'CodemirrorEnable'); $forms['Sql_queries']['Sql_box'] = array('SQLQuery' => array( @@ -233,8 +229,8 @@ $forms['Main_panel']['Tabs'] = array( 'ActionLinksMode', 'DefaultTabServer', 'DefaultTabDatabase', - 'DefaultTabTable', - 'QueryWindowDefTab'); + 'DefaultTabTable' +); $forms['Import']['Import_defaults'] = array('Import' => array( 'format', 'charset', diff --git a/libraries/config/user_preferences.forms.php b/libraries/config/user_preferences.forms.php index 3d4c2568da..2e91ecefcd 100644 --- a/libraries/config/user_preferences.forms.php +++ b/libraries/config/user_preferences.forms.php @@ -67,10 +67,6 @@ $forms['Sql_queries']['Sql_queries'] = array( 'QueryHistoryMax', 'IgnoreMultiSubmitErrors', 'MaxCharactersInDisplayedSQL', - 'EditInWindow', - //'QueryWindowWidth', // overridden in theme - //'QueryWindowHeight', - 'QueryWindowDefTab', 'RetainQueryBox', 'CodemirrorEnable'); $forms['Sql_queries']['Sql_box'] = array( diff --git a/libraries/navigation/NavigationHeader.class.php b/libraries/navigation/NavigationHeader.class.php index e9c6639d89..732e9bd32b 100644 --- a/libraries/navigation/NavigationHeader.class.php +++ b/libraries/navigation/NavigationHeader.class.php @@ -160,18 +160,6 @@ class PMA_NavigationHeader true ); } - $link = 'querywindow.php?'; - $link .= PMA_URL_getCommon($GLOBALS['db'], $GLOBALS['table']); - $link .= '&no_js=true'; - $retval .= PMA_Util::getNavigationLink( - $link, - $showText, - __('Query window'), - $showIcon, - 'b_selboard.png', - 'pma_open_querywindow', - true - ); } $retval .= PMA_Util::getNavigationLink( PMA_Util::getDocuLink('index'), diff --git a/libraries/sql_query_form.lib.php b/libraries/sql_query_form.lib.php index 1a6a1a4985..9f896fad35 100644 --- a/libraries/sql_query_form.lib.php +++ b/libraries/sql_query_form.lib.php @@ -8,7 +8,6 @@ * @usedby tbl_sql.php * @usedby tbl_structure.php * @usedby tbl_tracking.php - * @usedby querywindow.php * @package PhpMyAdmin */ if (! defined('PHPMYADMIN')) { @@ -38,20 +37,14 @@ require_once './libraries/bookmark.lib.php'; // used for bookmarks * @usedby tbl_sql.php * @usedby tbl_structure.php * @usedby tbl_tracking.php - * @usedby querywindow.php */ function PMA_getHtmlForSqlQueryForm( $query = true, $display_tab = false, $delimiter = ';' ) { $html = ''; - // check tab to display if inside querywindow if (! $display_tab) { $display_tab = 'full'; - $is_querywindow = false; - } else { - $is_querywindow = true; } - // query to show if (true === $query) { $query = $GLOBALS['sql_query']; @@ -83,25 +76,10 @@ function PMA_getHtmlForSqlQueryForm( } // start output - if ($is_querywindow) { - $html .= '
'; - } else { - $html .= '' . "\n"; - if ($display_tab != 'sql' && $display_tab != 'full') { - $html .= '' . "\n"; - $html .= '' . "\n"; - } - } $html .= '' . "\n" . PMA_URL_getHiddenInputs($db, $table) . "\n" . '' . "\n" @@ -115,7 +93,7 @@ function PMA_getHtmlForSqlQueryForm( // display querybox if ($display_tab === 'full' || $display_tab === 'sql') { $html .= PMA_getHtmlForSqlQueryFormInsert( - $query, $is_querywindow, $delimiter + $query, $delimiter ); } @@ -149,7 +127,6 @@ function PMA_getHtmlForSqlQueryForm( * return HTML for Sql Query Form Insert * * @param string $query query to display in the textarea - * @param boolean $is_querywindow if inside querywindow or not * @param string $delimiter default delimiter to use * * @return string @@ -157,7 +134,7 @@ function PMA_getHtmlForSqlQueryForm( * @usedby PMA_getHtmlForSqlQueryForm() */ function PMA_getHtmlForSqlQueryFormInsert( - $query = '', $is_querywindow = false, $delimiter = ';' + $query = '', $delimiter = ';' ) { // enable auto select text in textarea if ($GLOBALS['cfg']['TextareaAutoSelect']) { @@ -166,15 +143,8 @@ function PMA_getHtmlForSqlQueryFormInsert( $auto_sel = ''; } - // enable locking if inside query window - if ($is_querywindow) { - $locking = ' onkeypress="document.sqlform.elements[\'LockFromUpdate\'].' - . 'checked = true;"'; - $height = $GLOBALS['cfg']['TextareaRows'] * 1.25; - } else { - $locking = ''; - $height = $GLOBALS['cfg']['TextareaRows'] * 2; - } + $locking = ''; + $height = $GLOBALS['cfg']['TextareaRows'] * 2; $table = ''; $db = ''; @@ -195,10 +165,6 @@ function PMA_getHtmlForSqlQueryFormInsert( // if you want navigation: $tmp_db_link = ''; // else use @@ -221,12 +187,6 @@ function PMA_getHtmlForSqlQueryFormInsert( $tmp_db_link = ''; // else use @@ -343,13 +303,6 @@ function PMA_getHtmlForSqlQueryFormInsert( $html .= '
' . "\n"; $html .= '
' . "\n"; - if ($is_querywindow) { - $html .= ' '; - } $html .= '
' . "\n"; $html .= '
' . "\n"; $html .= '
' . "\n"; $html .= '' . "\n"; $html .= '
' . "\n"; $html .= '
' . "\n"; diff --git a/querywindow.php b/querywindow.php deleted file mode 100644 index 6bc6600dbe..0000000000 --- a/querywindow.php +++ /dev/null @@ -1,208 +0,0 @@ -isSuperuser(); - -/** - * Gets a core script and starts output buffering work - */ -require_once 'libraries/sql_query_form.lib.php'; - -/** - * load relation params - */ -$cfgRelation = PMA_getRelationsParam(); - -/** - * load bookmark support - */ -require_once 'libraries/bookmark.lib.php'; - -$querydisplay_tabs = array( - 'sql', - 'files', - 'history', - 'full', -); - -if (isset($_REQUEST['querydisplay_tab']) - && in_array($_REQUEST['querydisplay_tab'], $querydisplay_tabs) -) { - $querydisplay_tab = $_REQUEST['querydisplay_tab']; -} else { - $querydisplay_tab = $GLOBALS['cfg']['QueryWindowDefTab']; -} - -/** - * $_REQUEST['no_js'] is set if open new window by JavaScript failed - * so this page is loaded in main frame - */ -$no_js = PMA_ifSetOr($_REQUEST['no_js'], false); - -if ($no_js) { - $querydisplay_tab = 'full'; - $tabs = false; -} else { - $tabs = array(); - $tabs['sql']['icon'] = 'b_sql.png'; - $tabs['sql']['text'] = __('SQL'); - $tabs['sql']['fragment'] = '#'; - $tabs['sql']['attr'] = 'onclick="PMA_querywindowCommit(\'sql\');return false;"'; - $tabs['sql']['active'] = (bool) ($querydisplay_tab == 'sql'); - $tabs['import']['icon'] = 'b_import.png'; - $tabs['import']['text'] = __('Import files'); - $tabs['import']['fragment'] = '#'; - $tabs['import']['attr'] - = 'onclick="PMA_querywindowCommit(\'files\');return false;"'; - $tabs['import']['active'] = (bool) ($querydisplay_tab == 'files'); - $tabs['history']['icon'] = 'b_bookmark.png'; - $tabs['history']['text'] = __('SQL history'); - $tabs['history']['fragment'] = '#'; - $tabs['history']['attr'] - = 'onclick="PMA_querywindowCommit(\'history\');return false;"'; - $tabs['history']['active'] = (bool) ($querydisplay_tab == 'history'); - - if ($GLOBALS['cfg']['QueryWindowDefTab'] == 'full') { - $tabs['all']['text'] = __('All'); - $tabs['all']['fragment'] = '#'; - $tabs['all']['attr'] - = 'onclick="PMA_querywindowCommit(\'full\');return false;"'; - $tabs['all']['active'] = (bool) ($querydisplay_tab == 'full'); - } -} - -$titles['Change'] = PMA_Util::getIcon('b_edit.png', __('Change')); -$url_query = PMA_URL_getCommon($db, $table); - -if (! empty($sql_query)) { - $show_query = 1; -} - -if ($no_js) { - // ... we redirect to appropriate query sql page - // works only full if $db and $table is also stored/grabbed from $_COOKIE - if (strlen($table)) { - include 'tbl_sql.php'; - } elseif (strlen($db)) { - include 'db_sql.php'; - } else { - include 'server_sql.php'; - } - exit; -} - -/** - * Defines the query to be displayed in the query textarea - */ -if (! empty($show_query)) { - $query_to_display = $sql_query; -} else if (! empty($_REQUEST['sql_query'])) { - $query_to_display = htmlspecialchars($_REQUEST['sql_query']); - $show_query = 1; -} else { - $query_to_display = ''; -} -$sql_query = ''; - -/** - * prepare JavaScript functionality - */ -$response = PMA_Response::getInstance(); -$response->getFooter()->setMinimal(); -$header = $response->getHeader(); -$header->disableMenuAndConsole(); -$header->setBodyId('bodyquerywindow'); -$scripts = $header->getScripts(); -$scripts->addFile('common.js'); -$scripts->addFile('querywindow.js'); - -if (PMA_isValid($_REQUEST['auto_commit'], 'identical', 'true')) { - $scripts->addEvent('load', 'PMA_queryAutoCommit'); -} -// always set focus to the textarea -if ($querydisplay_tab == 'sql' || $querydisplay_tab == 'full') { - $scripts->addEvent('load', 'PMA_querywindowSetFocus'); -} - -echo '
'; - -if ($tabs) { - echo PMA_Util::getHtmlTabs($tabs, array(), 'topmenu', true); - unset($tabs); -} - -echo PMA_getHtmlForSqlQueryForm($query_to_display, $querydisplay_tab); - -// Hidden forms and query frame interaction stuff - -$_sql_history = PMA_getHistory($GLOBALS['cfg']['Server']['user']); -if (! empty($_sql_history) - && ($querydisplay_tab == 'history' || $querydisplay_tab == 'full') -) { - $tab = $querydisplay_tab != 'full' ? 'sql' : 'full'; - echo __('SQL history:') . '
' - . '' . "\n"; -} - -echo ''; -echo PMA_URL_getHiddenInputs('', ''); -echo ''; -echo ''; -echo ''; -echo ''; -echo ''; -echo '
'; -?> diff --git a/test/libraries/PMA_server_privileges_test.php b/test/libraries/PMA_server_privileges_test.php index ead90de8be..82fff8cff2 100644 --- a/test/libraries/PMA_server_privileges_test.php +++ b/test/libraries/PMA_server_privileges_test.php @@ -65,8 +65,6 @@ class PMA_ServerPrivileges_Test extends PHPUnit_Framework_TestCase $GLOBALS['cfg']['Server']['users'] = 'users'; $GLOBALS['cfg']['ActionLinksMode'] = "both"; $GLOBALS['cfg']['DefaultTabDatabase'] = 'db_structure.php'; - $GLOBALS['cfg']['QueryWindowHeight'] = 100; - $GLOBALS['cfg']['QueryWindowWidth'] = 100; $GLOBALS['cfg']['PmaAbsoluteUri'] = "PmaAbsoluteUri"; $GLOBALS['cfg']['DefaultTabTable'] = "db_structure.php"; $GLOBALS['cfg']['NavigationTreeDefaultTabTable'] = "db_structure.php"; diff --git a/test/libraries/core/PMA_checkPageValidity_test.php b/test/libraries/core/PMA_checkPageValidity_test.php index c9402a9ba5..638bfc44ee 100644 --- a/test/libraries/core/PMA_checkPageValidity_test.php +++ b/test/libraries/core/PMA_checkPageValidity_test.php @@ -29,7 +29,6 @@ class PMA_CheckPageValidity_Test extends PHPUnit_Framework_TestCase 'index.php', 'pdf_pages.php', 'pdf_schema.php', - 'querywindow.php', 'server_binlog.php', 'server_variables.php', 'sql.php', diff --git a/themes/original/css/common.css.php b/themes/original/css/common.css.php index c2d48c2c7c..045cafc986 100644 --- a/themes/original/css/common.css.php +++ b/themes/original/css/common.css.php @@ -1168,25 +1168,6 @@ div#logTable table { } /* end server variables */ -/* querywindow */ -body#bodyquerywindow { - margin: 0; - padding: 0; - background-image: none; - background-color: #F5F5F5; -} - -div#querywindowcontainer { - margin: 0; - padding: 0; - width: 100%; -} - -div#querywindowcontainer fieldset { - margin-top: 0; -} -/* end querywindow */ - /* profiling */ div#profilingchart { @@ -1306,10 +1287,6 @@ li.no_bullets { margin: .5em .5em 0 .5em; } -#bodyquerywindow { - background: ; -} - #bodythemes { width: 500px; margin: auto; diff --git a/themes/original/layout.inc.php b/themes/original/layout.inc.php index 084aeef1c0..b0f91ac037 100644 --- a/themes/original/layout.inc.php +++ b/themes/original/layout.inc.php @@ -75,14 +75,6 @@ $GLOBALS['cfg']['BgOne'] = '#E5E5E5'; // table data row background, alternate $GLOBALS['cfg']['BgTwo'] = '#D5D5D5'; -/** - * query window - */ -// Width of Query window -$GLOBALS['cfg']['QueryWindowWidth'] = 600; -// Height of Query window -$GLOBALS['cfg']['QueryWindowHeight'] = 400; - /** * Chart colors */ diff --git a/themes/pmahomme/css/common.css.php b/themes/pmahomme/css/common.css.php index 4fc432cce4..63fad2b5e3 100644 --- a/themes/pmahomme/css/common.css.php +++ b/themes/pmahomme/css/common.css.php @@ -1544,25 +1544,6 @@ p.notice a { text-decoration: underline; } -/* querywindow */ -body#bodyquerywindow { - margin: 0; - padding: 0; - background-image: none; - background-color: #F5F5F5; -} - -div#querywindowcontainer { - margin: 0; - padding: 0; - width: 100%; -} - -div#querywindowcontainer fieldset { - margin-top: 0; -} -/* end querywindow */ - /* profiling */ div#profilingchart { @@ -1755,10 +1736,6 @@ li.no_bullets { margin: .5em .5em 0 .5em; } -#bodyquerywindow { - background: ; -} - #bodythemes { width: 500px; margin: auto; diff --git a/themes/pmahomme/layout.inc.php b/themes/pmahomme/layout.inc.php index c273b6b3b5..2822b678c7 100644 --- a/themes/pmahomme/layout.inc.php +++ b/themes/pmahomme/layout.inc.php @@ -76,14 +76,6 @@ $GLOBALS['cfg']['BgOne'] = '#E5E5E5'; // table data row background, alternate $GLOBALS['cfg']['BgTwo'] = '#D5D5D5'; -/** - * query window - */ -// Width of Query window -$GLOBALS['cfg']['QueryWindowWidth'] = 600; -// Height of Query window -$GLOBALS['cfg']['QueryWindowHeight'] = 400; - /** * Chart colors */