diff --git a/js/src/database/multi_table_query.ts b/js/src/database/multi_table_query.ts index adcc9bd478..c864abf821 100644 --- a/js/src/database/multi_table_query.ts +++ b/js/src/database/multi_table_query.ts @@ -168,11 +168,11 @@ AJAX.registerOnload('database/multi_table_query.js', function () { $('#add_column_button').on('click', function () { columnCount++; - var $newColumnDom = $($('#new_column_layout').html()).clone(); + var $newColumnDom = $('
').html($('#new_column_layout').html()); $newColumnDom.find('.jsCriteriaButton').first().attr('data-bs-target', '#criteriaOptionsExtra' + columnCount.toString()); $newColumnDom.find('.jsCriteriaButton').first().attr('aria-controls', 'criteriaOptionsExtra' + columnCount.toString()); $newColumnDom.find('.jsCriteriaOptions').first().attr('id', 'criteriaOptionsExtra' + columnCount.toString()); - $('#add_column_button').parent().before($newColumnDom); + $('#add_column_button').parent().siblings('.row').append($newColumnDom); addNewColumnCallbacks(); }); @@ -190,7 +190,7 @@ AJAX.registerOnload('database/multi_table_query.js', function () { $('.jsRemoveColumn').each(function () { $(this).on('click', function () { - $(this).parent().remove(); + $(this).parent().parent().parent().remove(); }); }); diff --git a/js/src/modules/functions.ts b/js/src/modules/functions.ts index 1cbb71c172..f99773f3ec 100644 --- a/js/src/modules/functions.ts +++ b/js/src/modules/functions.ts @@ -2453,24 +2453,24 @@ function onloadEnumSetEditor (): void { /** * @var dialog HTML code for the ENUM/SET dialog */ - var dialog = '
' + - '
' + - '' + title + '' + + var dialog = '
' + + '
' + title + '
' + + '
' + '

' + getImageTag('s_notice') + window.Messages.enum_hint + '

' + '' + fields + '
' + - '
' + + '
' + '
' + - '
' + + '
' + '		' + - '
' + '
' + - '' + + '
' + ''; $('#enumEditorGoButton').on('click', function () { // When the submit button is clicked, @@ -2585,17 +2585,18 @@ function onloadEnumSetEditor (): void { var seeMore = ''; if (listSize > maxRows) { - seeMore = '
' + - '' + window.Messages.seeMore + '
'; + seeMore = '
' + + '
'; } - var centralColumnsDialog = '
' + - '
' + + var centralColumnsDialog = '
' + + '
' + searchIn + '' + fields + '
' + - '
' + + '
' + seeMore + - ''; + ''; var width = parseInt( ((parseInt($('html').css('font-size'), 10) / 13) * 500).toString(), @@ -2851,7 +2852,7 @@ function indexDialogModal (routeUrl, url, title, callbackSuccess, callbackFailur modal.find('.modal-body').first().html(data.message); $('#indexDialogModalLabel').first().text(title); Functions.verifyColumnsProperties(); - modal.find('.tblFooters').remove(); + modal.find('.card-footer').remove(); Functions.showIndexEditDialog(modal); }); // end $.get() } diff --git a/js/src/modules/indexes.ts b/js/src/modules/indexes.ts index 76911878d3..b869ed3ecb 100644 --- a/js/src/modules/indexes.ts +++ b/js/src/modules/indexes.ts @@ -428,16 +428,17 @@ var removeIndexOnChangeEvent = function () { * @param {string} colIndex Index of new column on form */ function indexTypeSelectionDialog (sourceArray, indexChoice, colIndex): void { - var $singleColumnRadio = $('' + - ''); - var $compositeIndexRadio = $('' + - ''); - var $dialogContent = $('
'); + var $singleColumnRadio = $('
' + + '' + + '
'); + var $compositeIndexRadio = $('
' + + '' + + '
'); + var $dialogContent = $('
'); $dialogContent.append('' + indexChoice.toUpperCase() + ''); - // For UNIQUE/INDEX type, show choice for single-column and composite index. $dialogContent.append($singleColumnRadio); $dialogContent.append($compositeIndexRadio); diff --git a/js/src/normalization.ts b/js/src/normalization.ts index fd4e8e3e32..351bcc2a89 100644 --- a/js/src/normalization.ts +++ b/js/src/normalization.ts @@ -53,7 +53,7 @@ function goTo3NFStep1 (newTables) { 'tables': tables, }, function (data) { $('#page_content').find('h3').html(window.Messages.str3NFNormalization); - $('#mainContent').find('legend').html(data.legendText); + $('#mainContent').find('.card-header').html(data.legendText); $('#mainContent').find('h4').html(data.headText); $('#mainContent').find('p').html(data.subText); $('#mainContent').find('#extra').html(data.extra); @@ -65,7 +65,7 @@ function goTo3NFStep1 (newTables) { }); $('#mainContent').find('#newCols').html(''); - $('.tblFooters').html(''); + $('#mainContent .card-footer').html(''); if (data.subText !== '') { $('') @@ -77,7 +77,7 @@ function goTo3NFStep1 (newTables) { .on('click', function () { processDependencies('', true); }) - .appendTo('.tblFooters'); + .appendTo('#mainContent .card-footer'); } } ); @@ -93,7 +93,7 @@ function goTo2NFStep1 () { 'server': CommonParams.get('server'), }, function (data) { $('#page_content h3').html(window.Messages.str2NFNormalization); - $('#mainContent legend').html(data.legendText); + $('#mainContent .card-header').html(data.legendText); $('#mainContent h4').html(data.headText); $('#mainContent p').html(data.subText); $('#mainContent #extra').html(data.extra); @@ -108,7 +108,7 @@ function goTo2NFStep1 () { .on('click', function () { processDependencies(data.primary_key); }) - .appendTo('.tblFooters'); + .appendTo('#mainContent .card-footer'); } else { if (normalizeto === '3nf') { $('#mainContent #newCols').html(window.Messages.strToNextStep); @@ -127,7 +127,7 @@ function goToFinish1NF () { return true; } - $('#mainContent legend').html(window.Messages.strEndStep); + $('#mainContent .card-header').html(window.Messages.strEndStep); $('#mainContent h4').html( '

' + window.sprintf(window.Messages.strFinishMsg, escapeHtml(CommonParams.get('table'))) + '

' ); @@ -135,7 +135,7 @@ function goToFinish1NF () { $('#mainContent p').html(''); $('#mainContent #extra').html(''); $('#mainContent #newCols').html(''); - $('.tblFooters').html(''); + $('#mainContent .card-footer').html(''); } function goToStep4 () { @@ -147,12 +147,12 @@ function goToStep4 () { 'table': CommonParams.get('table'), 'server': CommonParams.get('server'), }, function (data) { - $('#mainContent legend').html(data.legendText); + $('#mainContent .card-header').html(data.legendText); $('#mainContent h4').html(data.headText); $('#mainContent p').html(data.subText); $('#mainContent #extra').html(data.extra); $('#mainContent #newCols').html(''); - $('.tblFooters').html(''); + $('#mainContent .card-footer').html(''); for (var pk in primaryKey) { $('#extra input[value=\'' + escapeJsString(primaryKey[pk]) + '\']').attr('disabled', 'disabled'); } @@ -179,12 +179,12 @@ function goToStep3 () { 'table': CommonParams.get('table'), 'server': CommonParams.get('server'), }, function (data) { - $('#mainContent legend').html(data.legendText); + $('#mainContent .card-header').html(data.legendText); $('#mainContent h4').html(data.headText); $('#mainContent p').html(data.subText); $('#mainContent #extra').html(data.extra); $('#mainContent #newCols').html(''); - $('.tblFooters').html(''); + $('#mainContent .card-footer').html(''); primaryKey = JSON.parse(data.primary_key); for (var pk in primaryKey) { $('#extra input[value=\'' + escapeJsString(primaryKey[pk]) + '\']').attr('disabled', 'disabled'); @@ -202,11 +202,11 @@ function goToStep2 (extra = undefined) { 'table': CommonParams.get('table'), 'server': CommonParams.get('server') }, function (data) { - $('#mainContent legend').html(data.legendText); + $('#mainContent .card-header').html(data.legendText); $('#mainContent h4').html(data.headText); $('#mainContent p').html(data.subText); $('#mainContent #extra,#mainContent #newCols').html(''); - $('.tblFooters').html(''); + $('#mainContent .card-footer').html(''); if (data.hasPrimaryKey === '1') { if (extra === 'goToStep3') { $('#mainContent h4').html(window.Messages.strPrimaryKeyAdded); @@ -257,11 +257,11 @@ function goTo2NFFinish (pd) { return true; } - $('#mainContent legend').html(data.legendText); + $('#mainContent .card-header').html(data.legendText); $('#mainContent h4').html(data.headText); $('#mainContent p').html(''); $('#mainContent #extra').html(''); - $('.tblFooters').html(''); + $('#mainContent .card-footer').html(''); } else { ajaxShowMessage(data.extra, false); } @@ -299,11 +299,11 @@ function goTo3NFFinish (newTables) { success: function (data) { if (data.success === true) { if (data.queryError === false) { - $('#mainContent legend').html(data.legendText); + $('#mainContent .card-header').html(data.legendText); $('#mainContent h4').html(data.headText); $('#mainContent p').html(''); $('#mainContent #extra').html(''); - $('.tblFooters').html(''); + $('#mainContent .card-footer').html(''); } else { ajaxShowMessage(data.extra, false); } @@ -320,7 +320,7 @@ var backup = ''; function goTo2NFStep2 (pd, primaryKey) { $('#newCols').html(''); - $('#mainContent legend').html(window.Messages.strStep + ' 2.2 ' + window.Messages.strConfirmPd); + $('#mainContent .card-header').html(window.Messages.strStep + ' 2.2 ' + window.Messages.strConfirmPd); $('#mainContent h4').html(window.Messages.strSelectedPd); $('#mainContent p').html(window.Messages.strPdHintNote); var extra = '
'; @@ -360,7 +360,7 @@ function goTo2NFStep2 (pd, primaryKey) { } $('#mainContent #extra').html(extra); - $('.tblFooters').html(''); + $('#mainContent .card-footer').html(''); $('#goTo2NFFinish').on('click', function () { goTo2NFFinish(pd); }); @@ -368,7 +368,7 @@ function goTo2NFStep2 (pd, primaryKey) { function goTo3NFStep2 (pd, tablesTds) { $('#newCols').html(''); - $('#mainContent legend').html(window.Messages.strStep + ' 3.2 ' + window.Messages.strConfirmTd); + $('#mainContent .card-header').html(window.Messages.strStep + ' 3.2 ' + window.Messages.strConfirmTd); $('#mainContent h4').html(window.Messages.strSelectedTd); $('#mainContent p').html(window.Messages.strPdHintNote); var extra = '
'; @@ -412,7 +412,7 @@ function goTo3NFStep2 (pd, tablesTds) { } $('#mainContent #extra').html(extra); - $('.tblFooters').html(''); + $('#mainContent .card-footer').html(''); $('#goTo3NFFinish').on('click', function () { if (! pdFound) { goTo3NFFinish([]); @@ -528,9 +528,9 @@ function moveRepeatingGroup (repeatingCols) { AJAX.registerTeardown('normalization.js', function () { $('#extra').off('click', '#selectNonAtomicCol'); $('#splitGo').off('click'); - $('.tblFooters').off('click', '#saveSplit'); + $('#mainContent .card-footer').off('click', '#saveSplit'); $('#extra').off('click', '#addNewPrimary'); - $('.tblFooters').off('click', '#saveNewPrimary'); + $('#mainContent .card-footer').off('click', '#saveNewPrimary'); $('#extra').off('click', '#removeRedundant'); $('#mainContent p').off('click', '#createPrimaryKey'); $('#mainContent').off('click', '#backEditPd'); @@ -577,7 +577,7 @@ AJAX.registerOnload('normalization.js', function () { value: window.Messages.strSave, class: 'btn btn-primary' }) - .appendTo('.tblFooters'); + .appendTo('#mainContent .card-footer'); $('') .attr({ @@ -590,7 +590,7 @@ AJAX.registerOnload('normalization.js', function () { $('#newCols').html(''); $(this).parent().html(''); }) - .appendTo('.tblFooters'); + .appendTo('#mainContent .card-footer'); } } ); @@ -598,7 +598,7 @@ AJAX.registerOnload('normalization.js', function () { return false; }); - $('.tblFooters').on('click', '#saveSplit', function () { + $('#mainContent .card-footer').on('click', '#saveSplit', function () { window.centralColumnList = []; if ($('#newCols #field_0_1').val() === '') { $('#newCols #field_0_1').trigger('focus'); @@ -627,7 +627,7 @@ AJAX.registerOnload('normalization.js', function () { if (data.success === true) { appendHtmlColumnsList(); $('#newCols').html(''); - $('.tblFooters').html(''); + $('#mainContent .card-footer').html(''); } else { ajaxShowMessage(data.error, false); } @@ -663,7 +663,7 @@ AJAX.registerOnload('normalization.js', function () { value: window.Messages.strSave, class: 'btn btn-primary' }) - .appendTo('.tblFooters'); + .appendTo('#mainContent .card-footer'); $('') .attr({ @@ -676,7 +676,7 @@ AJAX.registerOnload('normalization.js', function () { $('#newCols').html(''); $(this).parent().html(''); }) - .appendTo('.tblFooters'); + .appendTo('#mainContent .card-footer'); } else { ajaxShowMessage(data.error, false); } @@ -686,7 +686,7 @@ AJAX.registerOnload('normalization.js', function () { return false; }); - $('.tblFooters').on('click', '#saveNewPrimary', function () { + $('#mainContent .card-footer').on('click', '#saveNewPrimary', function () { var datastring = $('#newCols :input').serialize(); var argsep = CommonParams.get('arg_separator'); datastring += argsep + 'field_key[0]=primary_0' + argsep + 'ajax_request=1' + argsep + 'do_save_data=1' + argsep + 'field_where=last'; @@ -696,7 +696,7 @@ AJAX.registerOnload('normalization.js', function () { $('#mainContent p').html(window.Messages.strToNextStep); $('#mainContent #extra').html(''); $('#mainContent #newCols').html(''); - $('.tblFooters').html(''); + $('#mainContent .card-footer').html(''); setTimeout(function () { goToStep3(); }, 2000); @@ -759,7 +759,7 @@ AJAX.registerOnload('normalization.js', function () { $('#newCols').html(''); $('#extra input[type=checkbox]').prop('checked', false); }) - .appendTo('.tblFooters'); + .appendTo('#mainContent .card-footer'); $('') .attr({ @@ -770,7 +770,7 @@ AJAX.registerOnload('normalization.js', function () { .on('click', function () { moveRepeatingGroup(repeatingCols); }) - .appendTo('.tblFooters'); + .appendTo('#mainContent .card-footer'); } }); @@ -791,7 +791,7 @@ AJAX.registerOnload('normalization.js', function () { // on success $('.sqlqueryresults').remove(); $('.result_query').remove(); - $('.tblFooters').html(''); + $('#mainContent .card-footer').html(''); goToStep2('goToStep3'); }); diff --git a/js/src/server/status/monitor.ts b/js/src/server/status/monitor.ts index 376e080c60..59aae2a454 100644 --- a/js/src/server/status/monitor.ts +++ b/js/src/server/status/monitor.ts @@ -1932,18 +1932,19 @@ AJAX.registerOnload('server/status/monitor.js', function () { /* Add filter options if more than a bunch of rows there to filter */ if (logData.numRows > 12) { $('#logTable').prepend( - '
' + - ' ' + window.Messages.strFiltersForLogTable + '' + - '
' + - ' ' + - ' ' + + '
' + + '
' + window.Messages.strFiltersForLogTable + '
' + + '
' + + '
' + + ' ' + + ' ' + '
' + - ((logData.numRows > 250) ? '
' : '') + - '
' + - ' ' + - ' ' + - ' ' + '
' + + ' ' + + ' ' + + '
' + + ((logData.numRows > 250) ? '
' : '') + + '
' ); $('#noWHEREData').on('change', function () { diff --git a/libraries/classes/Controllers/Database/DesignerController.php b/libraries/classes/Controllers/Database/DesignerController.php index d416b010c5..3eb7211d18 100644 --- a/libraries/classes/Controllers/Database/DesignerController.php +++ b/libraries/classes/Controllers/Database/DesignerController.php @@ -48,7 +48,7 @@ class DesignerController extends AbstractController } elseif ($dialog === 'export') { $html = $this->databaseDesigner->getHtmlForSchemaExport( $db, - $request->getParsedBodyParam('selected_page'), + (int) $request->getParsedBodyParam('selected_page'), ); } elseif ($dialog === 'add_table') { // Pass the db and table to the getTablesInfo so we only have the table we asked for diff --git a/libraries/classes/Controllers/HomeController.php b/libraries/classes/Controllers/HomeController.php index 5b9f263d90..903243399a 100644 --- a/libraries/classes/Controllers/HomeController.php +++ b/libraries/classes/Controllers/HomeController.php @@ -105,7 +105,7 @@ class HomeController extends AbstractController && (count($GLOBALS['cfg']['Servers']) > 1 || ($GLOBALS['server'] == 0 && count($GLOBALS['cfg']['Servers']) === 1))); if ($hasServerSelection) { - $serverSelection = Select::render(true, true); + $serverSelection = Select::render(true); } if ($GLOBALS['server'] > 0) { diff --git a/libraries/classes/Html/Generator.php b/libraries/classes/Html/Generator.php index 0a43bd4a60..d04720477a 100644 --- a/libraries/classes/Html/Generator.php +++ b/libraries/classes/Html/Generator.php @@ -901,9 +901,9 @@ class Generator $_SESSION['Import_message']['go_back_url'] = $backUrl; - $errorMessage .= '
' + $errorMessage .= '
' . '[ ' . __('Back') . ' ]' - . '
' . "\n\n"; + . '
' . "\n\n"; } $response->callExit($errorMessage); diff --git a/libraries/classes/Navigation/Navigation.php b/libraries/classes/Navigation/Navigation.php index 9911c7c6e7..707e69905c 100644 --- a/libraries/classes/Navigation/Navigation.php +++ b/libraries/classes/Navigation/Navigation.php @@ -84,7 +84,7 @@ class Navigation } if ($GLOBALS['cfg']['NavigationDisplayServers'] && count($GLOBALS['cfg']['Servers']) > 1) { - $serverSelect = Select::render(true, true); + $serverSelect = Select::render(true); } if (! defined('PMA_DISABLE_NAVI_SETTINGS')) { diff --git a/libraries/classes/Normalization.php b/libraries/classes/Normalization.php index c6b4011ebb..e439a0e8d4 100644 --- a/libraries/classes/Normalization.php +++ b/libraries/classes/Normalization.php @@ -193,11 +193,10 @@ class Normalization { $step = 1; $stepTxt = __('Make all columns atomic'); - $html = "

" - . __('First step of normalization (1NF)') . '

'; - $html .= "
" - . '
' - . '' . __('Step 1.') . $step . ' ' . $stepTxt . '' + $html = '

' . __('First step of normalization (1NF)') . '

'; + $html .= '
' + . '
' . __('Step 1.') . $step . ' ' . $stepTxt . '
' + . '
' . '

' . __( 'Do you have any column which can be split into more than one column?' . ' For example: address can be split into street, city, country and zip.', @@ -225,8 +224,7 @@ class Normalization . "" . '

' . "
" - . '
' - . '
' + . '
' . '
'; return $html; diff --git a/libraries/classes/Plugins/Auth/AuthenticationConfig.php b/libraries/classes/Plugins/Auth/AuthenticationConfig.php index 480d3a2c1f..6b0e1acac5 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationConfig.php +++ b/libraries/classes/Plugins/Auth/AuthenticationConfig.php @@ -147,7 +147,7 @@ class AuthenticationConfig extends AuthenticationPlugin // offer a chance to login to other servers if the current one failed echo '' , "\n"; echo ' ' , "\n"; - echo Select::render(true, true); + echo Select::render(true); echo ' ' , "\n"; echo '' , "\n"; } diff --git a/libraries/classes/Plugins/Auth/AuthenticationCookie.php b/libraries/classes/Plugins/Auth/AuthenticationCookie.php index f8f78bdd7f..51628beefc 100644 --- a/libraries/classes/Plugins/Auth/AuthenticationCookie.php +++ b/libraries/classes/Plugins/Auth/AuthenticationCookie.php @@ -138,7 +138,7 @@ class AuthenticationCookie extends AuthenticationPlugin $serversOptions = ''; $hasServers = count($GLOBALS['cfg']['Servers']) > 1; if ($hasServers) { - $serversOptions = Select::render(false, false); + $serversOptions = Select::render(false); } $formParams = []; diff --git a/libraries/classes/Server/Select.php b/libraries/classes/Server/Select.php index 4c5a7f8e6f..82a1f415ef 100644 --- a/libraries/classes/Server/Select.php +++ b/libraries/classes/Server/Select.php @@ -22,9 +22,8 @@ class Select * Renders the server selection in list or selectbox form, or option tags only * * @param bool $notOnlyOptions whether to include form tags or not - * @param bool $omitFieldset whether to omit fieldset tag or not */ - public static function render(bool $notOnlyOptions, bool $omitFieldset): string + public static function render(bool $notOnlyOptions): string { // Show as list? if ($notOnlyOptions) { @@ -90,7 +89,6 @@ class Select return $template->render('server/select/index', [ 'not_only_options' => $notOnlyOptions, - 'omit_fieldset' => $omitFieldset, 'servers' => $servers, 'form_action' => $formAction, ]); diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon index 4680a7b519..2492928567 100644 --- a/phpstan-baseline.neon +++ b/phpstan-baseline.neon @@ -777,7 +777,7 @@ parameters: - message: "#^Cannot cast mixed to int\\.$#" - count: 1 + count: 2 path: libraries/classes/Controllers/Database/DesignerController.php - @@ -885,11 +885,6 @@ parameters: count: 1 path: libraries/classes/Controllers/Database/DesignerController.php - - - message: "#^Parameter \\#2 \\$page of method PhpMyAdmin\\\\Database\\\\Designer\\:\\:getHtmlForSchemaExport\\(\\) expects int, mixed given\\.$#" - count: 1 - path: libraries/classes/Controllers/Database/DesignerController.php - - message: "#^Parameter \\#2 \\$table of method PhpMyAdmin\\\\Database\\\\Designer\\\\Common\\:\\:getTablesInfo\\(\\) expects string\\|null, mixed given\\.$#" count: 2 diff --git a/psalm-baseline.xml b/psalm-baseline.xml index 453e11299e..9066e30d8d 100644 --- a/psalm-baseline.xml +++ b/psalm-baseline.xml @@ -1005,7 +1005,6 @@ getParsedBodyParam('on_delete')]]> getParsedBodyParam('on_update')]]> getParsedBodyParam('selected_page')]]> - getParsedBodyParam('selected_page')]]> getParsedBodyParam('selected_value')]]> getParsedBodyParam('selected_value')]]> getParsedBodyParam('selected_value')]]> diff --git a/public/setup/scss/_custom.scss b/public/setup/scss/_custom.scss index 3cf9933a48..1d970ea9c4 100644 --- a/public/setup/scss/_custom.scss +++ b/public/setup/scss/_custom.scss @@ -287,23 +287,6 @@ fieldset { vertical-align: top; } - &.simple { - th { - width: auto; - min-width: 0; - } - - th, - td { - border-top: none; - border-bottom: 1px #555 dotted; - } - - .lastrow { - border: 0; - } - } - .doc { margin-left: 1em; } diff --git a/public/themes/bootstrap/scss/_common.scss b/public/themes/bootstrap/scss/_common.scss index de642b28ce..6237a81ccf 100644 --- a/public/themes/bootstrap/scss/_common.scss +++ b/public/themes/bootstrap/scss/_common.scss @@ -20,38 +20,6 @@ textarea { } } -.pma-fieldset { - margin-top: 1em; - border-radius: 4px 4px 0 0; - border: #aaa solid 1px; - padding: 0.5em; - background: #eee; - text-shadow: 1px 1px 2px $white; - box-shadow: 1px 1px 2px $white inset; -} - -.pma-fieldset { - .pma-fieldset { - margin: 0.8em; - border: 1px solid #aaa; - background: #e8e8e8; - } - - legend { - float: none; - font-weight: bold; - color: #444; - padding: 5px 10px; - border-radius: 2px; - border: 1px solid #aaa; - background-color: $white; - max-width: 100%; - box-shadow: 3px 3px 15px #bbb; - width: initial; - font-size: 1em; - } -} - // 3.4 .datatable { table-layout: fixed; @@ -71,17 +39,6 @@ textarea { text-shadow: 0 1px 0 $black; } -.pma-fieldset.tblFooters { - margin-top: 0; - margin-bottom: 0.5em; - // avoid a thick line since this should be used under another fieldset - border-top: 0; - text-align: right; - float: none; - clear: both; - border-radius: 0 0 4px 4px; -} - div.null_div { height: 20px; text-align: center; @@ -102,20 +59,6 @@ div.null_div { } } -.pma-fieldset { - .formelement { - float: left; - margin-right: 0.5em; - // IE - white-space: nowrap; - } - - // revert for Gecko - div[class=formelement] { - white-space: normal; - } -} - button.mult_submit { border: none; background-color: transparent; @@ -227,11 +170,6 @@ td .icon { padding: 0 0.5em; } -.confirmation { - color: $black; - background-color: pink; -} - // end messageboxes .new_central_col { @@ -244,39 +182,6 @@ td .icon { color: #009; } -.tblHeaders { - font-weight: bold; - color: $black; - background: #d3dce3; -} - -.tblFooters { - font-weight: normal; - color: $black; - background: #d3dce3; -} - -.tblHeaders a { - &:link, - &:active, - &:visited { - color: #00f; - } -} - -.tblFooters a { - &:link, - &:active, - &:visited { - color: #00f; - } -} - -.tblHeaders a:hover, -.tblFooters a:hover { - color: #f00; -} - .error { border: 1px solid maroon !important; margin-left: 2px; @@ -388,10 +293,6 @@ label.col-3.d-flex.align-items-center { color: gray; } -.max_height_400 { - max-height: 400px; -} - li.last.database { // Avoid having the last item of the tree hidden behind the scroll bar margin-bottom: 15px !important; @@ -549,10 +450,6 @@ div#tablestatistics table { } } -#fieldset_user_global_rights .pma-fieldset { - float: left; -} - #fieldset_user_global_rights > legend input { margin-left: 2em; } @@ -576,8 +473,7 @@ caption a.top { div { &#serverstatus table { - tbody td.descr a, - .tblFooters a { + tbody td.descr a { white-space: nowrap; } } @@ -1321,22 +1217,6 @@ input#auto_increment_opt { } } -.doubleFieldset { - .pma-fieldset { - width: 48%; - float: left; - padding: 0; - } - - legend { - margin-left: 1.5em; - } - - div.wrap { - padding: 1.5em; - } -} - #table_name_col_no_outer { margin-top: 45px; } @@ -1748,10 +1628,6 @@ body .ui-widget { font-size: 1em; } -.ui-dialog .pma-fieldset legend a { - color: #235a81; -} - .ui-draggable { z-index: 801; } @@ -2513,31 +2389,6 @@ body .ui-dialog { } // end of styles for jQuery-ui to support rtl languages -/* templates/database/multi_table_query */ - -.multi_table_query_form { - .query-form__tr--hide { - display: none; - } - - .query-form__fieldset--inline, - .query-form__select--inline { - display: inline; - } - - .query-form__tr--bg-none { - background: none; - } - - .query-form__input--wide { - width: 91%; - } - - .query-form__multi-sql-query { - float: left; - } -} - // templates/database/designer // side menu #name-panel { @@ -2587,10 +2438,6 @@ body .ui-dialog { } } - .doubleFieldset .pma-fieldset { - width: 98%; - } - .ui-dialog { margin: 1%; width: 95% !important; @@ -2641,14 +2488,6 @@ body .ui-dialog { width: 100%; } -// Extra large devices (large desktops, 1200px and up) -@include media-breakpoint-up(xl) { - .pma-fieldset.tblFooters, - .tblFooters { - text-align: left; - } -} - .resize-vertical { resize: vertical; } diff --git a/public/themes/bootstrap/scss/_designer.scss b/public/themes/bootstrap/scss/_designer.scss index 9bdf5c32fe..5790e691b2 100644 --- a/public/themes/bootstrap/scss/_designer.scss +++ b/public/themes/bootstrap/scss/_designer.scss @@ -440,11 +440,6 @@ a { } } -#foreignkeychk { - text-align: left; - cursor: pointer; -} - .side-menu { float: left; position: fixed; diff --git a/public/themes/metro/scss/_common.scss b/public/themes/metro/scss/_common.scss index a63d959a28..c35f3f9c98 100644 --- a/public/themes/metro/scss/_common.scss +++ b/public/themes/metro/scss/_common.scss @@ -67,8 +67,7 @@ body#loginform { line-height: 2; } - a.logo, - .pma-fieldset legend { + a.logo { display: none; } @@ -137,8 +136,7 @@ body#loginform { } .card, - .card-footer, - .pma-fieldset { + .card-footer { border: none; color: var(--navi-color); padding: 0; @@ -150,12 +148,6 @@ body#loginform { border-bottom: none; margin: 0; } - - &.tblFooters { - border: none; - margin: 0; - clear: none; - } } } @@ -314,20 +306,6 @@ textarea { background-color: $body-bg; } -.pma-fieldset { - margin-top: 20px; - border: 1px solid $border-color; - padding: 20px; - background-color: $th-background; - - .pma-fieldset { - margin: 20px; - margin-bottom: 0; - background-color: $body-bg; - border: none; - } -} - legend { float: none; padding: 0 5px; @@ -382,14 +360,6 @@ select { margin-bottom: 20px; } -.pma-fieldset.tblFooters { - margin-top: -1px; - border-top: 0; - text-align: right; - float: none; - clear: both; -} - div.null_div { height: 20px; text-align: center; @@ -410,18 +380,6 @@ div.null_div { } } -.pma-fieldset { - .formelement { - float: left; - margin-right: 0.5em; - } - - /* revert for Gecko */ - div[class="formelement"] { - white-space: normal; - } -} - button.mult_submit { border: none; background-color: transparent; @@ -535,15 +493,6 @@ img.lightbulb { padding: 0; } -.confirmation { - color: $button-color; - background-color: var(--browse-warning-color); -} - -.pma-fieldset.confirmation legend { - background-color: var(--browse-warning-color); -} - .error { border: 1px solid var(--browse-warning-color) !important; padding: 5px; @@ -568,34 +517,6 @@ img.lightbulb { color: #009; } -.tblHeaders { - font-family: $font-family-bold; - color: $th-color; - background: $th-background; - font-weight: normal; -} - -.tblFooters { - font-weight: normal; - color: $th-color; - background: $th-background; -} - -.tblHeaders, -.tblFooters { - a { - &:link, - &:active, - &:visited { - color: #00f; - } - - &:hover { - color: #f00; - } - } -} - /* disabled text */ .disabled { color: #666; @@ -786,10 +707,6 @@ div#tablestatistics table { } } -#fieldset_user_global_rights .pma-fieldset { - float: left; -} - /* END user privileges */ /* serverstatus */ @@ -810,8 +727,7 @@ caption a.top { div { &#serverstatus table { - tbody td.descr a, - .tblFooters a { + tbody td.descr a { white-space: nowrap; } } @@ -1287,62 +1203,9 @@ table#index_columns { /* config forms */ .config-form { - .pma-fieldset { - margin-top: 0; - padding: 0; - clear: both; - background: none; - } - legend { display: none; } - - .pma-fieldset { - p { - margin: 0; - padding: 10px; - background: #fff; - font-family: $font-family-light; - font-size: 16px; - } - - /* form error list */ - .errors { - margin: 0 -2px 1em; - padding: 0.5em 1.5em; - background: #fbead9; - border-color: #c83838; - border-style: solid; - border-width: 1px 0; - list-style: none; - font-family: sans-serif; - font-size: small; - } - - /* field error list */ - .inline_errors { - margin: 0.3em 0.3em 0.3em; - margin-left: 0; - padding: 0; - list-style: none; - color: #9a0000; - font-size: small; - } - - table { - background-color: #fff; - } - - label { - font-weight: normal; - } - - textarea { - margin: 5px; - padding: 5px; - } - } } .insertRowTable textarea { @@ -1439,18 +1302,6 @@ fieldset { } } -form { - &.create_table_form .pma-fieldset.tblFooters, - &#multi_edit_central_columns .pma-fieldset.tblFooters { - background: none; - border: none; - } -} - -#db_or_table_specific_priv .tblFooters { - margin-top: -68px; -} - #edit_user_dialog, #add_user_dialog { margin: 20px !important; @@ -1600,27 +1451,6 @@ input#auto_increment_opt { } } -.doubleFieldset { - .pma-fieldset { - width: 48%; - float: left; - padding: 0; - } - - legend { - margin-left: 1.5em; - } - - div.wrap { - padding: 1.5em; - } -} - -form.append_fields_form .tblFooters { - background: none; - border: none; -} - #table_columns { display: block; overflow: auto; @@ -2032,10 +1862,6 @@ body #ui-datepicker-div { z-index: 9999 !important; } -.ui-dialog .pma-fieldset legend a { - color: #235a81; -} - div#page_content div { &#tableslistcontainer { margin-top: 1em; @@ -2804,45 +2630,12 @@ body { vertical-align: baseline; } -/* templates/database/multi_table_query */ - -.multi_table_query_form { - .query-form__tr--hide { - display: none; - } - - .query-form__fieldset--inline, - .query-form__select--inline { - display: inline; - } - - .query-form__tr--bg-none { - background: none; - } - - .query-form__input--wide { - width: 91%; - } - - .query-form__multi-sql-query { - float: left; - } -} - // Enable scrollable blocks of code .pre-scrollable { max-height: 340px; overflow-y: scroll; } -// Extra large devices (large desktops, 1200px and up) -@include media-breakpoint-up(xl) { - .pma-fieldset.tblFooters, - .tblFooters { - text-align: left; - } -} - .resize-vertical { resize: vertical; } diff --git a/public/themes/metro/scss/_designer.scss b/public/themes/metro/scss/_designer.scss index 7b0c0696b2..b60ae9e238 100644 --- a/public/themes/metro/scss/_designer.scss +++ b/public/themes/metro/scss/_designer.scss @@ -380,11 +380,6 @@ a { } } -#foreignkeychk { - text-align: left; - cursor: pointer; -} - .side-menu { float: left; position: fixed; diff --git a/public/themes/original/scss/_common.scss b/public/themes/original/scss/_common.scss index d4a9121c48..e0e3b97c4a 100644 --- a/public/themes/original/scss/_common.scss +++ b/public/themes/original/scss/_common.scss @@ -60,26 +60,6 @@ textarea.charField { width: 95%; } -.pma-fieldset { - margin-top: 1em; - border: $main-color solid 1px; - padding: 0.5em; - background: $bg-one; - - .pma-fieldset { - margin: 0.8em; - } - - legend { - float: none; - font-weight: bold; - color: #444; - background-color: transparent; - width: initial; - font-size: 1em; - } -} - // buttons in some browsers (eg. Konqueror) are block elements, this breaks design button { display: inline; @@ -101,17 +81,6 @@ button { padding-top: 1em; } -.pma-fieldset.tblFooters { - margin-top: 0; - margin-bottom: 0.5em; - - /* avoid a thick line since this should be used under another fieldset */ - border-top: 0; - text-align: right; - float: none; - clear: both; -} - div.null_div { height: 20px; text-align: center; @@ -132,19 +101,6 @@ div.null_div { } } -.pma-fieldset { - .formelement { - float: left; - margin-right: 0.5em; - white-space: nowrap; - } - - // revert for Gecko - div[class="formelement"] { - white-space: normal; - } -} - button.mult_submit { border: none; background-color: transparent; @@ -238,24 +194,6 @@ img.lightbulb { padding: 0 0.5em; } -.confirmation { - background-color: #ffc; -} - -.pma-fieldset.confirmation { - border: 0.1em solid #f00; - - legend { - border-left: 0.1em solid #f00; - border-right: 0.1em solid #f00; - font-weight: bold; - background-image: url("../img/s_really.png"); - background-repeat: no-repeat; - background-position: 5px 50% #{"/* rtl:97% 50% */"}; - padding: 0.2em 0.2em 0.2em 25px; - } -} - .error { background-color: #ffc; color: #f00; @@ -278,42 +216,6 @@ label.error { color: #009; } -.tblHeaders { - font-weight: bold; - color: $th-color; - background: $th-background; -} - -.tblFooters { - font-weight: normal; - color: $th-color; - background: $th-background; -} - -.tblHeaders a { - &:link, - &:active, - &:visited { - color: #00f; - } - - &:hover { - color: #f00; - } -} - -.tblFooters a { - &:link, - &:active, - &:visited { - color: #00f; - } - - &:hover { - color: #f00; - } -} - /* disabled text */ .disabled { @@ -395,10 +297,6 @@ div.container.modal_form { text-align: left; } -#login_form .pma-fieldset.tblFooters { - text-align: right; -} - #login_form select#select_server { width: 100%; } @@ -446,10 +344,6 @@ div#modalOverlay { color: gray; } -.max_height_400 { - max-height: 400px; -} - li.last.database { // Avoid having the last item of the tree hidden behind the scroll bar margin-bottom: 15px !important; @@ -597,10 +491,6 @@ div#tablestatistics table { } } -#fieldset_user_global_rights .pma-fieldset { - float: left; -} - #fieldset_user_global_rights > legend input { margin-left: 2em; } @@ -621,8 +511,7 @@ caption a.top { div { &#serverstatus table { - tbody td.descr a, - .tblFooters a { + tbody td.descr a { white-space: nowrap; } } @@ -1308,22 +1197,6 @@ input#auto_increment_opt { } } -.doubleFieldset { - .pma-fieldset { - width: 48%; - float: left; - padding: 0; - } - - legend { - margin-left: 0.5em; - } - - div.wrap { - padding: 0.5em; - } -} - #table_name_col_no_outer { margin-top: 45px; } @@ -1751,10 +1624,6 @@ body #ui-datepicker-div { z-index: 9999 !important; } -.ui-dialog .pma-fieldset legend a { - color: #00f; -} - .ui-draggable { z-index: 801; } @@ -2515,31 +2384,6 @@ body { } } -/* templates/database/multi_table_query */ - -.multi_table_query_form { - .query-form__tr--hide { - display: none; - } - - .query-form__fieldset--inline, - .query-form__select--inline { - display: inline; - } - - .query-form__tr--bg-none { - background: none; - } - - .query-form__input--wide { - width: 91%; - } - - .query-form__multi-sql-query { - float: left; - } -} - /* templates/database/designer */ /* side menu */ @@ -2584,10 +2428,6 @@ body { } } - .doubleFieldset .pma-fieldset { - width: 98%; - } - .ui-dialog { margin: 1%; width: 95% !important; @@ -2644,14 +2484,6 @@ body { overflow-y: scroll; } -// Extra large devices (large desktops, 1200px and up) -@include media-breakpoint-up(xl) { - .pma-fieldset.tblFooters, - .tblFooters { - text-align: left; - } -} - .resize-vertical { resize: vertical; } diff --git a/public/themes/pmahomme/scss/_common.scss b/public/themes/pmahomme/scss/_common.scss index 3f1652963a..399cbe3226 100644 --- a/public/themes/pmahomme/scss/_common.scss +++ b/public/themes/pmahomme/scss/_common.scss @@ -194,38 +194,6 @@ textarea { } } -.pma-fieldset { - margin-top: 1em; - border-radius: 4px 4px 0 0; - border: #aaa solid 1px; - padding: 0.5em; - background: #eee; - text-shadow: 1px 1px 2px #fff inset; - box-shadow: 1px 1px 2px #fff inset; -} - -.pma-fieldset { - .pma-fieldset { - margin: 0.8em; - border: 1px solid #aaa; - background: #e8e8e8; - } - - legend { - float: none; - font-weight: bold; - color: #444; - padding: 5px 10px; - border-radius: 2px; - border: 1px solid #aaa; - background-color: #fff; - max-width: 100%; - box-shadow: 3px 3px 15px #bbb; - width: initial; - font-size: 1em; - } -} - // buttons in some browsers (eg. Konqueror) are block elements, this breaks design button { display: inline; @@ -278,17 +246,6 @@ select { text-shadow: 0 1px 0 #000; } -.pma-fieldset.tblFooters { - margin-top: 0; - margin-bottom: 0.5em; - // avoid a thick line since this should be used under another fieldset - border-top: 0; - text-align: right; - float: none; - clear: both; - border-radius: 0 0 4px 4px; -} - div.null_div { height: 20px; text-align: center; @@ -309,20 +266,6 @@ div.null_div { } } -.pma-fieldset { - .formelement { - float: left; - margin-right: 0.5em; - // IE - white-space: nowrap; - } - - // revert for Gecko - div[class=formelement] { - white-space: normal; - } -} - button.mult_submit { border: none; background-color: transparent; @@ -428,11 +371,6 @@ img.lightbulb { padding: 0 0.5em; } -.confirmation { - color: #000; - background-color: pink; -} - .error { border: 1px solid maroon !important; padding: 0.27em; @@ -452,39 +390,6 @@ img.lightbulb { color: #009; } -.tblHeaders { - font-weight: bold; - color: $th-color; - background: $th-background; -} - -.tblFooters { - font-weight: normal; - color: $th-color; - background: $th-background; -} - -.tblHeaders a { - &:link, - &:active, - &:visited { - color: #00f; - } -} - -.tblFooters a { - &:link, - &:active, - &:visited { - color: #00f; - } -} - -.tblHeaders a:hover, -.tblFooters a:hover { - color: #f00; -} - // disabled text .disabled { color: #666; @@ -586,10 +491,6 @@ label.col-3.d-flex.align-items-center { color: gray; } -.max_height_400 { - max-height: 400px; -} - li.last.database { // Avoid having the last item of the tree hidden behind the scroll bar margin-bottom: 15px !important; @@ -735,10 +636,6 @@ div#tablestatistics table { } } -#fieldset_user_global_rights .pma-fieldset { - float: left; -} - #fieldset_user_global_rights > legend input { margin-left: 2em; } @@ -762,8 +659,7 @@ caption a.top { div { &#serverstatus table { - tbody td.descr a, - .tblFooters a { + tbody td.descr a { white-space: nowrap; } } @@ -1502,22 +1398,6 @@ input#auto_increment_opt { } } -.doubleFieldset { - .pma-fieldset { - width: 48%; - float: left; - padding: 0; - } - - legend { - margin-left: 1.5em; - } - - div.wrap { - padding: 1.5em; - } -} - #table_name_col_no_outer { margin-top: 45px; } @@ -1933,10 +1813,6 @@ body #ui-datepicker-div { z-index: 9999 !important; } -.ui-dialog .pma-fieldset legend a { - color: #235a81; -} - .ui-draggable { z-index: 801; } @@ -2651,31 +2527,6 @@ body .ui-dialog { } // end of styles for jQuery-ui to support rtl languages -/* templates/database/multi_table_query */ - -.multi_table_query_form { - .query-form__tr--hide { - display: none; - } - - .query-form__fieldset--inline, - .query-form__select--inline { - display: inline; - } - - .query-form__tr--bg-none { - background: none; - } - - .query-form__input--wide { - width: 91%; - } - - .query-form__multi-sql-query { - float: left; - } -} - // templates/database/designer // side menu #name-panel { @@ -2719,10 +2570,6 @@ body .ui-dialog { } } - .doubleFieldset .pma-fieldset { - width: 98%; - } - .ui-dialog { margin: 1%; width: 95% !important; @@ -2775,14 +2622,6 @@ body .ui-dialog { overflow-y: scroll; } -// Extra large devices (large desktops, 1200px and up) -@include media-breakpoint-up(xl) { - .pma-fieldset.tblFooters, - .tblFooters { - text-align: left; - } -} - .resize-vertical { resize: vertical; } diff --git a/public/themes/pmahomme/scss/_designer.scss b/public/themes/pmahomme/scss/_designer.scss index 8d63ace1ca..d2759df460 100644 --- a/public/themes/pmahomme/scss/_designer.scss +++ b/public/themes/pmahomme/scss/_designer.scss @@ -441,11 +441,6 @@ a { } } -#foreignkeychk { - text-align: left; - cursor: pointer; -} - .side-menu { float: left; position: fixed; diff --git a/templates/columns_definitions/column_definitions_form.twig b/templates/columns_definitions/column_definitions_form.twig index 7ee9752bb9..825139c9e7 100644 --- a/templates/columns_definitions/column_definitions_form.twig +++ b/templates/columns_definitions/column_definitions_form.twig @@ -148,7 +148,8 @@
{% endif %} -
+
+
{% if action == '/table/add-field' or action == '/table/structure/save' %} {% trans %}Online transaction{% context %}Online transaction part of the SQL DDL for InnoDB{% endtrans %}{{ show_mysql_docu('innodb-online-ddl') }} {% endif %} @@ -157,7 +158,8 @@ -
+ +
{% if is_integers_length_restricted %} + {% endfor %} + -
- -
+
+ +
-
- {# Keep the block without a space between the open and close tag #} - -
- + + -
+
-
- + + +
diff --git a/templates/database/routines/execute_form.twig b/templates/database/routines/execute_form.twig index 7b27c536e6..4b34e07bd1 100644 --- a/templates/database/routines/execute_form.twig +++ b/templates/database/routines/execute_form.twig @@ -9,7 +9,7 @@
{% if not ajax %} - + {% endif %} diff --git a/templates/database/search/results.twig b/templates/database/search/results.twig index f1babebf2e..22bd7bab43 100644 --- a/templates/database/search/results.twig +++ b/templates/database/search/results.twig @@ -1,5 +1,5 @@
{% trans 'Routine parameters' %}{% trans 'Routine parameters' %}
{% trans 'Name' %}
-
+ {{- 'Search results for "%s" %s:'|format( criteria_search_string|e, search_type_description diff --git a/templates/display/results/table.twig b/templates/display/results/table.twig index 09e0152625..3571a43abc 100644 --- a/templates/display/results/table.twig +++ b/templates/display/results/table.twig @@ -203,73 +203,82 @@
{% endif %} -
-
-
- - -
-
- - -
-
+
+
+
+
+
+ + +
+
+ + +
+
- {% if relwork and displaywork %} -
-
- - + {% if relwork and displaywork %} +
+
+ + +
+
+ + +
+
+ {% endif %} + +
+
+ + +
+ +
+ + +
+
+ + {# I would have preferred to name this "display_transformation". + This is the only way I found to be able to keep this setting sticky + per SQL query, and at the same time have a default that displays + the transformations. #} +
+
+ + +
-
- - -
-
- {% endif %} -
- - - - - -
- - {# I would have preferred to name this "display_transformation". - This is the only way I found to be able to keep this setting sticky - per SQL query, and at the same time have a default that displays - the transformations. #} -
- - -
- -
- {% if headers.options.possible_as_geometry %} -
- - -
- {% endif %} -
- - -
-
- - +
+ {% if headers.options.possible_as_geometry %} +
+ + +
+ {% endif %} +
+ + +
+
+ + +
+
-
-
-
- -
+
+ +
+
{% if default_sliders_state != 'disabled' %} {% endif %} diff --git a/templates/import_status.twig b/templates/import_status.twig index e87ba0cb54..d5f6bf2adc 100644 --- a/templates/import_status.twig +++ b/templates/import_status.twig @@ -1,3 +1,3 @@ -
+
[ {% trans 'Back' %} ] -
+ diff --git a/templates/indexes.twig b/templates/indexes.twig index 2122fbe68b..04694e17c6 100644 --- a/templates/indexes.twig +++ b/templates/indexes.twig @@ -1,9 +1,10 @@ -
- +
+
{% trans 'Indexes' %} {{ show_mysql_docu('optimizing-database-structure') }} - +
+
{% if indexes is not empty %} {{ indexes_duplicates|raw }} @@ -91,4 +92,5 @@ {% else %}
{{ 'No index defined!'|trans|notice }}
{% endif %} -
+ + diff --git a/templates/navigation/item_unhide_dialog.twig b/templates/navigation/item_unhide_dialog.twig index 05edb681df..1295361eec 100644 --- a/templates/navigation/item_unhide_dialog.twig +++ b/templates/navigation/item_unhide_dialog.twig @@ -1,29 +1,27 @@
-
- {{ get_hidden_inputs(database) }} + {{ get_hidden_inputs(database) }} - {% for type, label in types %} - {% if hidden[type] is iterable %} - {{ not loop.first ? '
' }} - {{ label }} - - - {% for item in hidden[type] %} - - - - - {% endfor %} - -
{{ item }} - {{ get_icon('show', 'Unhide'|trans) }} -
- {% endif %} - {% endfor %} -
+ {% for type, label in types %} + {% if hidden[type] is iterable %} + {{ not loop.first ? '
' }} + {{ label }} + + + {% for item in hidden[type] %} + + + + + {% endfor %} + +
{{ item }} + {{ get_icon('show', 'Unhide'|trans) }} +
+ {% endif %} + {% endfor %}
diff --git a/templates/server/binlog/index.twig b/templates/server/binlog/index.twig index 41bf63c8a7..b38b54ad1f 100644 --- a/templates/server/binlog/index.twig +++ b/templates/server/binlog/index.twig @@ -3,13 +3,11 @@ {% trans 'Binary log' %} -
+ {{ get_hidden_inputs(url_params) }} -
- - {% trans 'Select binary log to view' %} - +
{% trans 'Select binary log to view' %}
+
{% set full_size = 0 %} -
+
{{ sql_message|raw }} diff --git a/templates/server/privileges/add_user_fieldset.twig b/templates/server/privileges/add_user_fieldset.twig index 892eea75ff..d682e4442b 100644 --- a/templates/server/privileges/add_user_fieldset.twig +++ b/templates/server/privileges/add_user_fieldset.twig @@ -1,9 +1,8 @@ -
-
-
- {% trans %}New{% context %}Create new user{% endtrans %} - - {{ get_icon('b_usradd') }}{% trans 'Add user account' %} -
-
+
+
{% trans %}New{% context %}Create new user{% endtrans %}
+
+ + {{- get_icon('b_usradd', 'Add user account'|trans) -}} + +
diff --git a/templates/server/privileges/user_overview.twig b/templates/server/privileges/user_overview.twig index ef02aae2c8..5faef7638b 100644 --- a/templates/server/privileges/user_overview.twig +++ b/templates/server/privileges/user_overview.twig @@ -16,14 +16,12 @@ {% if users_overview is not empty %} {{- users_overview|raw -}} {% elseif is_createuser %} -
-
-
- {% trans %}New{% context %}Create new user{% endtrans %} - - {{- get_icon('b_usradd', 'Add user account'|trans) -}} - -
+
+
{% trans %}New{% context %}Create new user{% endtrans %}
+
+ + {{- get_icon('b_usradd', 'Add user account'|trans) -}} +
{% endif %} diff --git a/templates/server/replication/change_primary.twig b/templates/server/replication/change_primary.twig index 38304171d8..6bc8ed16ed 100644 --- a/templates/server/replication/change_primary.twig +++ b/templates/server/replication/change_primary.twig @@ -1,10 +1,13 @@ -
+ {{ get_hidden_inputs('', '') }} -
- - {% trans 'Replica configuration' %} - - {% trans 'Change or reconfigure primary server' %} - + + + +
+ {% trans 'Replica configuration - Change or reconfigure primary server' %} +
+ +

{% trans 'Make sure you have a unique server-id in your configuration file (my.cnf). If not, please add the following line into [mysqld] section:' %}

@@ -26,10 +29,9 @@
-
-
+ +
- +
diff --git a/templates/server/replication/primary_add_replica_user.twig b/templates/server/replication/primary_add_replica_user.twig index 6140bcde4e..d7f9a63377 100644 --- a/templates/server/replication/primary_add_replica_user.twig +++ b/templates/server/replication/primary_add_replica_user.twig @@ -1,16 +1,16 @@
-
+ {{ get_hidden_inputs('', '') }} + + + {# Needed for the replication replicas. #} + + + -
- {% trans 'Add replica replication user' %} - - - - {# Needed for the replication replicas. #} - - +
{% trans 'Add replica replication user' %}
+
-
+
- +
diff --git a/templates/server/replication/primary_configuration.twig b/templates/server/replication/primary_configuration.twig index c79426262f..1888b9e7b6 100644 --- a/templates/server/replication/primary_configuration.twig +++ b/templates/server/replication/primary_configuration.twig @@ -1,32 +1,35 @@ -
- {% trans 'Primary configuration' %} -

- {% trans %} - This server is not configured as a primary server in a replication process. You can choose from either replicating all databases and ignoring some of them (useful if you want to replicate a majority of the databases) or you can choose to ignore all databases by default and allow only certain databases to be replicated. Please select the mode: - {% endtrans %} -

- -

{% trans 'Please select databases:' %}

- {{ database_multibox|raw }} -

- {% trans %} - Now, add the following lines at the end of [mysqld] section in your my.cnf and please restart the MySQL server afterwards. - {% endtrans %} -

- 

-  

-    {% trans %}
-      Once you restarted MySQL server, please click on Go button. Afterwards, you should see a message informing you, that this server is configured as primary.
-    {% endtrans %}
-  

-

+

+  
{% trans 'Primary configuration' %}

 
-

-  

-    {{ get_hidden_inputs('', '') }}
-    
-  

-

+  

+    

+      {% trans %}
+        This server is not configured as a primary server in a replication process. You can choose from either replicating all databases and ignoring some of them (useful if you want to replicate a majority of the databases) or you can choose to ignore all databases by default and allow only certain databases to be replicated. Please select the mode:
+      {% endtrans %}
+    

+    
+    
{% trans 'Please select databases:' %}

+    {{ database_multibox|raw }}
+    

+      {% trans %}
+        Now, add the following lines at the end of [mysqld] section in your my.cnf and please restart the MySQL server afterwards.
+      {% endtrans %}
+    

+    

+    

+      {% trans %}
+        Once you restarted MySQL server, please click on Go button. Afterwards, you should see a message informing you, that this server is configured as primary.
+      {% endtrans %}
+    

+  

+
+  

+    

+      {{ get_hidden_inputs('', '') }}
+      
+    

+  

+

diff --git a/templates/server/select/index.twig b/templates/server/select/index.twig
index 2bb5d10c4b..f3afd81b6e 100644
--- a/templates/server/select/index.twig
+++ b/templates/server/select/index.twig
@@ -1,8 +1,5 @@
 {% if not_only_options %}
     

-        {% if omit_fieldset == false %}
-            

-        {% endif %}
         {{ get_hidden_fields([]) }}
         
         
-        {% if omit_fieldset == false %}
-            

-        {% endif %}
     

 {% elseif servers.list %}
     {% trans 'Current server:' %}

diff --git a/templates/setup/home/index.twig b/templates/setup/home/index.twig
index 04b7285f08..34da6bab85 100644
--- a/templates/setup/home/index.twig
+++ b/templates/setup/home/index.twig
@@ -30,9 +30,10 @@
   
 {% endfor %}
 
-

-  {% trans 'Servers' %}
+

+  
{% trans 'Servers' %}

 
+  

   

     
     {% if has_check_page_refresh %}
@@ -92,11 +93,13 @@
   

 
   
-

+  
+
 
-

-  {% trans 'Configuration file' %}
+

+  
{% trans 'Configuration file' %}

 
+  

   

     
     {% if has_check_page_refresh %}
@@ -169,7 +172,8 @@
   

 
   
-
+

+
 
 
     {# The modal already has buttons to execute and preview SQL #}
     {%- if not create_edit_table -%}
-    

+    

         
         
-    

+    
     {%- endif -%}
 
 {% if is_from_nav %}
diff --git a/templates/table/index_rename_form.twig b/templates/table/index_rename_form.twig
index 64db87c4d9..a57ecca0dc 100644
--- a/templates/table/index_rename_form.twig
+++ b/templates/table/index_rename_form.twig
@@ -1,8 +1,8 @@
-

+
 
   {{ get_hidden_inputs(form_params) }}
 
-  

+  

     

       

           

@@ -23,8 +23,8 @@
               onfocus="this.select()">
       

     

-  

-  

+  
+  

     
-  

+  
 

diff --git a/templates/table/insert/get_head_and_foot_of_insert_row_table.twig b/templates/table/insert/get_head_and_foot_of_insert_row_table.twig
index c7ae0c4919..347fe06a70 100644
--- a/templates/table/insert/get_head_and_foot_of_insert_row_table.twig
+++ b/templates/table/insert/get_head_and_foot_of_insert_row_table.twig
@@ -11,7 +11,7 @@
     
      
     
-      
+      
         
         
       
diff --git a/templates/table/normalization/normalization.twig b/templates/table/normalization/normalization.twig
index 381df0ca5f..398a62f537 100644
--- a/templates/table/normalization/normalization.twig
+++ b/templates/table/normalization/normalization.twig
@@ -1,26 +1,28 @@
-

+
   {{ get_hidden_inputs(db, table) }}
 
-  

-    {{ 'Improve table structure (Normalization):'|trans }}
+  
{{ 'Improve table structure (Normalization):'|trans }}

 
-    
{{ 'Select up to what step you want to normalize'|trans }}

+  

+    
{{ 'Select up to what step you want to normalize'|trans }}

 
-    

-      
-      
+    {{ 'Hint: Please follow the procedure carefully in order to obtain correct normalization'|trans|notice }}
+
+    

+      
+      
     

-    

-      
-      
+    

+      
+      
     

-    

-      
-      
+    

+      
+      
     

-  

-  

-    {{ 'Hint: Please follow the procedure carefully in order to obtain correct normalization'|trans }}
+  
+
+  

     
-  

+  
 

diff --git a/templates/table/relation/common_form.twig b/templates/table/relation/common_form.twig
index a22d6339c7..f95c56067d 100644
--- a/templates/table/relation/common_form.twig
+++ b/templates/table/relation/common_form.twig
@@ -1,194 +1,200 @@
 {% extends 'table/page_with_secondary_tabs.twig' %}
 
 {% block content %}
-

-    {{ get_hidden_inputs(db, table) }}
-    {# InnoDB #}
-    {% if is_foreign_key_supported %}
-        

-            {% trans 'Foreign key constraints' %}
-            

+  

+    
+      {{ get_hidden_inputs(db, table) }}
+      {# InnoDB #}
+      {% if is_foreign_key_supported %}
+        

+          
{% trans 'Foreign key constraints' %}

+          

+          

             
-                
+              
-                    
-                    
-                    {% if tbl_storage_engine|upper == 'INNODB' %}
-                        
-                    {% else %}
-                        
-                    {% endif %}
-                    
-                
-                
-                    
-                    
-                    
-                    
-                    
-                    
-                
-                {{ foreign_key_row|raw }}
-                
-                    
-                
-            

                 
{% trans 'Actions' %}{% trans 'Constraint properties' %}
-                            {% trans 'Column' %}
-                            {{ show_hint('Creating a foreign key over a non-indexed column would automatically create an index on it. Alternatively, you can define an index below, before creating the foreign key.'|trans) }}
-                        
-                            {% trans 'Column' %}
-                            {{ show_hint('Only columns with index will be displayed. You can define an index below.'|trans) }}
-                        
-                        {% trans 'Foreign key constraint' %}
-                        ({{ tbl_storage_engine }})
-                    
{% trans 'Database' %}{% trans 'Table' %}{% trans 'Column' %}

-                        
-                            {% trans '+ Add constraint' %}
-                        
-                    

-            

-        

-    {% endif %}
-
-    {% if relation_parameters.relationFeature is not null %}
-        {% if default_sliders_state != 'disabled' and is_foreign_key_supported %}
-        

-          
-        

-        

-        {% endif %}
-
-        

-            
-                {% trans 'Internal relationships' %}
-                {{ show_docu('config', 'cfg_Servers_relation') }}
-            
-            
-                
-                  
-                    
+                  
+                  
+                  {% if tbl_storage_engine|upper == 'INNODB' %}
                     
-                  
-                
-                
-                    {% set saved_row_cnt = save_row|length - 1 %}
-                    {% for i in 0..saved_row_cnt %}
-                        {% set myfield = save_row[i]['Field'] %}
-                        {# Use an md5 as array index to avoid having special characters
-                           in the name attribute (see bug #1746964 ) #}
-                        {% set myfield_md5 = column_hash_array[myfield] %}
-
-                        {% set foreign_table = false %}
-                        {% set foreign_column = false %}
-
-                        {# Database dropdown #}
-                        {% if existrel[myfield] is defined %}
-                            {% set foreign_db = existrel[myfield]['foreign_db'] %}
-                        {% else %}
-                            {% set foreign_db = db %}
-                        {% endif %}
-
-                        {# Table dropdown #}
-                        {% set tables = [] %}
-                        {% if foreign_db %}
-                            {% if existrel[myfield] is defined %}
-                                {% set foreign_table = existrel[myfield]['foreign_table'] %}
-                            {% endif %}
-                            {% set tables = dbi.getTables(foreign_db) %}
-                        {% endif %}
-
-                        {# Column dropdown #}
-                        {% set unique_columns = [] %}
-                        {% if foreign_db and foreign_table %}
-                            {% if existrel[myfield] is defined %}
-                                {% set foreign_column = existrel[myfield]['foreign_field'] %}
-                            {% endif %}
-                            {% set table_obj = table_get(foreign_table, foreign_db, dbi) %}
-                            {% set unique_columns = table_obj.getUniqueColumns(false, false) %}
-                        {% endif %}
-
-                        
-                            
-
-                            
-                        
-                    {% endfor %}
-                
+                  {% else %}
+                    
+                  {% endif %}
+                  
+                
+                
+                  
+                  
+                  
+                  
+                  
+                  
+                
+              
+              {{ foreign_key_row|raw }}
+              
+                
+              
{% trans 'Column' %}{% trans 'Actions' %}{% trans 'Constraint properties' %}
-                      {% trans 'Internal relation' %}
-                      {% if is_foreign_key_supported %}
-                        {{ show_hint('An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'|trans) }}
-                      {% endif %}
+                      {% trans 'Column' %}
+                      {{ show_hint('Creating a foreign key over a non-indexed column would automatically create an index on it. Alternatively, you can define an index below, before creating the foreign key.'|trans) }}
                     

-                                {{ myfield }}
-                                
-                            
-                                {% include 'table/relation/relational_dropdown.twig' with {
-                                    'name': 'destination_db[' ~ myfield_md5 ~ ']',
-                                    'title': 'Database'|trans,
-                                    'values': databases,
-                                    'foreign': foreign_db
-                                } only %}
-
-                                {% include 'table/relation/relational_dropdown.twig' with {
-                                    'name': 'destination_table[' ~ myfield_md5 ~ ']',
-                                    'title': 'Table'|trans,
-                                    'values': tables,
-                                    'foreign': foreign_table
-                                } only %}
-
-                                {% include 'table/relation/relational_dropdown.twig' with {
-                                    'name': 'destination_column[' ~ myfield_md5 ~ ']',
-                                    'title': 'Column'|trans,
-                                    'values': unique_columns,
-                                    'foreign': foreign_column
-                                } only %}
-                            

+                      {% trans 'Column' %}
+                      {{ show_hint('Only columns with index will be displayed. You can define an index below.'|trans) }}
+                    
+                    {% trans 'Foreign key constraint' %}
+                    ({{ tbl_storage_engine }})
+                  
{% trans 'Database' %}{% trans 'Table' %}{% trans 'Column' %}

+                  
+                    {% trans '+ Add constraint' %}
+                  
+                

             

-        

-        {% if default_sliders_state != 'disabled' and is_foreign_key_supported %}
+          

+          
         
+      {% endif %}
+
+      {% if relation_parameters.relationFeature is not null %}
+        {% if default_sliders_state != 'disabled' and is_foreign_key_supported %}
+          

+            
+          

+          

         {% endif %}
-    {% endif %}
 
-    {% if relation_parameters.displayFeature is not null %}
-        

-            
-            
-        

-    {% endif %}
+        

+          

+            {% trans 'Internal relationships' %}
+            {{ show_docu('config', 'cfg_Servers_relation') }}
+          

+          

+          
+            
+              
+                
+                
+              
+            
+            
+              {% set saved_row_cnt = save_row|length - 1 %}
+              {% for i in 0..saved_row_cnt %}
+                {% set myfield = save_row[i]['Field'] %}
+                {# Use an md5 as array index to avoid having special characters in the name attribute (see bug #1746964 ) #}
+                {% set myfield_md5 = column_hash_array[myfield] %}
 
-    

+                {% set foreign_table = false %}
+                {% set foreign_column = false %}
+
+                {# Database dropdown #}
+                {% if existrel[myfield] is defined %}
+                  {% set foreign_db = existrel[myfield]['foreign_db'] %}
+                {% else %}
+                  {% set foreign_db = db %}
+                {% endif %}
+
+                {# Table dropdown #}
+                {% set tables = [] %}
+                {% if foreign_db %}
+                  {% if existrel[myfield] is defined %}
+                    {% set foreign_table = existrel[myfield]['foreign_table'] %}
+                  {% endif %}
+                  {% set tables = dbi.getTables(foreign_db) %}
+                {% endif %}
+
+                {# Column dropdown #}
+                {% set unique_columns = [] %}
+                {% if foreign_db and foreign_table %}
+                  {% if existrel[myfield] is defined %}
+                    {% set foreign_column = existrel[myfield]['foreign_field'] %}
+                  {% endif %}
+                  {% set table_obj = table_get(foreign_table, foreign_db, dbi) %}
+                  {% set unique_columns = table_obj.getUniqueColumns(false, false) %}
+                {% endif %}
+
+                

+                  
+
+                  
+                
+              {% endfor %}
+            
+          
{% trans 'Column' %}
+                  {% trans 'Internal relation' %}
+                  {% if is_foreign_key_supported %}
+                    {{ show_hint('An internal relation is not necessary when a corresponding FOREIGN KEY relation exists.'|trans) }}
+                  {% endif %}
+                

+                    {{ myfield }}
+                    
+                  
+                    {% include 'table/relation/relational_dropdown.twig' with {
+                      'name': 'destination_db[' ~ myfield_md5 ~ ']',
+                      'title': 'Database'|trans,
+                      'values': databases,
+                      'foreign': foreign_db
+                    } only %}
+
+                    {% include 'table/relation/relational_dropdown.twig' with {
+                      'name': 'destination_table[' ~ myfield_md5 ~ ']',
+                      'title': 'Table'|trans,
+                      'values': tables,
+                      'foreign': foreign_table
+                    } only %}
+
+                    {% include 'table/relation/relational_dropdown.twig' with {
+                      'name': 'destination_column[' ~ myfield_md5 ~ ']',
+                      'title': 'Column'|trans,
+                      'values': unique_columns,
+                      'foreign': foreign_column
+                    } only %}
+                  

+          

+        

+        {% if default_sliders_state != 'disabled' and is_foreign_key_supported %}
+          

+        {% endif %}
+      {% endif %}
+
+      {% if relation_parameters.displayFeature is not null %}
+        

+          
+          
+        

+      {% endif %}
+
+      

         
         
-    
-
+      

+    
 
-