moved some options (SQL Queries and SQL Box forms)
This commit is contained in:
Crack
2010-07-03 23:22:20 +02:00
parent a3d46e16e2
commit 47cd7c9a20
8 changed files with 45 additions and 33 deletions

View File

@@ -1,6 +1,2 @@
cache'ing of user preferences to avoid round trips to server on each page refresh
backlog:
- Import and Export options
restore cache'ing in phpmyadmin.css.php
make CSS for darkblue_orange

View File

@@ -137,7 +137,7 @@ function display_input($path, $name, $description = '', $type, $value, $value_is
$tr_class = $_FormDisplayGroup ? ' class="group-field"' : '';
if (isset($opts['setvalue']) && $opts['setvalue'] == ':group') {
unset($opts['setvalue']);
$tr_class = ' class="group-header"';
$tr_class = ' class="group-header-field"';
if ($_FormDisplayGroup) {
display_group_footer();
}

View File

@@ -161,9 +161,11 @@ $strSetupForm_Csv = __('CSV');
$strSetupForm_Csv_desc = __('Customize default options');
$strSetupForm_Edit = __('Edit mode');
$strSetupForm_Edit_desc = __('Customize edit mode');
$strSetupForm_Export = __('Export');
$strSetupForm_Export_defaults = __('Export defaults');
$strSetupForm_Export_defaults_desc = __('Customize default export options');
$strSetupForm_General = __('General settings');
$strSetupForm_Import = __('Import');
$strSetupForm_Import_defaults = __('Import defaults');
$strSetupForm_Import_defaults_desc = __('Customize default common import options');
$strSetupForm_Import_export = __('Import / export');
@@ -213,7 +215,7 @@ $strSetupForm_Sql_box = __('SQL Query box');
$strSetupForm_Sql_box_desc = __('Customize links shown in SQL Query boxes');
$strSetupForm_Sql_desc = __('Customize default options');
$strSetupForm_Sql_queries = __('SQL queries');
$strSetupForm_Sql_queries_desc = __('SQL queries settings, for SQL Query box options see [a@?page=form&formset=Main_frame#tab_Sql_box]Navigation frame[/a] settings');
$strSetupForm_Sql_queries_desc = __('SQL queries settings');
$strSetupForm_Startup = __('Startup');
$strSetupForm_Startup_desc = __('Customize startup page');
$strSetupForm_Tabs = __('Tabs');

View File

@@ -94,18 +94,6 @@ $forms['Features']['Security'] = array(
'LoginCookieValidity',
'LoginCookieStore',
'LoginCookieDeleteAll');
$forms['Features']['Sql_queries'] = array(
'ShowSQL',
'Confirm',
'QueryHistoryDB',
'QueryHistoryMax',
'IgnoreMultiSubmitErrors',
'VerboseMultiSubmit',
'MaxCharactersInDisplayedSQL',
'EditInWindow',
//'QueryWindowWidth', // overridden in theme
//'QueryWindowHeight',
'QueryWindowDefTab');
$forms['Features']['Page_titles'] = array(
'TitleDefault',
'TitleTable',
@@ -125,6 +113,24 @@ $forms['Features']['Other_core_settings'] = array(
'MemoryLimit',
'SkipLockedTables',
'UseDbSearch');
$forms['Sql_queries']['Sql_queries'] = array(
'ShowSQL',
'Confirm',
'QueryHistoryDB',
'QueryHistoryMax',
'IgnoreMultiSubmitErrors',
'VerboseMultiSubmit',
'MaxCharactersInDisplayedSQL',
'EditInWindow',
//'QueryWindowWidth', // overridden in theme
//'QueryWindowHeight',
'QueryWindowDefTab');
$forms['Sql_queries']['Sql_box'] = array('SQLQuery' => array(
'Edit',
'Explain',
'ShowAsPHP',
'Validate',
'Refresh'));
$forms['Left_frame']['Left_frame'] = array(
'LeftFrameLight',
'LeftDisplayLogo',
@@ -145,7 +151,7 @@ $forms['Left_frame']['Left_tables'] = array(
'LeftFrameTableLevel',
'ShowTooltip',
'ShowTooltipAliasTB');
$forms['Startup'] = array(
$forms['Main_frame']['Startup'] = array(
'MainPageIconic',
'ShowStats',
'ShowPhpInfo',
@@ -186,12 +192,6 @@ $forms['Main_frame']['Tabs'] = array(
'DefaultTabDatabase',
'DefaultTabTable',
'QueryWindowDefTab');
$forms['Main_frame']['Sql_box'] = array('SQLQuery' => array(
'Edit',
'Explain',
'ShowAsPHP',
'Validate',
'Refresh'));
$forms['Import']['Import_defaults'] = array('Import' => array(
'format',
'allow_interrupt',

View File

@@ -39,7 +39,7 @@ $forms['Sql_queries']['Sql_box'] = array(
'SQLQuery/Edit',
'SQLQuery/Explain',
'SQLQuery/ShowAsPHP',
'SQLQuery/Validate',// [false or no override]
// 'SQLQuery/Validate',// [false or no override]
'SQLQuery/Refresh');
$forms['Features']['Page_titles'] = array(
'TitleDefault',

View File

@@ -16,6 +16,7 @@ $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=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>

View File

@@ -286,14 +286,14 @@ fieldset th, fieldset td, .form .lastrow {
border-top: 1px #555 dotted;
}
fieldset .group-header th, fieldset .group-header td {
background: #F7FBFF;
border: 0 #DEE1FF solid;
border-width: 2px 0 0 0.5em;
fieldset .group-header th {
background: #EAEDFF;
border: none;
}
fieldset .group-header td {
border-left: none;
fieldset .group-header + tr th, fieldset .group-header + tr td,
fieldset p + table tr:first-child td, fieldset p + table tr:first-child th {
border-top: none;
}
fieldset .group-field th {

View File

@@ -1338,6 +1338,18 @@ table#serverconnection_trg_local {
border-top: 1px <?php echo $GLOBALS['cfg']['BgTwo']; ?> solid;
}
fieldset .group-header th {
background: <?php echo $GLOBALS['cfg']['BgTwo']; ?>;
}
fieldset .group-header + tr th {
padding-top: 0.6em;
}
fieldset .group-field th {
padding-left: 1.5em;
}
.config-form .lastrow {
border-top: 1px #000 solid;
}
@@ -1377,6 +1389,7 @@ table#serverconnection_trg_local {
.config-form select,
.config-form textarea {
border: 1px #A7A6AA solid;
height: auto;
}
.config-form input[type="text"]:focus,